cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-07-16 01:23:41 +01:00
Code Issues Packages Projects Releases Wiki Activity

Address Fox's concerns

Browse Source
This commit is contained in:
tigercat2000
2018-03-22 15:39:41 -07:00
parent b14faa19c3
commit 47f1e2c1e4
4 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/controllers/failsafe.dm
+1 -1
View File
@@ -1,4 +1,4 @@
var/global/datum/controller/failsafe/Failsafe
GLOBAL_REAL(Failsafe, /datum/controller/failsafe)
/datum/controller/failsafe // This thing pretty much just keeps poking the master controller
code/controllers/master.dm
+1 -1
View File
@@ -405,7 +405,7 @@ GLOBAL_REAL(Master, /datum/controller/master) = new
if(SS_flags & SS_NO_FIRE)
subsystemstocheck -= SS
continue
if(!(SS_flags & SS_TICKER) && (SS_flags & SS_KEEP_TIMING) && SS.last_fire + (SS.wait * 0.75) > world.time)
if((SS_flags & (SS_TICKER|SS_KEEP_TIMING)) == SS_KEEP_TIMING && SS.last_fire + (SS.wait * 0.75) > world.time)
continue
SS.enqueue()
. = 1