Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods

This commit is contained in:
Poojawa
2019-08-15 08:39:41 -05:00
112 changed files with 692 additions and 547 deletions
+1 -7
View File
@@ -184,7 +184,7 @@
/obj/item/organ/eyes/robotic/glow/proc/terminate_effects()
if(owner && active)
deactivate()
deactivate(TRUE)
active = FALSE
clear_visuals(TRUE)
STOP_PROCESSING(SSfastprocess, src)
@@ -237,12 +237,6 @@
return
deactivate(silent = TRUE)
/obj/item/organ/eyes/robotic/glow/Remove(mob/living/carbon/M)
. = ..()
if(active)
UnregisterSignal(M, COMSIG_ATOM_DIR_CHANGE)
active = FALSE
/obj/item/organ/eyes/robotic/glow/proc/activate(silent = FALSE)
start_visuals()
if(!silent)