Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into dev

Conflicts:
	baystation12.int

code/controllers/autotransfer.dm

@@ -0,0 +1,13 @@
+var/datum/controller/transfer_controller = new /transfer_controller()
+var/timerbuffer = 0 //buffer for time check
+/transfer_controller/New()
+	timerbuffer = config.vote_autotransfer_initial
+	processing_objects += src
+
+/transfer_controller/Del()
+	processing_objects -= src
+
+/transfer_controller/proc/process()
+	if (world.time >= timerbuffer - 600)
+		vote.autotransfer()
+		timerbuffer = timerbuffer + config.vote_autotransfer_interval

code/controllers/configuration.dm

@@ -43,7 +43,8 @@
 	var/Tickcomp = 0
 	var/socket_talk	= 0					// use socket_talk to communicate with other processes
 	var/list/resource_urls = null
-
+	var/antag_hud_allowed = 0			// Ghosts can turn on Antagovision to see a HUD of who is the bad guys this round.
+	var/antag_hud_restricted = 0                    // Ghosts that turn on Antagovision cannot rejoin the round.
 	var/list/mode_names = list()
 	var/list/modes = list()				// allowed modes
 	var/list/votable_modes = list()		// votable modes
@@ -385,6 +386,11 @@
 				if("ticklag")
 					Ticklag = text2num(value)
 
+				if("allow_antag_hud")
+					config.antag_hud_allowed = 1
+				if("antag_hud_restricted")
+					config.antag_hud_restricted = 1
+
 				if("socket_talk")
 					socket_talk = text2num(value)
 

code/controllers/voting.dm

@@ -50,7 +50,6 @@ datum/controller/vote
 		initiate_vote("crew_transfer","the server")
 		log_debug("The server has called an Autotransfer")
 
-
 	proc/reset()
 		initiator = null
 		time_remaining = 0