From ac3a2072753cf406aa641ab696c011e6fbe60873 Mon Sep 17 00:00:00 2001 From: xxalpha Date: Wed, 23 Sep 2015 06:12:52 +0100 Subject: [PATCH] Fixed icon when emagging bolted airlock. --- code/game/machinery/doors/airlock.dm | 33 ++++++++++++++---- icons/obj/doors/airlocks/station/overlays.dmi | Bin 6570 -> 6477 bytes 2 files changed, 26 insertions(+), 7 deletions(-) diff --git a/code/game/machinery/doors/airlock.dm b/code/game/machinery/doors/airlock.dm index 8f8a5fdfeaf..9a2b1f97905 100644 --- a/code/game/machinery/doors/airlock.dm +++ b/code/game/machinery/doors/airlock.dm @@ -256,14 +256,30 @@ About the new airlock wires panel: lights_overlay = get_airlock_overlay("lights_bolts", overlays_file) else if(emergency) lights_overlay = get_airlock_overlay("lights_emergency", overlays_file) + if(AIRLOCK_DENY) - overlays += get_airlock_overlay("lights_denied", overlays_file) - sleep(4) - update_icon(AIRLOCK_CLOSED) - return + frame_overlay = get_airlock_overlay("closed", icon) + if(airlock_material) + filling_overlay = get_airlock_overlay("[airlock_material]_closed", overlays_file) + else + filling_overlay = get_airlock_overlay("fill_closed", icon) + if(p_open) + panel_overlay = get_airlock_overlay("panel_closed", overlays_file) + if(welded) + weld_overlay = get_airlock_overlay("welded", overlays_file) + lights_overlay = get_airlock_overlay("lights_denied", overlays_file) + if(AIRLOCK_EMAG) - overlays += get_airlock_overlay("sparks", overlays_file) - return + frame_overlay = get_airlock_overlay("closed", icon) + sparks_overlay = get_airlock_overlay("sparks", overlays_file) + if(airlock_material) + filling_overlay = get_airlock_overlay("[airlock_material]_closed", overlays_file) + else + filling_overlay = get_airlock_overlay("fill_closed", icon) + if(p_open) + panel_overlay = get_airlock_overlay("panel_closed", overlays_file) + if(welded) + weld_overlay = get_airlock_overlay("welded", overlays_file) if(AIRLOCK_CLOSING) frame_overlay = get_airlock_overlay("closing", icon) @@ -319,6 +335,8 @@ About the new airlock wires panel: update_icon(AIRLOCK_CLOSING) if("deny") update_icon(AIRLOCK_DENY) + sleep(6) + update_icon(AIRLOCK_CLOSED) icon_state = "closed" /obj/machinery/door/airlock/examine(mob/user) @@ -1118,7 +1136,8 @@ About the new airlock wires panel: sleep(6) if(qdeleted(src)) return - open() + if(!open()) + update_icon(AIRLOCK_CLOSED) emagged = 1 desc = "Its access panel is smoking slightly." lights = 0 diff --git a/icons/obj/doors/airlocks/station/overlays.dmi b/icons/obj/doors/airlocks/station/overlays.dmi index f37a1838c76c25129d1cd5922f0e9b70e222c5cb..37425b59510f7cc8e0ed2916f9af730500156f4d 100644 GIT binary patch literal 6477 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