From 805a07de7ee1976102949260340d2dd01cbbff73 Mon Sep 17 00:00:00 2001 From: Jordan Brown Date: Sun, 21 Jan 2018 10:09:55 -0500 Subject: [PATCH] Merge pull request #34679 from Xhuis/patch-3 Fixes emergency lights literally never working --- 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 f83a4f41d8..22e78298b8 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 || !flickering + return !A.lightswitch && A.power_light || flickering // returns whether this light has power // true if area has power and lightswitch is on