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

code/controllers/voting.dm

@@ -59,8 +59,8 @@ datum/controller/vote
 		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.")
+			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.")
 
 
@@ -154,12 +154,6 @@ 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)
@@ -235,7 +229,7 @@ datum/controller/vote
 			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>"
+				world << "<b>The OOC channel has been automatically disabled due to a 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)
@@ -247,7 +241,7 @@ datum/controller/vote
 			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>"
+				world << "<b>The OOC channel has been automatically disabled due to a custom vote.</b>"
 				log_admin("OOC was toggled automatically due to custom vote.")
 				message_admins("OOC has been toggled off automatically.")
 

code/game/gamemodes/changeling/changeling_powers.dm

@@ -186,6 +186,7 @@
 	changeling.geneticdamage = 30
 	src.dna = chosen_dna
 	src.real_name = chosen_dna.real_name
+	src.flavor_text = ""
 	updateappearance(src, src.dna.uni_identity)
 	domutcheck(src, null)
 

code/game/machinery/alarm.dm

@@ -125,6 +125,8 @@
 		pixel_x = (dir & 3)? 0 : (dir == 4 ? -24 : 24)
 		pixel_y = (dir & 3)? (dir ==1 ? -24 : 24) : 0
 		update_icon()
+		if(ticker && ticker.current_state == 3)//if the game is running
+			src.initialize()
 		return
 
 	first_run()

code/game/mecha/equipment/tools/tools.dm

@@ -20,6 +20,8 @@
 	action(atom/target)
 		if(!action_checks(target)) return
 		if(!cargo_holder) return
+		if(istype(target, /obj/structure/stool)) return
+
 		if(istype(target,/obj))
 			var/obj/O = target
 			if(!O.anchored)

code/modules/admin/admin_verbs.dm

@@ -68,10 +68,8 @@ var/list/admin_verbs_admin = list(
 	/datum/admins/proc/show_skills,
 	/client/proc/check_customitem_activity,
 	/client/proc/man_up,
-	/client/proc/global_man_up
-	/* Currently unticked.
-	/client/proc/response_team
-	*/
+	/client/proc/global_man_up,
+	/client/proc/response_team // Response Teams admin verb
 )
 var/list/admin_verbs_ban = list(
 	/client/proc/unban_panel,
@@ -764,4 +762,4 @@ var/list/admin_verbs_mod = list(
 		T << 'sound/voice/ManUp1.ogg'
 
 	log_admin("[key_name(usr)] told everyone to man up and deal with it.")
-	message_admins("\blue [key_name_admin(usr)] told everyone to man up and deal with it.", 1)
+	message_admins("\blue [key_name_admin(usr)] told everyone to man up and deal with it.", 1)

code/modules/admin/verbs/cinematic.dm

@@ -3,6 +3,7 @@
 	set category = "Fun"
 	set desc = "Shows a cinematic."	// Intended for testing but I thought it might be nice for events on the rare occasion Feel free to comment it out if it's not wanted.
 	set hidden = 1
+	if(alert("Are you sure you want to run [cinematic]?","Confirmation","Yes","No")=="No") return
 	if(!ticker)	return
 	switch(cinematic)
 		if("explosion")

code/modules/events/prison_break.dm

@@ -10,6 +10,9 @@
 	announceWhen = rand(50, 60)
 	releaseWhen = rand(20, 30)
 
+	src.startWhen = src.releaseWhen-1
+	src.endWhen = src.releaseWhen+1
+
 
 /datum/event/prison_break/announce()
 	if(prisonAreas && prisonAreas.len > 0)

code/world.dm

@@ -308,6 +308,7 @@ proc/setup_database_connection()
 		failed_db_connections = 0	//If this connection succeeded, reset the failed connections counter.
 	else
 		failed_db_connections++		//If it failed, increase the failed connections counter.
+		world.log << dbcon.ErrorMsg()
 
 	return .
 
@@ -345,6 +346,7 @@ proc/setup_old_database_connection()
 		failed_old_db_connections = 0	//If this connection succeeded, reset the failed connections counter.
 	else
 		failed_old_db_connections++		//If it failed, increase the failed connections counter.
+		world.log << dbcon.ErrorMsg()
 
 	return .
 

maptools/new_clean.bat

@@ -89,7 +89,7 @@ goto :qm_error
 echo ...
 echo That wasn't a valid response, or you didn't choose anything!
 echo Valid responses: y, n, yes, no
-goto :quitmayber
+goto :quitmaybe
 
 :exit
 pause

maptools/new_prepare.bat

@@ -65,7 +65,7 @@ goto :qm_error
 echo ...
 echo That wasn't a valid response, or you didn't choose anything!
 echo Valid responses: y, n, yes, no
-goto :quitmayber
+goto :quitmaybe
 
 :exit
 pause