From c785e53563beba0083e252cdaf808e92d0c9e15c Mon Sep 17 00:00:00 2001
From: LetterJay <jgilbert1991@gmail.com>
Date: Tue, 12 Sep 2017 03:08:20 -0500
Subject: [PATCH] Update failsafe.dm

---
 code/controllers/failsafe.dm | 105 -----------------------------------
 1 file changed, 105 deletions(-)

diff --git a/code/controllers/failsafe.dm b/code/controllers/failsafe.dm
index 9e14925c96..2ca208642c 100644
--- a/code/controllers/failsafe.dm
+++ b/code/controllers/failsafe.dm
@@ -1,107 +1,3 @@
-<<<<<<< HEAD
- /**
-  * Failsafe
-  *
-  * Pretty much pokes the MC to make sure it's still alive.
- **/
-
-GLOBAL_REAL(Failsafe, /datum/controller/failsafe)
-
-/datum/controller/failsafe // This thing pretty much just keeps poking the master controller
-	name = "Failsafe"
-
-	// The length of time to check on the MC (in deciseconds).
-	// Set to 0 to disable.
-	var/processing_interval = 20
-	// The alert level. For every failed poke, we drop a DEFCON level. Once we hit DEFCON 1, restart the MC.
-	var/defcon = 5
-	//the world.time of the last check, so the mc can restart US if we hang.
-	//	(Real friends look out for *eachother*)
-	var/lasttick = 0
-
-	// Track the MC iteration to make sure its still on track.
-	var/master_iteration = 0
-	var/running = TRUE
-
-/datum/controller/failsafe/New()
-	// Highlander-style: there can only be one! Kill off the old and replace it with the new.
-	if(Failsafe != src)
-		if(istype(Failsafe))
-			qdel(Failsafe)
-	Failsafe = src
-	Initialize()
-
-/datum/controller/failsafe/Initialize()
-	set waitfor = 0
-	Failsafe.Loop()
-	if(!QDELETED(src))
-		qdel(src) //when Loop() returns, we delete ourselves and let the mc recreate us
-
-/datum/controller/failsafe/Destroy()
-	running = FALSE
-	..()
-	return QDEL_HINT_HARDDEL_NOW
-
-/datum/controller/failsafe/proc/Loop()
-	while(running)
-		lasttick = world.time
-		if(!Master)
-			// Replace the missing Master! This should never, ever happen.
-			new /datum/controller/master()
-		// Only poke it if overrides are not in effect.
-		if(processing_interval > 0)
-			if(Master.processing && Master.iteration)
-				// Check if processing is done yet.
-				if(Master.iteration == master_iteration)
-					switch(defcon)
-						if(4,5)
-							--defcon
-						if(3)
-							to_chat(GLOB.admins, "<span class='adminnotice'>Notice: DEFCON [defcon_pretty()]. The Master Controller has not fired in the last [(5-defcon) * processing_interval] ticks.")
-							--defcon
-						if(2)
-							to_chat(GLOB.admins, "<span class='boldannounce'>Warning: DEFCON [defcon_pretty()]. The Master Controller has not fired in the last [(5-defcon) * processing_interval] ticks. Automatic restart in [processing_interval] ticks.</span>")
-							--defcon
-						if(1)
-
-							to_chat(GLOB.admins, "<span class='boldannounce'>Warning: DEFCON [defcon_pretty()]. The Master Controller has still not fired within the last [(5-defcon) * processing_interval] ticks. Killing and restarting...</span>")
-							--defcon
-							var/rtn = Recreate_MC()
-							if(rtn > 0)
-								defcon = 4
-								master_iteration = 0
-								to_chat(GLOB.admins, "<span class='adminnotice'>MC restarted successfully</span>")
-							else if(rtn < 0)
-								log_game("FailSafe: Could not restart MC, runtime encountered. Entering defcon 0")
-								to_chat(GLOB.admins, "<span class='boldannounce'>ERROR: DEFCON [defcon_pretty()]. Could not restart MC, runtime encountered. I will silently keep retrying.</span>")
-							//if the return number was 0, it just means the mc was restarted too recently, and it just needs some time before we try again
-							//no need to handle that specially when defcon 0 can handle it
-						if(0) //DEFCON 0! (mc failed to restart)
-							var/rtn = Recreate_MC()
-							if(rtn > 0)
-								defcon = 4
-								master_iteration = 0
-								to_chat(GLOB.admins, "<span class='adminnotice'>MC restarted successfully</span>")
-				else
-					defcon = min(defcon + 1,5)
-					master_iteration = Master.iteration
-			if (defcon <= 1)
-				sleep(processing_interval*2)
-			else
-				sleep(processing_interval)
-		else
-			defcon = 5
-			sleep(initial(processing_interval))
-
-/datum/controller/failsafe/proc/defcon_pretty()
-	return defcon
-
-/datum/controller/failsafe/stat_entry()
-	if(!statclick)
-		statclick = new/obj/effect/statclick/debug(null, "Initializing...", src)
-
-	stat("Failsafe Controller:", statclick.update("Defcon: [defcon_pretty()] (Interval: [Failsafe.processing_interval] | Iteration: [Failsafe.master_iteration])"))
-=======
  /**
   * Failsafe
   *
@@ -204,4 +100,3 @@ GLOBAL_REAL(Failsafe, /datum/controller/failsafe)
 		statclick = new/obj/effect/statclick/debug(null, "Initializing...", src)
 
 	stat("Failsafe Controller:", statclick.update("Defcon: [defcon_pretty()] (Interval: [Failsafe.processing_interval] | Iteration: [Failsafe.master_iteration])"))
->>>>>>> a479714... Adds missing span-endings (#30494)