Throw impacts play the thrown object's hitsound

Conflicts: code/modules/mob/living/living_defense.dm
2026-08-29 06:57:42 +01:00 · 2014-01-22 10:26:58 -05:00
parent 67c88c42e7
commit 6a1b03aa24
1 changed files with 2 additions and 1 deletions
@@ -72,11 +72,12 @@
 		if(istype(O,/obj/item/weapon))
 			var/obj/item/weapon/W = O
 			dtype = W.damtype
+		if (W.hitsound && W.throwforce > 0)
+			playsound(loc, W.hitsound, 30, 1, -1)
 		src.visible_message("\red [src] has been hit by [O].")
 		var/armor = run_armor_check(zone, "melee", "Your armor has protected your [zone].", "Your armor has softened hit to your [zone].")
 		if(armor < 2)
 			apply_damage(O.throwforce*(speed/5), dtype, zone, armor, O.sharp, O)
-
 		if(!O.fingerprintslast)
 			return