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

This reverts commit 86941a58f0, reversing
changes made to 65b8215ec7.

code/controllers/failsafe.dm

@@ -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

code/controllers/master_controller.dm

@@ -78,7 +78,6 @@ datum/controller/game_controller/proc/setup()
 		if(ticker)
 			ticker.pregame()
 
-	new/datum/controller/lighting()
 	lighting_controller.Initialize()
 
 

code/controllers/verbs.dm

@@ -19,7 +19,7 @@
 			feedback_add_details("admin_verb","RFailsafe")
 		if("Lighting")
 			new /datum/controller/lighting()
-			//lighting_controller.process()
+			lighting_controller.process()
 			feedback_add_details("admin_verb","RLighting")
 		if("Supply Shuttle")
 			supply_shuttle.process()