mirror of
https://github.com/Bubberstation/Bubberstation.git
synced 2026-08-30 08:37:43 +01:00
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:
committed by
Emmett Gaines
parent
e2093f11f5
commit
bee0b5b2c3
@@ -36,6 +36,7 @@
|
||||
return OXYLOSS
|
||||
|
||||
/obj/item/hand_labeler/afterattack(atom/A, mob/user,proximity)
|
||||
. = ..()
|
||||
if(!proximity)
|
||||
return
|
||||
if(!mode) //if it's off, give up.
|
||||
@@ -89,7 +90,7 @@
|
||||
name = "cyborg-hand labeler"
|
||||
|
||||
/obj/item/hand_labeler/borg/afterattack(atom/A, mob/user, proximity)
|
||||
..(A, user, proximity)
|
||||
. = ..(A, user, proximity)
|
||||
if(!iscyborg(user))
|
||||
return
|
||||
|
||||
|
||||
@@ -123,6 +123,7 @@
|
||||
. = ..()
|
||||
|
||||
/obj/item/pen/afterattack(obj/O, mob/living/user, proximity)
|
||||
. = ..()
|
||||
//Changing Name/Description of items. Only works if they have the 'unique_rename' flag set
|
||||
if(isobj(O) && proximity && (O.obj_flags & UNIQUE_RENAME))
|
||||
var/penchoice = input(user, "What would you like to edit?", "Rename or change description?") as null|anything in list("Rename","Change description")
|
||||
|
||||
@@ -459,6 +459,7 @@
|
||||
viewpichelper(Ainfo)
|
||||
|
||||
/obj/item/camera/afterattack(atom/target, mob/user, flag)
|
||||
. = ..()
|
||||
if(!on || !pictures_left || !isturf(target.loc))
|
||||
return
|
||||
if (disk)
|
||||
|
||||
Reference in New Issue
Block a user