From 49406825a1c5a6b8e6e9fb3ca1dbade6a7393549 Mon Sep 17 00:00:00 2001 From: Ermucat Date: Sat, 7 Dec 2024 19:51:08 -0500 Subject: [PATCH 1/4] More rubber duckies --- Resources/Prototypes/Catalog/Fills/Crates/fun.yml | 2 ++ Resources/Prototypes/Catalog/Fills/Crates/service.yml | 1 + Resources/Prototypes/_Harmony/Catalog/Fills/Items/toolboxes.yml | 2 ++ 3 files changed, 5 insertions(+) diff --git a/Resources/Prototypes/Catalog/Fills/Crates/fun.yml b/Resources/Prototypes/Catalog/Fills/Crates/fun.yml index 411dc307210351..ef0c069214f1ff 100644 --- a/Resources/Prototypes/Catalog/Fills/Crates/fun.yml +++ b/Resources/Prototypes/Catalog/Fills/Crates/fun.yml @@ -324,6 +324,8 @@ - id: PlasticBanana - id: WhoopieCushion - id: ToyHammer + - id: ToyRubberDuck + amount: 2 - id: MrChips orGroup: GiftPool - id: MrDips diff --git a/Resources/Prototypes/Catalog/Fills/Crates/service.yml b/Resources/Prototypes/Catalog/Fills/Crates/service.yml index 59a1ed476d7823..298fe11506ed8e 100644 --- a/Resources/Prototypes/Catalog/Fills/Crates/service.yml +++ b/Resources/Prototypes/Catalog/Fills/Crates/service.yml @@ -20,6 +20,7 @@ - id: Plunger amount: 2 - id: BoxCleanerGrenades + - id: ToyRubberDuck - type: entity id: CrateServiceReplacementLights diff --git a/Resources/Prototypes/_Harmony/Catalog/Fills/Items/toolboxes.yml b/Resources/Prototypes/_Harmony/Catalog/Fills/Items/toolboxes.yml index 7bccf6f8206472..0a03006e0d7f41 100644 --- a/Resources/Prototypes/_Harmony/Catalog/Fills/Items/toolboxes.yml +++ b/Resources/Prototypes/_Harmony/Catalog/Fills/Items/toolboxes.yml @@ -6,6 +6,8 @@ components: - type: StorageFill contents: + - id: ToyRubberDuck + amount: 2 - id: Screwdriver - id: Wrench - id: NetworkConfigurator From 98f8d4f2e658f363fbc9f22d1ca1844b5c0218fe Mon Sep 17 00:00:00 2001 From: Ermucat Date: Sun, 8 Dec 2024 12:18:49 -0500 Subject: [PATCH 2/4] Update Resources/Prototypes/Catalog/Fills/Crates/fun.yml Co-authored-by: FluffMe <1780586+FluffMe@users.noreply.github.com> Signed-off-by: Ermucat --- 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 ef0c069214f1ff..154e3e028e2d56 100644 --- a/Resources/Prototypes/Catalog/Fills/Crates/fun.yml +++ b/Resources/Prototypes/Catalog/Fills/Crates/fun.yml @@ -324,7 +324,7 @@ - id: PlasticBanana - id: WhoopieCushion - id: ToyHammer - - id: ToyRubberDuck + - id: ToyRubberDuck # Harmony change. More ways to spawn duckies amount: 2 - id: MrChips orGroup: GiftPool From 78f18ec9fb7b4fcc13b1464dd86df5e02df3d41a Mon Sep 17 00:00:00 2001 From: Ermucat Date: Sun, 8 Dec 2024 12:18:57 -0500 Subject: [PATCH 3/4] Update Resources/Prototypes/Catalog/Fills/Crates/service.yml Co-authored-by: FluffMe <1780586+FluffMe@users.noreply.github.com> Signed-off-by: Ermucat --- Resources/Prototypes/Catalog/Fills/Crates/service.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/Catalog/Fills/Crates/service.yml b/Resources/Prototypes/Catalog/Fills/Crates/service.yml index 298fe11506ed8e..80d092c144e0f8 100644 --- a/Resources/Prototypes/Catalog/Fills/Crates/service.yml +++ b/Resources/Prototypes/Catalog/Fills/Crates/service.yml @@ -20,7 +20,7 @@ - id: Plunger amount: 2 - id: BoxCleanerGrenades - - id: ToyRubberDuck + - id: ToyRubberDuck # Harmony change. More ways to spawn duckies - type: entity id: CrateServiceReplacementLights From 525af371ff4635ccbf5188078a4f1c3ec6c925ae Mon Sep 17 00:00:00 2001 From: Ermucat Date: Sun, 8 Dec 2024 12:34:43 -0500 Subject: [PATCH 4/4] Removes ducks from janitorial toolbox because they already exist --- Resources/Prototypes/_Harmony/Catalog/Fills/Items/toolboxes.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/Resources/Prototypes/_Harmony/Catalog/Fills/Items/toolboxes.yml b/Resources/Prototypes/_Harmony/Catalog/Fills/Items/toolboxes.yml index 0a03006e0d7f41..7bccf6f8206472 100644 --- a/Resources/Prototypes/_Harmony/Catalog/Fills/Items/toolboxes.yml +++ b/Resources/Prototypes/_Harmony/Catalog/Fills/Items/toolboxes.yml @@ -6,8 +6,6 @@ components: - type: StorageFill contents: - - id: ToyRubberDuck - amount: 2 - id: Screwdriver - id: Wrench - id: NetworkConfigurator