]> git.smokeofanarchy.ru Git - space-station-14.git/commitdiff
Juice that makes you Weh! (but real!) (#25132)
authorWhisper <121047731+QuietlyWhisper@users.noreply.github.com>
Sun, 25 Feb 2024 13:54:07 +0000 (08:54 -0500)
committerGitHub <noreply@github.com>
Sun, 25 Feb 2024 13:54:07 +0000 (00:54 +1100)
* Juice that makes you Weh!

* Remove dupe

* updated the localization files

* try to fix error

Resources/Locale/en-US/flavors/flavor-profiles.ftl
Resources/Locale/en-US/reagents/meta/fun.ftl
Resources/Prototypes/Entities/Objects/Fun/toys.yml
Resources/Prototypes/Flavors/flavors.yml
Resources/Prototypes/Reagents/fun.yml
Resources/Prototypes/SoundCollections/emotes.yml
Resources/Prototypes/Voice/speech_emote_sounds.yml
Resources/Prototypes/Voice/speech_emotes.yml

index f2bbd60bed4f586ae52f84416c6e30af77af963c..5d42146f7439e102b23e5237ec7e35898d329d2c 100644 (file)
@@ -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
index 68de618a3652ce7734e15982a813a41303acff0d..8764a3d28a4b5900c5c05a4180fdff8dfe874f85 100644 (file)
@@ -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!
index 86417c4839bb2c53062dc266c2ce0796dc1d6682..5566b65bf4831fe813c0d92ad91a30c7d53cc982 100644 (file)
     wideAnimationRotation: 180
     soundHit:
       path: /Audio/Items/Toys/weh.ogg
+  - type: Extractable
+    juiceSolution:
+      reagents:
+      - ReagentId: JuiceThatMakesYouWeh
+        Quantity: 30
 
 - type: entity
   parent: PlushieLizard
     wideAnimationRotation: 180
     soundHit:
       path: /Audio/Items/Toys/muffled_weh.ogg
+  - type: Extractable
+    juiceSolution:
+      reagents:
+      - ReagentId: JuiceThatMakesYouWeh
+        Quantity: 30
 
 - type: entity
   parent: BasePlushie
index 9015d0a6bd73fd3e7175eb202e72882f74106def..44d8847bae967f39eb34146e9ec3f1201574ce97 100644 (file)
   flavorType: Complex
   description: flavor-complex-profits
 
+- type: flavor
+  id: weh
+  flavorType: Base
+  description: flavor-weh
+
 - type: flavor
   id: fishops
   flavorType: Complex
index 25b0e8da80911f3731f456d20b61b723695213af..9597627e876104f04d5ba15ea86c81f2c6b6a7a1 100644 (file)
@@ -41,7 +41,6 @@
         conditions:
         - !type:OrganType
           type: Moth
-     
 
 - type: reagent
   id: BuzzochloricBees
     entity: IceCrust
     maxOnTileWhitelist:
       tags: [ Ice ]
-  - !type:ExtinguishTileReaction { } 
+  - !type:ExtinguishTileReaction { }
   reactiveEffects:
     Acidic:
       methods: [ Touch ]
       effects:
       - !type:HealthChange
-        scaleByQuantity: true 
+        scaleByQuantity: true
         ignoreResistances: false
         damage:
           types:
       - !type:AdjustTemperature
         conditions:
         - !type:Temperature
-          min: 160.15 
+          min: 160.15
         amount: -30000
     Extinguish:
       methods: [ Touch ]
         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
index 19b1b0e33ddfc61b84e5537366a2ea6303985621..1fbd88b48f7c1d9d2220b8089a4706ddb47e88b7 100644 (file)
@@ -74,3 +74,8 @@
   id: Squishes
   files:
     - /Audio/Voice/Slime/slime_squish.ogg
+
+- type: soundCollection
+  id: Weh
+  files:
+  - /Audio/Items/Toys/weh.ogg
index 3740b995212f2d75d16208cde96746397c313d48..ee76fa33d2c92e2285dbd07e73d18fb40f0402c9 100644 (file)
@@ -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
       collection: MaleCry
     Whistle:
       collection: Whistles
+    Weh:
+      collection: Weh
   params:
     variation: 0.125
 
       collection: FemaleCry
     Whistle:
       collection: Whistles
+    Weh:
+      collection: Weh
   params:
     variation: 0.125
 
       collection: DionaLaugh
     Honk:
       collection: BikeHorn
+    Weh:
+      collection: Weh
   params:
     variation: 0.125
 
-
 - type: emoteSounds
   id: UnisexArachnid
   params:
       path: /Audio/Voice/Arachnid/arachnid_chitter.ogg
     Click:
       path: /Audio/Voice/Arachnid/arachnid_click.ogg
+    Weh:
+      collection: Weh
 
 - type: emoteSounds
   id: UnisexDwarf
       collection: MaleCry
     Whistle:
       collection: Whistles
+    Weh:
+      collection: Weh
   params:
     variation: 0.125
     pitch: 0.75
       collection: FemaleCry
     Whistle:
       collection: Whistles
+    Weh:
+      collection: Weh
   params:
     variation: 0.125
     pitch: 0.75
       path: /Audio/Voice/Moth/moth_chitter.ogg
     Squeak:
       path: /Audio/Voice/Moth/moth_squeak.ogg
+    Weh:
+      collection: Weh
 
 # body emotes
 - type: emoteSounds
index 0ee67d17c789e40568781a5331763deef67be8f3..01cb7e6697edddfcbccbce974acd0850c8b3c959 100644 (file)
     - buzzes.
     - buzzes!
 
+- type: emote
+  id: Weh
+  category: Vocal
+  chatMessages: [Weh!]
+
 - type: emote
   id: Chirp
   category: Vocal
     - chirped!
     - chirping
     - chirping.
-    - chirping!
\ No newline at end of file
+    - chirping!