From 48c439aaac545bf28d5ba5c1de64dd6ae20a236c Mon Sep 17 00:00:00 2001 From: CitadelStationBot Date: Fri, 2 Jun 2017 14:11:29 -0500 Subject: [PATCH] Fix cable coil dupe and APC icon oddity --- code/modules/power/apc.dm | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/code/modules/power/apc.dm b/code/modules/power/apc.dm index e526d6ba6d..d980591ceb 100644 --- a/code/modules/power/apc.dm +++ b/code/modules/power/apc.dm @@ -96,8 +96,6 @@ /obj/machinery/power/apc/connect_to_network() //Override because the APC does not directly connect to the network; it goes through a terminal. //The terminal is what the power computer looks for anyway. - if(!terminal) - make_terminal() if(terminal) terminal.connect_to_network() @@ -238,6 +236,8 @@ icon_state = "apcemag" else if(update_state & UPSTATE_WIREEXP) icon_state = "apcewires" + else if(update_state & UPSTATE_MAINT) + icon_state = "apc0" if(!(update_state & UPSTATE_ALLGOOD)) cut_overlays() @@ -445,6 +445,8 @@ update_icon() else if(emagged) to_chat(user, "The interface is broken!") + else if((stat & MAINT) && !opened) + ..() //its an empty closed frame... theres no wires to expose! else panel_open = !panel_open to_chat(user, "The wires have been [panel_open ? "exposed" : "unexposed"]") @@ -631,6 +633,8 @@ charging = 0 src.update_icon() return + if((stat & MAINT) && !opened) //no board; no interface + return ..() /obj/machinery/power/apc/ui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = 0, \