Merge remote-tracking branch 'upstream/master' into slime-puddle

This commit is contained in:
Timothy Teakettle
2020-09-30 19:55:54 +01:00
4 changed files with 0 additions and 3 deletions
-3
View File
@@ -77,7 +77,6 @@ SUBSYSTEM_DEF(air)
/datum/controller/subsystem/air/proc/extools_update_ssair()
/datum/controller/subsystem/air/proc/extools_update_reactions()
/datum/controller/subsystem/air/proc/scan_for_active_turfs()
/datum/controller/subsystem/air/fire(resumed = 0)
var/timer = TICK_USAGE_REAL
@@ -165,8 +164,6 @@ SUBSYSTEM_DEF(air)
if(state != SS_RUNNING)
return
resumed = 0
if(get_amt_active_turfs() < 3000 && !TICK_CHECK)
scan_for_active_turfs()
currentpart = SSAIR_REBUILD_PIPENETS