From 983ca2d5e3d37519285207590283b2f36db8f99c Mon Sep 17 00:00:00 2001
From: DJSnapshot <trevornaze@gmail.com>
Date: Thu, 21 Nov 2013 17:44:31 -0800
Subject: [PATCH] Fix for reported issue with the transfer_controller causing a
 runtime error. Also included is a debug controller for the
 transfer_controller

---
 code/controllers/autotransfer.dm      | 14 +++++++++-----
 code/controllers/master_controller.dm |  5 ++++-
 code/controllers/verbs.dm             |  5 ++++-
 code/controllers/voting.dm            |  6 +++++-
 4 files changed, 22 insertions(+), 8 deletions(-)

diff --git a/code/controllers/autotransfer.dm b/code/controllers/autotransfer.dm
index c69290c7bd..f1240a1fae 100644
--- a/code/controllers/autotransfer.dm
+++ b/code/controllers/autotransfer.dm
@@ -1,13 +1,17 @@
-var/datum/controller/transfer_controller = new /transfer_controller()
-var/timerbuffer = 0 //buffer for time check
-/transfer_controller/New()
+var/datum/controller/transfer_controller/transfer_controller
+
+datum/controller/transfer_controller
+	var/timerbuffer = 0 //buffer for time check
+	var/currenttick = 0
+datum/controller/transfer_controller/New()
 	timerbuffer = config.vote_autotransfer_initial
 	processing_objects += src
 
-/transfer_controller/Del()
+datum/controller/transfer_controller/Del()
 	processing_objects -= src
 
-/transfer_controller/proc/process()
+datum/controller/transfer_controller/proc/process()
+	currenttick = currenttick + 1
 	if (world.time >= timerbuffer - 600)
 		vote.autotransfer()
 		timerbuffer = timerbuffer + config.vote_autotransfer_interval
\ No newline at end of file
diff --git a/code/controllers/master_controller.dm b/code/controllers/master_controller.dm
index d3ddef9f37..5e7d308a9e 100644
--- a/code/controllers/master_controller.dm
+++ b/code/controllers/master_controller.dm
@@ -67,6 +67,8 @@ datum/controller/game_controller/proc/setup()
 	setupfactions()
 	setup_economy()
 
+	transfer_controller = new
+
 	for(var/i=0, i<max_secret_rooms, i++)
 		make_mining_asteroid_secret()
 
@@ -119,6 +121,7 @@ datum/controller/game_controller/proc/process()
 				controller_iteration++
 
 				vote.process()
+				transfer_controller.process()
 				process_newscaster()
 
 				//AIR
@@ -196,7 +199,7 @@ datum/controller/game_controller/proc/process()
 				timer = world.timeofday
 				process_nano()
 				nano_cost = (world.timeofday - timer) / 10
-				
+
 				sleep(breather_ticks)
 
 				//EVENTS
diff --git a/code/controllers/verbs.dm b/code/controllers/verbs.dm
index d659d2fa68..3faa6e4c80 100644
--- a/code/controllers/verbs.dm
+++ b/code/controllers/verbs.dm
@@ -28,7 +28,7 @@
 	return
 
 
-/client/proc/debug_controller(controller in list("Master","Failsafe","Ticker","Lighting","Air","Jobs","Sun","Radio","Supply Shuttle","Emergency Shuttle","Configuration","pAI", "Cameras"))
+/client/proc/debug_controller(controller in list("Master","Failsafe","Ticker","Lighting","Air","Jobs","Sun","Radio","Supply Shuttle","Emergency Shuttle","Configuration","pAI", "Cameras", "Transfer Controller"))
 	set category = "Debug"
 	set name = "Debug Controller"
 	set desc = "Debug the various periodic loop controllers for the game (be careful!)"
@@ -74,5 +74,8 @@
 		if("Cameras")
 			debug_variables(cameranet)
 			feedback_add_details("admin_verb","DCameras")
+		if("Transfer Controller")
+			debug_variables(transfer_controller)
+			feedback_add_details("admin_verb","DAutovoter")
 	message_admins("Admin [key_name_admin(usr)] is debugging the [controller] controller.")
 	return
diff --git a/code/controllers/voting.dm b/code/controllers/voting.dm
index 92f55a3fd6..172642f444 100644
--- a/code/controllers/voting.dm
+++ b/code/controllers/voting.dm
@@ -48,7 +48,11 @@ datum/controller/vote
 
 	proc/autotransfer()
 		initiate_vote("crew_transfer","the server")
-		log_debug("The server has called an Autotransfer")
+		log_debug("The server has called a crew transfer vote")
+
+/*	proc/autogamemode() //This is here for whoever can figure out how to make this work
+		initiate_vote("gamemode","the server")
+		log_debug("The server has called a gamemode vote")*/
 
 	proc/reset()
 		initiator = null