From dda40804347ea9457eec9ce61c158495ab8d50bc Mon Sep 17 00:00:00 2001
From: DJSnapshot <trevornaze@gmail.com>
Date: Sun, 29 Sep 2013 11:57:28 -0700
Subject: [PATCH] Bugfix for gamemode vote delay

---
 code/controllers/voting.dm | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/code/controllers/voting.dm b/code/controllers/voting.dm
index 8be45cdf2e1..fdc10124eba 100644
--- a/code/controllers/voting.dm
+++ b/code/controllers/voting.dm
@@ -46,10 +46,6 @@ datum/controller/vote
 
 				voting.Cut()
 
-	proc/autotransfer()
-		initiate_vote("crew_transfer","the server")
-
-
 	proc/reset()
 		initiator = null
 		time_remaining = 0
@@ -206,12 +202,16 @@ datum/controller/vote
 						return 0
 					choices.Add(config.votable_modes)
 				if("crew_transfer")
-					if (get_security_level() == "red" || get_security_level() == "delta")
-						return 0
-					if(ticker.current_state <= 2)
-						return 0
-					question = "End the shift?"
-					choices.Add("Initiate Crew Transfer", "Continue The Round")
+					if(check_rights(R_ADMIN) || check_rights(R_MOD))
+						question = "End the shift?"
+						choices.Add("Initiate Crew Transfer", "Continue The Round")
+					else
+						if (get_security_level() == "red" || get_security_level() == "delta")
+							return 0
+						if(ticker.current_state <= 2)
+							return 0
+						question = "End the shift?"
+						choices.Add("Initiate Crew Transfer", "Continue The Round")
 				if("custom")
 					question = html_encode(input(usr,"What is the vote for?") as text|null)
 					if(!question)	return 0
@@ -236,10 +236,10 @@ datum/controller/vote
 					world << sound('sound/ambience/alarm4.ogg')
 				if("custom")
 					world << sound('sound/ambience/alarm4.ogg')
-		/*	if(mode == "gamemode" && going)
+			if(mode == "gamemode" && going)
 				going = 0
 				world << "<font color='red'><b>Round start has been delayed.</b></font>"
-			if(mode == "crew_transfer" && ooc_allowed)
+		/*	if(mode == "crew_transfer" && ooc_allowed)
 				auto_muted = 1
 				ooc_allowed = !( ooc_allowed )
 				world << "<b>The OOC channel has been automatically disabled due to a crew transfer vote.</b>"