Merge pull request #4292 from Citadel-Station-13/upstream-merge-33376

[MIRROR] Flickering no longer enables emergency lights
2017-12-10 03:07:54 +00:00
parent f83da95eb0 f72af85e3f
commit 0c7bc2f3fe
1 changed files with 1 additions and 1 deletions
--- 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