Wife plush real.

TheDenSS14 · Dec 2, 2024 · d5defa5 · d5defa5
1 parent 39f042e
commit d5defa5
Show file tree

Hide file tree

Showing 7 changed files with 54 additions and 1 deletion.
diff --git a/Resources/Audio/Items/Toys/attributions.yml b/Resources/Audio/Items/Toys/attributions.yml
@@ -18,6 +18,11 @@
   copyright: "Time immemorial"
   source: "https://github.com/tgstation/tgstation/blob/172b533d0257fcc1f8a05406f1c9fad514c14d88/sound/items/trayhit2.ogg"
 
+- files: ["grimble1.ogg", "grimble2.ogg", "grimble3.ogg"]
+  license: "CC-BY-SA-3.0"
+  copyright: "Created by Grimsy Arcum"
+  source: "GrimsyArcum on discord"
+
 - files: ["rped.ogg"]
   license: "CC-BY-SA-3.0"
   copyright: "Created by Cuboos"

diff --git a/Resources/Audio/Items/Toys/grimble1.ogg b/Resources/Audio/Items/Toys/grimble1.ogg
diff --git a/Resources/Audio/Items/Toys/grimble2.ogg b/Resources/Audio/Items/Toys/grimble2.ogg
diff --git a/Resources/Audio/Items/Toys/grimbleactive.ogg b/Resources/Audio/Items/Toys/grimbleactive.ogg
diff --git a/Resources/Prototypes/Entities/Objects/Fun/toys.yml b/Resources/Prototypes/Entities/Objects/Fun/toys.yml
@@ -1970,8 +1970,48 @@
   parent: BasePlushie
   id: PlushieGrim
   name: grimble plushie
-  description: A stuffed toy that resembles a Grimble!
+  description: Smells like ginger.
   components:
   - type: Sprite
     sprite: Objects/Fun/toys.rsi
     state: plushie_grim
+  - type: StaminaDamageOnHit
+    damage: 0.8
+  - type: EmitSoundOnActivate
+    sound:
+      collection: Grimble
+      params:
+        variation: 0.05
+  - type: EmitSoundOnUse
+    sound:
+      path: /Audio/Items/Toys/grimbleactive.ogg
+  - type: EmitSoundOnCollide
+    sound:
+      collection: Grimble
+      params:
+        variation: 0.05
+  - type: EmitSoundOnLand
+    sound:
+      collection: Grimble
+      params:
+        variation: 0.05
+  - type: UseDelay
+    delay: 0.8
+  - type: MeleeWeapon
+    wideAnimationRotation: -135
+    attackRate: 0.5
+    damage:
+      types:
+        Blunt: 0
+    soundHit:
+      collection: Grimble
+      params:
+        variation: 0.05
+    soundSwing:
+      collection: Grimble
+      params:
+        variation: 0.05
+    soundNoDamage:
+      collection: Grimble
+      params:
+        variation: 0.05
diff --git a/Resources/Prototypes/SoundCollections/toys.yml b/Resources/Prototypes/SoundCollections/toys.yml
@@ -0,0 +1,5 @@
+- type: soundCollection
+  id: Grimble
+  files:
+  - /Audio/Items/Toys/grimble1.ogg
+  - /Audio/Items/Toys/grimble2.ogg
diff --git a/Resources/Textures/Objects/Fun/toys.rsi/meta.json b/Resources/Textures/Objects/Fun/toys.rsi/meta.json
@@ -413,6 +413,9 @@
         },
         {
             "name": "shadowkin"
+        },
+        {
+            "name": "plushie_grim"
         }
     ]
 }
-Original file line number
+Diff line change
@@ Expand Up / @@ -413,6 +413,9 @@ @@
             },
             {
                 "name": "shadowkin"
+            },
+            {
+                "name": "plushie_grim"
             }
         ]
     }