diff --git a/Resources/Locale/en-US/flavors/flavor-profiles.ftl b/Resources/Locale/en-US/flavors/flavor-profiles.ftl index f2bbd60bed..5d42146f74 100644 --- a/Resources/Locale/en-US/flavors/flavor-profiles.ftl +++ b/Resources/Locale/en-US/flavors/flavor-profiles.ftl @@ -252,3 +252,4 @@ flavor-complex-bee = unbeelievable flavor-complex-sax = like jazz flavor-complex-bottledlightning = like lightning in a bottle flavor-complex-punishment = like punishment +flavor-weh = like weh diff --git a/Resources/Locale/en-US/reagents/meta/fun.ftl b/Resources/Locale/en-US/reagents/meta/fun.ftl index 68de618a36..8764a3d28a 100644 --- a/Resources/Locale/en-US/reagents/meta/fun.ftl +++ b/Resources/Locale/en-US/reagents/meta/fun.ftl @@ -25,3 +25,5 @@ reagent-desc-fresium = A mysterious compound that slows the vibration of atoms a reagent-name-laughter = Laughter reagent-desc-laughter = Some say that this is the best medicine, but recent studies have proven that to be untrue. +reagent-name-weh = juice that makes you Weh +reagent-desc-weh = Pure essence of lizard plush. Makes you Weh! diff --git a/Resources/Prototypes/Entities/Objects/Fun/toys.yml b/Resources/Prototypes/Entities/Objects/Fun/toys.yml index 86417c4839..5566b65bf4 100644 --- a/Resources/Prototypes/Entities/Objects/Fun/toys.yml +++ b/Resources/Prototypes/Entities/Objects/Fun/toys.yml @@ -273,6 +273,11 @@ wideAnimationRotation: 180 soundHit: path: /Audio/Items/Toys/weh.ogg + - type: Extractable + juiceSolution: + reagents: + - ReagentId: JuiceThatMakesYouWeh + Quantity: 30 - type: entity parent: PlushieLizard @@ -311,6 +316,11 @@ wideAnimationRotation: 180 soundHit: path: /Audio/Items/Toys/muffled_weh.ogg + - type: Extractable + juiceSolution: + reagents: + - ReagentId: JuiceThatMakesYouWeh + Quantity: 30 - type: entity parent: BasePlushie diff --git a/Resources/Prototypes/Flavors/flavors.yml b/Resources/Prototypes/Flavors/flavors.yml index 9015d0a6bd..44d8847bae 100644 --- a/Resources/Prototypes/Flavors/flavors.yml +++ b/Resources/Prototypes/Flavors/flavors.yml @@ -1004,6 +1004,11 @@ flavorType: Complex description: flavor-complex-profits +- type: flavor + id: weh + flavorType: Base + description: flavor-weh + - type: flavor id: fishops flavorType: Complex diff --git a/Resources/Prototypes/Reagents/fun.yml b/Resources/Prototypes/Reagents/fun.yml index 25b0e8da80..9597627e87 100644 --- a/Resources/Prototypes/Reagents/fun.yml +++ b/Resources/Prototypes/Reagents/fun.yml @@ -41,7 +41,6 @@ conditions: - !type:OrganType type: Moth - - type: reagent id: BuzzochloricBees @@ -222,13 +221,13 @@ entity: IceCrust maxOnTileWhitelist: tags: [ Ice ] - - !type:ExtinguishTileReaction { } + - !type:ExtinguishTileReaction { } reactiveEffects: Acidic: methods: [ Touch ] effects: - !type:HealthChange - scaleByQuantity: true + scaleByQuantity: true ignoreResistances: false damage: types: @@ -236,7 +235,7 @@ - !type:AdjustTemperature conditions: - !type:Temperature - min: 160.15 + min: 160.15 amount: -30000 Extinguish: methods: [ Touch ] @@ -319,3 +318,33 @@ messages: [ "laughter-effect-control-laughter" ] probability: 0.2 +- type: reagent + id: JuiceThatMakesYouWeh + name: reagent-name-weh + group: Toxins + desc: reagent-desc-weh + physicalDesc: reagent-physical-desc-vibrant + flavor: weh + color: "#59b23a" + metabolisms: + Poison: + metabolismRate: 0.25 + effects: + - !type:Emote + emote: Weh + showInChat: true + probability: 0.5 + - !type:Polymorph + prototype: ArtifactLizard # 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: JuiceThatMakesYouWeh + amount: -20 + conditions: + - !type:ReagentThreshold + min: 50 diff --git a/Resources/Prototypes/SoundCollections/emotes.yml b/Resources/Prototypes/SoundCollections/emotes.yml index 19b1b0e33d..1fbd88b48f 100644 --- a/Resources/Prototypes/SoundCollections/emotes.yml +++ b/Resources/Prototypes/SoundCollections/emotes.yml @@ -74,3 +74,8 @@ id: Squishes files: - /Audio/Voice/Slime/slime_squish.ogg + +- type: soundCollection + id: Weh + files: + - /Audio/Items/Toys/weh.ogg diff --git a/Resources/Prototypes/Voice/speech_emote_sounds.yml b/Resources/Prototypes/Voice/speech_emote_sounds.yml index 3740b99521..ee76fa33d2 100644 --- a/Resources/Prototypes/Voice/speech_emote_sounds.yml +++ b/Resources/Prototypes/Voice/speech_emote_sounds.yml @@ -32,6 +32,8 @@ collection: MaleCry Whistle: collection: Whistles + Weh: + collection: Weh - type: emoteSounds id: FemaleHuman @@ -66,6 +68,8 @@ collection: FemaleCry Whistle: collection: Whistles + Weh: + collection: Weh - type: emoteSounds id: UnisexReptilian @@ -82,6 +86,8 @@ collection: Whistles Crying: collection: MaleCry + Weh: + collection: Weh - type: emoteSounds id: MaleSlime @@ -116,6 +122,8 @@ collection: MaleCry Whistle: collection: Whistles + Weh: + collection: Weh params: variation: 0.125 @@ -152,6 +160,8 @@ collection: FemaleCry Whistle: collection: Whistles + Weh: + collection: Weh params: variation: 0.125 @@ -175,10 +185,11 @@ collection: DionaLaugh Honk: collection: BikeHorn + Weh: + collection: Weh params: variation: 0.125 - - type: emoteSounds id: UnisexArachnid params: @@ -192,6 +203,8 @@ path: /Audio/Voice/Arachnid/arachnid_chitter.ogg Click: path: /Audio/Voice/Arachnid/arachnid_click.ogg + Weh: + collection: Weh - type: emoteSounds id: UnisexDwarf @@ -224,6 +237,8 @@ collection: MaleCry Whistle: collection: Whistles + Weh: + collection: Weh params: variation: 0.125 pitch: 0.75 @@ -259,6 +274,8 @@ collection: FemaleCry Whistle: collection: Whistles + Weh: + collection: Weh params: variation: 0.125 pitch: 0.75 @@ -278,6 +295,8 @@ path: /Audio/Voice/Moth/moth_chitter.ogg Squeak: path: /Audio/Voice/Moth/moth_squeak.ogg + Weh: + collection: Weh # body emotes - type: emoteSounds diff --git a/Resources/Prototypes/Voice/speech_emotes.yml b/Resources/Prototypes/Voice/speech_emotes.yml index 0ee67d17c7..01cb7e6697 100644 --- a/Resources/Prototypes/Voice/speech_emotes.yml +++ b/Resources/Prototypes/Voice/speech_emotes.yml @@ -242,6 +242,11 @@ - buzzes. - buzzes! +- type: emote + id: Weh + category: Vocal + chatMessages: [Weh!] + - type: emote id: Chirp category: Vocal @@ -258,4 +263,4 @@ - chirped! - chirping - chirping. - - chirping! \ No newline at end of file + - chirping!