Afterattack() Signal (#38606)

* adds signal and modifies each call of afterattack to call it's inherited proc

* uses new macro for sendsignal()

* map fuck

* skip precommithooks

* combine and negate 2 ifs
This commit is contained in:
Trevor Serpas
2018-07-07 02:00:25 -04:00
committed by Emmett Gaines
parent e2093f11f5
commit bee0b5b2c3
113 changed files with 167 additions and 129 deletions
+4 -4
View File
@@ -24,6 +24,7 @@
..()
/obj/item/melee/touch_attack/afterattack(atom/target, mob/user, proximity)
. = ..()
user.say(catchphrase)
playsound(get_turf(user), on_use_sound,50,1)
charges--
@@ -63,10 +64,9 @@
var/obj/item/bodypart/part = user.get_holding_bodypart_of_item(src)
if(part)
part.dismember()
..()
return
return ..()
M.gib()
..()
return ..()
/obj/item/melee/touch_attack/fleshtostone
name = "\improper petrifying touch"
@@ -93,4 +93,4 @@
return
M.Stun(40)
M.petrify()
..()
return ..()