cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-10 10:12:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Merge pull request #4478 from Aryn/master"

Browse Source 
This reverts commit 86941a58f0, reversing
changes made to 65b8215ec7.
This commit is contained in:
Mloc-Hibernia
2014-03-24 13:55:41 +00:00
parent 34c39e773a
commit d4324901d3
19 changed files with 29 additions and 611 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
code/controllers/failsafe.dm
View File

@@ -45,8 +45,7 @@ var/datum/controller/failsafe/Failsafe
MC_defcon = 0
MC_iteration = controller_iteration
//Lighting controller now neither processes nor iterates.
/*if(lighting_controller.processing)
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)
@@ -61,7 +60,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