From c39e5ccca0a0cad67cea91e3c6a73ebd80ed04de Mon Sep 17 00:00:00 2001 From: Ashe Higgs Date: Thu, 7 Dec 2017 17:05:06 -0500 Subject: [PATCH] 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 13ec5f46c07..a588eeb0e0d 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