From 9a37b7104b44c765eeee7b8d09610cdf039eb9e0 Mon Sep 17 00:00:00 2001 From: DGamerL <108773801+DGamerL@users.noreply.github.com> Date: Mon, 8 Jul 2024 15:09:16 +0200 Subject: [PATCH] Knuckledusters now change hitsound again (#26177) --- code/game/objects/items/weapons/knuckledusters.dm | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/code/game/objects/items/weapons/knuckledusters.dm b/code/game/objects/items/weapons/knuckledusters.dm index cac68d536f8..c75ac83fe3f 100644 --- a/code/game/objects/items/weapons/knuckledusters.dm +++ b/code/game/objects/items/weapons/knuckledusters.dm @@ -34,13 +34,10 @@ gripped = FALSE flags &= ~(NODROP | ABSTRACT) -/obj/item/melee/knuckleduster/attack/(mob/living/user) - hitsound = pick('sound/weapons/punch1.ogg', 'sound/weapons/punch2.ogg', 'sound/weapons/punch3.ogg', 'sound/weapons/punch4.ogg') - return ..() - /obj/item/melee/knuckleduster/attack(mob/living/target, mob/living/user) . = ..() - if(!ishuman(target)) + hitsound = pick('sound/weapons/punch1.ogg', 'sound/weapons/punch2.ogg', 'sound/weapons/punch3.ogg', 'sound/weapons/punch4.ogg') + if(!ishuman(target) || QDELETED(target)) return var/obj/item/organ/external/punched = target.get_organ(user.zone_selected)