Fix blunt melee weapon hitsound (#26286)

* ok

* Update welders.yml

diff --git a/Resources/Prototypes/Entities/Mobs/base.yml b/Resources/Prototypes/Entities/Mobs/base.yml
index d4e9a561c5e6a85e8a8ee8299820a155c30dac0a..ac9aabbeadbb5d57e703d0fb9a79248ce14df3f5 100644 (file)
--- a/Resources/Prototypes/Entities/Mobs/base.yml
+++ b/Resources/Prototypes/Entities/Mobs/base.yml
@@ -102,6 +102,8 @@
   - type: CombatMode
   - type: MeleeWeapon
     hidden: true
+    soundHit:
+      collection: MetalThud
     damage:
       groups:
         Brute: 5

diff --git a/Resources/Prototypes/Entities/Objects/Specific/Hydroponics/tools.yml b/Resources/Prototypes/Entities/Objects/Specific/Hydroponics/tools.yml
index 00224fd3182d2d35b68f48280e1c9426635e8bab..727c75c8794906e1b6e783e7e09d9428ccc581cf 100644 (file)
--- a/Resources/Prototypes/Entities/Objects/Specific/Hydroponics/tools.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Hydroponics/tools.yml
@@ -106,6 +106,8 @@
       types:
         Blunt: 8
         Piercing: 2 # I guess you can stab it into them?
+    soundHit:
+      collection: MetalThud
   - type: Item
     sprite: Objects/Tools/Hydroponics/spade.rsi
   - type: Shovel

diff --git a/Resources/Prototypes/Entities/Objects/Specific/Mech/mechs.yml b/Resources/Prototypes/Entities/Objects/Specific/Mech/mechs.yml
index 0e132541e1e67fc3a6baad8fc21fcd9c7e5deda0..5a2587ff710e418ba7ea03fbfc8fb8976b14ef62 100644 (file)
--- a/Resources/Prototypes/Entities/Objects/Specific/Mech/mechs.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Mech/mechs.yml
@@ -48,6 +48,8 @@
       types:
         Blunt: 25 #thwack
         Structural: 20
+    soundHit:
+      collection: MetalThud
   - type: Puller
     needsHands: false
   - type: InputMover

diff --git a/Resources/Prototypes/Entities/Objects/Tools/flashlights.yml b/Resources/Prototypes/Entities/Objects/Tools/flashlights.yml
index 39809b31b6862a6fc731bb55cfc9836aab35bf8e..d22e9190921521ae3370fa492e4ac767c28f6999 100644 (file)
--- a/Resources/Prototypes/Entities/Objects/Tools/flashlights.yml
+++ b/Resources/Prototypes/Entities/Objects/Tools/flashlights.yml
@@ -111,6 +111,8 @@
     damage:
       types:
         Blunt: 10
+    soundHit:
+      collection: MetalThud
   - type: Item
     sprite: Objects/Tools/seclite.rsi
   - type: PointLight

diff --git a/Resources/Prototypes/Entities/Objects/Tools/jaws_of_life.yml b/Resources/Prototypes/Entities/Objects/Tools/jaws_of_life.yml
index bb8545d91ff9fb1b25e78c985931340382fc9001..8e2b7597970d1b22ca2591458f483258267d811e 100644 (file)
--- a/Resources/Prototypes/Entities/Objects/Tools/jaws_of_life.yml
+++ b/Resources/Prototypes/Entities/Objects/Tools/jaws_of_life.yml
@@ -47,6 +47,8 @@
     damage:
       types:
         Blunt: 10
+    soundHit:
+      collection: MetalThud
 
 - type: entity
   name: syndicate jaws of life

diff --git a/Resources/Prototypes/Entities/Objects/Tools/tools.yml b/Resources/Prototypes/Entities/Objects/Tools/tools.yml
index c56c322b744a3396c499f158720368b6b4310d39..b46eded7d84fe620e13b605212a26e9b594ea8de 100644 (file)
--- a/Resources/Prototypes/Entities/Objects/Tools/tools.yml
+++ b/Resources/Prototypes/Entities/Objects/Tools/tools.yml
@@ -114,6 +114,8 @@
     damage:
       types:
         Blunt: 4.5
+    soundHit:
+      collection: MetalThud
   - type: Tool
     qualities:
       - Anchoring
@@ -151,6 +153,8 @@
     damage:
       types:
         Blunt: 8
+    soundHit:
+      collection: MetalThud
   - type: Tool
     qualities:
       - Prying
@@ -492,6 +496,8 @@
     damage:
       types:
         Blunt: 14
+    soundHit:
+      collection: MetalThud
   - type: Item
     size: Normal
     sprite: Objects/Tools/shovel.rsi
@@ -525,6 +531,8 @@
     damage:
       types:
         Blunt: 7
+    soundHit:
+      collection: MetalThud
   - type: Tool
     qualities:
     - Rolling

diff --git a/Resources/Prototypes/Entities/Objects/Tools/welders.yml b/Resources/Prototypes/Entities/Objects/Tools/welders.yml
index 42b16ba0538244af14e8e104b461c80edfa7d3cf..9bf3f2e2cb9d0b34b9b586f94f81d1d41dfab96d 100644 (file)
--- a/Resources/Prototypes/Entities/Objects/Tools/welders.yml
+++ b/Resources/Prototypes/Entities/Objects/Tools/welders.yml
@@ -47,6 +47,8 @@
       params:
         variation: 0.250
         volume: -12
+    deactivatedSoundOnHitNoDamage:
+      collection: MetalThud
     activatedDamage:
         types:
             Heat: 8
@@ -70,6 +72,8 @@
     damage:
       types:
         Blunt: 5 #i mean... i GUESS you could use it like that
+    soundHit:
+      collection: MetalThud
   - type: RefillableSolution
     solution: Welder
   - type: SolutionContainerManager

diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/baseball_bat.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/baseball_bat.yml
index b7fae7acede8db35d904b649af0035187bacb926..8ba643a115521dbbdb541f4f7d88d0d1fc5e53fb 100644 (file)
--- a/Resources/Prototypes/Entities/Objects/Weapons/Melee/baseball_bat.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Melee/baseball_bat.yml
@@ -13,6 +13,8 @@
       types:
         Blunt: 10
         Structural: 5
+    soundHit:
+      collection: MetalThud
   - type: Wieldable
   - type: IncreaseDamageOnWield
     damage:

diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/cult.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/cult.yml
index db24d3e2cd00313ffe94f336d39701b01a7f0e5d..ecb6479de7066879629d531f1eeff01fdeef2052 100644 (file)
--- a/Resources/Prototypes/Entities/Objects/Weapons/Melee/cult.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Melee/cult.yml
@@ -67,6 +67,8 @@
         Blunt: 10
         Slash: 10
         Structural: 5
+    soundHit:
+      collection: MetalThud
   - type: Wieldable
   - type: IncreaseDamageOnWield
     damage:

diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/fireaxe.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/fireaxe.yml
index b46ee096336039820b600a998bcd1c770b6eb33e..93765ec40c361a2866927f8e3fa5b05858823281 100644 (file)
--- a/Resources/Prototypes/Entities/Objects/Weapons/Melee/fireaxe.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Melee/fireaxe.yml
@@ -21,6 +21,8 @@
         Blunt: 5
         Slash: 10
         Structural: 10
+    soundHit:
+      collection: MetalThud
   - type: Wieldable
   - type: IncreaseDamageOnWield
     damage:

diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/mining.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/mining.yml
index eee65a1ca782feb38cdf80d03da36cd9cfb10f38..ccf45bf59aa92cdbd52b0d7bcf11e39ab67731fd 100644 (file)
--- a/Resources/Prototypes/Entities/Objects/Weapons/Melee/mining.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Melee/mining.yml
@@ -49,6 +49,8 @@
       types:
         Blunt: 10
         Slash: 5
+    soundHit:
+      collection: MetalThud
   - type: Wieldable
   - type: IncreaseDamageOnWield
     damage:

diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/sledgehammer.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/sledgehammer.yml
index e566f90968e83e5ccfc94dced2cc5a475bb64b43..0c75015d9aa6f087432d50eb09807667ddf8557b 100644 (file)
--- a/Resources/Prototypes/Entities/Objects/Weapons/Melee/sledgehammer.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Melee/sledgehammer.yml
@@ -13,6 +13,8 @@
       types:
         Blunt: 10
         Structural: 10
+    soundHit:
+      collection: MetalThud
   - type: Wieldable
   - type: IncreaseDamageOnWield
     damage:

diff --git a/Resources/Prototypes/Entities/Objects/Weapons/security.yml b/Resources/Prototypes/Entities/Objects/Weapons/security.yml
index 082a8a956c830afded5de802bdc5347c0e46ad0f..6df6ae7b4ba6870ae3de26a7838ef5b383831de3 100644 (file)
--- a/Resources/Prototypes/Entities/Objects/Weapons/security.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/security.yml
@@ -97,6 +97,8 @@
     damage:
       types:
         Blunt: 20
+    soundHit:
+      collection: MetalThud
     bluntStaminaDamageFactor: 1.5
   - type: Item
     size: Normal

diff --git a/Resources/Prototypes/Entities/Structures/Furniture/chairs.yml b/Resources/Prototypes/Entities/Structures/Furniture/chairs.yml
index 59782c958576c9d55a76cd986975ce9cfa79bda1..0b3c291af257056050518fe721c67255d023b4d8 100644 (file)
--- a/Resources/Prototypes/Entities/Structures/Furniture/chairs.yml
+++ b/Resources/Prototypes/Entities/Structures/Furniture/chairs.yml
@@ -343,6 +343,8 @@
     damage:
       types:
         Blunt: 8
+    soundHit:
+      collection: MetalThud
   - type: Construction
     graph: Seat
     node: chairFolding