From 86d5b4b070b23f1bcfcfed44ce5a7bf7bdfc56d5 Mon Sep 17 00:00:00 2001 From: Citinited Date: Sat, 11 May 2019 23:32:32 +0100 Subject: [PATCH] Handles APC spoopiness differently --- code/modules/power/apc.dm | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/code/modules/power/apc.dm b/code/modules/power/apc.dm index f240a67df52..1733d54abb0 100644 --- a/code/modules/power/apc.dm +++ b/code/modules/power/apc.dm @@ -414,15 +414,17 @@ update_icon() updating_icon = 0 -/obj/machinery/power/apc/get_spooked() +/obj/machinery/power/apc/get_spooked(second_pass = FALSE) if(opened || wiresexposed) return if(stat & (NOPOWER | BROKEN)) return - addtimer(CALLBACK(src, .proc/update_icon, TRUE), 10) - overlays.Cut() - flick("apcemag", src) - + if(!second_pass) //The first time, we just cut overlays + addtimer(CALLBACK(src, .get_spooked, TRUE), 1) + cut_overlays() + else + flick("apcemag", src) //Second time we cause the APC to update its icon, then add a timer to update icon later + addtimer(CALLBACK(src, .proc/update_icon, TRUE), 10) //attack with an item - open/close cover, insert cell, or (un)lock interface /obj/machinery/power/apc/attackby(obj/item/W, mob/living/user, params)