From 72ae84a0bbc62c08b215c8e9e90c301f6ae445a3 Mon Sep 17 00:00:00 2001 From: WitheredGryphon Date: Tue, 26 Nov 2013 20:20:14 -0600 Subject: [PATCH 1/2] Fixed the greyed out portable flasher issue. --- code/game/machinery/flasher.dm | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/code/game/machinery/flasher.dm b/code/game/machinery/flasher.dm index 6dd2af1418d..37bb63254cf 100644 --- a/code/game/machinery/flasher.dm +++ b/code/game/machinery/flasher.dm @@ -26,12 +26,12 @@ bulb = new /obj/item/device/flash(src) /obj/machinery/flasher/power_change() - if (powered() && bulb && anchored) + if (powered() && anchored && bulb) stat &= ~NOPOWER if(bulb.broken) - icon_state = "[base_state]1-p" - else icon_state = "[base_state]1" + else + icon_state = "[base_state]1-p" else stat |= ~NOPOWER icon_state = "[base_state]1-p" @@ -132,14 +132,15 @@ if (!anchored && !isinspace()) user << "[src] is now secured." overlays.Cut() - power_change() anchored = 1 + power_change() + else user << "[src] can now be moved." overlays += "[base_state]-s" - power_change() anchored = 0 + power_change() else ..() From cdfc7ae7c3fff66b7cf72ec732ef5a184034cca0 Mon Sep 17 00:00:00 2001 From: WitheredGryphon Date: Tue, 26 Nov 2013 20:50:44 -0600 Subject: [PATCH 2/2] Re-fixed the flashers after breaking them --- code/game/machinery/flasher.dm | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/code/game/machinery/flasher.dm b/code/game/machinery/flasher.dm index 37bb63254cf..05129852379 100644 --- a/code/game/machinery/flasher.dm +++ b/code/game/machinery/flasher.dm @@ -29,9 +29,9 @@ if (powered() && anchored && bulb) stat &= ~NOPOWER if(bulb.broken) - icon_state = "[base_state]1" - else icon_state = "[base_state]1-p" + else + icon_state = "[base_state]1" else stat |= ~NOPOWER icon_state = "[base_state]1-p" @@ -134,8 +134,6 @@ overlays.Cut() anchored = 1 power_change() - - else user << "[src] can now be moved." overlays += "[base_state]-s"