Merge remote-tracking branch 'upstream/master' into diagonal-movement

This commit is contained in:
Couls
2019-04-25 23:45:08 -04:00
222 changed files with 1040 additions and 866 deletions

View File

@@ -109,7 +109,7 @@ Data storage vars:
CRASH("The global_iterator loop \ref[src] failed to terminate in designated timeframe. This may be caused by server lagging.")
return 1
/datum/global_iterator/proc/process()
/datum/global_iterator/process()
return
/datum/global_iterator/proc/active()