Conflict resolution

This commit is contained in:
Krausus
2016-08-17 22:54:22 -04:00
233 changed files with 4535 additions and 42032 deletions
@@ -228,6 +228,8 @@ var/global/datum/controller/processScheduler/processScheduler
if(!isRunning)
stat("Processes", "Scheduler not running")
return
stat("Processes", "[processes.len] (R [running.len] / Q [queued.len] / I [idle.len])")
if(!statclick)
statclick = new (src)
stat("Processes", statclick.update("[processes.len] (R [running.len] / Q [queued.len] / I [idle.len])"))
for(var/datum/controller/process/p in processes)
p.statProcess()