cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-08-26 06:22:26 +01:00
Code Issues Packages Projects Releases Wiki Activity

Finish porting bay's timer SS (#12978)

Browse Source
This commit is contained in:
Matt Atlas
2022-01-29 13:07:51 -03:00
committed by GitHub
parent edb1c08178
commit 2842f4e39f
18 changed files with 381 additions and 303 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/controllers/master/master.dm
+1 -1
View File
@@ -489,7 +489,7 @@ var/CURRENT_TICKLIMIT = TICK_LIMIT_RUNNING
queue_node.times_fired++
if (queue_node_flags & SS_TICKER)
queue_node.next_fire = world.time + (world.tick_lag * (queue_node.wait + (queue_node.tick_overrun/100)))
queue_node.next_fire = world.time + (world.tick_lag * queue_node.wait)
else if (queue_node_flags & SS_POST_FIRE_TIMING)
queue_node.next_fire = world.time + queue_node.wait + (world.tick_lag * (queue_node.tick_overrun/100))
else if (queue_node_flags & SS_KEEP_TIMING)
code/controllers/master/subsystem.dm
+1 -1
View File
@@ -104,7 +104,7 @@
else
if (SS_flags & SS_BACKGROUND)
continue
if (SS_flags & SS_TICKER)
if (SS_flags & (SS_TICKER|SS_BACKGROUND) == SS_TICKER)
break
if (queue_node_priority < SS_priority)
break