From 6a1b03aa240acad516fada50e30237192a376b09 Mon Sep 17 00:00:00 2001 From: Tenebrosity Date: Thu, 23 Jan 2014 02:29:39 +1300 Subject: [PATCH] Throw impacts play the thrown object's hitsound Conflicts: code/modules/mob/living/living_defense.dm --- code/modules/mob/living/living_defense.dm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/code/modules/mob/living/living_defense.dm b/code/modules/mob/living/living_defense.dm index 80a6c036571..6c7ca95f57b 100644 --- a/code/modules/mob/living/living_defense.dm +++ b/code/modules/mob/living/living_defense.dm @@ -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