Merge tgstation r4633 into bs12_with_tgport

Conflicts:
	code/defines/obj/costume.dm
	code/game/gamemodes/cult/runes.dm
	code/game/machinery/computer/communications.dm
	code/game/machinery/telecomms/broadcaster.dm
	code/game/objects/structures/crates_lockers/closets/fitness.dm
	code/modules/mob/living/simple_animal/life.dm
	code/modules/mob/living/simple_animal/parrot.dm
	code/modules/power/power.dm
	code/modules/power/switch.dm

Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>

code/controllers/master_controller.dm

@@ -293,10 +293,10 @@ datum/controller/game_controller/proc/Recover()		//Mostly a placeholder for now.
 							if(0 to 3)
 								defcon++
 							if(4)
-								defcon = 5
 								for(var/client/C in admin_list)
 									if(C.holder)
 										C << "<font color='red' size='2'><b>Warning. The Master Controller has not fired in the last [defcon*ticks_per_spin] ticks. Automatic restart in [ticks_per_spin] ticks.</b></font>"
+								defcon = 5
 							if(5)
 								for(var/client/C in admin_list)
 									if(C.holder)