Merge branch 'master' of https://github.com/tgstation/-tg-station into ointmentandshit

Conflicts:
	_maps/map_files/TgStation/tgstation.2.1.3.dmm

code/modules/admin/admin_verbs.dm

@@ -49,7 +49,7 @@ var/list/admin_verbs_admin = list(
 	/client/proc/Getmob,				/*teleports a mob to our location*/
 	/client/proc/Getkey,				/*teleports a mob with a certain ckey to our location*/
 //	/client/proc/sendmob,				/*sends a mob somewhere*/ -Removed due to it needing two sorting procs to work, which were executed every time an admin right-clicked. ~Errorage
-	/client/proc/Jump,
+	/client/proc/jumptoarea,
 	/client/proc/jumptokey,				/*allows us to jump to the location of a mob with a certain ckey*/
 	/client/proc/jumptomob,				/*allows us to jump to a specific mob*/
 	/client/proc/jumptoturf,			/*allows us to jump to a specific turf*/

code/modules/admin/player_notes.dm

@@ -20,7 +20,7 @@
 	while(!notesfile.eof)
 		var/note
 		notesfile >> note
-		dat += note
+		dat += note + "<br>"
 	var/datum/browser/popup = new(usr, "player_notes", "Player Notes", 700, 400)
 	popup.set_content(dat)
 	popup.open()

code/modules/admin/verbs/adminjump.dm

@@ -1,11 +1,11 @@
-/client/proc/Jump(area/A in returnSortedAreas())
+/client/proc/jumptoarea(area/A in sortedAreas)
 	set name = "Jump to Area"
 	set desc = "Area to jump to"
 	set category = "Admin"
 	if(!src.holder)
 		src << "Only administrators may use this command."
 		return
-
+
 	if(!A)
 		return
 
@@ -19,8 +19,8 @@
 	var/turf/T = pick_n_take(turfs)
 	if(!T)
 		src << "Nowhere to jump to!"
-		return
-	usr.loc = T
+		return
+	admin_forcemove(usr, T)
 	log_admin("[key_name(usr)] jumped to [A]")
 	message_admins("[key_name_admin(usr)] jumped to [A]")
 	feedback_add_details("admin_verb","JA") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
@@ -53,7 +53,7 @@
 		var/turf/T = get_turf(M)
 		if(T && isturf(T))
 			feedback_add_details("admin_verb","JM") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
-			A.loc = T
+			admin_forcemove(A, M.loc)
 		else
 			A << "This mob is not located in the game world."
 
@@ -91,7 +91,9 @@
 	var/mob/M = selection:mob
 	log_admin("[key_name(usr)] jumped to [key_name(M)]")
 	message_admins("[key_name_admin(usr)] jumped to [key_name_admin(M)]")
-	usr.loc = M.loc
+
+	admin_forcemove(usr, M.loc)
+
 	feedback_add_details("admin_verb","JK") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
 
 /client/proc/Getmob(var/mob/M in mob_list)
@@ -104,7 +106,7 @@
 
 	log_admin("[key_name(usr)] teleported [key_name(M)]")
 	message_admins("[key_name_admin(usr)] teleported [key_name_admin(M)]")
-	M.loc = get_turf(usr)
+	admin_forcemove(M, get_turf(usr))
 	feedback_add_details("admin_verb","GM") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
 
 /client/proc/Getkey()
@@ -129,7 +131,8 @@
 	log_admin("[key_name(usr)] teleported [key_name(M)]")
 	message_admins("[key_name_admin(usr)] teleported [key_name(M)]")
 	if(M)
-		M.loc = get_turf(usr)
+		admin_forcemove(M, get_turf(usr))
+		usr.loc = M.loc
 		feedback_add_details("admin_verb","GK") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
 
 /client/proc/sendmob(var/mob/M in sortmobs())
@@ -138,10 +141,27 @@
 	if(!src.holder)
 		src << "Only administrators may use this command."
 		return
-	var/area/A = input(usr, "Pick an area.", "Pick an area") in returnSortedAreas()
+	var/area/A = input(usr, "Pick an area.", "Pick an area") in sortedAreas
 	if(A)
-		M.loc = pick(get_area_turfs(A))
+		admin_forcemove(M, pick(get_area_turfs(A)))
 		feedback_add_details("admin_verb","SMOB") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
-
 		log_admin("[key_name(usr)] teleported [key_name(M)] to [A]")
-		message_admins("[key_name_admin(usr)] teleported [key_name_admin(M)] to [A]")
+		message_admins("[key_name_admin(usr)] teleported [key_name_admin(M)] to [A]")
+
+/proc/admin_forcemove(var/mob/mover, var/atom/newloc)
+	var/startdensity = mover.density
+	var/startflags = mover.pass_flags
+	var/startincorporeal = 0
+	if(istype(mover, /mob/living))
+		var/mob/living/L = mover
+		startincorporeal = L.incorporeal_move
+		L.incorporeal_move = 1
+	mover.density = 0
+	mover.pass_flags = ALL
+	newloc.density = 0
+	. = mover.Move(newloc)
+	mover.density = startdensity
+	mover.pass_flags = startflags
+	if(istype(mover, /mob/living))
+		var/mob/living/L = mover
+		L.incorporeal_move = startincorporeal

code/modules/admin/verbs/debug.dm

@@ -748,7 +748,7 @@ var/global/list/g_fancy_list_of_types = null
 			M.equip_to_slot_or_del(new /obj/item/clothing/mask/gas/clown_hat(M), slot_wear_mask)
 			M.equip_to_slot_or_del(new /obj/item/device/radio/headset(M), slot_ears)
 			M.equip_to_slot_or_del(new /obj/item/clothing/glasses/thermal/monocle(M), slot_glasses)
-			M.equip_to_slot_or_del(new /obj/item/clothing/suit/toggle/chaplain_hoodie(M), slot_wear_suit)
+			M.equip_to_slot_or_del(new /obj/item/clothing/suit/hooded/chaplain_hoodie(M), slot_wear_suit)
 			M.equip_to_slot_or_del(new /obj/item/weapon/reagent_containers/food/snacks/grown/banana(M), slot_l_store)
 			M.equip_to_slot_or_del(new /obj/item/weapon/bikehorn(M), slot_r_store)
 

code/modules/admin/verbs/randomverbs.dm

@@ -681,13 +681,6 @@ Traitors and the like can also be revived with the previous role mostly intact.
 	var/confirm = alert(src, "You sure?", "Confirm", "Yes", "No")
 	if(confirm != "Yes") return
 
-	if(ticker.mode.name == "revolution" || ticker.mode.name == "AI malfunction" || ticker.mode.name == "confliction")
-		var/choice = input("The shuttle will just return if you call it. Call anyway?") in list("Confirm", "Cancel")
-		if(choice == "Confirm")
-			SSshuttle.emergencyFakeRecall = rand(5,9) * 0.1
-		else
-			return
-
 	SSshuttle.emergency.request()
 	feedback_add_details("admin_verb","CSHUT") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
 	log_admin("[key_name(usr)] admin-called the emergency shuttle.")