mirror of
https://github.com/ParadiseSS13/Paradise.git
synced 2026-08-27 05:57:24 +01:00
Knuckledusters now change hitsound again (#26177)
This commit is contained in:
@@ -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)
|
||||
|
||||
Reference in New Issue
Block a user