Resolves further merge conflicts

This commit is contained in:
Krausus
2015-08-03 23:40:28 -04:00
396 changed files with 13577 additions and 11129 deletions

View File

@@ -57,7 +57,7 @@ var/global/datum/controller/processScheduler/processScheduler
var/process
// Add all the processes we can find, except for the ticker
for (process in typesof(/datum/controller/process) - /datum/controller/process)
for (process in subtypesof(/datum/controller/process))
if (!(process in deferredSetupList))
addProcess(new process(src))