Merge pull request #33376 from Xhuis/patch-3

Flickering no longer enables emergency lights
2017-12-09 16:16:40 -05:00
parent edce62494d
commit 7b9bcb37aa
1 changed files with 1 additions and 1 deletions
@@ -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