Make plushies, whoopie cushions, and some toys usable as modular grenade payloads...

* Toot

* Hm, but why stop there?

---------

Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>

diff --git a/Resources/Prototypes/Entities/Objects/Fun/bike_horn.yml b/Resources/Prototypes/Entities/Objects/Fun/bike_horn.yml
index 1a79011d1b28adda89bf977e2885ba500fd75e0b..7c69aa09013784015d3b1db51d3df37725a3e872 100644 (file)
--- a/Resources/Prototypes/Entities/Objects/Fun/bike_horn.yml
+++ b/Resources/Prototypes/Entities/Objects/Fun/bike_horn.yml
@@ -133,6 +133,11 @@
       collection: BananiumHorn
       params:
         variation: 0.246
+  - type: EmitSoundOnTrigger
+    sound:
+      collection: BananiumHorn
+      params:
+        variation: 0.246
   - 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 0061270df2feef993bef4f2ff4dbb192271aee56..9d4bfe79bb05505e78f250f72464510d7f9bd3bb 100644 (file)
--- a/Resources/Prototypes/Entities/Objects/Fun/skub.yml
+++ b/Resources/Prototypes/Entities/Objects/Fun/skub.yml
@@ -7,10 +7,16 @@
   - type: Sprite
     sprite: Objects/Misc/skub.rsi
     state: icon
+  - type: Tag
+    tags:
+      - Payload
   - type: Item
     sprite: Objects/Misc/skub.rsi
   - type: EmitSoundOnUse
     sound:
       collection: Skub
+  - type: EmitSoundOnTrigger
+    sound:
+      collection: Skub
   - type: UseDelay
     delay: 2.0

diff --git a/Resources/Prototypes/Entities/Objects/Fun/toys.yml b/Resources/Prototypes/Entities/Objects/Fun/toys.yml
index d1757273752b62087d42c4fb86993b42100e0b15..80e177542ef32dfff1fcb64e8a837b74210166a2 100644 (file)
--- a/Resources/Prototypes/Entities/Objects/Fun/toys.yml
+++ b/Resources/Prototypes/Entities/Objects/Fun/toys.yml
@@ -7,6 +7,9 @@
   components:
   - type: Sprite
     sprite: Objects/Fun/toys.rsi
+  - type: Tag
+    tags:
+      - Payload
   - type: EmitSoundOnUse
     sound:
       collection: ToySqueak
@@ -19,6 +22,9 @@
   - type: EmitSoundOnLand
     sound:
       collection: ToyFall
+  - type: EmitSoundOnTrigger
+    sound:
+      collection: ToySqueak
   - type: UseDelay
     delay: 1.0
   - type: MeleeWeapon
@@ -66,6 +72,7 @@
       tags:
         - ForceableFollow
         - PlushieGhost
+        - Payload
     - type: RandomWalk
       accumulatorRatio: 0.5
       maxSpeed: 1
@@ -133,6 +140,9 @@
   - type: EmitSoundOnActivate
     sound:
       path: /Audio/Items/Toys/mousesqueek.ogg
+  - type: EmitSoundOnTrigger
+    sound:
+      path: /Audio/Items/Toys/mousesqueek.ogg
   - type: MeleeWeapon
     wideAnimationRotation: 180
     soundHit:
@@ -199,6 +209,9 @@
   - type: EmitSoundOnActivate
     sound:
       path: /Audio/Voice/Arachnid/arachnid_laugh.ogg
+  - type: EmitSoundOnTrigger
+    sound:
+      path: /Audio/Voice/Arachnid/arachnid_laugh.ogg
   - type: MeleeWeapon
     wideAnimationRotation: 180
     soundHit:
@@ -221,6 +234,9 @@
   - type: EmitSoundOnActivate
     sound:
       path: /Audio/Items/Toys/weh.ogg
+  - type: EmitSoundOnTrigger
+    sound:
+      path: /Audio/Items/Toys/weh.ogg
   - type: MeleeWeapon
     wideAnimationRotation: 180
     soundHit:
@@ -252,6 +268,9 @@
   - type: EmitSoundOnActivate
     sound:
       path: /Audio/Items/Toys/muffled_weh.ogg
+  - type: EmitSoundOnTrigger
+    sound:
+      path: /Audio/Items/Toys/muffled_weh.ogg
   - type: MeleeWeapon
     wideAnimationRotation: 180
     soundHit:
@@ -278,6 +297,9 @@
     - type: EmitSoundOnActivate
       sound:
         path: /Audio/Items/Toys/toy_rustle.ogg
+    - type: EmitSoundOnTrigger
+      sound:
+        path: /Audio/Items/Toys/toy_rustle.ogg
     - type: MeleeWeapon
       wideAnimationRotation: 180
       soundHit:
@@ -333,6 +355,7 @@
   - type: Tag
     tags:
       - PlushieSharkBlue
+      - Payload
 
 - type: entity
   parent: PlushieSharkBlue
@@ -348,6 +371,7 @@
   - type: Tag
     tags:
       - PlushieSharkPink
+      - Payload
 
 - type: entity
   parent: PlushieSharkBlue
@@ -363,6 +387,7 @@
   - type: Tag
     tags:
       - PlushieSharkGrey
+      - Payload
 
 - type: entity
   parent: BasePlushie
@@ -405,6 +430,9 @@
   - type: EmitSoundOnActivate
     sound:
       path: /Audio/Effects/bite.ogg
+  - type: EmitSoundOnTrigger
+    sound:
+      path: /Audio/Effects/bite.ogg
   - type: MeleeWeapon
     wideAnimationRotation: -90
     soundHit:
@@ -432,6 +460,9 @@
   - type: EmitSoundOnUse
     sound:
       path: /Audio/Items/Toys/rattle.ogg
+  - type: EmitSoundOnTrigger
+    sound:
+      path: /Audio/Items/Toys/rattle.ogg
   - type: MeleeWeapon
     wideAnimationRotation: 180
     soundHit:
@@ -448,6 +479,9 @@
   - type: EmitSoundOnUse
     sound:
       path: /Audio/Items/Toys/mousesqueek.ogg
+  - type: EmitSoundOnTrigger
+    sound:
+      path: /Audio/Items/Toys/mousesqueek.ogg
   - type: MeleeWeapon
     wideAnimationRotation: -90
     soundHit:
@@ -478,6 +512,9 @@
   - type: EmitSoundOnUse
     sound:
       path: /Audio/Items/Toys/quack.ogg
+  - type: EmitSoundOnTrigger
+    sound:
+      path: /Audio/Items/Toys/quack.ogg
 
 - type: entity
   parent: BasePlushie
@@ -493,6 +530,9 @@
   - type: EmitSoundOnLand
     sound:
       path: /Audio/Voice/Vox/shriek1.ogg
+  - type: EmitSoundOnTrigger
+    sound:
+      path: /Audio/Voice/Vox/shriek1.ogg
   - type: MeleeWeapon
     wideAnimationRotation: 180
     soundHit:
@@ -526,6 +566,9 @@
   - type: EmitSoundOnActivate
     sound:
       path: /Audio/Weapons/Xeno/alien_spitacid.ogg
+  - type: EmitSoundOnTrigger
+    sound:
+      path: /Audio/Weapons/Xeno/alien_spitacid.ogg
   - type: MeleeWeapon
     wideAnimationRotation: 180
     soundHit:
@@ -568,6 +611,9 @@
   components:
   - type: Sprite
     state: nuketoy
+  - type: Tag
+    tags:
+      - Payload
   - type: UseDelay
     delay: 180.0
   - type: EmitSoundOnUse
@@ -582,6 +628,12 @@
       params:
         volume: -5
         maxDistance: 10
+  - type: EmitSoundOnTrigger
+    sound:
+      path: /Audio/Machines/Nuke/nuke_alarm.ogg
+      params:
+        volume: -5
+        maxDistance: 10
 
 - type: entity
   parent: BasePlushie
@@ -596,6 +648,9 @@
   - type: EmitSoundOnUse
     sound:
       path: /Audio/Items/Toys/ian.ogg
+  - type: EmitSoundOnTrigger
+    sound:
+      path: /Audio/Items/Toys/ian.ogg
   - type: MeleeWeapon
     soundHit:
       path: /Audio/Items/Toys/ian.ogg
@@ -1013,11 +1068,15 @@
   - type: EmitSoundOnActivate
     sound:
       collection: ClownRecorder
+  - type: EmitSoundOnTrigger
+    sound:
+      collection: ClownRecorder
   - type: UseDelay
     delay: 30.0
   - type: Tag
     tags:
     - ClownRecorder
+    - Payload
 
 - type: entity
   parent: BaseItem
@@ -1067,6 +1126,9 @@
     sprite: Objects/Fun/whoopie.rsi
     state: icon
     quickEquip: false
+  - type: Tag
+    tags:
+      - Payload
   - type: EmitSoundOnUse
     sound:
       collection: Parp
@@ -1092,6 +1154,11 @@
     intersectRatio: 0.2
     requiredTriggeredSpeed: 1
   - type: TriggerOnStepTrigger
+  - type: EmitSoundOnTrigger
+    sound:
+      collection: Parp
+      params:
+        variation: 0.125
   - type: Appearance
   - type: CollisionWake
     enabled: false
@@ -1178,6 +1245,9 @@
   - type: EmitSoundOnActivate
     sound:
       path: /Audio/Voice/Moth/moth_chitter.ogg
+  - type: EmitSoundOnTrigger
+    sound:
+      path: /Audio/Voice/Moth/moth_chitter.ogg
   - type: MeleeWeapon
     soundHit:
       path: /Audio/Voice/Moth/moth_chitter.ogg
@@ -1211,6 +1281,9 @@
   - type: MeleeWeapon
     soundHit:
       path: /Audio/Voice/Human/malescream_4.ogg
+  - type: EmitSoundOnTrigger
+    sound:
+      path: /Audio/Voice/Human/malescream_5.ogg
 
 - type: entity
   parent: BaseItem

diff --git a/Resources/Prototypes/Entities/Objects/Misc/desk_bell.yml b/Resources/Prototypes/Entities/Objects/Misc/desk_bell.yml
index cef406ea50b86b346195959c1745a41cde462b07..1fe3b8a271c64736deabf18f5073f1930b2f6f07 100644 (file)
--- a/Resources/Prototypes/Entities/Objects/Misc/desk_bell.yml
+++ b/Resources/Prototypes/Entities/Objects/Misc/desk_bell.yml
@@ -7,6 +7,9 @@
   - type: Sprite
     sprite: Objects/Misc/desk_bell.rsi
     state: "normal"
+  - type: Tag
+    tags:
+      - Payload
   - type: InteractionPopup
     successChance: 1
     interactSuccessSound: