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/modules/power/switch.dm

@@ -2,7 +2,7 @@
 //After it knows this it creates the number of cables from the center to each of the cables attempting to conenct. These cables cannot be removed
 //with wirecutters. When the switch is turned off it removes all the cables on the tile it's on.
 //The switch uses a 5s delay to prevent powernet change spamming.
-
+/*
 /obj/structure/powerswitch
 	name = "power switch"
 	desc = "A switch that controls power."
@@ -81,4 +81,5 @@
 	else
 		icon_state = icon_state_off
 		for(var/obj/structure/cable/C in src.loc)
-			del(C)
+			del(C)
+*/