SoundScopes' bugfixes - 01SEP2016 (#848)

code/controllers/master_controller.dm

@@ -12,7 +12,10 @@ var/global/pipe_processing_killed = 0
 
 datum/controller/game_controller
 	var/list/shuttle_list	                    // For debugging and VV
+
+#ifdef TESTING //This is just lagging start times and is never used on a live server.
 	var/datum/random_map/ore/asteroid_ore_map   // For debugging and VV.
+#endif
 
 datum/controller/game_controller/New()
 	//There can be only one master_controller. Out with the old and in with the new.
@@ -70,10 +73,13 @@ datum/controller/game_controller/proc/setup_objects()
 			var/obj/machinery/atmospherics/unary/vent_scrubber/T = U
 			T.broadcast_status()
 
+
 	// Create the mining ore distribution map.
 	// These values determine the specific area that the map is applied to.
 	// If you do not use the official Baycode asteroid map, you will need to change them.
+#ifdef TESTING
 	asteroid_ore_map = new /datum/random_map/ore(null,13,32,5,217,223)
+#endif
 
 	// Set up antagonists.
 	populate_antag_type_list()

code/controllers/voting.dm

@@ -339,7 +339,10 @@ datum/controller/vote
 				. += "<font color='grey'>Restart (Disallowed)</font>"
 			. += "</li><li>"
 			if(is_staff || config.allow_vote_restart)
-				. += "<a href='?src=\ref[src];vote=crew_transfer'>Crew Transfer</a>"
+				if (get_security_level() == "red" || get_security_level() == "delta")
+					. += "<a href='?src=\ref[src];vote=crew_transfer'>Crew Transfer (Disallowed, Code Red or above)</a>"
+				else
+					. += "<a href='?src=\ref[src];vote=crew_transfer'>Crew Transfer</a>"
 			else
 				. += "<font color='grey'>Crew Transfer (Disallowed)</font>"
 			if(is_staff)