From 3f550fde418cd69a78b648e7bfa8b1cc07e7249e Mon Sep 17 00:00:00 2001 From: KyuPolaris Date: Sun, 30 Jun 2024 12:28:52 +1000 Subject: [PATCH 1/5] meowstrogen (juice that makes you meow :3) --- .../en-US/deltav/flavors/flavor-profiles.ftl | 1 + .../Locale/en-US/deltav/reagents/meta/fun.ftl | 2 ++ .../Prototypes/DeltaV/Flavors/flavors.yml | 5 ++++ .../DeltaV/Polymorphs/polymorph.yml | 11 +++++++ Resources/Prototypes/DeltaV/Reagents/fun.yml | 30 +++++++++++++++++++ .../Entities/Clothing/Head/misc.yml | 14 +++++++++ .../Objects/Specific/Species/felinid.yml | 2 ++ 7 files changed, 65 insertions(+) create mode 100644 Resources/Locale/en-US/deltav/reagents/meta/fun.ftl create mode 100644 Resources/Prototypes/DeltaV/Polymorphs/polymorph.yml create mode 100644 Resources/Prototypes/DeltaV/Reagents/fun.yml diff --git a/Resources/Locale/en-US/deltav/flavors/flavor-profiles.ftl b/Resources/Locale/en-US/deltav/flavors/flavor-profiles.ftl index c3d84d1a244..3c47db0ff94 100644 --- a/Resources/Locale/en-US/deltav/flavors/flavor-profiles.ftl +++ b/Resources/Locale/en-US/deltav/flavors/flavor-profiles.ftl @@ -28,6 +28,7 @@ flavor-complex-healthcodeviolation = ominous flavor-complex-blellow = like an impossible color flavor-complex-candy-strawberry = like strawberries flavor-complex-candy-bubblegum = like bubble gum +flavor-complex-meowstrogen = like hairballs candy-flavor-profile = This one is supposed to taste {$flavor}. candy-flavor-profile-multiple = This one is supposed to taste {$flavors} and {$lastFlavor}. diff --git a/Resources/Locale/en-US/deltav/reagents/meta/fun.ftl b/Resources/Locale/en-US/deltav/reagents/meta/fun.ftl new file mode 100644 index 00000000000..f01d4390e80 --- /dev/null +++ b/Resources/Locale/en-US/deltav/reagents/meta/fun.ftl @@ -0,0 +1,2 @@ +reagent-name-meow = Meowstrogen +reagent-desc-meow = Pure essence of being a cat. Can cause you to meow uncontrolably, unstable in high doses. diff --git a/Resources/Prototypes/DeltaV/Flavors/flavors.yml b/Resources/Prototypes/DeltaV/Flavors/flavors.yml index b76b0dccd99..47ca4f0b891 100644 --- a/Resources/Prototypes/DeltaV/Flavors/flavors.yml +++ b/Resources/Prototypes/DeltaV/Flavors/flavors.yml @@ -121,6 +121,11 @@ flavorType: Complex description: flavor-complex-blellow +- type: flavor + id: meowstrogen + flavorType: Complex + description: flavor-complex-meowstrogen + # this is prefixed with "candy" to avoid clashes with potential future strawberries upstream - type: flavor id: candystrawberry diff --git a/Resources/Prototypes/DeltaV/Polymorphs/polymorph.yml b/Resources/Prototypes/DeltaV/Polymorphs/polymorph.yml new file mode 100644 index 00000000000..d4983e624c2 --- /dev/null +++ b/Resources/Prototypes/DeltaV/Polymorphs/polymorph.yml @@ -0,0 +1,11 @@ +- type: polymorph + id: Meowstrogen + configuration: + entity: MobCat + forced: true + transferName: true + transferHumanoidAppearance: true + inventory: None + revertOnDeath: true + revertOnCrit: true + duration: 20 diff --git a/Resources/Prototypes/DeltaV/Reagents/fun.yml b/Resources/Prototypes/DeltaV/Reagents/fun.yml new file mode 100644 index 00000000000..91d6b5743ab --- /dev/null +++ b/Resources/Prototypes/DeltaV/Reagents/fun.yml @@ -0,0 +1,30 @@ +- type: reagent + id: Meowstrogen + name: reagent-name-meow + group: Toxins + desc: reagent-desc-meow + physicalDesc: reagent-physical-desc-vibrant + flavor: meowstrogen + color: "#f599ff" + metabolisms: + Poison: + metabolismRate: 0.25 + effects: + - !type:Emote + emote: Meow + showInChat: true + probability: 0.5 + - !type:Polymorph + prototype: Meowstrogen # Does the same thing as the original YML I made for this reagent. + conditions: + - !type:OrganType + type: Animal + shouldHave: false + - !type:ReagentThreshold + min: 50 + - !type:AdjustReagent + reagent: Meowstrogen + amount: -20 + conditions: + - !type:ReagentThreshold + min: 50 diff --git a/Resources/Prototypes/Entities/Clothing/Head/misc.yml b/Resources/Prototypes/Entities/Clothing/Head/misc.yml index c6a556b2d32..928327f5299 100644 --- a/Resources/Prototypes/Entities/Clothing/Head/misc.yml +++ b/Resources/Prototypes/Entities/Clothing/Head/misc.yml @@ -182,6 +182,20 @@ sprite: Clothing/Head/Hats/catears.rsi - type: AddAccentClothing accent: OwOAccent + - type: Extractable + juiceSolution: + reagents: + - ReagentId: Meowstrogen + Quantity: 30 + - type: SolutionContainerManager + solutions: + food: + maxVol: 20 + reagents: + - ReagentId: Fiber + Quantity: 10 + - ReagentId: Meowstrogen + Quantity: 10 - type: entity parent: ClothingHeadBase diff --git a/Resources/Prototypes/Nyanotrasen/Entities/Objects/Specific/Species/felinid.yml b/Resources/Prototypes/Nyanotrasen/Entities/Objects/Specific/Species/felinid.yml index c48126d9143..20f342c7e4e 100644 --- a/Resources/Prototypes/Nyanotrasen/Entities/Objects/Specific/Species/felinid.yml +++ b/Resources/Prototypes/Nyanotrasen/Entities/Objects/Specific/Species/felinid.yml @@ -15,6 +15,8 @@ reagents: - ReagentId: Protein Quantity: 2 + - ReagentId: Meowstrogen + Quantity: 2 - type: Extractable grindableSolutionName: hairball - type: Tag From ea00748f2fb1d07f92b26f908ef9cf0c186f9f21 Mon Sep 17 00:00:00 2001 From: Tabitha <64847293+KyuPolaris@users.noreply.github.com> Date: Sun, 30 Jun 2024 20:08:38 +1000 Subject: [PATCH 2/5] Update Resources/Prototypes/Nyanotrasen/Entities/Objects/Specific/Species/felinid.yml Co-authored-by: Danger Revolution! <142105406+DangerRevolution@users.noreply.github.com> Signed-off-by: Tabitha <64847293+KyuPolaris@users.noreply.github.com> --- .../Nyanotrasen/Entities/Objects/Specific/Species/felinid.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/Nyanotrasen/Entities/Objects/Specific/Species/felinid.yml b/Resources/Prototypes/Nyanotrasen/Entities/Objects/Specific/Species/felinid.yml index 20f342c7e4e..0aadc1a8061 100644 --- a/Resources/Prototypes/Nyanotrasen/Entities/Objects/Specific/Species/felinid.yml +++ b/Resources/Prototypes/Nyanotrasen/Entities/Objects/Specific/Species/felinid.yml @@ -15,7 +15,7 @@ reagents: - ReagentId: Protein Quantity: 2 - - ReagentId: Meowstrogen + - ReagentId: Meowstrogen # Delta-V : Asda Meowstrogen Quantity: 2 - type: Extractable grindableSolutionName: hairball From cfad0f7e9435d65f834df8bdf9da007da9c07f4d Mon Sep 17 00:00:00 2001 From: Tabitha <64847293+KyuPolaris@users.noreply.github.com> Date: Sun, 30 Jun 2024 20:08:48 +1000 Subject: [PATCH 3/5] Update Resources/Prototypes/Nyanotrasen/Entities/Objects/Specific/Species/felinid.yml Co-authored-by: Danger Revolution! <142105406+DangerRevolution@users.noreply.github.com> Signed-off-by: Tabitha <64847293+KyuPolaris@users.noreply.github.com> --- .../Nyanotrasen/Entities/Objects/Specific/Species/felinid.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/Nyanotrasen/Entities/Objects/Specific/Species/felinid.yml b/Resources/Prototypes/Nyanotrasen/Entities/Objects/Specific/Species/felinid.yml index 0aadc1a8061..b6d0ef911ec 100644 --- a/Resources/Prototypes/Nyanotrasen/Entities/Objects/Specific/Species/felinid.yml +++ b/Resources/Prototypes/Nyanotrasen/Entities/Objects/Specific/Species/felinid.yml @@ -16,7 +16,7 @@ - ReagentId: Protein Quantity: 2 - ReagentId: Meowstrogen # Delta-V : Asda Meowstrogen - Quantity: 2 + Quantity: 2 # Delta-V : Adds Meowstrogen - type: Extractable grindableSolutionName: hairball - type: Tag From 4e0398490ab1f83cc39fae1b97736e0427abe558 Mon Sep 17 00:00:00 2001 From: Tabitha <64847293+KyuPolaris@users.noreply.github.com> Date: Sun, 30 Jun 2024 20:35:59 +1000 Subject: [PATCH 4/5] Update misc.yml added delta v tag Signed-off-by: Tabitha <64847293+KyuPolaris@users.noreply.github.com> --- Resources/Prototypes/Entities/Clothing/Head/misc.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/Entities/Clothing/Head/misc.yml b/Resources/Prototypes/Entities/Clothing/Head/misc.yml index 928327f5299..28254621b0c 100644 --- a/Resources/Prototypes/Entities/Clothing/Head/misc.yml +++ b/Resources/Prototypes/Entities/Clothing/Head/misc.yml @@ -182,7 +182,7 @@ sprite: Clothing/Head/Hats/catears.rsi - type: AddAccentClothing accent: OwOAccent - - type: Extractable + - type: Extractable # DeltaV - Meowstrogen juiceSolution: reagents: - ReagentId: Meowstrogen From e438cad8d45af0fc082a163c8e9f0bea248dbec2 Mon Sep 17 00:00:00 2001 From: Tabitha <64847293+KyuPolaris@users.noreply.github.com> Date: Sun, 30 Jun 2024 20:36:10 +1000 Subject: [PATCH 5/5] Update Resources/Prototypes/Nyanotrasen/Entities/Objects/Specific/Species/felinid.yml Co-authored-by: Danger Revolution! <142105406+DangerRevolution@users.noreply.github.com> Signed-off-by: Tabitha <64847293+KyuPolaris@users.noreply.github.com> --- .../Nyanotrasen/Entities/Objects/Specific/Species/felinid.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/Nyanotrasen/Entities/Objects/Specific/Species/felinid.yml b/Resources/Prototypes/Nyanotrasen/Entities/Objects/Specific/Species/felinid.yml index b6d0ef911ec..0ee8df76852 100644 --- a/Resources/Prototypes/Nyanotrasen/Entities/Objects/Specific/Species/felinid.yml +++ b/Resources/Prototypes/Nyanotrasen/Entities/Objects/Specific/Species/felinid.yml @@ -15,7 +15,7 @@ reagents: - ReagentId: Protein Quantity: 2 - - ReagentId: Meowstrogen # Delta-V : Asda Meowstrogen + - ReagentId: Meowstrogen # Delta-V : Adds Meowstrogen Quantity: 2 # Delta-V : Adds Meowstrogen - type: Extractable grindableSolutionName: hairball