Welp, fix for me accidentally re-adding the MC failsafe, and a stat check for metroids, so now they won't process targets, their friend list, or any of that other shit when dead.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4202 316c924e-a436-60f5-8080-3fe189b3f50e
This commit is contained in:
sieve32@gmail.com
2012-07-28 16:36:22 +00:00
parent 92dd10f892
commit 082c7a13ce
2 changed files with 3 additions and 37 deletions

View File

@@ -224,40 +224,4 @@ datum/controller/game_controller
process()
return 1
/datum/failsafe // This thing pretty much just keeps poking the master controller
var/spinning = 1
var/current_iteration = 0
/datum/failsafe/proc/spin()
if(!master_controller) // Well fuck. How did this happen?
sleep(50)
if(!master_controller)
master_controller = new /datum/controller/game_controller()
spawn(-1)
master_controller.setup()
else
while(spinning)
current_iteration = controller_iteration
sleep(600) // Wait 15 seconds
if(current_iteration == controller_iteration) // Mm. The master controller hasn't ticked yet.
for (var/mob/M in admin_list)
if (M.client)
M << "<font color='red' size='2'><b> Warning. The Master Controller has not fired in the last 60 seconds. Restart recommended. Automatic restart in 60 seconds.</b></font>"
sleep(600)
if(current_iteration == controller_iteration)
for (var/mob/M in admin_list)
if (M.client)
M << "<font color='red' size='2'><b> Warning. The Master Controller has not fired in the last 2 minutes. Automatic restart beginning.</b></font>"
master_controller.process()
sleep(150)
else
for (var/mob/M in admin_list)
if (M.client)
M << "<font color='red' size='2'><b> The Master Controller has fired. Automatic restart aborted.</b></font>"
return 1

View File

@@ -41,6 +41,8 @@
if(client)
handle_regular_hud_updates() */
if(stat == 2)
return
handle_nutrition()
if(Tempstun)