Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into space_allocation

This commit is contained in:
Crazylemon64
2016-08-03 13:31:42 -07:00
65 changed files with 174 additions and 2702 deletions
@@ -105,6 +105,10 @@
last_task = 0
last_object = null
/datum/controller/process/Destroy()
..()
return QDEL_HINT_HARDDEL_NOW
/datum/controller/process/proc/started()
// Initialize run_start so we can detect hung processes.
run_start = TimeOfGame
@@ -180,8 +184,7 @@
// Allow inheritors to clean up if needed
onKill()
// This should del
del(src)
qdel(src)
// Do not call this directly - use SHECK or SCHECK_EVERY
/datum/controller/process/proc/sleepCheck(var/tickId = 0)
@@ -58,6 +58,10 @@ var/global/datum/controller/processScheduler/processScheduler
timeAllowance = world.tick_lag * 0.5
timeAllowanceMax = world.tick_lag
/datum/controller/processScheduler/Destroy()
..()
return QDEL_HINT_HARDDEL_NOW
/**
* deferSetupFor
* @param path processPath
@@ -72,7 +76,7 @@ var/global/datum/controller/processScheduler/processScheduler
/datum/controller/processScheduler/proc/setup()
// There can be only one
if(processScheduler && (processScheduler != src))
del(src)
qdel(src)
return 0
var/process
+5 -1
View File
@@ -24,7 +24,7 @@ var/global/pipe_processing_killed = 0
//There can be only one master_controller. Out with the old and in with the new.
if(master_controller != src)
if(istype(master_controller))
del(master_controller)
qdel(master_controller)
master_controller = src
var/watch=0
@@ -38,6 +38,10 @@ var/global/pipe_processing_killed = 0
if(!syndicate_code_phrase) syndicate_code_phrase = generate_code_phrase()
if(!syndicate_code_response) syndicate_code_response = generate_code_phrase()
/datum/controller/game_controller/Destroy()
..()
return QDEL_HINT_HARDDEL_NOW
/datum/controller/game_controller/proc/setup()
world.tick_lag = config.Ticklag