Merge pull request #4992 from Citadel-Station-13/upstream-merge-34679

[MIRROR] Fixes emergency lights literally never working
2018-01-21 12:01:43 -06:00
parent ba8122eebe d5e014ad41
commit a074e10815
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 || !flickering
+	return !A.lightswitch && A.power_light || flickering

 // returns whether this light has power
 // true if area has power and lightswitch is on