From 7b9bcb37aacf9cdb7a10e47d60e9a3b0e783f42d Mon Sep 17 00:00:00 2001 From: Jordan Brown Date: Sat, 9 Dec 2017 16:16:40 -0500 Subject: [PATCH 1/2] Merge pull request #33376 from Xhuis/patch-3 Flickering no longer enables emergency lights --- code/modules/power/lighting.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/power/lighting.dm b/code/modules/power/lighting.dm index 68751174ca..461fb537d6 100644 --- a/code/modules/power/lighting.dm +++ b/code/modules/power/lighting.dm @@ -492,7 +492,7 @@ // if a light is turned off, it won't activate emergency power /obj/machinery/light/proc/turned_off() var/area/A = get_area(src) - return !A.lightswitch && A.power_light + return !A.lightswitch && A.power_light || !flickering // returns whether this light has power // true if area has power and lightswitch is on