Changes to pause proc

This commit is contained in:
Shadowlight213
2016-04-27 23:11:20 -07:00
parent 1ad3b440ff
commit f03d8f9b1a
11 changed files with 20 additions and 18 deletions
+2
View File
@@ -45,6 +45,8 @@
can_fire = 0
/datum/subsystem/proc/pause()
if(!McTickCheck)
return 0
. = 1
if (!dynamic_wait)
Master.priority_queue += src
+7 -7
View File
@@ -147,7 +147,7 @@ var/datum/subsystem/air/SSair
thing.process()
else
networks.Remove(thing)
if(MC_TICK_CHECK && McTickCheck)
if(MC_TICK_CHECK)
return
@@ -162,7 +162,7 @@ var/datum/subsystem/air/SSair
currentrun.Cut(1, 2)
if(!M || (M.process_atmos(seconds) == PROCESS_KILL))
atmos_machinery.Remove(M)
if(MC_TICK_CHECK && McTickCheck)
if(MC_TICK_CHECK)
return
@@ -175,7 +175,7 @@ var/datum/subsystem/air/SSair
var/turf/T = currentrun[1]
currentrun.Cut(1, 2)
T.super_conduct()
if(MC_TICK_CHECK && McTickCheck)
if(MC_TICK_CHECK)
return
/datum/subsystem/air/proc/process_hotspots(resumed = 0)
@@ -190,7 +190,7 @@ var/datum/subsystem/air/SSair
H.process()
else
hotspots -= H
if(MC_TICK_CHECK && McTickCheck)
if(MC_TICK_CHECK)
return
@@ -200,7 +200,7 @@ var/datum/subsystem/air/SSair
high_pressure_delta.Cut(1,2)
T.high_pressure_movements()
T.pressure_difference = 0
if(MC_TICK_CHECK && McTickCheck)
if(MC_TICK_CHECK)
return
/datum/subsystem/air/proc/process_active_turfs(resumed = 0)
@@ -215,7 +215,7 @@ var/datum/subsystem/air/SSair
currentrun.Cut(1, 2)
if (T)
T.process_cell(fire_count)
if (MC_TICK_CHECK && McTickCheck)
if (MC_TICK_CHECK)
return
/datum/subsystem/air/proc/process_excited_groups(resumed = 0)
@@ -232,7 +232,7 @@ var/datum/subsystem/air/SSair
EG.self_breakdown()
else if(EG.dismantle_cooldown >= EXCITED_GROUP_DISMANTLE_CYCLES)
EG.dismantle()
if (MC_TICK_CHECK && McTickCheck)
if (MC_TICK_CHECK)
return
+1 -1
View File
@@ -25,5 +25,5 @@ var/datum/subsystem/diseases/SSdisease
thing.process()
else
processing.Remove(thing)
if (MC_TICK_CHECK && McTickCheck)
if (MC_TICK_CHECK)
return
+1 -1
View File
@@ -48,7 +48,7 @@ var/datum/subsystem/events/SSevent
thing.process()
else
running.Remove(thing)
if (MC_TICK_CHECK && McTickCheck)
if (MC_TICK_CHECK)
return
//checks if we should select a random event yet, and reschedules if necessary
+1 -1
View File
@@ -33,5 +33,5 @@ var/datum/subsystem/fastprocess/SSfastprocess
thing.process(wait)
else
SSfastprocess.processing -= thing
if (MC_TICK_CHECK && McTickCheck)
if (MC_TICK_CHECK)
return
+2 -2
View File
@@ -62,7 +62,7 @@ var/datum/subsystem/garbage_collector/SSgarbage
/datum/subsystem/garbage_collector/proc/HandleToBeQueued(time_to_stop)
var/list/tobequeued = src.tobequeued
while(tobequeued.len && world.timeofday < time_to_stop)
if (MC_TICK_CHECK && McTickCheck)
if (MC_TICK_CHECK)
break
var/ref = tobequeued[1]
Queue(ref)
@@ -74,7 +74,7 @@ var/datum/subsystem/garbage_collector/SSgarbage
var/time_to_kill = world.time - collection_timeout // Anything qdel() but not GC'd BEFORE this time needs to be manually del()
var/list/queue = src.queue
while(queue.len && world.timeofday < time_to_stop)
if (MC_TICK_CHECK && McTickCheck)
if (MC_TICK_CHECK)
break
var/refID = queue[1]
if (!refID)
+1 -1
View File
@@ -13,7 +13,7 @@ var/datum/subsystem/icon_smooth/SSicon_smooth
for(var/atom in smooth_queue)
ss_smooth_icon(atom)
smooth_queue -= atom
if (MC_TICK_CHECK && McTickCheck)
if (MC_TICK_CHECK)
return
/datum/subsystem/icon_smooth/Initialize()
+2 -2
View File
@@ -41,7 +41,7 @@ var/datum/subsystem/lighting/SSlighting
var/datum/light_source/LS = changed_lights[1]
changed_lights.Cut(1, 2)
LS.check()
if (MC_TICK_CHECK && McTickCheck)
if (MC_TICK_CHECK)
return
var/list/changed_turfs = src.changed_turfs
@@ -52,7 +52,7 @@ var/datum/subsystem/lighting/SSlighting
changed_turfs.Cut(1, 2)
if(T.lighting_changed)
T.redraw_lighting()
if (MC_TICK_CHECK && McTickCheck)
if (MC_TICK_CHECK)
return
//same as above except it attempts to shift ALL turfs in the world regardless of lighting_changed status
+1 -1
View File
@@ -52,7 +52,7 @@ var/datum/subsystem/machines/SSmachine
thing:auto_use_power() //add back the power state
else
processing.Remove(thing)
if (MC_TICK_CHECK && McTickCheck)
if (MC_TICK_CHECK)
return
/datum/subsystem/machines/proc/setup_template_powernets(list/cables)
+1 -1
View File
@@ -30,5 +30,5 @@ var/datum/subsystem/mobs/SSmob
M.Life(seconds)
else
mob_list.Remove(M)
if (MC_TICK_CHECK && McTickCheck)
if (MC_TICK_CHECK)
return
+1 -1
View File
@@ -52,7 +52,7 @@ var/datum/subsystem/objects/SSobj
thing.process(wait)
else
SSobj.processing.Remove(thing)
if (MC_TICK_CHECK && McTickCheck)
if (MC_TICK_CHECK)
return
for(var/obj/burningobj in SSobj.burning)