Lighting system is too buggy to continue until I know wtf is going on

Conflicts:
	baystation12.dme
	code/game/turfs/turf.dm
This commit is contained in:
Aryn
2014-02-28 17:47:50 -05:00
committed by ZomgPonies
parent d443734d60
commit 5b2f811b71
20 changed files with 167 additions and 97 deletions
+3 -2
View File
@@ -45,7 +45,8 @@ var/datum/controller/failsafe/Failsafe
MC_defcon = 0
MC_iteration = controller_iteration
if(lighting_controller.processing)
//Lighting controller now neither processes nor iterates.
/*if(lighting_controller.processing)
if(lighting_iteration == lighting_controller.iteration) //master_controller hasn't finished processing in the defined interval
switch(lighting_defcon)
if(0 to 3)
@@ -60,7 +61,7 @@ var/datum/controller/failsafe/Failsafe
lighting_defcon = 0
else
lighting_defcon = 0
lighting_iteration = lighting_controller.iteration
lighting_iteration = lighting_controller.iteration*/
else
MC_defcon = 0
lighting_defcon = 0