From: Winkarst <74284083+Winkarst-cpu@users.noreply.github.com>
Date: Thu, 20 Feb 2025 01:12:06 +0000 (+0300)
Subject: Fix: Toys sounds (#33449)
X-Git-Url: https://git.smokeofanarchy.ru/gitweb.cgi?a=commitdiff_plain;h=3e449f755f1fa49b79a2082cc5caa7e9c9d8763e;p=space-station-14.git

Fix: Toys sounds (#33449)

Co-authored-by: Winkarst <74284083+Winkarst-cpu@users.noreply.github.co>
Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
---

diff --git a/Resources/Prototypes/Entities/Objects/Fun/bike_horn.yml b/Resources/Prototypes/Entities/Objects/Fun/bike_horn.yml
index 3e05c0e8ff..288c41dc6b 100644
--- a/Resources/Prototypes/Entities/Objects/Fun/bike_horn.yml
+++ b/Resources/Prototypes/Entities/Objects/Fun/bike_horn.yml
@@ -14,18 +14,33 @@
     sprite: Objects/Fun/bikehorn.rsi
     slots: [Belt]
     quickEquip: false
+  - type: UseDelay
+    delay: 0.5
   - type: EmitSoundOnUse
     sound:
       collection: BikeHorn
       params:
         variation: 0.125
-  - type: UseDelay
-    delay: 0.5
+  - type: EmitSoundOnLand
+    sound:
+      collection: BikeHorn
+      params:
+        variation: 0.125
   - type: EmitSoundOnTrigger
     sound:
       collection: BikeHorn
       params:
         variation: 0.125
+  - type: EmitSoundOnActivate
+    sound:
+      collection: BikeHorn
+      params:
+        variation: 0.125
+  - type: EmitSoundOnCollide
+    sound:
+      collection: BikeHorn
+      params:
+        variation: 0.125
   - type: Tag
     tags:
     - Payload # yes, you can make re-usable prank grenades
@@ -75,7 +90,22 @@
     sound:
       collection: CluwneHorn
       params:
-        variation: 0.246
+        variation: 0.125
+  - type: EmitSoundOnActivate
+    sound:
+      collection: CluwneHorn
+      params:
+        variation: 0.125
+  - type: EmitSoundOnCollide
+    sound:
+      collection: CluwneHorn
+      params:
+        variation: 0.125
+  - type: EmitSoundOnLand
+    sound:
+      collection: CluwneHorn
+      params:
+        variation: 0.125
   - type: MeleeWeapon
     wideAnimationRotation: 135
     soundHit:
@@ -133,11 +163,36 @@
       collection: BananiumHorn
       params:
         variation: 0.246
+  - type: EmitSoundOnLand
+    sound:
+      collection: BananiumHorn
+      params:
+        variation: 0.246
   - type: EmitSoundOnTrigger
     sound:
       collection: BananiumHorn
       params:
         variation: 0.246
+  - type: EmitSoundOnActivate
+    sound:
+      collection: BananiumHorn
+      params:
+        variation: 0.246
+  - type: EmitSoundOnCollide
+    sound:
+      collection: BananiumHorn
+      params:
+        variation: 0.246
+  - type: MeleeWeapon
+    wideAnimationRotation: 135
+    soundHit:
+      collection: BananiumHorn
+      params:
+        variation: 0.246
+    damage:
+      types:
+        Blunt: 0
+    hidden: true
   - type: Construction
     graph: BananiumHorn
     node: bananiumHorn
diff --git a/Resources/Prototypes/Entities/Objects/Fun/skub.yml b/Resources/Prototypes/Entities/Objects/Fun/skub.yml
index 9d4bfe79bb..ce73d4f3ef 100644
--- a/Resources/Prototypes/Entities/Objects/Fun/skub.yml
+++ b/Resources/Prototypes/Entities/Objects/Fun/skub.yml
@@ -15,8 +15,24 @@
   - type: EmitSoundOnUse
     sound:
       collection: Skub
+  - type: EmitSoundOnLand
+    sound:
+      collection: Skub
   - type: EmitSoundOnTrigger
     sound:
       collection: Skub
+  - type: EmitSoundOnActivate
+    sound:
+      collection: Skub
+  - type: EmitSoundOnCollide
+    sound:
+      collection: Skub
+  - type: MeleeWeapon
+    soundHit:
+      collection: Skub
+    damage:
+      types:
+        Blunt: 0
+    hidden: true
   - type: UseDelay
     delay: 2.0
diff --git a/Resources/Prototypes/Entities/Objects/Fun/toys.yml b/Resources/Prototypes/Entities/Objects/Fun/toys.yml
index 585e3b31f1..6255ce4998 100644
--- a/Resources/Prototypes/Entities/Objects/Fun/toys.yml
+++ b/Resources/Prototypes/Entities/Objects/Fun/toys.yml
@@ -199,6 +199,9 @@
   - type: EmitSoundOnTrigger
     sound:
       path: /Audio/Items/Toys/mousesqueek.ogg
+  - type: EmitSoundOnCollide
+    sound:
+      path: /Audio/Items/Toys/mousesqueek.ogg
   - type: Food
     requiresSpecialDigestion: true
     useSound:
@@ -285,6 +288,9 @@
   - type: EmitSoundOnTrigger
     sound:
       path: /Audio/Voice/Arachnid/arachnid_laugh.ogg
+  - type: EmitSoundOnCollide
+    sound:
+      path: /Audio/Voice/Arachnid/arachnid_laugh.ogg
   - type: Food
     requiresSpecialDigestion: true
     useSound:
@@ -317,6 +323,9 @@
   - type: EmitSoundOnTrigger
     sound:
       path: /Audio/Items/Toys/weh.ogg
+  - type: EmitSoundOnCollide
+    sound:
+      path: /Audio/Items/Toys/weh.ogg
   - type: Food
     requiresSpecialDigestion: true
     useSound:
@@ -407,6 +416,9 @@
   - type: EmitSoundOnTrigger
     sound:
       path: /Audio/Items/Toys/muffled_weh.ogg
+  - type: EmitSoundOnCollide
+    sound:
+      path: /Audio/Items/Toys/muffled_weh.ogg
   - type: Food
     requiresSpecialDigestion: true
     useSound:
@@ -514,6 +526,9 @@
     - type: EmitSoundOnTrigger
       sound:
         path: /Audio/Items/Toys/toy_rustle.ogg
+    - type: EmitSoundOnCollide
+      sound:
+        path: /Audio/Items/Toys/toy_rustle.ogg
     - type: MeleeWeapon
       wideAnimationRotation: 180
       soundHit:
@@ -587,6 +602,9 @@
   - type: EmitSoundOnActivate
     sound:
       path: /Audio/Items/Toys/rawr.ogg
+  - type: EmitSoundOnCollide
+    sound:
+      path: /Audio/Items/Toys/rawr.ogg
   - type: MeleeWeapon
     wideAnimationRotation: 180
     soundHit:
@@ -676,6 +694,9 @@
   - type: EmitSoundOnTrigger
     sound:
       path: /Audio/Effects/bite.ogg
+  - type: EmitSoundOnCollide
+    sound:
+      path: /Audio/Effects/bite.ogg
   - type: Food
     requiresSpecialDigestion: true
     useSound:
@@ -768,9 +789,18 @@
   - type: EmitSoundOnUse
     sound:
       path: /Audio/Items/Toys/rattle.ogg
+  - type: EmitSoundOnLand
+    sound:
+      path: /Audio/Items/Toys/rattle.ogg
+  - type: EmitSoundOnActivate
+    sound:
+      path: /Audio/Items/Toys/rattle.ogg
   - type: EmitSoundOnTrigger
     sound:
       path: /Audio/Items/Toys/rattle.ogg
+  - type: EmitSoundOnCollide
+    sound:
+      path: /Audio/Items/Toys/rattle.ogg
   - type: Food
     requiresSpecialDigestion: true
     useSound:
@@ -791,9 +821,18 @@
   - type: EmitSoundOnUse
     sound:
       path: /Audio/Items/Toys/mousesqueek.ogg
+  - type: EmitSoundOnLand
+    sound:
+      path: /Audio/Items/Toys/mousesqueek.ogg
+  - type: EmitSoundOnActivate
+    sound:
+      path: /Audio/Items/Toys/mousesqueek.ogg
   - type: EmitSoundOnTrigger
     sound:
       path: /Audio/Items/Toys/mousesqueek.ogg
+  - type: EmitSoundOnCollide
+    sound:
+      path: /Audio/Items/Toys/mousesqueek.ogg
   - type: Food
     requiresSpecialDigestion: true
     useSound:
@@ -828,9 +867,18 @@
   - type: EmitSoundOnUse
     sound:
       path: /Audio/Items/Toys/quack.ogg
+  - type: EmitSoundOnLand
+    sound:
+      path: /Audio/Items/Toys/quack.ogg
+  - type: EmitSoundOnActivate
+    sound:
+      path: /Audio/Items/Toys/quack.ogg
   - type: EmitSoundOnTrigger
     sound:
       path: /Audio/Items/Toys/quack.ogg
+  - type: EmitSoundOnCollide
+    sound:
+      path: /Audio/Items/Toys/quack.ogg
   - type: Food
     requiresSpecialDigestion: true
     useSound:
@@ -853,9 +901,15 @@
   - type: EmitSoundOnLand
     sound:
       path: /Audio/Voice/Vox/shriek1.ogg
+  - type: EmitSoundOnActivate
+    sound:
+      path: /Audio/Voice/Vox/shriek1.ogg
   - type: EmitSoundOnTrigger
     sound:
       path: /Audio/Voice/Vox/shriek1.ogg
+  - type: EmitSoundOnCollide
+    sound:
+      path: /Audio/Voice/Vox/shriek1.ogg
   - type: Food
     requiresSpecialDigestion: true
     useSound:
@@ -896,6 +950,9 @@
   - type: EmitSoundOnTrigger
     sound:
       path: /Audio/Weapons/Xeno/alien_spitacid.ogg
+  - type: EmitSoundOnCollide
+    sound:
+      path: /Audio/Weapons/Xeno/alien_spitacid.ogg
   - type: Food
     requiresSpecialDigestion: true
     useSound:
@@ -930,6 +987,9 @@
   - type: EmitSoundOnActivate
     sound:
       path: /Audio/Voice/Human/malescream_3.ogg
+  - type: EmitSoundOnCollide
+    sound:
+      path: /Audio/Voice/Human/malescream_4.ogg
   - type: Food
     requiresSpecialDigestion: true
     useSound:
@@ -961,6 +1021,9 @@
   - type: EmitSoundOnTrigger
     sound:
       path: /Audio/Voice/Moth/moth_chitter.ogg
+  - type: EmitSoundOnCollide
+    sound:
+      path: /Audio/Voice/Moth/moth_chitter.ogg
   - type: MeleeWeapon
     soundHit:
       path: /Audio/Voice/Moth/moth_chitter.ogg
@@ -1043,9 +1106,18 @@
   - type: EmitSoundOnUse
     sound:
       path: /Audio/Items/Toys/ian.ogg
+  - type: EmitSoundOnLand
+    sound:
+      path: /Audio/Items/Toys/ian.ogg
+  - type: EmitSoundOnActivate
+    sound:
+      path: /Audio/Items/Toys/ian.ogg
   - type: EmitSoundOnTrigger
     sound:
       path: /Audio/Items/Toys/ian.ogg
+  - type: EmitSoundOnCollide
+    sound:
+      path: /Audio/Items/Toys/ian.ogg
   - type: MeleeWeapon
     soundHit:
       path: /Audio/Items/Toys/ian.ogg
@@ -1508,12 +1580,18 @@
   - type: EmitSoundOnUse
     sound:
       collection: ClownRecorder
+  - type: EmitSoundOnLand
+    sound:
+      collection: ClownRecorder
   - type: EmitSoundOnActivate
     sound:
       collection: ClownRecorder
   - type: EmitSoundOnTrigger
     sound:
       collection: ClownRecorder
+  - type: EmitSoundOnCollide
+    sound:
+      collection: ClownRecorder
   - type: UseDelay
     delay: 30.0
   - type: Tag
@@ -1575,6 +1653,21 @@
       collection: Parp
       params:
         variation: 0.125
+  - type: EmitSoundOnLand
+    sound:
+      collection: Parp
+      params:
+        variation: 0.125
+  - type: EmitSoundOnActivate
+    sound:
+      collection: Parp
+      params:
+        variation: 0.125
+  - type: EmitSoundOnCollide
+    sound:
+      collection: Parp
+      params:
+        variation: 0.125
   - type: UseDelay
     delay: 0.8
   - type: Slippery