From a9ee92940070097b65282c912f0a3d9f97c93e7b Mon Sep 17 00:00:00 2001 From: dge21 <129136517+dge21@users.noreply.github.com> Date: Mon, 5 Feb 2024 13:55:58 -0500 Subject: [PATCH 1/3] Update fun.yml Signed-off-by: dge21 <129136517+dge21@users.noreply.github.com> --- .../Prototypes/Catalog/Fills/Crates/fun.yml | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/Resources/Prototypes/Catalog/Fills/Crates/fun.yml b/Resources/Prototypes/Catalog/Fills/Crates/fun.yml index 3a20d6d47a9..7210dea7819 100644 --- a/Resources/Prototypes/Catalog/Fills/Crates/fun.yml +++ b/Resources/Prototypes/Catalog/Fills/Crates/fun.yml @@ -368,4 +368,21 @@ - id: BoxDarts amount: 1 prob: 0.05 + +- type: entity + name: cap gun box set + description: A box filled with fun, harmless cap guns that are sure to keep security entertained and the air smelling of sulfur. + id: CrateCapGunSet + parent: CratePlastic + components: + - type: StorageFill + contents: + - id: RevolverCapGun + amount: 1 + - id: BaseSpeedLoaderCap + amount: 2 + - id: BoxCartridgeCap + amount: 2 + + From 7415473e72bc71b52818e25e52a6570123f36909 Mon Sep 17 00:00:00 2001 From: dge21 <129136517+dge21@users.noreply.github.com> Date: Mon, 5 Feb 2024 13:56:12 -0500 Subject: [PATCH 2/3] Update cargo_fun.yml Signed-off-by: dge21 <129136517+dge21@users.noreply.github.com> --- Resources/Prototypes/Catalog/Cargo/cargo_fun.yml | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/Resources/Prototypes/Catalog/Cargo/cargo_fun.yml b/Resources/Prototypes/Catalog/Cargo/cargo_fun.yml index e3092724dc6..55d61f30504 100644 --- a/Resources/Prototypes/Catalog/Cargo/cargo_fun.yml +++ b/Resources/Prototypes/Catalog/Cargo/cargo_fun.yml @@ -208,6 +208,16 @@ category: Fun group: market +- type: cargoProduct + id: CapGunSet + icon: + sprite: Objects/Fun/caps.rsi + state: icon + product: CrateCapGunSet + cost: 550 + category: Fun + group: market + #- type: cargoProduct # id: FunCrateGambling # icon: From f23d0dc094f2d56820fe7cc5f259906041e445fd Mon Sep 17 00:00:00 2001 From: dge21 <129136517+dge21@users.noreply.github.com> Date: Mon, 12 Feb 2024 01:42:29 -0500 Subject: [PATCH 3/3] Update Resources/Prototypes/Catalog/Fills/Crates/fun.yml Co-authored-by: Fluffiest Floofers Signed-off-by: dge21 <129136517+dge21@users.noreply.github.com> --- Resources/Prototypes/Catalog/Fills/Crates/fun.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/Catalog/Fills/Crates/fun.yml b/Resources/Prototypes/Catalog/Fills/Crates/fun.yml index 7210dea7819..1d78338320c 100644 --- a/Resources/Prototypes/Catalog/Fills/Crates/fun.yml +++ b/Resources/Prototypes/Catalog/Fills/Crates/fun.yml @@ -379,7 +379,7 @@ contents: - id: RevolverCapGun amount: 1 - - id: BaseSpeedLoaderCap + - id: SpeedLoaderCap amount: 2 - id: BoxCartridgeCap amount: 2