Merge branch 'bleeding-edge-freeze' of github.com:Baystation12/Baystation12 into loops

Conflicts:
	code/game/gamemodes/objective.dm

code/controllers/configuration.dm

@@ -34,7 +34,7 @@
 	var/feature_object_spell_system = 0 //spawns a spellbook which gives object-type spells instead of verb-type spells for the wizard
 	var/traitor_scaling = 0 			//if amount of traitors scales based on amount of players
 	var/protect_roles_from_antagonist = 0// If security and such can be tratior/cult/other
-	var/continous_rounds = 0			// Gamemodes which end instantly will instead keep on going until the round ends by escape shuttle or nuke.
+	var/continous_rounds = 1			// Gamemodes which end instantly will instead keep on going until the round ends by escape shuttle or nuke.
 	var/allow_Metadata = 0				// Metadata is supported.
 	var/popup_admin_pm = 0				//adminPMs to non-admins show in a pop-up 'reply' window when set to 1.
 	var/Ticklag = 0.9
@@ -167,7 +167,7 @@
 			switch (name)
 				if ("resource_urls")
 					config.resource_urls = stringsplit(value, " ")
-			
+
 				if ("admin_legacy_system")
 					config.admin_legacy_system = 1
 

code/controllers/master_controller.dm

@@ -51,7 +51,8 @@ datum/controller/game_controller/New()
 datum/controller/game_controller/proc/setup()
 	world.tick_lag = config.Ticklag
 
-	createRandomZlevel()
+	spawn(20)
+		createRandomZlevel()
 
 	if(!air_master)
 		air_master = new /datum/controller/air_system()

code/controllers/voting.dm

@@ -10,6 +10,7 @@ datum/controller/vote
 	var/list/voted = list()
 	var/list/voting = list()
 	var/list/current_votes = list()
+	var/auto_muted = 0
 
 	New()
 		if(vote != src)
@@ -53,6 +54,14 @@ datum/controller/vote
 		voting.Cut()
 		current_votes.Cut()
 
+		if(auto_muted && !ooc_allowed)
+			auto_muted = 0
+			ooc_allowed = !( ooc_allowed )
+			world << "<b>The OOC channel has been automatically enabled due to vote cancellation.</b>"
+			log_admin("OOC was toggled automatically due to vote cancellation.")
+			message_admins("OOC has been toggled on automatically.")
+
+
 	proc/get_result()
 		//get the highest number of votes
 		var/greatest_votes = 0
@@ -138,6 +147,12 @@ datum/controller/vote
 				if("crew_transfer")
 					if(. == "Initiate Crew Transfer")
 						init_shift_change(null, 1)
+					if(auto_muted && !ooc_allowed)
+						auto_muted = 0
+						ooc_allowed = !( ooc_allowed )
+						world << "<b>The OOC channel has been automatically enabled due to vote end.</b>"
+						log_admin("OOC was toggled automatically due to vote end.")
+						message_admins("OOC has been toggled on automatically.")
 
 
 		if(restart)
@@ -202,14 +217,35 @@ datum/controller/vote
 			world << "<font color='purple'><b>[text]</b>\nType vote to place your votes.\nYou have [config.vote_period/10] seconds to vote.</font>"
 			switch(vote_type)
 				if("crew_transfer")
-					world << sound('sound/voice/Serithi/Shuttlehere.ogg')
+					world << sound('sound/ambience/alarm4.ogg')
 				if("gamemode")
-					world << sound('sound/voice/Serithi/pretenddemoc.ogg')
+					world << sound('sound/ambience/alarm4.ogg')
 				if("custom")
-					world << sound('sound/voice/Serithi/weneedvote.ogg')
+					world << sound('sound/ambience/alarm4.ogg')
 			if(mode == "gamemode" && going)
 				going = 0
 				world << "<font color='red'><b>Round start has been delayed.</b></font>"
+			if(mode == "crew_transfer" && ooc_allowed)
+				auto_muted = 1
+				ooc_allowed = !( ooc_allowed )
+				world << "<b>The OOC channel has been automatically disabled due to the crew transfer vote.</b>"
+				log_admin("OOC was toggled automatically due to crew_transfer vote.")
+				message_admins("OOC has been toggled off automatically.")
+			if(mode == "gamemode" && ooc_allowed)
+				auto_muted = 1
+				ooc_allowed = !( ooc_allowed )
+				world << "<b>The OOC channel has been automatically disabled due to the gamemode vote.</b>"
+				log_admin("OOC was toggled automatically due to gamemode vote.")
+				message_admins("OOC has been toggled off automatically.")
+			if(mode == "custom" && ooc_allowed)
+				auto_muted = 1
+				ooc_allowed = !( ooc_allowed )
+				world << "<b>The OOC channel has been automatically disabled due to the custom vote.</b>"
+				log_admin("OOC was toggled automatically due to custom vote.")
+				message_admins("OOC has been toggled off automatically.")
+
+
+
 
 			time_remaining = round(config.vote_period/10)
 			return 1