Merge pull request #315 from Tox3ct/grayscreamingcrying

Gray Plushie
impstation · Sep 21, 2024 · 73017d6 · 73017d6
2 parents dbe11aa + 3aada5e
commit 73017d6
Show file tree

Hide file tree

Showing 4 changed files with 33 additions and 1 deletion.
diff --git a/Resources/Prototypes/Catalog/Fills/Crates/fun.yml b/Resources/Prototypes/Catalog/Fills/Crates/fun.yml
@@ -39,6 +39,7 @@
     - id: PlushieMoth
     - id: PlushieArachind
     - id: PlushiePenguin
+    - id: PlushieGray
 
 - type: entity
   id: CrateFunPlushie
@@ -397,4 +398,4 @@
   - type: StorageFill
     contents:
       - id: StackOfCigs
-        amount: 1
+        amount: 1
diff --git a/Resources/Prototypes/Entities/Objects/Fun/toys.yml b/Resources/Prototypes/Entities/Objects/Fun/toys.yml
@@ -884,6 +884,34 @@
     graph: YarnNoodles
     node: noodles
 
+- type: entity
+  parent: BasePlushie
+  id: PlushieGray
+  name: gray plushie
+  description: Manufactured recently to commemorate the gray exchange program becoming a booming success. It feels plasticky and seems easy to chew on. Thui love keb piskun plushie!!
+  components:
+  - type: Sprite
+    state: plushie_gray
+  - type: EmitSoundOnUse
+    sound:
+      path: /Audio/Voice/Gray/gray_scream.ogg
+  - type: EmitSoundOnLand
+    sound:
+      path: /Audio/Voice/Gray/gray_cry.ogg
+  - type: EmitSoundOnActivate
+    sound:
+      path: /Audio/Voice/Gray/gray_scream.ogg
+  - type: EmitSoundOnTrigger
+    sound:
+      path: /Audio/Voice/Gray/gray_scream.ogg
+  - type: MeleeWeapon
+    soundHit:
+      path: /Audio/Voice/Gray/gray_scream.ogg
+  - type: Food
+    requiresSpecialDigestion: false
+    useSound:
+      path: /Audio/Voice/Gray/gray_scream.ogg
+
 ## Cheapo Figurines
 
 - type: entity

diff --git a/Resources/Textures/Objects/Fun/toys.rsi/meta.json b/Resources/Textures/Objects/Fun/toys.rsi/meta.json
@@ -136,6 +136,9 @@
     {
       "name": "plushie_xeno"
     },
+    {
+        "name": "plushie_gray"
+      },
     {
       "name": "carpplush-inhand-left",
       "directions": 4

diff --git a/Resources/Textures/Objects/Fun/toys.rsi/plushie_gray.png b/Resources/Textures/Objects/Fun/toys.rsi/plushie_gray.png