Merge remote-tracking branch 'upstream/master' into updateicons

code/modules/admin/topic.dm

@@ -1540,13 +1540,13 @@
 			var/helptype = "ADMINHELP"
 			if(is_mhelp)
 				helptype = "MENTORHELP"
-			var/take_msg = "<span class='notice'><b>[helptype]</b>: <b>[key_name(usr.client)]</b> is attending to <b>[key_name(M)]'s</b> question.</span>"
+			var/take_msg = "<span class='notice'><b>[helptype]</b>: <b>[key_name_hidden(usr.client)]</b> is attending to <b>[key_name(M)]'s</b> question.</span>"
 			for(var/client/X in GLOB.admins)
 				if(check_rights(R_ADMIN, 0, X.mob))
 					to_chat(X, take_msg)
 				else if(is_mhelp && check_rights(R_MOD|R_MENTOR, 0, X.mob))
 					to_chat(X, take_msg)
-			to_chat(M, "<span class='notice'><b>Your question is being attended to by [key_name(usr.client, null, 0)]. Thanks for your patience!</b></span>")
+			to_chat(M, "<span class='notice'><b>Your question is being attended to by [key_name_hidden(usr.client, null, 0)]. Thanks for your patience!</b></span>")
 		else
 			to_chat(usr, "<span class='warning'>Unable to locate mob.</span>")
 

code/modules/admin/verbs/adminpm.dm

@@ -193,9 +193,8 @@
 			i.addResponse(src, msg) // Add this response to their open tickets.
 		return
 
-	tickets = SStickets.checkForTicket(C)
 	if(check_rights(R_ADMIN|R_MOD, 0, C.mob)) //Is the person being pm'd an admin? If so we check if the pm'er has open tickets
-		tickets = SStickets.checkForTicket(C)
+		tickets = SStickets.checkForTicket(src)
 		if(tickets)
 			for(var/datum/admin_ticket/i in tickets)
 				i.addResponse(src, msg)

code/modules/admin/verbs/freeze.dm

@@ -106,7 +106,6 @@ var/global/list/frozen_mob_list = list()
 						M.can_move = 0
 						M.overlays += adminomaly
 						if(M.occupant)
-							M.removeVerb(/obj/mecha/verb/eject)
 							to_chat(M.occupant, "<b><font color= red>You have been frozen by <a href='?priv_msg=[usr.client.UID()]'>[key]</a></b></font>")
 							message_admins("<span class='notice'>[key_name_admin(usr)] froze [key_name(M.occupant)] in a [M.name]</span>")
 							log_admin("[key_name(usr)] froze [key_name(M.occupant)] in a [M.name]")
@@ -117,7 +116,6 @@ var/global/list/frozen_mob_list = list()
 						M.can_move = 1
 						M.overlays -= adminomaly
 						if(M.occupant)
-							M.addVerb(/obj/mecha/verb/eject)
 							to_chat(M.occupant, "<b><font color= red>You have been unfrozen by <a href='?priv_msg=[usr.client.UID()]'>[key]</a></b></font>")
 							message_admins("<span class='notice'>[key_name_admin(usr)] unfroze [key_name(M.occupant)] in a [M.name]</span>")
 							log_admin("[key_name(usr)] unfroze [key_name(M.occupant)] in a [M.name]")

code/modules/admin/verbs/one_click_antag.dm

@@ -35,7 +35,7 @@ client/proc/one_click_antag()
 		if((M.mind.assigned_role in temp.restricted_jobs) || (M.client.prefs.species in temp.protected_species))
 			return FALSE
 	if(role) // Don't even bother evaluating if there's no role
-		if(player_old_enough_antag(M.client,role) && (role in M.client.prefs.be_special) && (!jobban_isbanned(M, role)))
+		if(player_old_enough_antag(M.client,role) && (role in M.client.prefs.be_special) && !M.client.skip_antag && (!jobban_isbanned(M, role)))
 			return TRUE
 		else
 			return FALSE

code/modules/admin/verbs/randomverbs.dm

@@ -646,8 +646,8 @@ Traitors and the like can also be revived with the previous role mostly intact.
 	var/atom/A = D
 	var/coords = istype(A) ? "at ([A.x], [A.y], [A.z])" : ""
 	if(alert(src, "Are you sure you want to delete:\n[D]\n[coords]?", "Confirmation", "Yes", "No") == "Yes")
-		log_admin("[key_name(usr)] deleted [D][coords]")
-		message_admins("[key_name_admin(usr)] deleted [D][coords]", 1)
+		log_admin("[key_name(usr)] deleted [D] [coords]")
+		message_admins("[key_name_admin(usr)] deleted [D] [coords]", 1)
 		feedback_add_details("admin_verb","DEL") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
 		if(isturf(D))
 			var/turf/T = D