From 3c0d278a91c6313be315e3c6073ca921e11f334a Mon Sep 17 00:00:00 2001
From: ZomgPonies <lorden@zomgponies.com>
Date: Mon, 23 Feb 2015 10:35:25 -0500
Subject: [PATCH] Scheduler fixes and additions

---
 code/controllers/Processes/Shuttle.dm |  2 +-
 code/controllers/Processes/supply.dm  |  6 ++++
 code/modules/mob/mob.dm               | 46 +++++++++++++--------------
 paradise.dme                          |  3 +-
 4 files changed, 32 insertions(+), 25 deletions(-)
 create mode 100644 code/controllers/Processes/supply.dm

diff --git a/code/controllers/Processes/Shuttle.dm b/code/controllers/Processes/Shuttle.dm
index 1c479c430c5..a10586d76d9 100644
--- a/code/controllers/Processes/Shuttle.dm
+++ b/code/controllers/Processes/Shuttle.dm
@@ -1,6 +1,6 @@
 /datum/controller/process/Shuttle/setup()
 	name = "shuttle controller"
-	schedule_interval = 300 // every 30 seconds
+	schedule_interval = 20 // every 2 seconds
 
 	if(!shuttle_controller)
 		shuttle_controller = new
diff --git a/code/controllers/Processes/supply.dm b/code/controllers/Processes/supply.dm
new file mode 100644
index 00000000000..891a511ec6d
--- /dev/null
+++ b/code/controllers/Processes/supply.dm
@@ -0,0 +1,6 @@
+/datum/controller/process/supply/setup()
+	name = "supply controller"
+	schedule_interval = 300 // every 30 seconds
+
+/datum/controller/process/supply/doWork()
+	supply_controller.process()
\ No newline at end of file
diff --git a/code/modules/mob/mob.dm b/code/modules/mob/mob.dm
index f0f38e13745..419601eec17 100644
--- a/code/modules/mob/mob.dm
+++ b/code/modules/mob/mob.dm
@@ -895,39 +895,18 @@ var/list/slot_equipment_priority = list( \
 			if(processScheduler.getIsRunning())
 				var/datum/controller/process/process
 
-				process = processScheduler.getProcess("vote")
-				stat(null, "VOT\t - #[process.getTicks()]\t - [process.getLastRunTime()]")
+				process = processScheduler.getProcess("ticker")
+				stat(null, "TIC\t - #[process.getTicks()]\t - [process.getLastRunTime()]")
 
 				process = processScheduler.getProcess("air")
 				stat(null, "AIR\t - #[process.getTicks()]\t - [process.getLastRunTime()]")
 
-				process = processScheduler.getProcess("sun")
-				stat(null, "SUN\t - #[process.getTicks()]\t - [process.getLastRunTime()]")
-
-				process = processScheduler.getProcess("ticker")
-				stat(null, "TIC\t - #[process.getTicks()]\t - [process.getLastRunTime()]")
-
-				//process = processScheduler.getProcess("garbage")
-				//stat(null, "GAR\t - #[process.getTicks()]\t - [process.getLastRunTime()]")
-
 				process = processScheduler.getProcess("lighting")
 				stat(null, "LIG\t - #[process.getTicks()]\t - [process.getLastRunTime()]")
 
-				process = processScheduler.getProcess("shuttle controller")
-				stat(null, "SHT\t - #[process.getTicks()]\t - [process.getLastRunTime()]")
-
-				process = processScheduler.getProcess("emergency shuttle")
-				stat(null, "EME\t - #[process.getTicks()]\t - [process.getLastRunTime()]")
-
-				process = processScheduler.getProcess("inactivity")
-				stat(null, "IAC\t - #[process.getTicks()]\t - [process.getLastRunTime()]")
-
 				process = processScheduler.getProcess("mob")
 				stat(null, "MOB([mob_list.len])\t - #[process.getTicks()]\t - [process.getLastRunTime()]")
 
-				process = processScheduler.getProcess("disease")
-				stat(null, "DIS([active_diseases.len])\t - #[process.getTicks()]\t - [process.getLastRunTime()]")
-
 				process = processScheduler.getProcess("machinery")
 				stat(null, "MAC([machines.len])\t - #[process.getTicks()]\t - [process.getLastRunTime()]")
 
@@ -943,6 +922,27 @@ var/list/slot_equipment_priority = list( \
 				process = processScheduler.getProcess("nanoui")
 				stat(null, "NAN([nanomanager.processing_uis.len])\t - #[process.getTicks()]\t - [process.getLastRunTime()]")
 
+				process = processScheduler.getProcess("disease")
+				stat(null, "DIS([active_diseases.len])\t - #[process.getTicks()]\t - [process.getLastRunTime()]")
+
+				//process = processScheduler.getProcess("sun")
+				//stat(null, "SUN\t - #[process.getTicks()]\t - [process.getLastRunTime()]")
+
+				//process = processScheduler.getProcess("garbage")
+				//stat(null, "GAR\t - #[process.getTicks()]\t - [process.getLastRunTime()]")
+
+				//process = processScheduler.getProcess("vote")
+				//stat(null, "VOT\t - #[process.getTicks()]\t - [process.getLastRunTime()]")
+
+				//process = processScheduler.getProcess("shuttle controller")
+				//stat(null, "SHT\t - #[process.getTicks()]\t - [process.getLastRunTime()]")
+
+				//process = processScheduler.getProcess("emergency shuttle")
+				//stat(null, "EME\t - #[process.getTicks()]\t - [process.getLastRunTime()]")
+
+				//process = processScheduler.getProcess("inactivity")
+				//stat(null, "IAC\t - #[process.getTicks()]\t - [process.getLastRunTime()]")
+
 				//process = processScheduler.getProcess("event")
 				//stat(null, "EVE([events.len])\t - #[process.getTicks()]\t - [process.getLastRunTime()]")
 			else
diff --git a/paradise.dme b/paradise.dme
index e1ef46d79af..0e4e59677be 100644
--- a/paradise.dme
+++ b/paradise.dme
@@ -187,8 +187,9 @@
 #include "code\controllers\Processes\obj.dm"
 #include "code\controllers\Processes\pipenet.dm"
 #include "code\controllers\Processes\powernet.dm"
-#include "code\controllers\Processes\Shuttle.dm"
+#include "code\controllers\Processes\shuttle.dm"
 #include "code\controllers\Processes\sun.dm"
+#include "code\controllers\Processes\supply.dm"
 #include "code\controllers\Processes\ticker.dm"
 #include "code\controllers\Processes\vote.dm"
 #include "code\controllers\ProcessScheduler\core\_define.dm"