No return for them.

This commit is contained in:
ESwordTheCat
2014-06-17 11:21:09 -08:00
parent b26cc4b532
commit ffd4854147
4 changed files with 11 additions and 11 deletions

View File

@@ -17,9 +17,9 @@ var/datum/controller/failsafe/Failsafe
if (Failsafe != src)
if (istype(Failsafe))
qdel(Failsafe)
return
Failsafe = src
Failsafe = src
Failsafe.process()
/datum/controller/failsafe/proc/process()

View File

@@ -25,9 +25,8 @@ datum/controller/lighting
if (istype(lighting_controller)
Recover() // If we are replacing an existing lighting_controller (due to a crash) we attempt to preserve as much as we can.
qdel(lighting_controller)
return
lighting_controller = src
lighting_controller = src
//Workhorse of lighting. It cycles through each light to see which ones need their effects updating. It updates their
//effects and then processes every turf in the queue, moving the turfs to the corresponing lighting sub-area.

View File

@@ -42,15 +42,17 @@ datum/controller/game_controller
datum/controller/game_controller/New()
. = ..()
//There can be only one master_controller. Out with the old and in with the new.
if(master_controller != src)
// There can be only one master_controller. Out with the old and in with the new.
if (master_controller != src)
log_debug("Rebuilding Master Controller")
if(istype(master_controller))
if (istype(master_controller))
Recover()
del(master_controller)
qdel(master_controller)
master_controller = src
if(!job_master)
if (isnull(job_master))
job_master = new /datum/controller/occupations()
job_master.SetupOccupations()
job_master.LoadJobs("config/jobs.txt")

View File

@@ -17,9 +17,8 @@ datum/controller/vote
if (vote != src)
if (istype(vote))
qdel(vote)
return
vote = src
vote = src
proc/process() //called by master_controller
if(mode)