YOOOOO0U. YOU GOT WHAT AH NEEEEEEEED

Conflicts:
	code/__HELPERS/game.dm
	code/game/machinery/alarm.dm
	code/game/machinery/doors/firedoor.dm
	code/modules/client/preferences_toggles.dm
	code/setup.dm
	maps/tgstation.2.1.0.0.1.dmm
This commit is contained in:
Rob Nelson
2014-03-11 02:28:58 -04:00
committed by ZomgPonies
parent 3128813d0a
commit 5c8ddf2a31
14 changed files with 280 additions and 53 deletions
+1 -2
View File
@@ -611,8 +611,7 @@
// called when area power state changes
/obj/machinery/light/power_change()
spawn(10)
var/area/A = src.loc.loc
A = A.master
var/area/A = get_area_master(src)
seton(A.lightswitch && A.power_light)
// called when on fire