Merge tgstation13 r4570 into bs12_with_tgport

Conflicts:
	baystation12.dme
	code/defines/obj.dm
	code/defines/procs/helpers.dm
	code/defines/turf.dm
	code/game/gamemodes/changeling/modularchangling.dm
	code/game/gamemodes/cult/cult_structures.dm
	code/game/gamemodes/events.dm
	code/game/machinery/telecomms/machine_interactions.dm
	code/game/master_controller.dm
	code/game/objects/items/blueprints.dm
	code/game/objects/items/devices/uplinks.dm
	code/game/objects/items/item.dm
	code/game/objects/items/weapons/gift_wrappaper.dm
	code/game/objects/items/weapons/wires.dm
	code/game/objects/weapons.dm
	code/game/turfs/turf.dm
	code/modules/clothing/head/hardhat.dm
	code/modules/mining/mine_items.dm
	code/modules/mining/mine_turfs.dm
	code/modules/mob/living/silicon/robot/life.dm
	code/modules/mob/mob_defines.dm
	code/modules/mob/new_player/login.dm
	code/modules/paperwork/pen.dm
	code/modules/paperwork/stamps.dm
	code/unused/toilets.dm
	html/changelog.html
	icons/effects/alert.dmi

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

code/modules/admin/admin.dm

@@ -1090,6 +1090,17 @@ var/global/BSACooldown = 0
 		else
 			alert("You cannot perform this action. You must be of a higher administrative rank!")
 			return
+	if (href_list["makeanimal"])
+		if(src.level>=3)
+			var/mob/M = locate(href_list["makeanimal"])
+			if(!istype(M, /mob/new_player))
+				usr.client.cmd_admin_animalize(M)
+			else
+				alert("The mob must not be a new_player.")
+				return
+		else
+			alert("You cannot perform this action. You must be of a higher administrative rank!")
+			return
 /***************** BEFORE**************
 
 	if (href_list["l_players"])
@@ -1973,7 +1984,11 @@ var/global/BSACooldown = 0
 				if("comms_blackout")
 					feedback_inc("admin_secrets_fun_used",1)
 					feedback_add_details("admin_secrets_fun_used","CB")
-					communications_blackout()
+					var/answer = alert(usr, "Would you like to alert the crew?", "Alert", "Yes", "No")
+					if(answer == "Yes")
+						communications_blackout(0)
+					else
+						communications_blackout(1)
 					message_admins("[key_name_admin(usr)] triggered a communications blackout.", 1)
 				if("spaceninja")
 					feedback_inc("admin_secrets_fun_used",1)
@@ -2312,6 +2327,12 @@ var/global/BSACooldown = 0
 				body += "<A href='?src=\ref[src];makealien=\ref[M]'>Make Alien</A> | "
 				body += "<A href='?src=\ref[src];makemetroid=\ref[M]'>Make Metroid</A> "
 
+			//Simple Animals
+			if(isanimal(M))
+				body += "<A href='?src=\ref[src];makeanimal=\ref[M]'>Re-Animalize</A> | "
+			else
+				body += "<A href='?src=\ref[src];makeanimal=\ref[M]'>Animalize</A> | "
+
 			body += "<br><br>"
 			body += "<b>Rudimentary transformation:</b><font size=2><br>These transformations only create a new mob type and copy stuff over. They do not take into account MMIs and similar mob-specific things. The buttons in 'Transformations' are preferred, when possible.</font><br>"
 			body += "<A href='?src=\ref[src];simplemake=observer;mob=\ref[M]'>Observer</A> | "
@@ -2997,7 +3018,7 @@ var/global/BSACooldown = 0
 	feedback_add_details("admin_verb","SA") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
 
 
-/obj/admins/proc/show_traitor_panel(var/mob/M in mob_list)
+/obj/admins/proc/show_traitor_panel(var/mob/M in sortmobs())
 	set category = "Admin"
 	set desc = "Edit mobs's memory and role"
 	set name = "Show Traitor Panel"

code/modules/admin/admin_verbs.dm

@@ -223,7 +223,7 @@
 			//verbs += /proc/togglebuildmode 							--Merged with view variables
 			//verbs += /client/proc/cmd_modify_object_variables 		--Merged with view variables
 			verbs += /client/proc/togglebuildmodeself
-			verbs += /client/proc/debug_master_controller
+			verbs += /client/proc/debug_controller
 		else	return
 
 		//Game Admin
@@ -244,7 +244,7 @@
 			verbs += /client/proc/make_sound
 			verbs += /client/proc/play_local_sound
 			verbs += /client/proc/send_space_ninja
-			verbs += /client/proc/restartcontroller						//Can call via aproccall --I_hate_easy_things.jpg, Mport --Agouri
+			verbs += /client/proc/restart_controller						//Can call via aproccall --I_hate_easy_things.jpg, Mport --Agouri
 			verbs += /client/proc/Blobize								//I need to remember to move/remove this later
 			verbs += /client/proc/Blobcount								//I need to remember to move/remove this later
 			verbs += /client/proc/toggle_clickproc 						//TODO ERRORAGE (Temporary proc while the new clickproc is being tested)
@@ -389,7 +389,7 @@
 	verbs -= /client/proc/air_report
 	verbs -= /client/proc/cmd_admin_say
 	verbs -= /client/proc/cmd_admin_gib_self
-	verbs -= /client/proc/restartcontroller
+	verbs -= /client/proc/restart_controller
 	verbs -= /client/proc/play_local_sound
 	verbs -= /client/proc/enable_debug_verbs
 	verbs -= /client/proc/toggleprayers
@@ -431,7 +431,7 @@
 	//verbs -= /client/proc/cmd_switch_radio							--removed because tcommsat is staying
 	verbs -= /client/proc/togglebuildmodeself
 	verbs -= /client/proc/kill_airgroup
-	verbs -= /client/proc/debug_master_controller
+	verbs -= /client/proc/debug_controller
 	verbs -= /client/proc/check_ai_laws
 	verbs -= /client/proc/cmd_debug_mob_lists
 	return

code/modules/admin/verbs/adminjump.dm

@@ -1,4 +1,4 @@
-/client/proc/Jump(var/area/A in world)
+/client/proc/Jump(var/area/A in return_sorted_areas())
 	set name = "Jump to Area"
 	set desc = "Area to jump to"
 	set category = "Admin"
@@ -30,7 +30,7 @@
 		alert("Admin jumping disabled")
 	return
 
-/client/proc/jumptomob(var/mob/M in mob_list)
+/client/proc/jumptomob(var/mob/M in sortmobs())
 	set category = "Admin"
 	set name = "Jump to Mob"
 
@@ -84,7 +84,7 @@
 		var/list/keys = list()
 		for(var/mob/M in player_list)
 			keys += M.client
-		var/selection = input("Please, select a player!", "Admin Jumping", null, null) as null|anything in keys
+		var/selection = input("Please, select a player!", "Admin Jumping", null, null) as null|anything in sortKey(keys)
 		if(!selection)
 			return
 		var/mob/M = selection:mob
@@ -95,7 +95,7 @@
 	else
 		alert("Admin jumping disabled")
 
-/client/proc/Getmob(var/mob/M in mob_list)
+/client/proc/Getmob(var/mob/M in sortmobs())
 	set category = "Admin"
 	set name = "Get Mob"
 	set desc = "Mob to teleport"
@@ -123,7 +123,7 @@
 		var/list/keys = list()
 		for(var/mob/M in player_list)
 			keys += M.client
-		var/selection = input("Please, select a player!", "Admin Jumping", null, null) as null|anything in keys
+		var/selection = input("Please, select a player!", "Admin Jumping", null, null) as null|anything in sortKey(keys)
 		if(!selection)
 			return
 		var/mob/M = selection:mob
@@ -138,7 +138,7 @@
 	else
 		alert("Admin jumping disabled")
 
-/client/proc/sendmob(var/mob/M in mob_list, var/area/A in world)
+/client/proc/sendmob(var/mob/M in sortmobs(), var/area/A in return_sorted_areas())
 	set category = "Admin"
 	set name = "Send Mob"
 	if(!src.holder)

code/modules/admin/verbs/debug.dm

@@ -172,6 +172,27 @@ But you can call procs that are of type /mob/living/carbon/human/proc/ for that
 	else
 		alert("Invalid mob")
 
+/client/proc/cmd_admin_animalize(var/mob/M in mob_list)
+	set category = "Fun"
+	set name = "Make Simple Animal"
+
+	if(!ticker)
+		alert("Wait until the game starts")
+		return
+
+	if(!M)
+		alert("That mob doesn't seem to exist, close the panel and try again.")
+		return
+
+	if(istype(M, /mob/new_player))
+		alert("The mob must not be a new_player.")
+		return
+
+	log_admin("[key_name(src)] has animalized [M.key].")
+	spawn(10)
+		M.Animalize()
+
+
 /client/proc/makepAI(var/turf/T in mob_list)
 	set category = "Fun"
 	set name = "Make pAI"
@@ -644,7 +665,7 @@ But you can call procs that are of type /mob/living/carbon/human/proc/ for that
 			M.equip_to_slot_or_del(new /obj/item/clothing/gloves/black(M), slot_gloves)
 			M.equip_to_slot_or_del(new /obj/item/device/radio/headset/heads/hop(M), slot_ears)
 			M.equip_to_slot_or_del(new /obj/item/clothing/glasses/sunglasses(M), slot_glasses)
-			M.equip_to_slot_or_del(new /obj/item/weapon/gun/energy(M), slot_belt)
+			M.equip_to_slot_or_del(new /obj/item/weapon/gun/energy/gun(M), slot_belt)
 			M.equip_to_slot_or_del(new /obj/item/weapon/pen(M), slot_l_store)
 
 			var/obj/item/device/pda/heads/pda = new(M)

code/modules/admin/verbs/mapping.dm

@@ -58,7 +58,7 @@ var/intercom_range_display_status = 0
 		del(C)
 
 	if(camera_range_display_status)
-		for(var/obj/machinery/camera/C in Cameras)
+		for(var/obj/machinery/camera/C in cameranet.cameras)
 			new/obj/effect/debugging/camera_range(C.loc)
 	feedback_add_details("admin_verb","mCRD") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
 
@@ -74,7 +74,7 @@ var/intercom_range_display_status = 0
 
 	var/list/obj/machinery/camera/CL = list()
 
-	for(var/obj/machinery/camera/C in Cameras)
+	for(var/obj/machinery/camera/C in cameranet.cameras)
 		CL += C
 
 	var/output = {"<B>CAMERA ANNOMALITIES REPORT</B><HR>

code/modules/admin/verbs/massmodvar.dm

@@ -213,7 +213,7 @@
 			if(new_value == null) return
 
 			if(variable=="luminosity")
-				O.sd_SetLuminosity(new_value)
+				O.SetLuminosity(new_value)
 			else
 				O.vars[variable] = new_value
 
@@ -222,7 +222,7 @@
 					for(var/mob/M in mob_list)
 						if ( istype(M , O.type) )
 							if(variable=="luminosity")
-								M.sd_SetLuminosity(new_value)
+								M.SetLuminosity(new_value)
 							else
 								M.vars[variable] = O.vars[variable]
 
@@ -230,7 +230,7 @@
 					for(var/obj/A in world)
 						if ( istype(A , O.type) )
 							if(variable=="luminosity")
-								A.sd_SetLuminosity(new_value)
+								A.SetLuminosity(new_value)
 							else
 								A.vars[variable] = O.vars[variable]
 
@@ -238,7 +238,7 @@
 					for(var/turf/A in world)
 						if ( istype(A , O.type) )
 							if(variable=="luminosity")
-								A.sd_SetLuminosity(new_value)
+								A.SetLuminosity(new_value)
 							else
 								A.vars[variable] = O.vars[variable]
 
@@ -247,7 +247,7 @@
 					for(var/mob/M in mob_list)
 						if (M.type == O.type)
 							if(variable=="luminosity")
-								M.sd_SetLuminosity(new_value)
+								M.SetLuminosity(new_value)
 							else
 								M.vars[variable] = O.vars[variable]
 
@@ -255,7 +255,7 @@
 					for(var/obj/A in world)
 						if (A.type == O.type)
 							if(variable=="luminosity")
-								A.sd_SetLuminosity(new_value)
+								A.SetLuminosity(new_value)
 							else
 								A.vars[variable] = O.vars[variable]
 
@@ -263,7 +263,7 @@
 					for(var/turf/A in world)
 						if (A.type == O.type)
 							if(variable=="luminosity")
-								A.sd_SetLuminosity(new_value)
+								A.SetLuminosity(new_value)
 							else
 								A.vars[variable] = O.vars[variable]
 

code/modules/admin/verbs/modifyvariables.dm

@@ -458,7 +458,7 @@ var/list/forbidden_varedit_object_types = list(
 			if(variable=="luminosity")
 				var/var_new = input("Enter new number:","Num",O.vars[variable]) as null|num
 				if(var_new == null) return
-				O.sd_SetLuminosity(var_new)
+				O.SetLuminosity(var_new)
 			else if(variable=="stat")
 				var/var_new = input("Enter new number:","Num",O.vars[variable]) as null|num
 				if(var_new == null) return