From c3440b07be53962e930216d916a89c15f2184ce5 Mon Sep 17 00:00:00 2001
From: Fox-McCloud <Fox_P_McCloud@hotmail.com>
Date: Wed, 14 Oct 2015 05:11:02 -0400
Subject: [PATCH] Supply Controller Refactor

---
 code/controllers/Processes/supply.dm         |  2 +-
 code/game/gamemodes/mutiny/key_pinpointer.dm | 14 --------------
 code/game/supplyshuttle.dm                   | 17 +++++------------
 3 files changed, 6 insertions(+), 27 deletions(-)

diff --git a/code/controllers/Processes/supply.dm b/code/controllers/Processes/supply.dm
index aa4ba1e52ab..2c16473f990 100644
--- a/code/controllers/Processes/supply.dm
+++ b/code/controllers/Processes/supply.dm
@@ -1,6 +1,6 @@
 /datum/controller/process/supply/setup()
 	name = "supply"
-	schedule_interval = 300 // every 30 seconds
+	schedule_interval = 10 // every second
 
 /datum/controller/process/supply/doWork()
 	supply_controller.process()
\ No newline at end of file
diff --git a/code/game/gamemodes/mutiny/key_pinpointer.dm b/code/game/gamemodes/mutiny/key_pinpointer.dm
index 9bee2b92c92..4d4596ab229 100644
--- a/code/game/gamemodes/mutiny/key_pinpointer.dm
+++ b/code/game/gamemodes/mutiny/key_pinpointer.dm
@@ -33,17 +33,3 @@
 			user << "It is calibrated for the Emergency Secondary Authentication Key."
 		else
 			user << "It is switched off."
-
-/datum/supply_packs/key_pinpointer
-	name = "Authentication Key Pinpointer crate"
-	contains = list(/obj/item/weapon/pinpointer/advpinpointer/auth_key)
-	cost = 250
-	containertype = /obj/structure/closet/crate
-	containername = "Authentication Key Pinpointer crate"
-	access = access_heads
-	group = "Operations"
-
-	New()
-		// This crate is only accessible during mutiny rounds
-		if (istype(ticker.mode,/datum/game_mode/mutiny))
-			..()
diff --git a/code/game/supplyshuttle.dm b/code/game/supplyshuttle.dm
index 7960132730e..371aee2ddd9 100644
--- a/code/game/supplyshuttle.dm
+++ b/code/game/supplyshuttle.dm
@@ -146,7 +146,7 @@ var/list/mechtoys = list(
 	//processing_interval = 300
 	//supply points
 	var/points = 50
-	var/points_per_process = 1
+	var/points_per_process = 0.05
 	var/points_per_slip = 2
 	var/points_per_crate = 5
 	var/points_per_plasma = 5
@@ -168,21 +168,14 @@ var/list/mechtoys = list(
 /datum/controller/supply/New()
 	ordernum = rand(1,9000)
 
-//Supply shuttle ticker - handles supply point regeneration and shuttle travelling between centcomm and the station
-/datum/controller/supply/proc/process()
 	for(var/typepath in subtypesof(/datum/supply_packs))
 		var/datum/supply_packs/P = new typepath()
-		if(P.name == "HEADER")
-			qdel(P)
-			continue
+		if(P.name == "HEADER") continue
 		supply_packs[P.name] = P
 
-	spawn(0)
-		if(processing)
-			iteration++
-			points += points_per_process
-
-			//sleep(processing_interval)
+//Supply shuttle ticker - handles supply point regeneration and shuttle travelling between centcomm and the station
+/datum/controller/supply/proc/process()
+	points += points_per_process
 
 //To stop things being sent to centcomm which should not be sent to centcomm. Recursively checks for these types.
 /datum/controller/supply/proc/forbidden_atoms_check(atom/A)