Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into Arntyougoingtosayhello

code/modules/admin/DB ban/functions.dm

@@ -100,14 +100,14 @@ datum/admins/proc/DB_ban_record(var/bantype, var/mob/banned_mob, var/duration =
 			return
 
 	var/who
-	for(var/client/C in clients)
+	for(var/client/C in GLOB.clients)
 		if(!who)
 			who = "[C]"
 		else
 			who += ", [C]"
 
 	var/adminwho
-	for(var/client/C in admins)
+	for(var/client/C in GLOB.admins)
 		if(!adminwho)
 			adminwho = "[C]"
 		else

code/modules/admin/IsBanned.dm

@@ -9,9 +9,9 @@ world/IsBanned(key,address,computer_id)
 		return list("reason"="invalid login data", "desc"="Error: Could not check ban status, Please try again. Error message: Your computer provided an invalid Computer ID.")
 	var/admin = 0
 	var/ckey = ckey(key)
-	if((ckey in admin_datums) || (ckey in deadmins))
+	if((ckey in admin_datums) || (ckey in GLOB.deadmins))
 		var/datum/admins/A = admin_datums[ckey]
-		if(A.rights & R_ADMIN)
+		if(A && (A.rights & R_ADMIN))
 			admin = 1
 
 	//Guest Checking

code/modules/admin/admin.dm

@@ -4,7 +4,7 @@ var/global/nologevent = 0
 ////////////////////////////////
 /proc/message_admins(var/msg)
 	msg = "<span class=\"admin\"><span class=\"prefix\">ADMIN LOG:</span> <span class=\"message\">[msg]</span></span>"
-	for(var/client/C in admins)
+	for(var/client/C in GLOB.admins)
 		if(R_ADMIN & C.holder.rights)
 			if(C.prefs && !(C.prefs.toggles & CHAT_NO_ADMINLOGS))
 				to_chat(C, msg)
@@ -12,7 +12,7 @@ var/global/nologevent = 0
 /proc/msg_admin_attack(var/text, var/loglevel)
 	if(!nologevent)
 		var/rendered = "<span class=\"admin\"><span class=\"prefix\">ATTACK:</span> <span class=\"message\">[text]</span></span>"
-		for(var/client/C in admins)
+		for(var/client/C in GLOB.admins)
 			if(R_ADMIN & C.holder.rights)
 				if(C.prefs.atklog == ATKLOG_NONE)
 					continue
@@ -23,7 +23,7 @@ var/global/nologevent = 0
 
 /proc/message_adminTicket(var/msg)
 	msg = "<span class='adminticket'><span class='prefix'>ADMIN TICKET:</span> [msg]</span>"
-	for(var/client/C in admins)
+	for(var/client/C in GLOB.admins)
 		if(R_ADMIN & C.holder.rights)
 			if(C.prefs && !(C.prefs.toggles & CHAT_NO_TICKETLOGS))
 				to_chat(C, msg)
@@ -31,7 +31,7 @@ var/global/nologevent = 0
 
 ///////////////////////////////////////////////////////////////////////////////////////////////Panels
 
-/datum/admins/proc/show_player_panel(var/mob/M in mob_list)
+/datum/admins/proc/show_player_panel(var/mob/M in GLOB.mob_list)
 	set category = "Admin"
 	set name = "Show Player Panel"
 	set desc="Edit player (respawn, ban, heal, etc)"
@@ -53,16 +53,16 @@ var/global/nologevent = 0
 	if(istype(M, /mob/new_player))
 		body += " <B>Hasn't Entered Game</B> "
 	else
-		body += " \[<A href='?_src_=holder;revive=\ref[M]'>Heal</A>\] "
+		body += " \[<A href='?_src_=holder;revive=[M.UID()]'>Heal</A>\] "
 
 	body += "<br><br>\[ "
 	body += "<a href='?_src_=vars;Vars=[M.UID()]'>VV</a> - "
-	body += "<a href='?_src_=holder;traitor=\ref[M]'>TP</a> - "
-	body += "<a href='?src=[usr.UID()];priv_msg=\ref[M]'>PM</a> - "
-	body += "<a href='?_src_=holder;subtlemessage=\ref[M]'>SM</a> - "
-	body += "[admin_jump_link(M)]\] </b><br>"
+	body += "[ADMIN_TP(M,"TP")] - "
+	body += "<a href='?src=[usr.UID()];priv_msg=[M.UID()]'>PM</a> - "
+	body += "[ADMIN_SM(M,"SM")] - "
 	if(ishuman(M) && M.mind)
-		body += "<a href='?_src_=holder;HeadsetMessage=[M.UID()]'>HM</a>"
+		body += "<a href='?_src_=holder;HeadsetMessage=[M.UID()]'>HM</a> -"
+	body += "[admin_jump_link(M)]\] </b><br>"
 	body += "<b>Mob type:</b> [M.type]<br>"
 	if(M.client)
 		if(M.client.related_accounts_cid.len)
@@ -70,45 +70,45 @@ var/global/nologevent = 0
 		if(M.client.related_accounts_ip.len)
 			body += "<b>Related accounts by IP:</b> [jointext(M.client.related_accounts_ip, " - ")]<br><br>"
 
-	body += "<A href='?_src_=holder;boot2=\ref[M]'>Kick</A> | "
+	body += "<A href='?_src_=holder;boot2=[M.UID()]'>Kick</A> | "
 	body += "<A href='?_src_=holder;warn=[M.ckey]'>Warn</A> | "
-	body += "<A href='?_src_=holder;newban=\ref[M]'>Ban</A> | "
-	body += "<A href='?_src_=holder;jobban2=\ref[M]'>Jobban</A> | "
-	body += "<A href='?_src_=holder;appearanceban=\ref[M]'>Appearance Ban</A> | "
+	body += "<A href='?_src_=holder;newban=[M.UID()]'>Ban</A> | "
+	body += "<A href='?_src_=holder;jobban2=[M.UID()]'>Jobban</A> | "
+	body += "<A href='?_src_=holder;appearanceban=[M.UID()]'>Appearance Ban</A> | "
 	body += "<A href='?_src_=holder;shownoteckey=[M.ckey]'>Notes</A> | "
 	if(M.client)
 		if(M.client.check_watchlist(M.client.ckey))
 			body += "<A href='?_src_=holder;watchremove=[M.ckey]'>Remove from Watchlist</A> | "
 			body += "<A href='?_src_=holder;watchedit=[M.ckey]'>Edit Watchlist Reason</A> "
 		else
-			body += "<A href='?_src_=holder;watchadd=\ref[M.ckey]'>Add to Watchlist</A> "
+			body += "<A href='?_src_=holder;watchadd=[M.ckey]'>Add to Watchlist</A> "
 
 	if(M.client)
-		body += "| <A HREF='?_src_=holder;sendtoprison=\ref[M]'>Prison</A> | "
-		body += "\ <A href='?_src_=holder;sendbacktolobby=\ref[M]'>Send back to Lobby</A> | "
+		body += "| <A href='?_src_=holder;sendtoprison=[M.UID()]'>Prison</A> | "
+		body += "\ <A href='?_src_=holder;sendbacktolobby=[M.UID()]'>Send back to Lobby</A> | "
 		var/muted = M.client.prefs.muted
 		body += {"<br><b>Mute: </b>
-			\[<A href='?_src_=holder;mute=\ref[M];mute_type=[MUTE_IC]'><font color='[(muted & MUTE_IC)?"red":"blue"]'>IC</font></a> |
-			<A href='?_src_=holder;mute=\ref[M];mute_type=[MUTE_OOC]'><font color='[(muted & MUTE_OOC)?"red":"blue"]'>OOC</font></a> |
-			<A href='?_src_=holder;mute=\ref[M];mute_type=[MUTE_PRAY]'><font color='[(muted & MUTE_PRAY)?"red":"blue"]'>PRAY</font></a> |
-			<A href='?_src_=holder;mute=\ref[M];mute_type=[MUTE_ADMINHELP]'><font color='[(muted & MUTE_ADMINHELP)?"red":"blue"]'>ADMINHELP</font></a> |
-			<A href='?_src_=holder;mute=\ref[M];mute_type=[MUTE_DEADCHAT]'><font color='[(muted & MUTE_DEADCHAT)?"red":"blue"]'>DEADCHAT</font></a>\]
-			(<A href='?_src_=holder;mute=\ref[M];mute_type=[MUTE_ALL]'><font color='[(muted & MUTE_ALL)?"red":"blue"]'>toggle all</font></a>)
+			\[<A href='?_src_=holder;mute=[M.UID()];mute_type=[MUTE_IC]'><font color='[(muted & MUTE_IC)?"red":"blue"]'>IC</font></a> |
+			<A href='?_src_=holder;mute=[M.UID()];mute_type=[MUTE_OOC]'><font color='[(muted & MUTE_OOC)?"red":"blue"]'>OOC</font></a> |
+			<A href='?_src_=holder;mute=[M.UID()];mute_type=[MUTE_PRAY]'><font color='[(muted & MUTE_PRAY)?"red":"blue"]'>PRAY</font></a> |
+			<A href='?_src_=holder;mute=[M.UID()];mute_type=[MUTE_ADMINHELP]'><font color='[(muted & MUTE_ADMINHELP)?"red":"blue"]'>ADMINHELP</font></a> |
+			<A href='?_src_=holder;mute=[M.UID()];mute_type=[MUTE_DEADCHAT]'><font color='[(muted & MUTE_DEADCHAT)?"red":"blue"]'>DEADCHAT</font></a>\]
+			(<A href='?_src_=holder;mute=[M.UID()];mute_type=[MUTE_ALL]'><font color='[(muted & MUTE_ALL)?"red":"blue"]'>toggle all</font></a>)
 		"}
 
 	var/jumptoeye = ""
 	if(isAI(M))
 		var/mob/living/silicon/ai/A = M
 		if(A.client && A.eyeobj) // No point following clientless AI eyes
-			jumptoeye = " <b>(<A href='?_src_=holder;jumpto=\ref[A.eyeobj]'>Eye</A>)</b>"
+			jumptoeye = " <b>(<A href='?_src_=holder;jumpto=[A.eyeobj.UID()]'>Eye</A>)</b>"
 	body += {"<br><br>
-		<A href='?_src_=holder;jumpto=\ref[M]'><b>Jump to</b></A>[jumptoeye] |
-		<A href='?_src_=holder;getmob=\ref[M]'>Get</A> |
-		<A href='?_src_=holder;sendmob=\ref[M]'>Send To</A>
+		<A href='?_src_=holder;jumpto=[M.UID()]'><b>Jump to</b></A>[jumptoeye] |
+		<A href='?_src_=holder;getmob=[M.UID()]'>Get</A> |
+		<A href='?_src_=holder;sendmob=[M.UID()]'>Send To</A>
 		<br><br>
-		[check_rights(R_ADMIN,0) ? "<A href='?_src_=holder;traitor=\ref[M]'>Traitor panel</A> | " : "" ]
-		<A href='?_src_=holder;narrateto=\ref[M]'>Narrate to</A> |
-		<A href='?_src_=holder;subtlemessage=\ref[M]'>Subtle message</A>
+		[check_rights(R_ADMIN,0) ? "[ADMIN_TP(M,"Traitor panel")] | " : "" ]
+		<A href='?_src_=holder;narrateto=[M.UID()]'>Narrate to</A> |
+		[ADMIN_SM(M,"Subtle message")]
 	"}
 
 	if(check_rights(R_EVENT, 0))
@@ -128,39 +128,39 @@ var/global/nologevent = 0
 			if(issmall(M))
 				body += "<B>Monkeyized</B> | "
 			else
-				body += "<A href='?_src_=holder;monkeyone=\ref[M]'>Monkeyize</A> | "
+				body += "<A href='?_src_=holder;monkeyone=[M.UID()]'>Monkeyize</A> | "
 
 			//Corgi
 			if(iscorgi(M))
 				body += "<B>Corgized</B> | "
 			else
-				body += "<A href='?_src_=holder;corgione=\ref[M]'>Corgize</A> | "
+				body += "<A href='?_src_=holder;corgione=[M.UID()]'>Corgize</A> | "
 
 			//AI / Cyborg
 			if(isAI(M))
 				body += "<B>Is an AI</B> "
 			else if(ishuman(M))
-				body += {"<A href='?_src_=holder;makeai=\ref[M]'>Make AI</A> |
-					<A href='?_src_=holder;makemask=\ref[M]'>Make Mask</A> |
-					<A href='?_src_=holder;makerobot=\ref[M]'>Make Robot</A> |
-					<A href='?_src_=holder;makealien=\ref[M]'>Make Alien</A> |
-					<A href='?_src_=holder;makeslime=\ref[M]'>Make Slime</A> |
-					<A href='?_src_=holder;makesuper=\ref[M]'>Make Superhero</A>
+				body += {"<A href='?_src_=holder;makeai=[M.UID()]'>Make AI</A> |
+					<A href='?_src_=holder;makemask=[M.UID()]'>Make Mask</A> |
+					<A href='?_src_=holder;makerobot=[M.UID()]'>Make Robot</A> |
+					<A href='?_src_=holder;makealien=[M.UID()]'>Make Alien</A> |
+					<A href='?_src_=holder;makeslime=[M.UID()]'>Make Slime</A> |
+					<A href='?_src_=holder;makesuper=[M.UID()]'>Make Superhero</A>
 				"}
 
 			//Simple Animals
 			if(isanimal(M))
-				body += "<A href='?_src_=holder;makeanimal=\ref[M]'>Re-Animalize</A> | "
+				body += "<A href='?_src_=holder;makeanimal=[M.UID()]'>Re-Animalize</A> | "
 			else
-				body += "<A href='?_src_=holder;makeanimal=\ref[M]'>Animalize</A> | "
+				body += "<A href='?_src_=holder;makeanimal=[M.UID()]'>Animalize</A> | "
 
 			if(istype(M, /mob/dead/observer))
-				body += "<a href='?_src_=holder;incarn_ghost=\ref[M]'>Re-incarnate</a> | "
+				body += "<A href='?_src_=holder;incarn_ghost=[M.UID()]'>Re-incarnate</a> | "
 
 			if(ispAI(M))
 				body += "<B>Is a pAI</B> "
 			else
-				body += "<A href='?_src_=holder;makePAI=\ref[M]'>Make pAI</A> | "
+				body += "<A href='?_src_=holder;makePAI=[M.UID()]'>Make pAI</A> | "
 
 			// DNA2 - Admin Hax
 			if(M.dna && iscarbon(M))
@@ -175,7 +175,7 @@ var/global/nologevent = 0
 					if(bname)
 						var/bstate=M.dna.GetSEState(block)
 						var/bcolor="[(bstate)?"#006600":"#ff0000"]"
-						body += "<A href='?_src_=holder;togmutate=\ref[M];block=[block]' style='color:[bcolor];'>[bname]</A><sub>[block]</sub>"
+						body += "<A href='?_src_=holder;togmutate=[M.UID()];block=[block]' style='color:[bcolor];'>[bname]</A><sub>[block]</sub>"
 					else
 						body += "[block]"
 					body+="</td>"
@@ -183,39 +183,39 @@ var/global/nologevent = 0
 
 			body += {"<br><br>
 				<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>
-				<A href='?_src_=holder;simplemake=observer;mob=\ref[M]'>Observer</A> |
-				\[ Alien: <A href='?_src_=holder;simplemake=drone;mob=\ref[M]'>Drone</A>,
-				<A href='?_src_=holder;simplemake=hunter;mob=\ref[M]'>Hunter</A>,
-				<A href='?_src_=holder;simplemake=queen;mob=\ref[M]'>Queen</A>,
-				<A href='?_src_=holder;simplemake=sentinel;mob=\ref[M]'>Sentinel</A>,
-				<A href='?_src_=holder;simplemake=larva;mob=\ref[M]'>Larva</A> \]
-				<A href='?_src_=holder;simplemake=human;mob=\ref[M]'>Human</A>
-				\[ slime: <A href='?_src_=holder;simplemake=slime;mob=\ref[M]'>Baby</A>,
-				<A href='?_src_=holder;simplemake=adultslime;mob=\ref[M]'>Adult</A> \]
-				<A href='?_src_=holder;simplemake=monkey;mob=\ref[M]'>Monkey</A> |
-				<A href='?_src_=holder;simplemake=robot;mob=\ref[M]'>Cyborg</A> |
-				<A href='?_src_=holder;simplemake=cat;mob=\ref[M]'>Cat</A> |
-				<A href='?_src_=holder;simplemake=runtime;mob=\ref[M]'>Runtime</A> |
-				<A href='?_src_=holder;simplemake=corgi;mob=\ref[M]'>Corgi</A> |
-				<A href='?_src_=holder;simplemake=ian;mob=\ref[M]'>Ian</A> |
-				<A href='?_src_=holder;simplemake=crab;mob=\ref[M]'>Crab</A> |
-				<A href='?_src_=holder;simplemake=coffee;mob=\ref[M]'>Coffee</A> |
-				\[ Construct: <A href='?_src_=holder;simplemake=constructarmoured;mob=\ref[M]'>Armoured</A> ,
-				<A href='?_src_=holder;simplemake=constructbuilder;mob=\ref[M]'>Builder</A> ,
-				<A href='?_src_=holder;simplemake=constructwraith;mob=\ref[M]'>Wraith</A> \]
-				<A href='?_src_=holder;simplemake=shade;mob=\ref[M]'>Shade</A>
+				<A href='?_src_=holder;simplemake=observer;mob=[M.UID()]'>Observer</A> |
+				\[ Alien: <A href='?_src_=holder;simplemake=drone;mob=[M.UID()]'>Drone</A>,
+				<A href='?_src_=holder;simplemake=hunter;mob=[M.UID()]'>Hunter</A>,
+				<A href='?_src_=holder;simplemake=queen;mob=[M.UID()]'>Queen</A>,
+				<A href='?_src_=holder;simplemake=sentinel;mob=[M.UID()]'>Sentinel</A>,
+				<A href='?_src_=holder;simplemake=larva;mob=[M.UID()]'>Larva</A> \]
+				<A href='?_src_=holder;simplemake=human;mob=[M.UID()]'>Human</A>
+				\[ slime: <A href='?_src_=holder;simplemake=slime;mob=[M.UID()]'>Baby</A>,
+				<A href='?_src_=holder;simplemake=adultslime;mob=[M.UID()]'>Adult</A> \]
+				<A href='?_src_=holder;simplemake=monkey;mob=[M.UID()]'>Monkey</A> |
+				<A href='?_src_=holder;simplemake=robot;mob=[M.UID()]'>Cyborg</A> |
+				<A href='?_src_=holder;simplemake=cat;mob=[M.UID()]'>Cat</A> |
+				<A href='?_src_=holder;simplemake=runtime;mob=[M.UID()]'>Runtime</A> |
+				<A href='?_src_=holder;simplemake=corgi;mob=[M.UID()]'>Corgi</A> |
+				<A href='?_src_=holder;simplemake=ian;mob=[M.UID()]'>Ian</A> |
+				<A href='?_src_=holder;simplemake=crab;mob=[M.UID()]'>Crab</A> |
+				<A href='?_src_=holder;simplemake=coffee;mob=[M.UID()]'>Coffee</A> |
+				\[ Construct: <A href='?_src_=holder;simplemake=constructarmoured;mob=[M.UID()]'>Armoured</A> ,
+				<A href='?_src_=holder;simplemake=constructbuilder;mob=[M.UID()]'>Builder</A> ,
+				<A href='?_src_=holder;simplemake=constructwraith;mob=[M.UID()]'>Wraith</A> \]
+				<A href='?_src_=holder;simplemake=shade;mob=[M.UID()]'>Shade</A>
 			"}
 
 	if(M.client)
 		body += {"<br><br>
 			<b>Other actions:</b>
 			<br>
-			<A href='?_src_=holder;forcespeech=\ref[M]'>Forcesay</A> |
-			<A href='?_src_=holder;aroomwarp=\ref[M]'>Admin Room</A> |
-			<A href='?_src_=holder;tdome1=\ref[M]'>Thunderdome 1</A> |
-			<A href='?_src_=holder;tdome2=\ref[M]'>Thunderdome 2</A> |
-			<A href='?_src_=holder;tdomeadmin=\ref[M]'>Thunderdome Admin</A> |
-			<A href='?_src_=holder;tdomeobserve=\ref[M]'>Thunderdome Observer</A> |
+			<A href='?_src_=holder;forcespeech=[M.UID()]'>Forcesay</A> |
+			<A href='?_src_=holder;aroomwarp=[M.UID()]'>Admin Room</A> |
+			<A href='?_src_=holder;tdome1=[M.UID()]'>Thunderdome 1</A> |
+			<A href='?_src_=holder;tdome2=[M.UID()]'>Thunderdome 2</A> |
+			<A href='?_src_=holder;tdomeadmin=[M.UID()]'>Thunderdome Admin</A> |
+			<A href='?_src_=holder;tdomeobserve=[M.UID()]'>Thunderdome Observer</A> |
 		"}
 
 	body += {"<br>
@@ -566,7 +566,7 @@ var/global/nologevent = 0
 		if(!check_rights(R_SERVER,0))
 			message = adminscrub(message,500)
 		message = replacetext(message, "\n", "<br>") // required since we're putting it in a <p> tag
-		to_chat(world, "<span class=notice><b>[usr.client.holder.fakekey ? "Administrator" : usr.key] Announces:</b><p style='text-indent: 50px'>[message]</p></span>")
+		to_chat(world, "<span class='notice'><b>[usr.client.holder.fakekey ? "Administrator" : usr.key] Announces:</b><p style='text-indent: 50px'>[message]</p></span>")
 		log_admin("Announce: [key_name(usr)] : [message]")
 	feedback_add_details("admin_verb","A") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
 
@@ -827,7 +827,7 @@ var/global/nologevent = 0
 	log_admin("[key_name(usr)] spawned [chosen] at ([usr.x],[usr.y],[usr.z])")
 	feedback_add_details("admin_verb","SA") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
 
-/datum/admins/proc/show_traitor_panel(var/mob/M in mob_list)
+/datum/admins/proc/show_traitor_panel(var/mob/M in GLOB.mob_list)
 	set category = "Admin"
 	set desc = "Edit mobs's memory and role"
 	set name = "Show Traitor Panel"
@@ -864,7 +864,7 @@ var/global/nologevent = 0
 
 /datum/admins/proc/output_ai_laws()
 	var/ai_number = 0
-	for(var/mob/living/silicon/S in mob_list)
+	for(var/mob/living/silicon/S in GLOB.mob_list)
 		ai_number++
 		if(isAI(S))
 			to_chat(usr, "<b>AI [key_name(S, TRUE)]'s laws:</b>")
@@ -953,14 +953,14 @@ var/gamma_ship_location = 1 // 0 = station , 1 = space
 	return "[A.name] - [loc.x],[loc.y],[loc.z]"
 
 /proc/formatPlayerPanel(var/mob/U,var/text="PP")
-	return "<A HREF='?_src_=holder;adminplayeropts=\ref[U]'>[text]</A>"
+	return "[ADMIN_PP(U,"[text]")]"
 
 //Kicks all the clients currently in the lobby. The second parameter (kick_only_afk) determins if an is_afk() check is ran, or if all clients are kicked
 //defaults to kicking everyone (afk + non afk clients in the lobby)
 //returns a list of ckeys of the kicked clients
 /proc/kick_clients_in_lobby(message, kick_only_afk = 0)
 	var/list/kicked_client_names = list()
-	for(var/client/C in clients)
+	for(var/client/C in GLOB.clients)
 		if(istype(C.mob, /mob/new_player))
 			if(kick_only_afk && !C.is_afk())	//Ignore clients who are not afk
 				continue
@@ -1037,7 +1037,7 @@ var/gamma_ship_location = 1 // 0 = station , 1 = space
 // result[3] is the number of staff that match the rank mask and are inactive
 /proc/staff_countup(rank_mask = R_BAN)
 	var/list/result = list(0, 0, 0)
-	for(var/client/X in admins)
+	for(var/client/X in GLOB.admins)
 		if(rank_mask && !check_rights_for(X, rank_mask))
 			result[2]++
 			continue

code/modules/admin/admin_ranks.dm

@@ -61,10 +61,10 @@ var/list/admin_ranks = list()								//list of all ranks with associated rights
 /proc/load_admins()
 	//clear the datums references
 	admin_datums.Cut()
-	for(var/client/C in admins)
+	for(var/client/C in GLOB.admins)
 		C.remove_admin_verbs()
 		C.holder = null
-	admins.Cut()
+	GLOB.admins.Cut()
 
 	if(config.admin_legacy_system)
 		load_admin_ranks()
@@ -97,7 +97,7 @@ var/list/admin_ranks = list()								//list of all ranks with associated rights
 			var/datum/admins/D = new /datum/admins(rank, rights, ckey)
 
 			//find the client for a ckey if they are connected and associate them with the new admin datum
-			D.associate(directory[ckey])
+			D.associate(GLOB.directory[ckey])
 
 	else
 		//The current admin system uses SQL
@@ -121,7 +121,7 @@ var/list/admin_ranks = list()								//list of all ranks with associated rights
 			var/datum/admins/D = new /datum/admins(rank, rights, ckey)
 
 			//find the client for a ckey if they are connected and associate them with the new admin datum
-			D.associate(directory[ckey])
+			D.associate(GLOB.directory[ckey])
 		if(!admin_datums)
 			log_world("The database query in load_admins() resulted in no admins being added to the list. Reverting to legacy system.")
 			config.admin_legacy_system = 1

code/modules/admin/admin_verbs.dm

@@ -171,7 +171,6 @@ var/list/admin_verbs_debug = list(
 	/client/proc/admin_serialize,
 	/client/proc/jump_to_ruin,
 	/client/proc/toggle_medal_disable,
-	/client/proc/startadmintickets,
 	)
 var/list/admin_verbs_possess = list(
 	/proc/possess,
@@ -214,7 +213,6 @@ var/list/admin_verbs_proccall = list(
 )
 var/list/admin_verbs_snpc = list(
 	/client/proc/resetSNPC,
-	/client/proc/toggleSNPC,
 	/client/proc/customiseSNPC,
 	/client/proc/hide_snpc_verbs
 )
@@ -448,10 +446,10 @@ var/list/admin_verbs_ticket = list(
 
 /client/proc/findStealthKey(txt)
 	if(txt)
-		for(var/P in stealthminID)
-			if(stealthminID[P] == txt)
+		for(var/P in GLOB.stealthminID)
+			if(GLOB.stealthminID[P] == txt)
 				return P
-	txt = stealthminID[ckey]
+	txt = GLOB.stealthminID[ckey]
 	return txt
 
 /client/proc/createStealthKey()
@@ -459,11 +457,11 @@ var/list/admin_verbs_ticket = list(
 	var/i = 0
 	while(i == 0)
 		i = 1
-		for(var/P in stealthminID)
-			if(num == stealthminID[P])
+		for(var/P in GLOB.stealthminID)
+			if(num == GLOB.stealthminID[P])
 				num++
 				i = 0
-	stealthminID["[ckey]"] = "@[num2text(num)]"
+	GLOB.stealthminID["[ckey]"] = "@[num2text(num)]"
 
 /client/proc/stealth()
 	set category = "Admin"
@@ -523,7 +521,7 @@ var/list/admin_verbs_ticket = list(
 		return
 
 	var/datum/preferences/D
-	var/client/C = directory[warned_ckey]
+	var/client/C = GLOB.directory[warned_ckey]
 	if(C)	D = C.prefs
 	else	D = preferences_datums[warned_ckey]
 
@@ -595,7 +593,7 @@ var/list/admin_verbs_ticket = list(
 	message_admins("<span class='adminnotice'>[key_name_admin(usr)] created an admin explosion at [epicenter.loc]</span>")
 	feedback_add_details("admin_verb","DB") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
 
-/client/proc/give_spell(mob/T as mob in mob_list) // -- Urist
+/client/proc/give_spell(mob/T as mob in GLOB.mob_list) // -- Urist
 	set category = "Event"
 	set name = "Give Spell"
 	set desc = "Gives a spell to a mob."
@@ -620,7 +618,7 @@ var/list/admin_verbs_ticket = list(
 	log_admin("[key_name(usr)] gave [key_name(T)] the spell [S].")
 	message_admins("[key_name_admin(usr)] gave [key_name(T)] the spell [S].", 1)
 
-/client/proc/give_disease(mob/T in mob_list)
+/client/proc/give_disease(mob/T in GLOB.mob_list)
 	set category = "Event"
 	set name = "Give Disease"
 	set desc = "Gives a Disease to a mob."
@@ -707,7 +705,7 @@ var/list/admin_verbs_ticket = list(
 	message_admins("[key_name_admin(usr)] deadmined themself.")
 	deadmin()
 	verbs += /client/proc/readmin
-	deadmins += ckey
+	GLOB.deadmins += ckey
 	to_chat(src, "<span class='interface'>You are now a normal player.</span>")
 	feedback_add_details("admin_verb","DAS") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
 
@@ -765,17 +763,17 @@ var/list/admin_verbs_ticket = list(
 					flags = text2num(flags)
 				D = new(admin_rank, flags, ckey)
 
-		var/client/C = directory[ckey]
+		var/client/C = GLOB.directory[ckey]
 		D.associate(C)
 		message_admins("[key_name_admin(usr)] re-adminned themselves.")
 		log_admin("[key_name(usr)] re-adminned themselves.")
-		deadmins -= ckey
+		GLOB.deadmins -= ckey
 		feedback_add_details("admin_verb","RAS")
 		return
 	else
 		to_chat(src, "You are already an admin.")
 		verbs -= /client/proc/readmin
-		deadmins -= ckey
+		GLOB.deadmins -= ckey
 		return
 
 /client/proc/toggle_log_hrefs()
@@ -809,7 +807,7 @@ var/list/admin_verbs_ticket = list(
 	if(!check_rights(R_ADMIN))
 		return
 
-	var/mob/living/silicon/S = input("Select silicon.", "Manage Silicon Laws") as null|anything in silicon_mob_list
+	var/mob/living/silicon/S = input("Select silicon.", "Manage Silicon Laws") as null|anything in GLOB.silicon_mob_list
 	if(!S) return
 
 	var/datum/nano_module/law_manager/L = new(S)
@@ -817,7 +815,7 @@ var/list/admin_verbs_ticket = list(
 	log_and_message_admins("has opened [S]'s law manager.")
 	feedback_add_details("admin_verb","MSL") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
 
-/client/proc/change_human_appearance_admin(mob/living/carbon/human/H in mob_list)
+/client/proc/change_human_appearance_admin(mob/living/carbon/human/H in GLOB.mob_list)
 	set name = "C.M.A. - Admin"
 	set desc = "Allows you to change the mob appearance"
 	set category = "Admin"
@@ -843,7 +841,7 @@ var/list/admin_verbs_ticket = list(
 		H.change_appearance(APPEARANCE_ALL, usr, usr, check_species_whitelist = 0)
 	feedback_add_details("admin_verb","CHAA") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
 
-/client/proc/change_human_appearance_self(mob/living/carbon/human/H in mob_list)
+/client/proc/change_human_appearance_self(mob/living/carbon/human/H in GLOB.mob_list)
 	set name = "C.M.A. - Self"
 	set desc = "Allows the mob to change its appearance"
 	set category = "Admin"
@@ -979,7 +977,7 @@ var/list/admin_verbs_ticket = list(
 	else
 		to_chat(usr, "You now won't get debug log messages")
 
-/client/proc/man_up(mob/T as mob in mob_list)
+/client/proc/man_up(mob/T as mob in GLOB.mob_list)
 	set category = "Admin"
 	set name = "Man Up"
 	set desc = "Tells mob to man up and deal with it."
@@ -1005,7 +1003,7 @@ var/list/admin_verbs_ticket = list(
 	var/confirm = alert("Are you sure you want to send the global message?", "Confirm Man Up Global", "Yes", "No")
 
 	if(confirm == "Yes")
-		for(var/mob/T as mob in mob_list)
+		for(var/mob/T as mob in GLOB.mob_list)
 			to_chat(T, "<br><center><span class='notice'><b><font size=4>Man up.<br> Deal with it.</font></b><br>Move on.</span></center><br>")
 			T << 'sound/voice/ManUp1.ogg'
 

code/modules/admin/buildmode.dm

@@ -1,656 +0,0 @@
-#define BASIC_BUILDMODE 1
-#define ADV_BUILDMODE 2
-#define VAR_BUILDMODE 3
-#define THROW_BUILDMODE 4
-#define AREA_BUILDMODE 5
-#define COPY_BUILDMODE 6
-#define AREAEDIT_BUILDMODE 7
-#define FILL_BUILDMODE 8
-#define LINK_BUILDMODE 9
-#define BOOM_BUILDMODE 10
-#define SAVE_BUILDMODE 11
-#define NUM_BUILDMODES 11
-
-/obj/screen/buildmode
-	icon = 'icons/misc/buildmode.dmi'
-	var/datum/click_intercept/buildmode/bd
-	layer = HUD_LAYER_BUILDMODE
-
-/obj/screen/buildmode/New(bld)
-	..()
-	bd = bld
-
-/obj/screen/buildmode/mode
-	name = "Toggle Mode"
-	icon_state = "buildmode1"
-	screen_loc = "NORTH,WEST"
-
-/obj/screen/buildmode/mode/Click(location, control, params)
-	var/list/pa = params2list(params)
-
-	if(pa.Find("left"))
-		bd.toggle_modes()
-	else if(pa.Find("right"))
-		bd.change_settings(usr)
-	update_icon()
-	return 1
-
-/obj/screen/buildmode/mode/update_icon()
-	icon_state = "buildmode[bd.mode]"
-	return
-
-/obj/screen/buildmode/help
-	icon_state = "buildhelp"
-	screen_loc = "NORTH,WEST+1"
-	name = "Buildmode Help"
-
-/obj/screen/buildmode/help/Click()
-	bd.show_help(usr)
-	return 1
-
-/obj/screen/buildmode/bdir
-	icon_state = "build"
-	screen_loc = "NORTH,WEST+2"
-	name = "Change Dir"
-
-/obj/screen/buildmode/bdir/update_icon()
-	dir = bd.build_dir
-	return
-
-/obj/screen/buildmode/bdir/Click()
-	bd.change_dir()
-	update_icon()
-	return 1
-
-/obj/screen/buildmode/quit
-	icon_state = "buildquit"
-	screen_loc = "NORTH,WEST+3"
-	name = "Quit Buildmode"
-
-/obj/screen/buildmode/quit/Click()
-	bd.quit()
-	return 1
-
-/obj/screen/buildmode/dir/Click()
-	bd.change_dir()
-	update_icon()
-	return 1
-
-/obj/effect/buildmode_reticule
-	var/image/I
-	var/client/cl
-	anchored = TRUE
-
-/obj/effect/buildmode_reticule/New(var/turf/t, var/client/c)
-	loc = t
-	I = image('icons/mob/blob.dmi', t, "marker",19.0,2) // Sprite reuse wooo
-	if(c)
-		cl = c
-		cl.images += I
-	else
-		log_runtime(EXCEPTION("Buildmode reticule created without a client!"), src)
-
-/obj/effect/buildmode_reticule/proc/deselect()
-	qdel(src)
-
-/obj/effect/buildmode_reticule/Destroy()
-	cl.images -= I
-	cl = null
-	qdel(I)
-	return ..()
-
-/obj/effect/buildmode_line
-	var/image/I
-	var/client/cl
-
-/obj/effect/buildmode_line/New(var/client/c, var/atom/atom_a, var/atom/atom_b, var/linename)
-	name = linename
-	loc = get_turf(atom_a)
-	I = image('icons/misc/mark.dmi', src, "line", 19.0)
-	var/x_offset = ((atom_b.x * 32) + atom_b.pixel_x) - ((atom_a.x * 32) + atom_a.pixel_x)
-	var/y_offset = ((atom_b.y * 32) + atom_b.pixel_y) - ((atom_a.y * 32) + atom_a.pixel_y)
-
-	var/matrix/M = matrix()
-	M.Translate(0, 16)
-	M.Scale(1, sqrt((x_offset * x_offset) + (y_offset * y_offset)) / 32)
-	M.Turn(90 - Atan2(x_offset, y_offset)) // So... You pass coords in order x,y to this version of atan2. It should be called acsc2.
-	M.Translate(atom_a.pixel_x, atom_a.pixel_y)
-
-	transform = M
-	cl = c
-	cl.images += I
-
-/obj/effect/buildmode_line/Destroy()
-	if(I)
-		if(istype(cl))
-			cl.images -= I
-			cl = null
-		QDEL_NULL(I)
-	return ..()
-
-/datum/click_intercept
-	var/client/holder = null
-	var/list/obj/screen/buttons = list()
-
-/datum/click_intercept/New(client/c)
-	create_buttons()
-	holder = c
-	holder.click_intercept = src
-	holder.show_popup_menus = 0
-	holder.screen += buttons
-
-/datum/click_intercept/Destroy()
-	QDEL_LIST(buttons)
-	return ..()
-
-
-/datum/click_intercept/proc/create_buttons()
-	return
-
-/datum/click_intercept/proc/InterceptClickOn(user,params,atom/object)
-	return
-
-/datum/click_intercept/proc/quit()
-	holder.screen -= buttons
-	holder.click_intercept = null
-	holder.show_popup_menus = 1
-	qdel(src)
-
-
-
-/datum/click_intercept/buildmode
-	var/mode = BASIC_BUILDMODE
-	var/build_dir = SOUTH
-	var/atom/movable/throw_atom = null
-	var/obj/effect/buildmode_reticule/cornerA = null
-	var/obj/effect/buildmode_reticule/cornerB = null
-	var/generator_path = null
-	var/varholder = "name"
-	var/valueholder = "derp"
-	var/objholder = /obj/structure/closet
-	var/area/storedarea = null
-	var/image/areaimage
-	var/atom/movable/stored = null
-	var/list/link_lines = list()
-	var/obj/link_obj
-	var/valid_links = 0
-	//Explosion mode
-	var/devastation = -1
-	var/heavy = -1
-	var/light = -1
-	var/flash = -1
-	var/flames = -1
-	// Saving mode
-	var/use_json = TRUE
-
-/datum/click_intercept/buildmode/New(client/c)
-	..()
-	areaimage = image('icons/turf/areas.dmi',null,"yellow")
-	holder.images += areaimage
-
-/datum/click_intercept/buildmode/Destroy()
-	stored = null
-	Reset()
-	areaimage.loc = null
-	qdel(areaimage)
-	return ..()
-
-/datum/click_intercept/buildmode/create_buttons()
-	buttons += new /obj/screen/buildmode/mode(src)
-	buttons += new /obj/screen/buildmode/help(src)
-	buttons += new /obj/screen/buildmode/bdir(src)
-	buttons += new /obj/screen/buildmode/quit(src)
-
-/datum/click_intercept/buildmode/proc/toggle_modes()
-	mode = (mode % NUM_BUILDMODES) +1
-	Reset()
-	return
-
-/datum/click_intercept/buildmode/proc/show_help(mob/user)
-	switch(mode)
-		if(BASIC_BUILDMODE)
-			to_chat(user, "<span class='notice'>***********************************************************</span>")
-			to_chat(user, "<span class='notice'>Left Mouse Button        = Construct / Upgrade</span>")
-			to_chat(user, "<span class='notice'>Right Mouse Button       = Deconstruct / Delete / Downgrade</span>")
-			to_chat(user, "<span class='notice'>Left Mouse Button + ctrl = R-Window</span>")
-			to_chat(user, "<span class='notice'>Left Mouse Button + alt  = Airlock</span>")
-			to_chat(user, "")
-			to_chat(user, "<span class='notice'>Use the button in the upper left corner to</span>")
-			to_chat(user, "<span class='notice'>change the direction of built objects.</span>")
-			to_chat(user, "<span class='notice'>***********************************************************</span>")
-		if(ADV_BUILDMODE)
-			to_chat(user, "<span class='notice'>***********************************************************</span>")
-			to_chat(user, "<span class='notice'>Right Mouse Button on buildmode button = Set object type</span>")
-			to_chat(user, "<span class='notice'>Left Mouse Button on turf/obj          = Place objects</span>")
-			to_chat(user, "<span class='notice'>Right Mouse Button                     = Delete objects</span>")
-			to_chat(user, "")
-			to_chat(user, "<span class='notice'>Use the button in the upper left corner to</span>")
-			to_chat(user, "<span class='notice'>change the direction of built objects.</span>")
-			to_chat(user, "<span class='notice'>***********************************************************</span>")
-		if(VAR_BUILDMODE)
-			to_chat(user, "<span class='notice'>***********************************************************</span>")
-			to_chat(user, "<span class='notice'>Right Mouse Button on buildmode button = Select var(type) & value</span>")
-			to_chat(user, "<span class='notice'>Left Mouse Button on turf/obj/mob      = Set var(type) & value</span>")
-			to_chat(user, "<span class='notice'>Right Mouse Button on turf/obj/mob     = Reset var's value</span>")
-			to_chat(user, "<span class='notice'>***********************************************************</span>")
-		if(THROW_BUILDMODE)
-			to_chat(user, "<span class='notice'>***********************************************************</span>")
-			to_chat(user, "<span class='notice'>Left Mouse Button on turf/obj/mob      = Select</span>")
-			to_chat(user, "<span class='notice'>Right Mouse Button on turf/obj/mob     = Throw</span>")
-			to_chat(user, "<span class='notice'>***********************************************************</span>")
-		if(AREA_BUILDMODE)
-			to_chat(user, "<span class='notice'>***********************************************************</span>")
-			to_chat(user, "<span class='notice'>Left Mouse Button on turf/obj/mob      = Select corner</span>")
-			to_chat(user, "<span class='notice'>Right Mouse Button on buildmode button = Select generator</span>")
-			to_chat(user, "<span class='notice'>***********************************************************</span>")
-		if(COPY_BUILDMODE)
-			to_chat(user, "<span class='notice'>***********************************************************</span>")
-			to_chat(user, "<span class='notice'>Left Mouse Button on obj/turf/mob   = Spawn a Copy of selected target</span>")
-			to_chat(user, "<span class='notice'>Right Mouse Button on obj/mob = Select target to copy</span>")
-			to_chat(user, "<span class='notice'>***********************************************************</span>")
-		if(AREAEDIT_BUILDMODE)
-			to_chat(user, "<span class='notice'>***********************************************************</span>")
-			to_chat(user, "<span class='notice'>Left Mouse Button on obj/turf/mob  = Paint area</span>")
-			to_chat(user, "<span class='notice'>Right Mouse Button on obj/turf/mob = Select area to paint</span>")
-			to_chat(user, "<span class='notice'>Right Mouse Button on buildmode button = Create new area</span>")
-			to_chat(user, "<span class='notice'>***********************************************************</span>")
-		if(FILL_BUILDMODE)
-			to_chat(user, "<span class='notice'>***********************************************************</span>")
-			to_chat(user, "<span class='notice'>Left Mouse Button on turf/obj/mob      = Select corner</span>")
-			to_chat(user, "<span class='notice'>Left Mouse Button + Alt on turf/obj/mob = Delete region</span>")
-			to_chat(user, "<span class='notice'>Right Mouse Button on buildmode button = Select object type</span>")
-			to_chat(user, "<span class='notice'>***********************************************************</span>")
-		if(LINK_BUILDMODE)
-			to_chat(user, "<span class='notice'>***********************************************************</span>")
-			to_chat(user, "<span class='notice'>Left Mouse Button on obj  = Select button to link</span>")
-			to_chat(user, "<span class='notice'>Right Mouse Button on obj = Link/unlink to selected button")
-			to_chat(user, "<span class='notice'>***********************************************************</span>")
-		if(BOOM_BUILDMODE)
-			to_chat(user, "<span class='notice'>***********************************************************</span>")
-			to_chat(user, "<span class='notice'>Mouse Button on obj  = Kaboom</span>")
-			to_chat(user, "<span class='notice'>***********************************************************</span>")
-		if(SAVE_BUILDMODE)
-			to_chat(user, "<span class='notice'>***********************************************************</span>")
-			to_chat(user, "<span class='notice'>Left Mouse Button on turf/obj/mob      = Select corner</span>")
-			to_chat(user, "<span class='notice'>***********************************************************</span>")
-
-
-
-
-/datum/click_intercept/buildmode/proc/change_settings(mob/user)
-	switch(mode)
-		if(BASIC_BUILDMODE)
-
-			return 1
-		if(ADV_BUILDMODE)
-			var/target_path = input(user,"Enter typepath:" ,"Typepath","/obj/structure/closet")
-			objholder = text2path(target_path)
-			if(!ispath(objholder))
-				objholder = pick_closest_path(target_path)
-				if(!objholder || ispath(objholder, /area))
-					objholder = /obj/structure/closet
-					alert("That path is not allowed.")
-			else
-				if(ispath(objholder,/mob) && !check_rights(R_DEBUG,0))
-					objholder = /obj/structure/closet
-		if(VAR_BUILDMODE)
-			var/list/locked = list("vars", "key", "ckey", "client", "firemut", "ishulk", "telekinesis", "xray", "virus", "viruses", "cuffed", "ka", "last_eaten", "urine")
-
-			varholder = input(user,"Enter variable name:" ,"Name", "name")
-			if(varholder in locked && !check_rights(R_DEBUG,0))
-
-				return 1
-			var/thetype = input(user,"Select variable type:" ,"Type") in list("text","number","mob-reference","obj-reference","turf-reference")
-			if(!thetype) return 1
-			switch(thetype)
-				if("text")
-					valueholder = input(user,"Enter variable value:" ,"Value", "value") as text
-				if("number")
-					valueholder = input(user,"Enter variable value:" ,"Value", 123) as num
-				if("mob-reference")
-					valueholder = input(user,"Enter variable value:" ,"Value") as mob in mob_list
-				if("obj-reference")
-					valueholder = input(user,"Enter variable value:" ,"Value") as obj in world
-				if("turf-reference")
-					valueholder = input(user,"Enter variable value:" ,"Value") as turf in world
-		if(AREA_BUILDMODE)
-			var/list/gen_paths = subtypesof(/datum/mapGenerator)
-
-			var/type = input(user,"Select Generator Type","Type") as null|anything in gen_paths
-			if(!type) return
-
-			generator_path = type
-			cornerA = null
-			cornerB = null
-		if(AREAEDIT_BUILDMODE)
-			var/target_path = input(user,"Enter typepath:", "Typepath", "/area")
-			var/areatype = text2path(target_path)
-			if(ispath(areatype,/area))
-				var/areaname = input(user,"Enter area name:", "Area name", "Area")
-				if(!areaname || !length(areaname))
-					return
-				storedarea = new areatype
-				storedarea.power_equip = 0
-				storedarea.power_light = 0
-				storedarea.power_environ = 0
-				storedarea.always_unpowered = 0
-				storedarea.name = areaname
-				areaimage.loc = storedarea
-		if(FILL_BUILDMODE)
-			var/target_path = input(user,"Enter typepath:" ,"Typepath","/obj/structure/closet")
-			objholder = text2path(target_path)
-			if(!ispath(objholder))
-				objholder = pick_closest_path(target_path)
-				if(!objholder || ispath(objholder, /area))
-					objholder = /obj/structure/closet
-					return
-			else
-				if(ispath(objholder,/mob) && !check_rights(R_DEBUG,0))
-					objholder = /obj/structure/closet
-			deselect_region()
-		if(BOOM_BUILDMODE)
-			devastation = input("Range of total devastation. -1 to none", text("Input"))  as num|null
-			if(devastation == null) devastation = -1
-			heavy = input("Range of heavy impact. -1 to none", text("Input"))  as num|null
-			if(heavy == null) heavy = -1
-			light = input("Range of light impact. -1 to none", text("Input"))  as num|null
-			if(light == null) light = -1
-			flash = input("Range of flash. -1 to none", text("Input"))  as num|null
-			if(flash == null) flash = -1
-			flames = input("Range of flames. -1 to none", text("Input"))  as num|null
-			if(flames == null) flames = -1
-
-		if(SAVE_BUILDMODE)
-			use_json = (alert("Would you like to use json (Default is \"Yes\")?",,"Yes","No") == "Yes")
-
-/datum/click_intercept/buildmode/proc/change_dir()
-	switch(build_dir)
-		if(NORTH)
-			build_dir = EAST
-		if(EAST)
-			build_dir = SOUTH
-		if(SOUTH)
-			build_dir = WEST
-		if(WEST)
-			build_dir = NORTHWEST
-		if(NORTHWEST)
-			build_dir = NORTH
-	return 1
-
-/datum/click_intercept/buildmode/proc/deselect_region()
-	QDEL_NULL(cornerA)
-	QDEL_NULL(cornerB)
-
-/datum/click_intercept/buildmode/proc/Reset()//Reset temporary variables
-	deselect_region()
-	if(mode == AREAEDIT_BUILDMODE)
-		areaimage.loc = storedarea
-	else
-		areaimage.loc = null
-	for(var/obj/effect/buildmode_line/L in link_lines)
-		qdel(L)
-		link_lines -= L
-
-/datum/click_intercept/buildmode/proc/select_tile(var/turf/T)
-	return new /obj/effect/buildmode_reticule(T, holder)
-
-/proc/togglebuildmode(mob/M as mob in player_list)
-	set name = "Toggle Build Mode"
-	set category = "Event"
-
-	if(M.client)
-		if(istype(M.client.click_intercept,/datum/click_intercept/buildmode))
-			var/datum/click_intercept/buildmode/B = M.client.click_intercept
-			B.quit()
-			log_admin("[key_name(usr)] has left build mode.")
-		else
-			new/datum/click_intercept/buildmode(M.client)
-			message_admins("[key_name_admin(usr)] has entered build mode.")
-			log_admin("[key_name(usr)] has entered build mode.")
-
-/datum/click_intercept/buildmode/InterceptClickOn(user,params,atom/object) //Click Intercept
-	var/list/pa = params2list(params)
-	var/right_click = pa.Find("right")
-	var/left_click = pa.Find("left")
-	var/alt_click = pa.Find("alt")
-	var/ctrl_click = pa.Find("ctrl")
-
-	. = 1
-	switch(mode)
-		if(BASIC_BUILDMODE)
-			if(istype(object,/turf) && left_click && !alt_click && !ctrl_click)
-				var/turf/T = object
-				if(istype(object,/turf/space))
-					T.ChangeTurf(/turf/simulated/floor/plasteel)
-				else if(istype(object,/turf/simulated/floor))
-					T.ChangeTurf(/turf/simulated/wall)
-				else if(istype(object,/turf/simulated/wall))
-					T.ChangeTurf(/turf/simulated/wall/r_wall)
-				log_admin("Build Mode: [key_name(user)] built [T] at ([T.x],[T.y],[T.z])")
-				return
-			else if(right_click)
-				log_admin("Build Mode: [key_name(user)] deleted [object] at ([object.x],[object.y],[object.z])")
-				if(istype(object,/turf/simulated/wall))
-					var/turf/T = object
-					T.ChangeTurf(/turf/simulated/floor/plasteel)
-				else if(istype(object,/turf/simulated/floor))
-					var/turf/T = object
-					T.ChangeTurf(/turf/space)
-				else if(istype(object,/turf/simulated/wall/r_wall))
-					var/turf/T = object
-					T.ChangeTurf(/turf/simulated/wall)
-				else if(istype(object,/obj))
-					qdel(object)
-				return
-			else if(istype(object,/turf) && alt_click && left_click)
-				log_admin("Build Mode: [key_name(user)] built an airlock at ([object.x],[object.y],[object.z])")
-				new/obj/machinery/door/airlock(get_turf(object))
-			else if(istype(object,/turf) && ctrl_click && left_click)
-				var/obj/structure/window/reinforced/WIN = new/obj/structure/window/reinforced(get_turf(object))
-				WIN.setDir(build_dir)
-				log_admin("Build Mode: [key_name(user)] built a window at ([object.x],[object.y],[object.z])")
-
-		if(ADV_BUILDMODE)
-			if(left_click)
-				if(ispath(objholder,/turf))
-					var/turf/T = get_turf(object)
-					log_admin("Build Mode: [key_name(user)] modified [T] ([T.x],[T.y],[T.z]) to [objholder]")
-					T.ChangeTurf(objholder)
-				else if(!isnull(objholder))
-					var/obj/A = new objholder (get_turf(object))
-					A.setDir(build_dir)
-					log_admin("Build Mode: [key_name(user)] modified [A]'s ([A.x],[A.y],[A.z]) dir to [build_dir]")
-				else
-					to_chat(user, "<span class='warning'>Select object type first.</span>")
-			else if(right_click)
-				if(isobj(object))
-					log_admin("Build Mode: [key_name(user)] deleted [object] at ([object.x],[object.y],[object.z])")
-					qdel(object)
-
-		if(VAR_BUILDMODE)
-			if(left_click) //I cant believe this shit actually compiles.
-				if(object.vars.Find(varholder))
-					log_admin("Build Mode: [key_name(user)] modified [object.name]'s [varholder] to [valueholder]")
-					object.vars[varholder] = valueholder
-				else
-					to_chat(user, "<span class='warning'>[initial(object.name)] does not have a var called '[varholder]'</span>")
-			if(right_click)
-				if(object.vars.Find(varholder))
-					log_admin("Build Mode: [key_name(user)] modified [object.name]'s [varholder] to [valueholder]")
-					object.vars[varholder] = initial(object.vars[varholder])
-				else
-					to_chat(user, "<span class='warning'>[initial(object.name)] does not have a var called '[varholder]'</span>")
-
-		if(THROW_BUILDMODE)
-			if(left_click)
-				if(isturf(object))
-					return
-				throw_atom = object
-			if(right_click)
-				if(throw_atom)
-					throw_atom.throw_at(object, 10, 1,user)
-					log_admin("Build Mode: [key_name(user)] threw [throw_atom] at [object] ([object.x],[object.y],[object.z])")
-		if(AREA_BUILDMODE)
-			if(!cornerA)
-				cornerA = select_tile(get_turf(object))
-				return
-			if(cornerA && !cornerB)
-				cornerB = select_tile(get_turf(object))
-			if(left_click) //rectangular
-				if(cornerA && cornerB)
-					if(!generator_path)
-						to_chat(user, "<span class='warning'>Select generator type first.</span>")
-					else
-						var/datum/mapGenerator/G = new generator_path
-						G.defineRegion(cornerA.loc,cornerB.loc,1)
-						G.generate()
-					deselect_region()
-					return
-
-			//Something wrong - Reset
-			deselect_region()
-		if(COPY_BUILDMODE)
-			if(left_click)
-				var/turf/T = get_turf(object)
-				if(stored)
-					DuplicateObject(stored, perfectcopy=1, sameloc=0,newloc=T)
-			else if(right_click)
-				if(ismovableatom(object)) // No copying turfs for now.
-					to_chat(user, "<span class='notice'>[object] set as template.</span>")
-					stored = object
-		if(AREAEDIT_BUILDMODE)
-			if(left_click)
-				if(!storedarea)
-					return
-				var/turf/T = get_turf(object)
-				if(get_area(T) != storedarea)
-					storedarea.contents.Add(T)
-			else if(right_click)
-				var/turf/T = get_turf(object)
-				storedarea = get_area(T)
-				areaimage.loc = storedarea
-		if(FILL_BUILDMODE)
-			if(!cornerA)
-				cornerA = select_tile(get_turf(object))
-				return
-			if(cornerA && !cornerB)
-				cornerB = select_tile(get_turf(object))
-			if(left_click) //rectangular
-				if(cornerA && cornerB)
-					if(alt_click)
-						empty_region(block(get_turf(cornerA),get_turf(cornerB)))
-						deselect_region()
-					else
-						if(!objholder)
-							to_chat(user, "<span class='warning'>Select object type first.</span>")
-						else
-							for(var/turf/T in block(get_turf(cornerA),get_turf(cornerB)))
-								if(ispath(objholder,/turf))
-									T.ChangeTurf(objholder)
-								else
-									var/obj/A = new objholder(T)
-									A.setDir(build_dir)
-						deselect_region()
-					return
-
-			//Something wrong - Reset
-			deselect_region()
-		if(LINK_BUILDMODE)
-			if(left_click && istype(object, /obj/machinery))
-				link_obj = object
-			if(right_click && istype(object, /obj/machinery))
-				if(istype(link_obj, /obj/machinery/door_control) && istype(object, /obj/machinery/door/airlock))
-					var/obj/machinery/door_control/M = link_obj
-					var/obj/machinery/door/airlock/P = object
-					if(!M.id || M.id == "")
-						M.id = input(holder, "Please select an ID for the button", "Buildmode", "")
-						if(!M.id || M.id == "")
-							goto(line_jump)
-					if(P.id_tag == M.id && (P in range(M.range, M)) && P.id_tag && P.id_tag != "")
-						P.id_tag = null
-						to_chat(holder, "[P] unlinked.")
-						goto(line_jump)
-					if(!M.normaldoorcontrol)
-						if(link_lines.len && alert(holder, "Warning: This will disable links to connected pod doors. Continue?", "Buildmode", "Yes", "No") == "No")
-							goto(line_jump)
-						M.normaldoorcontrol = 1
-					if(P.id_tag && alert(holder, "Warning: This will unlink something else from the door. Continue?", "Buildmode", "Yes", "No") == "No")
-						goto(line_jump)
-					P.id_tag = M.id
-				if(istype(link_obj, /obj/machinery/door_control) && istype(object, /obj/machinery/door/poddoor))
-					var/obj/machinery/door_control/M = link_obj
-					var/obj/machinery/door/poddoor/P = object
-					if(!M.id || M.id == "")
-						M.id = input(holder, "Please select an ID for the button", "Buildmode", "")
-						if(!M.id || M.id == "")
-							goto(line_jump)
-					if(P.id_tag == M.id && P.id_tag && P.id_tag != "")
-						P.id_tag = null
-						to_chat(holder, "[P] unlinked.")
-						goto(line_jump)
-					if(M.normaldoorcontrol)
-						if(link_lines.len && alert(holder, "Warning: This will disable links to connected airlocks. Continue?", "Buildmode", "Yes", "No") == "No")
-							goto(line_jump)
-						M.normaldoorcontrol = 0
-					if(!M.id || M.id == "")
-						M.id = input(holder, "Please select an ID for the button", "Buildmode", "")
-						if(!M.id || M.id == "")
-							goto(line_jump)
-					if(P.id_tag && P.id_tag != 1 && alert(holder, "Warning: This will unlink something else from the door. Continue?", "Buildmode", "Yes", "No") == "No")
-						goto(line_jump)
-					P.id_tag = M.id
-
-			line_jump // For the goto
-			valid_links = 0
-			for(var/obj/effect/buildmode_line/L in link_lines)
-				qdel(L)
-				link_lines -= L
-
-			if(istype(link_obj, /obj/machinery/door_control))
-				var/obj/machinery/door_control/M = link_obj
-				for(var/obj/machinery/door/airlock/P in range(M.range,M))
-					if(P.id_tag == M.id)
-						var/obj/effect/buildmode_line/L = new(holder, M, P, "[M.name] to [P.name]")
-						L.color = M.normaldoorcontrol ? "#339933" : "#993333"
-						if(M.normaldoorcontrol)
-							valid_links = 1
-						link_lines += L
-						var/obj/effect/buildmode_line/L2 = new(holder, P, M, "[M.name] to [P.name]") // Yes, reversed one so that you can see it from both sides.
-						L2.color = L.color
-						link_lines += L2
-				for(var/obj/machinery/door/poddoor/P in airlocks)
-					if(P.id_tag == M.id)
-						var/obj/effect/buildmode_line/L = new(holder, M, P, "[M.name] to [P.name]")
-						L.color = M.normaldoorcontrol ? "#993333" : "#339933"
-						if(M.normaldoorcontrol)
-							valid_links = 0
-						link_lines += L
-						var/obj/effect/buildmode_line/L2 = new(holder, P, M, "[M.name] to [P.name]") // Yes, reversed one so that you can see it from both sides.
-						L2.color = L.color
-						link_lines += L2
-		if(BOOM_BUILDMODE)
-			explosion(object, devastation, heavy, light, flash, null, TRUE, flames)
-		if(SAVE_BUILDMODE)
-			if(!cornerA)
-				cornerA = select_tile(get_turf(object))
-				return
-			if(!cornerB)
-				cornerB = select_tile(get_turf(object))
-			if(left_click)
-				if(cornerA && cornerB)
-					var/turf/A = get_turf(cornerA)
-					var/turf/B = get_turf(cornerB)
-					deselect_region() // So we don't read our own reticules
-					var/map_name = input(holder, "Please select a name for your map", "Buildmode", "")
-					if(map_name == "")
-						return
-					var/map_flags = 0
-					if(use_json)
-						map_flags = 32 // Magic number defined in `writer.dm` that I can't use directly
-						// because #defines are for some reason our coding standard
-					var/our_map = maploader.save_map(A,B,map_name,map_flags)
-					holder << ftp(our_map) // send the map they've made! Or are stealing, whatever
-					to_chat(holder, "Map saving complete! [our_map]")
-					return
-
-			deselect_region()

code/modules/admin/holder2.dm

@@ -35,11 +35,11 @@ var/list/admin_datums = list()
 		owner.on_holder_add()
 		owner.add_admin_verbs()	//TODO
 		owner.verbs -= /client/proc/readmin
-		admins |= C
+		GLOB.admins |= C
 
 /datum/admins/proc/disassociate()
 	if(owner)
-		admins -= owner
+		GLOB.admins -= owner
 		owner.remove_admin_verbs()
 		owner.holder = null
 		owner = null

code/modules/admin/player_panel.dm

@@ -61,7 +61,7 @@
 
 				}
 
-				function expand(id,job,name,real_name,image,key,ip,antagonist,ref,eyeref){
+				function expand(id,job,name,real_name,image,key,ip,antagonist,UID,eyeUID){
 
 					clearAll();
 
@@ -75,15 +75,15 @@
 
 					body += "</td><td align='center'>";
 
-					body += "<a href='?src=[UID()];adminplayeropts="+ref+"'>PP</a> - "
+					body += "<a href='?src=[UID()];adminplayeropts="+UID+"'>PP</a> - "
 					body += "<a href='?src=[UID()];shownoteckey="+key+"'>N</a> - "
-					body += "<a href='?_src_=vars;Vars="+ref+"'>VV</a> - "
-					body += "<a href='?src=[UID()];traitor="+ref+"'>TP</a> - "
-					body += "<a href='?src=[usr.UID()];priv_msg=\ref"+ref+"'>PM</a> - "
-					body += "<a href='?src=[UID()];subtlemessage="+ref+"'>SM</a> - "
-					body += "<a href='?src=[UID()];adminplayerobservefollow="+ref+"'>FLW</a>"
-					if(eyeref)
-						body += "|<a href='?src=[UID()];adminplayerobservefollow="+eyeref+"'>EYE</a>"
+					body += "<a href='?_src_=vars;Vars="+UID+"'>VV</a> - "
+					body += "<a href='?src=[UID()];traitor="+UID+"'>TP</a> - "
+					body += "<a href='?src=[usr.UID()];priv_msg="+UID+"'>PM</a> - "
+					body += "<a href='?src=[UID()];subtlemessage="+UID+"'>SM</a> - "
+					body += "<a href='?src=[UID()];adminplayerobservefollow="+UID+"'>FLW</a>"
+					if(eyeUID)
+						body += "|<a href='?src=[UID()];adminplayerobservefollow="+eyeUID+"'>EYE</a>"
 					body += "<br>"
 					if(antagonist > 0)
 						body += "<font size='2'><a href='?src=[UID()];check_antagonist=1'><font color='red'><b>Antagonist</b></font></a></font>";
@@ -288,11 +288,11 @@
 			M_key = replacetext(M_key, "\"", "")
 			M_key = replacetext(M_key, "\\", "")
 
-			var/M_eyeref = ""
+			var/M_eyeUID = ""
 			if(isAI(M))
 				var/mob/living/silicon/ai/A = M
 				if(A.client && A.eyeobj) // No point following clientless AI eyes
-					M_eyeref = "\ref[A.eyeobj]"
+					M_eyeUID = "[A.eyeobj.UID()]"
 			//output for each mob
 			dat += {"
 
@@ -300,7 +300,7 @@
 					<td align='center' bgcolor='[color]'>
 						<span id='notice_span[i]'></span>
 						<a id='link[i]'
-						onmouseover='expand("item[i]","[M_job]","[M_name]","[M_rname]","--unused--","[M_key]","[M.lastKnownIP]",[is_antagonist],"\ref[M]", "[M_eyeref]")'
+						onmouseover='expand("item[i]","[M_job]","[M_name]","[M_rname]","--unused--","[M_key]","[M.lastKnownIP]",[is_antagonist],"[M.UID()]", "[M_eyeUID]")'
 						>
 						<b id='search[i]'>[M_name] - [M_rname] - [M_key] ([M_job])</b>
 						</a>
@@ -370,16 +370,16 @@
 
 
 		dat += {"<td>[(M.client ? "[M.client]" : "No client")]</td>
-		<td align=center><A HREF='?src=[UID()];adminplayeropts=\ref[M]'>X</A></td>
-		<td align=center><A href='?src=[usr.UID()];priv_msg=\ref[M]'>PM</A></td>
+		<td align=center><A HREF='?src=[UID()];adminplayeropts=[M.UID()]'>X</A></td>
+		<td align=center><A href='?src=[usr.UID()];priv_msg=[M.UID()]'>PM</A></td>
 		"}
 		switch(is_special_character(M))
 			if(0)
-				dat += {"<td align=center><A HREF='?src=[UID()];traitor=\ref[M]'>Traitor?</A></td>"}
+				dat += {"<td align=center><A HREF='?src=[UID()];traitor=[M.UID()]'>Traitor?</A></td>"}
 			if(1)
-				dat += {"<td align=center><A HREF='?src=[UID()];traitor=\ref[M]'><font color=red>Traitor?</font></A></td>"}
+				dat += {"<td align=center><A HREF='?src=[UID()];traitor=[M.UID()]'><font color=red>Traitor?</font></A></td>"}
 			if(2)
-				dat += {"<td align=center><A HREF='?src=[UID()];traitor=\ref[M]'><font color=red><b>Traitor?</b></font></A></td>"}
+				dat += {"<td align=center><A HREF='?src=[UID()];traitor=[M.UID()]'><font color=red><b>Traitor?</b></font></A></td>"}
 
 	dat += "</table></body></html>"
 
@@ -397,8 +397,8 @@
 	if(!dname)
 		dname = M
 
-	return {"<tr><td><a href='?src=[UID()];adminplayeropts=\ref[M]'>[dname]</a><b>[caption]</b>[logout_status][M.stat == 2 ? " <b><font color=red>(DEAD)</font></b>" : ""]</td>
-		<td><A href='?src=[usr.UID()];priv_msg=\ref[M]'>PM</A></td>[close ? "</tr>" : ""]"}
+	return {"<tr><td><a href='?src=[UID()];adminplayeropts=[M.UID()]'>[dname]</a><b>[caption]</b>[logout_status][M.stat == 2 ? " <b><font color=red>(DEAD)</font></b>" : ""]</td>
+		<td><A href='?src=[usr.UID()];priv_msg=[M.UID()]'>PM</A></td>[close ? "</tr>" : ""]"}
 
 /datum/admins/proc/check_antagonists()
 	if(!check_rights(R_ADMIN))	return
@@ -407,11 +407,11 @@
 		dat += "Current Game Mode: <B>[ticker.mode.name]</B><BR>"
 		dat += "Round Duration: <B>[round(ROUND_TIME / 36000)]:[add_zero(num2text(ROUND_TIME / 600 % 60), 2)]:[add_zero(num2text(ROUND_TIME / 10 % 60), 2)]</B><BR>"
 		dat += "<B>Emergency shuttle</B><BR>"
-		if(shuttle_master.emergency.mode < SHUTTLE_CALL)
+		if(SSshuttle.emergency.mode < SHUTTLE_CALL)
 			dat += "<a href='?src=[UID()];call_shuttle=1'>Call Shuttle</a><br>"
 		else
-			var/timeleft = shuttle_master.emergency.timeLeft()
-			if(shuttle_master.emergency.mode < SHUTTLE_DOCKED)
+			var/timeleft = SSshuttle.emergency.timeLeft()
+			if(SSshuttle.emergency.mode < SHUTTLE_DOCKED)
 				dat += "ETA: <a href='?_src_=holder;edit_shuttle_time=1'>[(timeleft / 60) % 60]:[add_zero(num2text(timeleft % 60), 2)]</a><BR>"
 				dat += "<a href='?_src_=holder;call_shuttle=2'>Send Back</a><br>"
 			else
@@ -427,13 +427,13 @@
 				else
 					dat += "<tr><td><i>Nuclear Operative not found!</i></td></tr>"
 			dat += "</table><br><table><tr><td><B>Nuclear Disk(s)</B></td></tr>"
-			for(var/obj/item/disk/nuclear/N in poi_list)
+			for(var/obj/item/disk/nuclear/N in GLOB.poi_list)
 				dat += "<tr><td>[N.name], "
 				var/atom/disk_loc = N.loc
 				while(!istype(disk_loc, /turf))
 					if(istype(disk_loc, /mob))
 						var/mob/M = disk_loc
-						dat += "carried by <a href='?src=[UID()];adminplayeropts=\ref[M]'>[M.real_name]</a> "
+						dat += "carried by <a href='?src=[UID()];adminplayeropts=[M.UID()]'>[M.real_name]</a> "
 					if(istype(disk_loc, /obj))
 						var/obj/O = disk_loc
 						dat += "in \a [O.name] "
@@ -472,7 +472,7 @@
 			for(var/datum/mind/blob in mode.infected_crew)
 				var/mob/M = blob.current
 				if(M)
-					dat += "<tr><td><a href='?_src_=holder;adminplayeropts=\ref[M]'>[M.real_name]</a>[M.client ? "" : " <i>(ghost)</i>"][M.stat == 2 ? " <b><font color=red>(DEAD)</font></b>" : ""]</td>"
+					dat += "<tr><td>[ADMIN_PP(M,"[M.real_name]")][M.client ? "" : " <i>(ghost)</i>"][M.stat == 2 ? " <b><font color=red>(DEAD)</font></b>" : ""]</td>"
 					dat += "<td><A href='?priv_msg=[M.ckey]'>PM</A></td>"
 				else
 					dat += "<tr><td><i>Blob not found!</i></td></tr>"
@@ -563,7 +563,7 @@
 	if(show_objectives)
 		txt += {"
 			<td>
-				<a href='?src=[UID()];traitor=\ref[M]'>Show Objective</a>
+				<a href='?src=[UID()];traitor=[M.UID()]'>Show Objective</a>
 			</td>
 		"}
 

code/modules/admin/sql_notes.dm

@@ -121,7 +121,7 @@
 	var/ruler
 	ruler = "<hr style='background:#000000; border:0; height:3px'>"
 	navbar = "<a href='?_src_=holder;nonalpha=1'>\[All\]</a>|<a href='?_src_=holder;nonalpha=2'>\[#\]</a>"
-	for(var/letter in alphabet)
+	for(var/letter in GLOB.alphabet)
 		navbar += "|<a href='?_src_=holder;shownote=[letter]'>\[[letter]\]</a>"
 	navbar += "<br><form method='GET' name='search' action='?'>\
 	<input type='hidden' name='_src_' value='holder'>\

code/modules/admin/tickets/admintickets.dm

@@ -1,185 +0,0 @@
-/*
-Admin ticket system by Birdtalon
-*/
-//Global holder
-
-var/global/datum/adminTicketHolder/globAdminTicketHolder = new /datum/adminTicketHolder
-
-//Defines
-//Deciseconds until ticket becomes stale if unanswered. Alerts admins.
-#define ADMIN_TICKET_TIMEOUT 6000 // 10 minutes
-//Decisecions before the user is allowed to open another ticket while their existing one is open.
-#define ADMIN_TICKET_DUPLICATE_COOLDOWN 3000 // 5 minutes
-
-//Status defines
-#define ADMIN_TICKET_OPEN       1
-#define ADMIN_TICKET_CLOSED     2
-#define ADMIN_TICKET_RESOLVED   3
-#define ADMIN_TICKET_STALE      4
-
-//Datum holding all tickets
-/datum/adminTicketHolder
-	var/ticketCounter = 1 // Counts the tickets and used to assign the id number
-	var/list/allTickets = list()
-
-//Return the current ticket number ready to be called off.
-/datum/adminTicketHolder/proc/getTicketCounter()
-	return ticketCounter
-
-//Return the ticket counter and increment
-/datum/adminTicketHolder/proc/getTicketCounterAndInc()
-	. = ticketCounter
-	ticketCounter++
-	return
-
-/datum/adminTicketHolder/proc/resolveAllOpenTickets() // Resolve all open tickets
-	for(var/i in allTickets)
-		var/datum/admin_ticket/T = i
-		resolveTicket(T.ticketNum)
-
-//Open a new ticket and populate details then add to the list of open tickets
-/datum/adminTicketHolder/proc/newTicket(var/client/C, var/passedContent, var/title)
-	if(!C || !passedContent)
-		return
-
-  //Check if the user has an open ticket already within the cooldown period, if so we don't create a new one and re-set the cooldown period
-	var/datum/admin_ticket/existingTicket = checkForOpenTicket(C)
-	if(existingTicket)
-		existingTicket.setCooldownPeriod()
-		to_chat(C, "<span class='adminticket'>Your ticket #[existingTicket.ticketNum] remains open! Visit \"My tickets\" under the Admin Tab to view it.</span>")
-		return
-
-	if(!title)
-		title = passedContent
-
-	var/datum/admin_ticket/T =  new /datum/admin_ticket
-	T.clientName = C
-	T.timeOpened = worldtime2text()
-	T.title = title
-	T.content += passedContent
-	T.locationSent = C.mob.loc.loc.name
-	T.mobControlled = C.mob
-	T.ticketState = ADMIN_TICKET_OPEN
-	T.timeUntilStale = world.time + ADMIN_TICKET_TIMEOUT
-	T.setCooldownPeriod()
-	T.ticketNum = getTicketCounterAndInc()
-	allTickets += T
-
-	//Inform the user that they have opened a ticket
-	to_chat(C, "<span class='adminticket'>You have opened admin ticket number #[(globAdminTicketHolder.getTicketCounter() - 1)]! Please be patient and we will help you soon!</span>")
-
-	//Begin the stale count for this ticket.
-	spawn(0)
-		T.beginStaleCount()
-
-//Set ticket state with key N to open
-/datum/adminTicketHolder/proc/openTicket(var/N)
-	var/datum/admin_ticket/T = globAdminTicketHolder.allTickets[N]
-	if(T.ticketState != ADMIN_TICKET_OPEN)
-		T.ticketState = ADMIN_TICKET_OPEN
-		return TRUE
-
-//Set ticket state with key N to resolved
-/datum/adminTicketHolder/proc/resolveTicket(var/N)
-	var/datum/admin_ticket/T = globAdminTicketHolder.allTickets[N]
-	if(T.ticketState != ADMIN_TICKET_RESOLVED)
-		T.ticketState = ADMIN_TICKET_RESOLVED
-		return TRUE
-
-//Set ticket state with key N to closed
-/datum/adminTicketHolder/proc/closeTicket(var/N)
-	var/datum/admin_ticket/T = globAdminTicketHolder.allTickets[N]
-	if(T.ticketState != ADMIN_TICKET_CLOSED)
-		T.ticketState = ADMIN_TICKET_CLOSED
-		return TRUE
-
-//Check if the user already has a ticket open and within the cooldown period.
-/datum/adminTicketHolder/proc/checkForOpenTicket(var/client/C)
-	for(var/datum/admin_ticket/T in allTickets)
-		if(T.clientName == C && T.ticketState == ADMIN_TICKET_OPEN && (T.ticketCooldown > world.time))
-			return T
-	return FALSE
-
-//Check if the user has ANY ticket not resolved or closed.
-/datum/adminTicketHolder/proc/checkForTicket(var/client/C)
-	var/list/tickets = list()
-	for(var/datum/admin_ticket/T in allTickets)
-		if(T.clientName == C && (T.ticketState == ADMIN_TICKET_OPEN || T.ticketState == ADMIN_TICKET_STALE))
-			tickets += T
-	if(tickets.len)
-		return tickets
-	return FALSE
-
-//return the client of a ticket number
-/datum/adminTicketHolder/proc/returnClient(var/N)
-	var/datum/admin_ticket/T = globAdminTicketHolder.allTickets[N]
-	return T.clientName
-
-/datum/adminTicketHolder/proc/assignAdminToTicket(var/client/C, var/N)
-	var/datum/admin_ticket/T = globAdminTicketHolder.allTickets[N]
-	T.assignAdmin(C)
-	return TRUE
-
-//Single admin ticket
-
-/datum/admin_ticket
-	var/ticketNum // Ticket number
-	var/clientName // Client which opened the ticket
-	var/timeOpened // Time the ticket was opened
-	var/title //The initial message with links
-	var/list/content = list() // content of the admin help
-	var/lastAdminResponse // Last admin who responded
-	var/lastResponseTime // When the admin last responded
-	var/locationSent // Location the player was when they send the ticket
-	var/mobControlled // Mob they were controlling
-	var/ticketState // State of the ticket, open, closed, resolved etc
-	var/timeUntilStale // When the ticket goes stale
-	var/ticketCooldown // Cooldown before allowing the user to open another ticket.
-	var/adminAssigned // Admin who has assigned themselves to this ticket
-
-//Ticker called when a ticket is created, checks for stale-ness.
-/datum/admin_ticket/proc/beginStaleCount()
-	while(world.time < timeUntilStale || !lastAdminResponse || !adminAssigned) // While within the stale period OR no admin responded OR no admin assigned.
-
-		if(!src)
-			return
-
-		sleep(200) // Check every 20 seconds.
-		if(ticketState == ADMIN_TICKET_OPEN && world.time > timeUntilStale)
-			message_adminTicket("<span class='adminticket'>Ticket #[ticketNum] has been open for [ADMIN_TICKET_TIMEOUT * 0.1] seconds. Changing status to stale.</span>")
-			ticketState = ADMIN_TICKET_STALE
-			break
-
-//Set the cooldown period for the ticket. The time when it's created plus the defined cooldown time.
-/datum/admin_ticket/proc/setCooldownPeriod()
-	ticketCooldown = world.time + ADMIN_TICKET_DUPLICATE_COOLDOWN
-
-//Set the last admin who responded as the client passed as an arguement.
-/datum/admin_ticket/proc/setLastAdminResponse(var/client/C)
-	lastAdminResponse = C
-	lastResponseTime = worldtime2text()
-
-//Return the ticket state as a colour coded text string.
-/datum/admin_ticket/proc/state2text()
-	switch(ticketState)
-		if(ADMIN_TICKET_OPEN)
-			return "<font color='green'>OPEN</font>"
-		if(ADMIN_TICKET_RESOLVED)
-			return "<font color='blue'>RESOLVED</font>"
-		if(ADMIN_TICKET_CLOSED)
-			return "<font color='red'>CLOSED</font>"
-		if(ADMIN_TICKET_STALE)
-			return "<font color='orange'>STALE</font>"
-
-//Assign the client passed to var/adminAsssigned
-/datum/admin_ticket/proc/assignAdmin(var/client/C, var/N)
-	if(!C)
-		return
-	adminAssigned = C
-	return TRUE
-
-/datum/admin_ticket/proc/addResponse(var/client/C, var/M as text)
-	if(C.holder)
-		setLastAdminResponse(C)
-	M = "[C]: [M]"
-	content += M

code/modules/admin/tickets/adminticketsUI.dm

@@ -1,172 +0,0 @@
-/datum/adminTicketHolder/proc/returnUI(var/tab = ADMIN_TICKET_OPEN)
-	set name = "Open Ticket Interface"
-	set category = "Tickets"
-
-//dat
-	var/trStyle = "border-top:2px solid; border-bottom:2px solid; padding-top: 5px; padding-bottom: 5px;"
-	var/tdStyleleft = "border-top:2px solid; border-bottom:2px solid; width:150px; text-align:center;"
-	var/tdStyle = "border-top:2px solid; border-bottom:2px solid;"
-	var/datum/admin_ticket/ticket
-	var/dat
-	dat += "<head><style>.adminticket{border:2px solid}</style></head>"
-	dat += "<body><h1>Admin Tickets</h1>"
-
-	dat +="<a href='?src=[UID()];refresh=1'>Refresh</a><br /><a href='?src=[UID()];showopen=1'>Open Tickets</a><a href='?src=[UID()];showresolved=1'>Resolved Tickets</a><a href='?src=[UID()];showclosed=1'>Closed Tickets</a>"
-	if(tab == ADMIN_TICKET_OPEN)
-		dat += "<h2>Open Tickets</h2>"
-	dat += "<table style='width:1300px; border: 3px solid;'>"
-	dat +="<tr style='[trStyle]'><th style='[tdStyleleft]'>Control</th><th style='[tdStyle]'>Ticket</th></tr>"
-	if(tab == ADMIN_TICKET_OPEN)
-		for(var/T in allTickets)
-			ticket = T
-			if(ticket.ticketState == ADMIN_TICKET_OPEN || ticket.ticketState == ADMIN_TICKET_STALE)
-				dat += "<tr style='[trStyle]'><td style ='[tdStyleleft]'><a href='?src=[UID()];resolve=[ticket.ticketNum]'>Resolve</a><a href='?src=[UID()];details=[ticket.ticketNum]'>Details</a> <br /> #[ticket.ticketNum] ([ticket.timeOpened]) [ticket.ticketState == ADMIN_TICKET_STALE ? "<font color='red'><b>STALE</font>" : ""] </td><td style='[tdStyle]'><b>[ticket.title]</td></tr>"
-			else
-				continue
-	else  if(tab == ADMIN_TICKET_RESOLVED)
-		dat += "<h2>Resolved Tickets</h2>"
-		for(var/T in allTickets)
-			ticket = T
-			if(ticket.ticketState == ADMIN_TICKET_RESOLVED)
-				dat += "<tr style='[trStyle]'><td style ='[tdStyleleft]'><a href='?src=[UID()];resolve=[ticket.ticketNum]'>Resolve</a><a href='?src=[UID()];details=[ticket.ticketNum]'>Details</a> <br /> #[ticket.ticketNum] ([ticket.timeOpened]) </td><td style='[tdStyle]'><b>[ticket.title]</td></tr>"
-			else
-				continue
-	else if(tab == ADMIN_TICKET_CLOSED)
-		dat += "<h2>Closed Tickets</h2>"
-		for(var/T in allTickets)
-			ticket = T
-			if(ticket.ticketState == ADMIN_TICKET_CLOSED)
-				dat += "<tr style='[trStyle]'><td style ='[tdStyleleft]'><a href='?src=[UID()];resolve=[ticket.ticketNum]'>Resolve</a><a href='?src=[UID()];details=[ticket.ticketNum]'>Details</a> <br /> #[ticket.ticketNum] ([ticket.timeOpened]) </td><td style='[tdStyle]'><b>[ticket.title]</td></tr>"
-			else
-				continue
-
-	dat += "</table></body>"
-
-	return dat
-
-/datum/adminTicketHolder/proc/showUI(var/client/user, var/tab)
-	var/dat = null
-	dat = returnUI(tab)
-	var/datum/browser/popup = new(user, "admintickets", "Admin Tickets", 1400, 600)
-	popup.set_content(dat)
-	popup.open()
-
-/datum/adminTicketHolder/proc/showDetailUI(var/client/user, var/ticketID)
-	var/datum/admin_ticket/T = globAdminTicketHolder.allTickets[ticketID]
-	var/status = "[T.state2text()]"
-
-	var/dat = "<h1>Admin Tickets</h1>"
-
-	dat +="<a href='?src=[UID()];refresh=1'>Show All</a><a href='?src=[UID()];refreshdetail=[T.ticketNum]'>Refresh</a>"
-
-	dat += "<h2>Ticket #[T.ticketNum]</h2>"
-
-	dat += "<h3>[T.clientName] / [T.mobControlled] opened this ticket at [T.timeOpened] at location [T.locationSent]</h3>"
-	dat += "<h4>Ticket Status: <font color='red'>[status]</font>"
-	dat += "<table style='width:950px; border: 3px solid;'>"
-	dat += "<tr><td>[T.title]</td></tr>"
-
-	if(T.content.len > 1)
-		for(var/i = 2, i <= T.content.len, i++)
-			dat += "<tr><td>[T.content[i]]</td></tr>"
-
-	dat += "</table><br /><br />"
-	dat += "<a href='?src=[UID()];detailreopen=[T.ticketNum]'>Re-Open</a><a href='?src=[UID()];detailresolve=[T.ticketNum]'>Resolve</a><br /><br />"
-
-	if(!T.adminAssigned)
-		dat += "No admin assigned to this ticket - <a href='?src=[UID()];assignadmin=[T.ticketNum]'>Take Ticket</a><br />"
-	else
-		dat += "[T.adminAssigned] is assigned to this Ticket. - <a href='?src=[UID()];assignadmin=[T.ticketNum]'>Take Ticket</a><br />"
-
-	if(T.lastAdminResponse)
-		dat += "<b>Last Admin Response:</b> [T.lastAdminResponse] at [T.lastResponseTime]"
-	else
-		dat +="<font color='red'>No Admin Response</font>"
-
-	dat += "<br /><br />"
-
-	dat += "<a href='?src=[UID()];detailclose=[T.ticketNum]'>Close Ticket</a>"
-
-	var/datum/browser/popup = new(user, "adminticketsdetail", "Admin Ticket #[T.ticketNum]", 1000, 600)
-	popup.set_content(dat)
-	popup.open()
-
-/datum/adminTicketHolder/proc/userDetailUI(var/client/user)
-//dat
-	var/tickets = checkForTicket(user)
-	var/dat
-	dat += "<h1>Your open tickets</h1>"
-	dat += "<table>"
-	for(var/datum/admin_ticket/T in tickets)
-		dat += "<tr><td><h2>Ticket #[T.ticketNum]</h2></td></tr>"
-		for(var/i = 1, i <= T.content.len, i++)
-			dat += "<tr><td>[T.content[i]]</td></tr>"
-	dat += "</table>"
-
-	var/datum/browser/popup = new(user, "userticketsdetail", "Tickets", 1000, 600)
-	popup.set_content(dat)
-	popup.open()
-
-/datum/adminTicketHolder/Topic(href, href_list)
-
-	if(href_list["refresh"])
-		showUI(usr)
-		return
-
-	if(href_list["refreshdetail"])
-		var/indexNum = text2num(href_list["refreshdetail"])
-		showDetailUI(usr, indexNum)
-		return
-
-	if(href_list["showopen"])
-		showUI(usr, ADMIN_TICKET_OPEN)
-		return
-	if(href_list["showresolved"])
-		showUI(usr, ADMIN_TICKET_RESOLVED)
-		return
-	if(href_list["showclosed"])
-		showUI(usr, ADMIN_TICKET_CLOSED)
-		return
-
-	if(href_list["details"])
-		var/indexNum = text2num(href_list["details"])
-		showDetailUI(usr.client, indexNum)
-		return
-
-	if(href_list["resolve"])
-		var/indexNum = text2num(href_list["resolve"])
-		if(globAdminTicketHolder.resolveTicket(indexNum))
-			message_adminTicket("[usr.client] / ([usr]) resolved admin ticket number [indexNum]")
-			to_chat(returnClient(indexNum), "<span class='adminticket'>Your admin ticket has now been resolved.</span>")
-			showUI(usr)
-
-	if(href_list["detailresolve"])
-		var/indexNum = text2num(href_list["detailresolve"])
-		if(globAdminTicketHolder.resolveTicket(indexNum))
-			message_adminTicket("[usr.client] / ([usr]) resolved admin ticket number [indexNum]")
-			to_chat(returnClient(indexNum), "<span class='adminticket'>Your admin ticket has now been resolved.</span>")
-			showDetailUI(usr, indexNum)
-
-	if(href_list["detailclose"])
-		var/indexNum = text2num(href_list["detailclose"])
-		if(alert("Are you sure? This will send a negative message.",,"Yes","No") != "Yes")
-			return
-		if(globAdminTicketHolder.closeTicket(indexNum))
-			message_adminTicket("[usr.client] / ([usr]) closed admin ticket number [indexNum]")
-			to_chat(returnClient(indexNum), "<font color='red' size='4'><b>- AdminHelp Rejected! -</b></font>")
-			to_chat(returnClient(indexNum), "<span class='boldmessage'>Please try to be calm, clear, and descriptive in admin helps, do not assume the admin has seen any related events, and clearly state the names of anybody you are reporting. If you asked a question, please ensure it was clear what you were asking.</span>")
-			to_chat(returnClient(indexNum), "<span class='adminticket'>Your ticket has now been closed.</span>")
-			showDetailUI(usr, indexNum)
-
-	if(href_list["detailreopen"])
-		var/indexNum = text2num(href_list["detailreopen"])
-		if(globAdminTicketHolder.openTicket(indexNum))
-			message_adminTicket("[usr.client] / ([usr]) re-opened admin ticket number [indexNum]")
-			showDetailUI(usr, indexNum)
-
-	if(href_list["assignadmin"])
-		var/indexNum = text2num(href_list["assignadmin"])
-		if(globAdminTicketHolder.assignAdminToTicket(usr.client, indexNum))
-			message_adminTicket("[usr.client] / ([usr]) has taken ticket number [indexNum]")
-			to_chat(returnClient(indexNum), "<span class='adminticket'>Your ticket is being handled by [usr.client].")
-		showDetailUI(usr, indexNum)

code/modules/admin/tickets/adminticketsverbs.dm

@@ -1,51 +1,33 @@
 //Verbs
 
-/client/proc/startadmintickets()
-	set name = "Restart Admin Ticket System"
-	set category = "Debug"
-
-	if(!holder && !check_rights(R_DEBUG))
-		return
-
-	if(!globAdminTicketHolder)
-		var/global/datum/adminTicketHolder/globAdminTicketHolder = new /datum/adminTicketHolder
-	else
-		if(alert("Are you sure you want to reboot the admin ticket system?","Reboot Admin Tickets?","Yes","No") != "Yes")
-			return
-		message_admins("<span class='admintickets'>Restarting Admin Ticket System!</span>")
-		globAdminTicketHolder = new /datum/adminTicketHolder
-		message_admins("<span class='admintickets'>Admin Ticket System Restarted!</span>")
-
 /client/proc/openTicketUI()
 
 	set name = "Open Ticket Interface"
 	set category = "Admin"
 
-	if(!holder && !check_rights(R_ADMIN))
+	if(!holder || !check_rights(R_ADMIN))
 		return
 
-	globAdminTicketHolder.showUI(usr)
+	SStickets.showUI(usr)
 
 /client/proc/resolveAllTickets()
 	set name = "Resolve All Open Tickets"
 	set category = "Admin"
 
-	if(!holder && !check_rights(R_ADMIN))
+	if(!holder || !check_rights(R_ADMIN))
 		return
 
 	if(alert("Are you sure you want to resolve ALL open tickets?","Resolve all open tickets?","Yes","No") != "Yes")
 		return
 
-	globAdminTicketHolder.resolveAllOpenTickets()
-
-
+	SStickets.resolveAllOpenTickets()
 
 /client/proc/openUserUI()
 
 	set name = "My Tickets"
 	set category = "Admin"
 
-	if(!holder && !check_rights(R_ADMIN))
+	if(!holder || !check_rights(R_ADMIN))
 		return
 
-	globAdminTicketHolder.userDetailUI(usr.client)
+	SStickets.userDetailUI(usr)

code/modules/admin/topic.dm

@@ -13,7 +13,7 @@
 	if(href_list["rejectadminhelp"])
 		if(!check_rights(R_ADMIN|R_MOD))
 			return
-		var/client/C = locate(href_list["rejectadminhelp"])
+		var/client/C = locateUID(href_list["rejectadminhelp"])
 		if(!C)
 			return
 
@@ -30,7 +30,7 @@
 		if(!check_rights(R_ADMIN))
 			return
 		var/ticketID = text2num(href_list["openadminticket"])
-		globAdminTicketHolder.showDetailUI(usr, ticketID)
+		SStickets.showDetailUI(usr, ticketID)
 
 	if(href_list["stickyban"])
 		stickyban(href_list["stickyban"],href_list)
@@ -146,7 +146,7 @@
 
 		var/mob/playermob
 
-		for(var/mob/M in player_list)
+		for(var/mob/M in GLOB.player_list)
 			if(M.ckey == banckey)
 				playermob = M
 				break
@@ -238,7 +238,7 @@
 			else
 				D = new /datum/admins(new_rank, rights, adm_ckey)
 
-			var/client/C = directory[adm_ckey]						//find the client with the specified ckey (if they are logged in)
+			var/client/C = GLOB.directory[adm_ckey]						//find the client with the specified ckey (if they are logged in)
 			D.associate(C)											//link up with the client and add verbs
 
 			updateranktodb(adm_ckey, new_rank)
@@ -274,22 +274,22 @@
 
 		switch(href_list["call_shuttle"])
 			if("1")
-				if(shuttle_master.emergency.mode >= SHUTTLE_DOCKED)
+				if(SSshuttle.emergency.mode >= SHUTTLE_DOCKED)
 					return
-				shuttle_master.emergency.request()
+				SSshuttle.emergency.request()
 				log_admin("[key_name(usr)] called the Emergency Shuttle")
 				message_admins("<span class='adminnotice'>[key_name_admin(usr)] called the Emergency Shuttle to the station</span>")
 
 			if("2")
-				if(shuttle_master.emergency.mode >= SHUTTLE_DOCKED)
+				if(SSshuttle.emergency.mode >= SHUTTLE_DOCKED)
 					return
-				switch(shuttle_master.emergency.mode)
+				switch(SSshuttle.emergency.mode)
 					if(SHUTTLE_CALL)
-						shuttle_master.emergency.cancel()
+						SSshuttle.emergency.cancel()
 						log_admin("[key_name(usr)] sent the Emergency Shuttle back")
 						message_admins("<span class='adminnotice'>[key_name_admin(usr)] sent the Emergency Shuttle back</span>")
 					else
-						shuttle_master.emergency.cancel()
+						SSshuttle.emergency.cancel()
 						log_admin("[key_name(usr)] called the Emergency Shuttle")
 						message_admins("<span class='adminnotice'>[key_name_admin(usr)] called the Emergency Shuttle to the station</span>")
 
@@ -299,10 +299,10 @@
 	else if(href_list["edit_shuttle_time"])
 		if(!check_rights(R_SERVER))	return
 
-		var/timer = input("Enter new shuttle duration (seconds):","Edit Shuttle Timeleft", shuttle_master.emergency.timeLeft() ) as num
-		shuttle_master.emergency.setTimer(timer*10)
+		var/timer = input("Enter new shuttle duration (seconds):","Edit Shuttle Timeleft", SSshuttle.emergency.timeLeft() ) as num
+		SSshuttle.emergency.setTimer(timer*10)
 		log_admin("[key_name(usr)] edited the Emergency Shuttle's timeleft to [timer] seconds")
-		minor_announcement.Announce("The emergency shuttle will reach its destination in [round(shuttle_master.emergency.timeLeft(600))] minutes.")
+		minor_announcement.Announce("The emergency shuttle will reach its destination in [round(SSshuttle.emergency.timeLeft(600))] minutes.")
 		message_admins("<span class='adminnotice'>[key_name_admin(usr)] edited the Emergency Shuttle's timeleft to [timer] seconds</span>")
 		href_list["secrets"] = "check_antagonist"
 
@@ -317,7 +317,7 @@
 	else if(href_list["simplemake"])
 		if(!check_rights(R_SPAWN))	return
 
-		var/mob/M = locate(href_list["mob"])
+		var/mob/M = locateUID(href_list["mob"])
 		if(!ismob(M))
 			to_chat(usr, "This can only be used on instances of type /mob")
 			return
@@ -426,7 +426,7 @@
 	else if(href_list["appearanceban"])
 		if(!check_rights(R_BAN))
 			return
-		var/mob/M = locate(href_list["appearanceban"])
+		var/mob/M = locateUID(href_list["appearanceban"])
 		if(!ismob(M))
 			to_chat(usr, "This can only be used on instances of type /mob")
 			return
@@ -475,7 +475,7 @@
 	else if(href_list["jobban2"])
 //		if(!check_rights(R_BAN))	return
 
-		var/mob/M = locate(href_list["jobban2"])
+		var/mob/M = locateUID(href_list["jobban2"])
 		if(!ismob(M))
 			to_chat(usr, "This can only be used on instances of type /mob")
 			return
@@ -501,17 +501,17 @@
 //Regular jobs
 	//Command (Blue)
 		jobs += "<table cellpadding='1' cellspacing='0' width='100%'>"
-		jobs += "<tr align='center' bgcolor='ccccff'><th colspan='[length(command_positions)]'><a href='?src=[UID()];jobban3=commanddept;jobban4=\ref[M]'>Command Positions</a></th></tr><tr align='center'>"
+		jobs += "<tr align='center' bgcolor='ccccff'><th colspan='[length(command_positions)]'><a href='?src=[UID()];jobban3=commanddept;jobban4=[M.UID()]'>Command Positions</a></th></tr><tr align='center'>"
 		for(var/jobPos in command_positions)
 			if(!jobPos)	continue
 			var/datum/job/job = job_master.GetJob(jobPos)
 			if(!job) continue
 
 			if(jobban_isbanned(M, job.title))
-				jobs += "<td width='20%'><a href='?src=[UID()];jobban3=[job.title];jobban4=\ref[M]'><font color=red>[replacetext(job.title, " ", "&nbsp")]</font></a></td>"
+				jobs += "<td width='20%'><a href='?src=[UID()];jobban3=[job.title];jobban4=[M.UID()]'><font color=red>[replacetext(job.title, " ", "&nbsp")]</font></a></td>"
 				counter++
 			else
-				jobs += "<td width='20%'><a href='?src=[UID()];jobban3=[job.title];jobban4=\ref[M]'>[replacetext(job.title, " ", "&nbsp")]</a></td>"
+				jobs += "<td width='20%'><a href='?src=[UID()];jobban3=[job.title];jobban4=[M.UID()]'>[replacetext(job.title, " ", "&nbsp")]</a></td>"
 				counter++
 
 			if(counter >= 6) //So things dont get squiiiiished!
@@ -522,17 +522,17 @@
 	//Security (Red)
 		counter = 0
 		jobs += "<table cellpadding='1' cellspacing='0' width='100%'>"
-		jobs += "<tr bgcolor='ffddf0'><th colspan='[length(security_positions)]'><a href='?src=[UID()];jobban3=securitydept;jobban4=\ref[M]'>Security Positions</a></th></tr><tr align='center'>"
+		jobs += "<tr bgcolor='ffddf0'><th colspan='[length(security_positions)]'><a href='?src=[UID()];jobban3=securitydept;jobban4=[M.UID()]'>Security Positions</a></th></tr><tr align='center'>"
 		for(var/jobPos in security_positions)
 			if(!jobPos)	continue
 			var/datum/job/job = job_master.GetJob(jobPos)
 			if(!job) continue
 
 			if(jobban_isbanned(M, job.title))
-				jobs += "<td width='20%'><a href='?src=[UID()];jobban3=[job.title];jobban4=\ref[M]'><font color=red>[replacetext(job.title, " ", "&nbsp")]</font></a></td>"
+				jobs += "<td width='20%'><a href='?src=[UID()];jobban3=[job.title];jobban4=[M.UID()]'><font color=red>[replacetext(job.title, " ", "&nbsp")]</font></a></td>"
 				counter++
 			else
-				jobs += "<td width='20%'><a href='?src=[UID()];jobban3=[job.title];jobban4=\ref[M]'>[replacetext(job.title, " ", "&nbsp")]</a></td>"
+				jobs += "<td width='20%'><a href='?src=[UID()];jobban3=[job.title];jobban4=[M.UID()]'>[replacetext(job.title, " ", "&nbsp")]</a></td>"
 				counter++
 
 			if(counter >= 5) //So things dont get squiiiiished!
@@ -543,17 +543,17 @@
 	//Engineering (Yellow)
 		counter = 0
 		jobs += "<table cellpadding='1' cellspacing='0' width='100%'>"
-		jobs += "<tr bgcolor='fff5cc'><th colspan='[length(engineering_positions)]'><a href='?src=[UID()];jobban3=engineeringdept;jobban4=\ref[M]'>Engineering Positions</a></th></tr><tr align='center'>"
+		jobs += "<tr bgcolor='fff5cc'><th colspan='[length(engineering_positions)]'><a href='?src=[UID()];jobban3=engineeringdept;jobban4=[M.UID()]'>Engineering Positions</a></th></tr><tr align='center'>"
 		for(var/jobPos in engineering_positions)
 			if(!jobPos)	continue
 			var/datum/job/job = job_master.GetJob(jobPos)
 			if(!job) continue
 
 			if(jobban_isbanned(M, job.title))
-				jobs += "<td width='20%'><a href='?src=[UID()];jobban3=[job.title];jobban4=\ref[M]'><font color=red>[replacetext(job.title, " ", "&nbsp")]</font></a></td>"
+				jobs += "<td width='20%'><a href='?src=[UID()];jobban3=[job.title];jobban4=[M.UID()]'><font color=red>[replacetext(job.title, " ", "&nbsp")]</font></a></td>"
 				counter++
 			else
-				jobs += "<td width='20%'><a href='?src=[UID()];jobban3=[job.title];jobban4=\ref[M]'>[replacetext(job.title, " ", "&nbsp")]</a></td>"
+				jobs += "<td width='20%'><a href='?src=[UID()];jobban3=[job.title];jobban4=[M.UID()]'>[replacetext(job.title, " ", "&nbsp")]</a></td>"
 				counter++
 
 			if(counter >= 5) //So things dont get squiiiiished!
@@ -564,17 +564,17 @@
 	//Medical (White)
 		counter = 0
 		jobs += "<table cellpadding='1' cellspacing='0' width='100%'>"
-		jobs += "<tr bgcolor='ffeef0'><th colspan='[length(medical_positions)]'><a href='?src=[UID()];jobban3=medicaldept;jobban4=\ref[M]'>Medical Positions</a></th></tr><tr align='center'>"
+		jobs += "<tr bgcolor='ffeef0'><th colspan='[length(medical_positions)]'><a href='?src=[UID()];jobban3=medicaldept;jobban4=[M.UID()]'>Medical Positions</a></th></tr><tr align='center'>"
 		for(var/jobPos in medical_positions)
 			if(!jobPos)	continue
 			var/datum/job/job = job_master.GetJob(jobPos)
 			if(!job) continue
 
 			if(jobban_isbanned(M, job.title))
-				jobs += "<td width='20%'><a href='?src=[UID()];jobban3=[job.title];jobban4=\ref[M]'><font color=red>[replacetext(job.title, " ", "&nbsp")]</font></a></td>"
+				jobs += "<td width='20%'><a href='?src=[UID()];jobban3=[job.title];jobban4=[M.UID()]'><font color=red>[replacetext(job.title, " ", "&nbsp")]</font></a></td>"
 				counter++
 			else
-				jobs += "<td width='20%'><a href='?src=[UID()];jobban3=[job.title];jobban4=\ref[M]'>[replacetext(job.title, " ", "&nbsp")]</a></td>"
+				jobs += "<td width='20%'><a href='?src=[UID()];jobban3=[job.title];jobban4=[M.UID()]'>[replacetext(job.title, " ", "&nbsp")]</a></td>"
 				counter++
 
 			if(counter >= 5) //So things dont get squiiiiished!
@@ -585,17 +585,17 @@
 	//Science (Purple)
 		counter = 0
 		jobs += "<table cellpadding='1' cellspacing='0' width='100%'>"
-		jobs += "<tr bgcolor='e79fff'><th colspan='[length(science_positions)]'><a href='?src=[UID()];jobban3=sciencedept;jobban4=\ref[M]'>Science Positions</a></th></tr><tr align='center'>"
+		jobs += "<tr bgcolor='e79fff'><th colspan='[length(science_positions)]'><a href='?src=[UID()];jobban3=sciencedept;jobban4=[M.UID()]'>Science Positions</a></th></tr><tr align='center'>"
 		for(var/jobPos in science_positions)
 			if(!jobPos)	continue
 			var/datum/job/job = job_master.GetJob(jobPos)
 			if(!job) continue
 
 			if(jobban_isbanned(M, job.title))
-				jobs += "<td width='20%'><a href='?src=[UID()];jobban3=[job.title];jobban4=\ref[M]'><font color=red>[replacetext(job.title, " ", "&nbsp")]</font></a></td>"
+				jobs += "<td width='20%'><a href='?src=[UID()];jobban3=[job.title];jobban4=[M.UID()]'><font color=red>[replacetext(job.title, " ", "&nbsp")]</font></a></td>"
 				counter++
 			else
-				jobs += "<td width='20%'><a href='?src=[UID()];jobban3=[job.title];jobban4=\ref[M]'>[replacetext(job.title, " ", "&nbsp")]</a></td>"
+				jobs += "<td width='20%'><a href='?src=[UID()];jobban3=[job.title];jobban4=[M.UID()]'>[replacetext(job.title, " ", "&nbsp")]</a></td>"
 				counter++
 
 			if(counter >= 5) //So things dont get squiiiiished!
@@ -606,17 +606,17 @@
 	//Support (Grey)
 		counter = 0
 		jobs += "<table cellpadding='1' cellspacing='0' width='100%'>"
-		jobs += "<tr bgcolor='dddddd'><th colspan='[length(support_positions)]'><a href='?src=[UID()];jobban3=supportdept;jobban4=\ref[M]'>Support Positions</a></th></tr><tr align='center'>"
+		jobs += "<tr bgcolor='dddddd'><th colspan='[length(support_positions)]'><a href='?src=[UID()];jobban3=supportdept;jobban4=[M.UID()]'>Support Positions</a></th></tr><tr align='center'>"
 		for(var/jobPos in support_positions)
 			if(!jobPos)	continue
 			var/datum/job/job = job_master.GetJob(jobPos)
 			if(!job) continue
 
 			if(jobban_isbanned(M, job.title))
-				jobs += "<td width='20%'><a href='?src=[UID()];jobban3=[job.title];jobban4=\ref[M]'><font color=red>[replacetext(job.title, " ", "&nbsp")]</font></a></td>"
+				jobs += "<td width='20%'><a href='?src=[UID()];jobban3=[job.title];jobban4=[M.UID()]'><font color=red>[replacetext(job.title, " ", "&nbsp")]</font></a></td>"
 				counter++
 			else
-				jobs += "<td width='20%'><a href='?src=[UID()];jobban3=[job.title];jobban4=\ref[M]'>[replacetext(job.title, " ", "&nbsp")]</a></td>"
+				jobs += "<td width='20%'><a href='?src=[UID()];jobban3=[job.title];jobban4=[M.UID()]'>[replacetext(job.title, " ", "&nbsp")]</a></td>"
 				counter++
 
 			if(counter >= 5) //So things dont get squiiiiished!
@@ -627,17 +627,17 @@
 	//Non-Human (Green)
 		counter = 0
 		jobs += "<table cellpadding='1' cellspacing='0' width='100%'>"
-		jobs += "<tr bgcolor='ccffcc'><th colspan='[length(nonhuman_positions)+1]'><a href='?src=[UID()];jobban3=nonhumandept;jobban4=\ref[M]'>Non-human Positions</a></th></tr><tr align='center'>"
+		jobs += "<tr bgcolor='ccffcc'><th colspan='[length(nonhuman_positions)+1]'><a href='?src=[UID()];jobban3=nonhumandept;jobban4=[M.UID()]'>Non-human Positions</a></th></tr><tr align='center'>"
 		for(var/jobPos in nonhuman_positions)
 			if(!jobPos)	continue
 			var/datum/job/job = job_master.GetJob(jobPos)
 			if(!job) continue
 
 			if(jobban_isbanned(M, job.title))
-				jobs += "<td width='20%'><a href='?src=[UID()];jobban3=[job.title];jobban4=\ref[M]'><font color=red>[replacetext(job.title, " ", "&nbsp")]</font></a></td>"
+				jobs += "<td width='20%'><a href='?src=[UID()];jobban3=[job.title];jobban4=[M.UID()]'><font color=red>[replacetext(job.title, " ", "&nbsp")]</font></a></td>"
 				counter++
 			else
-				jobs += "<td width='20%'><a href='?src=[UID()];jobban3=[job.title];jobban4=\ref[M]'>[replacetext(job.title, " ", "&nbsp")]</a></td>"
+				jobs += "<td width='20%'><a href='?src=[UID()];jobban3=[job.title];jobban4=[M.UID()]'>[replacetext(job.title, " ", "&nbsp")]</a></td>"
 				counter++
 
 			if(counter >= 5) //So things dont get squiiiiished!
@@ -646,29 +646,29 @@
 
 		//Drone
 		if(jobban_isbanned(M, "Drone"))
-			jobs += "<td width='20%'><a href='?src=[UID()];jobban3=Drone;jobban4=\ref[M]'><font color=red>Drone</font></a></td>"
+			jobs += "<td width='20%'><a href='?src=[UID()];jobban3=Drone;jobban4=[M.UID()]'><font color=red>Drone</font></a></td>"
 		else
-			jobs += "<td width='20%'><a href='?src=[UID()];jobban3=Drone;jobban4=\ref[M]'>Drone</a></td>"
+			jobs += "<td width='20%'><a href='?src=[UID()];jobban3=Drone;jobban4=[M.UID()]'>Drone</a></td>"
 
 		//pAI
 		if(jobban_isbanned(M, "pAI"))
-			jobs += "<td width='20%'><a href='?src=[UID()];jobban3=pAI;jobban4=\ref[M]'><font color=red>pAI</font></a></td>"
+			jobs += "<td width='20%'><a href='?src=[UID()];jobban3=pAI;jobban4=[M.UID()]'><font color=red>pAI</font></a></td>"
 		else
-			jobs += "<td width='20%'><a href='?src=[UID()];jobban3=pAI;jobban4=\ref[M]'>pAI</a></td>"
+			jobs += "<td width='20%'><a href='?src=[UID()];jobban3=pAI;jobban4=[M.UID()]'>pAI</a></td>"
 
 		jobs += "</tr></table>"
 
 	//Antagonist (Orange)
 		var/isbanned_dept = jobban_isbanned(M, "Syndicate")
 		jobs += "<table cellpadding='1' cellspacing='0' width='100%'>"
-		jobs += "<tr bgcolor='ffeeaa'><th colspan='10'><a href='?src=[UID()];jobban3=Syndicate;jobban4=\ref[M]'>Antagonist Positions</a></th></tr><tr align='center'>"
+		jobs += "<tr bgcolor='ffeeaa'><th colspan='10'><a href='?src=[UID()];jobban3=Syndicate;jobban4=[M.UID()]'>Antagonist Positions</a></th></tr><tr align='center'>"
 
 		counter = 0
 		for(var/role in antag_roles)
 			if(jobban_isbanned(M, role) || isbanned_dept)
-				jobs += "<td width='20%'><a href='?src=[UID()];jobban3=[role];jobban4=\ref[M]'><font color=red>[replacetext(role, " ", "&nbsp")]</font></a></td>"
+				jobs += "<td width='20%'><a href='?src=[UID()];jobban3=[role];jobban4=[M.UID()]'><font color=red>[replacetext(role, " ", "&nbsp")]</font></a></td>"
 			else
-				jobs += "<td width='20%'><a href='?src=[UID()];jobban3=[role];jobban4=\ref[M]'>[replacetext(role, " ", "&nbsp")]</a></td>"
+				jobs += "<td width='20%'><a href='?src=[UID()];jobban3=[role];jobban4=[M.UID()]'>[replacetext(role, " ", "&nbsp")]</a></td>"
 			counter++
 
 			if(counter >= 5) //So things dont get squiiiiished!
@@ -683,9 +683,9 @@
 		counter = 0
 		for(var/role in other_roles)
 			if(jobban_isbanned(M, role) || isbanned_dept)
-				jobs += "<td width='20%'><a href='?src=[UID()];jobban3=[role];jobban4=\ref[M]'><font color=red>[replacetext(role, " ", "&nbsp")]</font></a></td>"
+				jobs += "<td width='20%'><a href='?src=[UID()];jobban3=[role];jobban4=[M.UID()]'><font color=red>[replacetext(role, " ", "&nbsp")]</font></a></td>"
 			else
-				jobs += "<td width='20%'><a href='?src=[UID()];jobban3=[role];jobban4=\ref[M]'>[replacetext(role, " ", "&nbsp")]</a></td>"
+				jobs += "<td width='20%'><a href='?src=[UID()];jobban3=[role];jobban4=[M.UID()]'>[replacetext(role, " ", "&nbsp")]</a></td>"
 			counter++
 
 			if(counter >= 5) //So things dont get squiiiiished!
@@ -696,17 +696,17 @@
 	//Whitelisted positions
 		counter = 0
 		jobs += "<table cellpadding='1' cellspacing='0' width='100%'>"
-		jobs += "<tr bgcolor='dddddd'><th colspan='[length(whitelisted_positions)]'><a href='?src=[UID()];jobban3=whitelistdept;jobban4=\ref[M]'>Whitelisted Positions</a></th></tr><tr align='center'>"
+		jobs += "<tr bgcolor='dddddd'><th colspan='[length(whitelisted_positions)]'><a href='?src=[UID()];jobban3=whitelistdept;jobban4=[M.UID()]'>Whitelisted Positions</a></th></tr><tr align='center'>"
 		for(var/jobPos in whitelisted_positions)
 			if(!jobPos)	continue
 			var/datum/job/job = job_master.GetJob(jobPos)
 			if(!job) continue
 
 			if(jobban_isbanned(M, job.title))
-				jobs += "<td width='20%'><a href='?src=[UID()];jobban3=[job.title];jobban4=\ref[M]'><font color=red>[replacetext(job.title, " ", "&nbsp")]</font></a></td>"
+				jobs += "<td width='20%'><a href='?src=[UID()];jobban3=[job.title];jobban4=[M.UID()]'><font color=red>[replacetext(job.title, " ", "&nbsp")]</font></a></td>"
 				counter++
 			else
-				jobs += "<td width='20%'><a href='?src=[UID()];jobban3=[job.title];jobban4=\ref[M]'>[replacetext(job.title, " ", "&nbsp")]</a></td>"
+				jobs += "<td width='20%'><a href='?src=[UID()];jobban3=[job.title];jobban4=[M.UID()]'>[replacetext(job.title, " ", "&nbsp")]</a></td>"
 				counter++
 
 			if(counter >= 5) //So things dont get squiiiiished!
@@ -723,7 +723,7 @@
 	else if(href_list["jobban3"])
 		if(!check_rights(R_BAN))	return
 
-		var/mob/M = locate(href_list["jobban4"])
+		var/mob/M = locateUID(href_list["jobban4"])
 		if(!ismob(M))
 			to_chat(usr, "This can only be used on instances of type /mob")
 			return
@@ -885,10 +885,10 @@
 		return 0 //we didn't do anything!
 
 	else if(href_list["boot2"])
-		var/mob/M = locate(href_list["boot2"])
+		var/mob/M = locateUID(href_list["boot2"])
 		if(ismob(M))
 			if(M.client && M.client.holder && (M.client.holder.rights & R_BAN))
-				to_chat(src, "<span class='warning'>[key_name_admin(M)] cannot be kicked from the server.</span>")
+				to_chat(usr, "<span class='warning'>[key_name_admin(M)] cannot be kicked from the server.</span>")
 				return
 			to_chat(M, "<span class='warning'>You have been kicked from the server</span>")
 			log_admin("[key_name(usr)] booted [key_name(M)].")
@@ -958,7 +958,7 @@
 	else if(href_list["newban"])
 		if(!check_rights(R_BAN))	return
 
-		var/mob/M = locate(href_list["newban"])
+		var/mob/M = locateUID(href_list["newban"])
 		if(!ismob(M)) return
 
 		switch(alert("Temporary Ban?",,"Yes","No", "Cancel"))
@@ -1016,7 +1016,7 @@
 
 	//Watchlist
 	else if(href_list["watchadd"])
-		var/target_ckey = locate(href_list["watchadd"])
+		var/target_ckey = href_list["watchadd"]
 		usr.client.watchlist_add(target_ckey)
 
 	else if(href_list["watchremove"])
@@ -1062,7 +1062,7 @@
 		if(!check_rights(R_ADMIN|R_MOD))
 			return
 
-		var/mob/M = locate(href_list["mute"])
+		var/mob/M = locateUID(href_list["mute"])
 		if(!ismob(M))	return
 		if(!M.client)	return
 
@@ -1128,7 +1128,7 @@
 	else if(href_list["monkeyone"])
 		if(!check_rights(R_SPAWN))	return
 
-		var/mob/living/carbon/human/H = locate(href_list["monkeyone"])
+		var/mob/living/carbon/human/H = locateUID(href_list["monkeyone"])
 		if(!istype(H))
 			to_chat(usr, "This can only be used on instances of type /mob/living/carbon/human")
 			return
@@ -1143,7 +1143,7 @@
 	else if(href_list["corgione"])
 		if(!check_rights(R_SPAWN))	return
 
-		var/mob/living/carbon/human/H = locate(href_list["corgione"])
+		var/mob/living/carbon/human/H = locateUID(href_list["corgione"])
 		if(!istype(H))
 			to_chat(usr, "This can only be used on instances of type /mob/living/carbon/human")
 			return
@@ -1158,7 +1158,7 @@
 	else if(href_list["makePAI"])
 		if(!check_rights(R_SPAWN))	return
 
-		var/mob/living/carbon/human/H = locate(href_list["makePAI"])
+		var/mob/living/carbon/human/H = locateUID(href_list["makePAI"])
 		if(!istype(H))
 			to_chat(usr, "This can only be used on instances of type /mob/living/carbon/human")
 			return
@@ -1182,7 +1182,7 @@
 	else if(href_list["forcespeech"])
 		if(!check_rights(R_SERVER|R_EVENT))	return
 
-		var/mob/M = locate(href_list["forcespeech"])
+		var/mob/M = locateUID(href_list["forcespeech"])
 		if(!ismob(M))
 			to_chat(usr, "this can only be used on instances of type /mob")
 
@@ -1199,7 +1199,7 @@
 		if(alert(usr, "Send to admin prison for the round?", "Message", "Yes", "No") != "Yes")
 			return
 
-		var/mob/M = locate(href_list["sendtoprison"])
+		var/mob/M = locateUID(href_list["sendtoprison"])
 		if(!ismob(M))
 			to_chat(usr, "This can only be used on instances of type /mob")
 			return
@@ -1216,8 +1216,7 @@
 
 		//strip their stuff and stick it in the crate
 		for(var/obj/item/I in M)
-			M.unEquip(I)
-			if(I)
+			if(M.unEquip(I))
 				I.loc = locker
 				I.layer = initial(I.layer)
 				I.plane = initial(I.plane)
@@ -1243,7 +1242,7 @@
 		if(!check_rights(R_ADMIN))
 			return
 
-		var/mob/M = locate(href_list["sendbacktolobby"])
+		var/mob/M = locateUID(href_list["sendbacktolobby"])
 
 		if(!isobserver(M))
 			to_chat(usr, "<span class='notice'>You can only send ghost players back to the Lobby.</span>")
@@ -1260,7 +1259,7 @@
 		message_admins("[key_name_admin(usr)] has sent [key_name_admin(M)] back to the Lobby.")
 
 		var/mob/new_player/NP = new()
-		non_respawnable_keys -= M.ckey
+		GLOB.non_respawnable_keys -= M.ckey
 		NP.ckey = M.ckey
 		qdel(M)
 
@@ -1270,7 +1269,7 @@
 		if(alert(usr, "Confirm?", "Message", "Yes", "No") != "Yes")
 			return
 
-		var/mob/M = locate(href_list["tdome1"])
+		var/mob/M = locateUID(href_list["tdome1"])
 		if(!ismob(M))
 			to_chat(usr, "This can only be used on instances of type /mob")
 			return
@@ -1300,7 +1299,7 @@
 		if(alert(usr, "Confirm?", "Message", "Yes", "No") != "Yes")
 			return
 
-		var/mob/M = locate(href_list["tdome2"])
+		var/mob/M = locateUID(href_list["tdome2"])
 		if(!ismob(M))
 			to_chat(usr, "This can only be used on instances of type /mob")
 			return
@@ -1330,7 +1329,7 @@
 		if(alert(usr, "Confirm?", "Message", "Yes", "No") != "Yes")
 			return
 
-		var/mob/M = locate(href_list["tdomeadmin"])
+		var/mob/M = locateUID(href_list["tdomeadmin"])
 		if(!ismob(M))
 			to_chat(usr, "This can only be used on instances of type /mob")
 			return
@@ -1352,7 +1351,7 @@
 		if(alert(usr, "Confirm?", "Message", "Yes", "No") != "Yes")
 			return
 
-		var/mob/M = locate(href_list["tdomeobserve"])
+		var/mob/M = locateUID(href_list["tdomeobserve"])
 		if(!ismob(M))
 			to_chat(usr, "This can only be used on instances of type /mob")
 			return
@@ -1386,7 +1385,7 @@
 		if(alert(usr, "Confirm?", "Message", "Yes", "No") != "Yes")
 			return
 
-		var/mob/M = locate(href_list["aroomwarp"])
+		var/mob/M = locateUID(href_list["aroomwarp"])
 		if(!ismob(M))
 			to_chat(usr, "This can only be used on instances of type /mob")
 			return
@@ -1406,7 +1405,7 @@
 	else if(href_list["revive"])
 		if(!check_rights(R_REJUVINATE))	return
 
-		var/mob/living/L = locate(href_list["revive"])
+		var/mob/living/L = locateUID(href_list["revive"])
 		if(!istype(L))
 			to_chat(usr, "This can only be used on instances of type /mob/living")
 			return
@@ -1418,7 +1417,7 @@
 	else if(href_list["makeai"])
 		if(!check_rights(R_SPAWN))	return
 
-		var/mob/living/carbon/human/H = locate(href_list["makeai"])
+		var/mob/living/carbon/human/H = locateUID(href_list["makeai"])
 		if(!istype(H))
 			to_chat(usr, "This can only be used on instances of type /mob/living/carbon/human")
 			return
@@ -1434,7 +1433,7 @@
 	else if(href_list["makealien"])
 		if(!check_rights(R_SPAWN))	return
 
-		var/mob/living/carbon/human/H = locate(href_list["makealien"])
+		var/mob/living/carbon/human/H = locateUID(href_list["makealien"])
 		if(!istype(H))
 			to_chat(usr, "This can only be used on instances of type /mob/living/carbon/human")
 			return
@@ -1446,7 +1445,7 @@
 	else if(href_list["makeslime"])
 		if(!check_rights(R_SPAWN))	return
 
-		var/mob/living/carbon/human/H = locate(href_list["makeslime"])
+		var/mob/living/carbon/human/H = locateUID(href_list["makeslime"])
 		if(!istype(H))
 			to_chat(usr, "This can only be used on instances of type /mob/living/carbon/human")
 			return
@@ -1458,7 +1457,7 @@
 	else if(href_list["makesuper"])
 		if(!check_rights(R_SPAWN))	return
 
-		var/mob/living/carbon/human/H = locate(href_list["makesuper"])
+		var/mob/living/carbon/human/H = locateUID(href_list["makesuper"])
 		if(!istype(H))
 			to_chat(usr, "This can only be used on instances of type /mob/living/carbon/human")
 			return
@@ -1471,7 +1470,7 @@
 	else if(href_list["makerobot"])
 		if(!check_rights(R_SPAWN))	return
 
-		var/mob/living/carbon/human/H = locate(href_list["makerobot"])
+		var/mob/living/carbon/human/H = locateUID(href_list["makerobot"])
 		if(!istype(H))
 			to_chat(usr, "This can only be used on instances of type /mob/living/carbon/human")
 			return
@@ -1483,7 +1482,7 @@
 	else if(href_list["makeanimal"])
 		if(!check_rights(R_SPAWN))	return
 
-		var/mob/M = locate(href_list["makeanimal"])
+		var/mob/M = locateUID(href_list["makeanimal"])
 		if(istype(M, /mob/new_player))
 			to_chat(usr, "This cannot be used on instances of type /mob/new_player")
 			return
@@ -1495,7 +1494,7 @@
 	else if(href_list["incarn_ghost"])
 		if(!check_rights(R_SPAWN)) return
 
-		var/mob/dead/observer/G = locate(href_list["incarn_ghost"])
+		var/mob/dead/observer/G = locateUID(href_list["incarn_ghost"])
 		if(!istype(G))
 			to_chat(usr, "This will only work on /mob/dead/observer")
 		log_admin("[key_name(G)] was incarnated by [key_name(src.owner)]")
@@ -1505,7 +1504,7 @@
 	else if(href_list["togmutate"])
 		if(!check_rights(R_SPAWN))	return
 
-		var/mob/living/carbon/human/H = locate(href_list["togmutate"])
+		var/mob/living/carbon/human/H = locateUID(href_list["togmutate"])
 		if(!istype(H))
 			to_chat(usr, "This can only be used on instances of type /mob/living/carbon/human")
 			return
@@ -1516,25 +1515,14 @@
 		//H.regenerate_icons()
 
 	else if(href_list["adminplayeropts"])
-		var/mob/M = locate(href_list["adminplayeropts"])
+		var/mob/M = locateUID(href_list["adminplayeropts"])
 		show_player_panel(M)
 
-	else if(href_list["adminplayerobservejump"])
-		if(!check_rights(R_ADMIN|R_MOD))
-			return
-
-		var/mob/M = locate(href_list["adminplayerobservejump"])
-
-		var/client/C = usr.client
-		if(!isobserver(usr))	C.admin_ghost()
-		sleep(2)
-		C.jumptomob(M)
-
 	else if(href_list["adminplayerobservefollow"])
 		if(!check_rights(R_ADMIN|R_MOD))
 			return
 
-		var/mob/M = locate(href_list["adminplayerobservefollow"])
+		var/mob/M = locateUID(href_list["adminplayerobservefollow"])
 
 		var/client/C = usr.client
 		if(!isobserver(usr))	C.admin_ghost()
@@ -1553,7 +1541,7 @@
 			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>"
-			for(var/client/X in admins)
+			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))
@@ -1584,7 +1572,7 @@
 			if (H.current)
 				to_chat(H.current, "<span class='danger'>[ticker.cultdat.entity_name]</span> murmurs, <span class='cultlarge'>[input]</span></span>")
 
-		for(var/mob/dead/observer/O in player_list)
+		for(var/mob/dead/observer/O in GLOB.player_list)
 			to_chat(O, "<span class='danger'>[ticker.cultdat.entity_name]</span> murmurs, <span class='cultlarge'>[input]</span></span>")
 
 		message_admins("Admin [key_name_admin(usr)] has talked with the Voice of [ticker.cultdat.entity_name].")
@@ -1606,13 +1594,13 @@
 		output_ai_laws()
 
 	else if(href_list["adminmoreinfo"])
-		var/mob/M = locate(href_list["adminmoreinfo"])
+		var/mob/M = locateUID(href_list["adminmoreinfo"])
 		admin_mob_info(M)
 
 	else if(href_list["adminspawncookie"])
 		if(!check_rights(R_ADMIN|R_EVENT))	return
 
-		var/mob/living/carbon/human/H = locate(href_list["adminspawncookie"])
+		var/mob/living/carbon/human/H = locateUID(href_list["adminspawncookie"])
 		if(!ishuman(H))
 			to_chat(usr, "This can only be used on instances of type /mob/living/carbon/human")
 			return
@@ -1636,7 +1624,7 @@
 	else if(href_list["BlueSpaceArtillery"])
 		if(!check_rights(R_ADMIN|R_EVENT))	return
 
-		var/mob/living/M = locate(href_list["BlueSpaceArtillery"])
+		var/mob/living/M = locateUID(href_list["BlueSpaceArtillery"])
 		if(!isliving(M))
 			to_chat(usr, "This can only be used on instances of type /mob/living")
 			return
@@ -1695,7 +1683,7 @@
 	else if(href_list["EvilFax"])
 		if(!check_rights(R_ADMIN))
 			return
-		var/mob/living/carbon/human/H = locate(href_list["EvilFax"])
+		var/mob/living/carbon/human/H = locateUID(href_list["EvilFax"])
 		if(!istype(H))
 			to_chat(usr, "This can only be used on instances of type /mob/living/carbon/human")
 			return
@@ -1918,7 +1906,7 @@
 			if("Crew Traitor")
 				logmsg = "crew traitor."
 				var/list/possible_traitors = list()
-				for(var/mob/living/player in living_mob_list)
+				for(var/mob/living/player in GLOB.living_mob_list)
 					if(player.client && player.mind && !player.mind.special_role && player.stat != DEAD && player != H)
 						if(ishuman(player))
 							if(player.client && (ROLE_TRAITOR in player.client.prefs.be_special) && !jobban_isbanned(player, ROLE_TRAITOR) && !jobban_isbanned(player, "Syndicate"))
@@ -1987,7 +1975,7 @@
 	else if(href_list["FaxReplyTemplate"])
 		if(!check_rights(R_ADMIN))
 			return
-		var/mob/living/carbon/human/H = locate(href_list["FaxReplyTemplate"])
+		var/mob/living/carbon/human/H = locateUID(href_list["FaxReplyTemplate"])
 		if(!istype(H))
 			to_chat(usr, "This can only be used on instances of type /mob/living/carbon/human")
 			return
@@ -1996,7 +1984,7 @@
 		P.name = "Central Command - paper"
 		var/stypes = list("Handle it yourselves!","Illegible fax","Fax not signed","Not Right Now","You are wasting our time", "Keep up the good work", "ERT Instructions")
 		var/stype = input(src.owner, "Which type of standard reply do you wish to send to [H]?","Choose your paperwork", "") as null|anything in stypes
-		var/tmsg = "<font face='Verdana' color='black'><center><img src = 'ntlogo.png'><BR><BR><BR><font size='4'><B>Nanotrasen Science Station Cyberiad</B></font><BR><BR><BR><font size='4'>NAS Trurl Communications Department Report</font></center><BR><BR>"
+		var/tmsg = "<font face='Verdana' color='black'><center><img src = 'ntlogo.png'><BR><BR><BR><font size='4'><B>Nanotrasen Science Station [using_map.station_short]</B></font><BR><BR><BR><font size='4'>NAS Trurl Communications Department Report</font></center><BR><BR>"
 		if(stype == "Handle it yourselves!")
 			tmsg += "Greetings, esteemed crewmember. Your fax has been <B><I>DECLINED</I></B> automatically by NAS Trurl Fax Registration.<BR><BR>Please proceed in accordance with Standard Operating Procedure and/or Space Law. You are fully trained to handle this situation without Central Command intervention.<BR><BR><i><small>This is an automatic message.</small>"
 		else if(stype == "Illegible fax")
@@ -2040,28 +2028,8 @@
 		log_admin("[key_name(src.owner)] sent [key_name(H)] a standard '[stype]' fax")
 		message_admins("[key_name_admin(src.owner)] replied to [key_name_admin(H)] with a standard '[stype]' fax")
 
-	else if(href_list["SyndicateReply"])
-		if(!check_rights(R_ADMIN))
-			return
-		var/mob/living/carbon/human/H = locate(href_list["SyndicateReply"])
-		if(!istype(H))
-			to_chat(usr, "This can only be used on instances of type /mob/living/carbon/human")
-			return
-		if(H.stat != 0)
-			to_chat(usr, "The person you are trying to contact is not conscious.")
-			return
-		if(!istype(H.l_ear, /obj/item/radio/headset) && !istype(H.r_ear, /obj/item/radio/headset))
-			to_chat(usr, "The person you are trying to contact is not wearing a headset")
-			return
-		var/input = input(src.owner, "Please enter a message to reply to [key_name(H)] via [H.p_their()] headset.","Outgoing message from The Syndicate", "")
-		if(!input)
-			return
-		to_chat(src.owner, "You sent [input] to [H] via a secure channel.")
-		log_admin("[src.owner] replied to [key_name(H)]'s Syndicate message with the message [input].")
-		to_chat(H, "You hear something crackle in your headset for a moment before a voice speaks.  \"Please stand by for a message from your benefactor.  Message as follows, agent. [input].  Message ends.\"")
-
 	else if(href_list["HONKReply"])
-		var/mob/living/carbon/human/H = locate(href_list["HONKReply"])
+		var/mob/living/carbon/human/H = locateUID(href_list["HONKReply"])
 		if(!istype(H))
 			to_chat(usr, "This can only be used on instances of type /mob/living/carbon/human")
 			return
@@ -2081,7 +2049,7 @@
 			return
 
 		if(alert(src.owner, "Accept or Deny ERT request?", "CentComm Response", "Accept", "Deny") == "Deny")
-			var/mob/living/carbon/human/H = locate(href_list["ErtReply"])
+			var/mob/living/carbon/human/H = locateUID(href_list["ErtReply"])
 			if(!istype(H))
 				to_chat(usr, "This can only be used on instances of type /mob/living/carbon/human")
 				return
@@ -2094,7 +2062,7 @@
 
 			var/input = input(src.owner, "Please enter a reason for denying [key_name(H)]'s ERT request.","Outgoing message from CentComm", "")
 			if(!input)	return
-			ert_request_answered = 1
+			ert_request_answered = TRUE
 			to_chat(src.owner, "You sent [input] to [H] via a secure channel.")
 			log_admin("[src.owner] denied [key_name(H)]'s ERT request with the message [input].")
 			to_chat(H, "You hear something crackle in your headset for a moment before a voice speaks.  \"Your ERT request has been denied for the following reasons: [input].  Message ends.\"")
@@ -2310,32 +2278,32 @@
 	else if(href_list["jumpto"])
 		if(!check_rights(R_ADMIN))	return
 
-		var/mob/M = locate(href_list["jumpto"])
+		var/mob/M = locateUID(href_list["jumpto"])
 		usr.client.jumptomob(M)
 
 	else if(href_list["getmob"])
 		if(!check_rights(R_ADMIN))	return
 
 		if(alert(usr, "Confirm?", "Message", "Yes", "No") != "Yes")	return
-		var/mob/M = locate(href_list["getmob"])
+		var/mob/M = locateUID(href_list["getmob"])
 		usr.client.Getmob(M)
 
 	else if(href_list["sendmob"])
 		if(!check_rights(R_ADMIN))	return
 
-		var/mob/M = locate(href_list["sendmob"])
+		var/mob/M = locateUID(href_list["sendmob"])
 		usr.client.sendmob(M)
 
 	else if(href_list["narrateto"])
 		if(!check_rights(R_ADMIN))	return
 
-		var/mob/M = locate(href_list["narrateto"])
+		var/mob/M = locateUID(href_list["narrateto"])
 		usr.client.cmd_admin_direct_narrate(M)
 
 	else if(href_list["subtlemessage"])
 		if(!check_rights(R_ADMIN))	return
 
-		var/mob/M = locate(href_list["subtlemessage"])
+		var/mob/M = locateUID(href_list["subtlemessage"])
 		usr.client.cmd_admin_subtle_message(M)
 
 	else if(href_list["traitor"])
@@ -2345,7 +2313,7 @@
 			alert("The game hasn't started yet!")
 			return
 
-		var/mob/M = locate(href_list["traitor"])
+		var/mob/M = locateUID(href_list["traitor"])
 		if(!ismob(M))
 			to_chat(usr, "This can only be used on instances of type /mob.")
 			return
@@ -2537,14 +2505,14 @@
 			if("monkey")
 				feedback_inc("admin_secrets_fun_used",1)
 				feedback_add_details("admin_secrets_fun_used","M")
-				for(var/mob/living/carbon/human/H in mob_list)
+				for(var/mob/living/carbon/human/H in GLOB.mob_list)
 					spawn(0)
 						H.monkeyize()
 				ok = 1
 			if("corgi")
 				feedback_inc("admin_secrets_fun_used",1)
 				feedback_add_details("admin_secrets_fun_used","M")
-				for(var/mob/living/carbon/human/H in mob_list)
+				for(var/mob/living/carbon/human/H in GLOB.mob_list)
 					spawn(0)
 						H.corgize()
 				ok = 1
@@ -2615,7 +2583,7 @@
 				feedback_inc("admin_secrets_fun_used",1)
 				feedback_add_details("admin_secrets_fun_used","PW")
 				message_admins("<span class='notice'>[key_name_admin(usr)] teleported all players to the prison station.</span>", 1)
-				for(var/mob/living/carbon/human/H in mob_list)
+				for(var/mob/living/carbon/human/H in GLOB.mob_list)
 					var/turf/loc = find_loc(H)
 					var/security = 0
 					if(!is_station_level(loc.z) || prisonwarped.Find(H))
@@ -2659,7 +2627,7 @@
 					return
 				feedback_inc("admin_secrets_fun_used",1)
 				feedback_add_details("admin_secrets_fun_used","TA([objective])")
-				for(var/mob/living/carbon/human/H in player_list)
+				for(var/mob/living/carbon/human/H in GLOB.player_list)
 					if(H.stat == 2 || !H.client || !H.mind) continue
 					if(is_special_character(H)) continue
 					//traitorize(H, objective, 0)
@@ -2672,7 +2640,7 @@
 					ticker.mode.greet_traitor(H.mind)
 					//ticker.mode.forge_traitor_objectives(H.mind)
 					ticker.mode.finalize_traitor(H.mind)
-				for(var/mob/living/silicon/A in player_list)
+				for(var/mob/living/silicon/A in GLOB.player_list)
 					ticker.mode.traitors += A.mind
 					A.mind.special_role = SPECIAL_ROLE_TRAITOR
 					var/datum/objective/new_objective = new
@@ -2709,7 +2677,7 @@
 				feedback_add_details("admin_secrets_fun_used","FL")
 				while(!usr.stat)
 //knock yourself out to stop the ghosts
-					for(var/mob/M in player_list)
+					for(var/mob/M in GLOB.player_list)
 						if(M.stat != 2 && prob(25))
 							var/area/AffectedArea = get_area(M)
 							if(AffectedArea.name != "Space" && AffectedArea.name != "Engine Walls" && AffectedArea.name != "Chemical Lab Test Chamber" && AffectedArea.name != "Escape Shuttle" && AffectedArea.name != "Arrival Area" && AffectedArea.name != "Arrival Shuttle" && AffectedArea.name != "start area" && AffectedArea.name != "Engine Combustion Chamber")
@@ -2732,7 +2700,7 @@
 									if(prob(25) && !W.anchored)
 										step_rand(W)
 					sleep(rand(100,1000))
-				for(var/mob/M in player_list)
+				for(var/mob/M in GLOB.player_list)
 					if(M.stat != 2)
 						M.show_message(text("<span class='notice'>The chilling wind suddenly stops...</span>"), 1)
 			if("lightout")
@@ -2745,13 +2713,13 @@
 				feedback_inc("admin_secrets_fun_used",1)
 				feedback_add_details("admin_secrets_fun_used","BO")
 				message_admins("[key_name_admin(usr)] broke all lights", 1)
-				for(var/obj/machinery/light/L in machines)
+				for(var/obj/machinery/light/L in GLOB.machines)
 					L.broken()
 			if("whiteout")
 				feedback_inc("admin_secrets_fun_used",1)
 				feedback_add_details("admin_secrets_fun_used","WO")
 				message_admins("[key_name_admin(usr)] fixed all lights", 1)
-				for(var/obj/machinery/light/L in machines)
+				for(var/obj/machinery/light/L in GLOB.machines)
 					L.fix()
 			if("floorlava")
 				feedback_inc("admin_secrets_fun_used", 1)
@@ -2780,7 +2748,7 @@
 			if("retardify")
 				feedback_inc("admin_secrets_fun_used",1)
 				feedback_add_details("admin_secrets_fun_used","RET")
-				for(var/mob/living/carbon/human/H in player_list)
+				for(var/mob/living/carbon/human/H in GLOB.player_list)
 					to_chat(H, "<span class='danger'>You suddenly feel stupid.</span>")
 					H.setBrainLoss(60)
 				message_admins("[key_name_admin(usr)] made everybody retarded")
@@ -2806,7 +2774,7 @@
 			if("eagles")//SCRAW
 				feedback_inc("admin_secrets_fun_used",1)
 				feedback_add_details("admin_secrets_fun_used","EgL")
-				for(var/obj/machinery/door/airlock/W in airlocks)
+				for(var/obj/machinery/door/airlock/W in GLOB.airlocks)
 					if(is_station_level(W.z) && !istype(get_area(W), /area/bridge) && !istype(get_area(W), /area/crew_quarters) && !istype(get_area(W), /area/security/prison))
 						W.req_access = list()
 				message_admins("[key_name_admin(usr)] activated Egalitarian Station mode")
@@ -2887,21 +2855,21 @@
 			if("moveminingshuttle")
 				feedback_inc("admin_secrets_fun_used",1)
 				feedback_add_details("admin_secrets_fun_used","ShM")
-				if(!shuttle_master.toggleShuttle("mining","mining_home","mining_away"))
+				if(!SSshuttle.toggleShuttle("mining","mining_home","mining_away"))
 					message_admins("[key_name_admin(usr)] moved mining shuttle")
 					log_admin("[key_name(usr)] moved the mining shuttle")
 
 			if("movelaborshuttle")
 				feedback_inc("admin_secrets_fun_used",1)
 				feedback_add_details("admin_secrets_fun_used","ShL")
-				if(!shuttle_master.toggleShuttle("laborcamp","laborcamp_home","laborcamp_away"))
+				if(!SSshuttle.toggleShuttle("laborcamp","laborcamp_home","laborcamp_away"))
 					message_admins("[key_name_admin(usr)] moved labor shuttle")
 					log_admin("[key_name(usr)] moved the labor shuttle")
 
 			if("moveferry")
 				feedback_inc("admin_secrets_fun_used",1)
 				feedback_add_details("admin_secrets_fun_used","ShF")
-				if(!shuttle_master.toggleShuttle("ferry","ferry_home","ferry_away"))
+				if(!SSshuttle.toggleShuttle("ferry","ferry_home","ferry_away"))
 					message_admins("[key_name_admin(usr)] moved the centcom ferry")
 					log_admin("[key_name(usr)] moved the centcom ferry")
 
@@ -2946,7 +2914,7 @@
 			if("manifest")
 				var/dat = "<B>Showing Crew Manifest.</B><HR>"
 				dat += "<table cellspacing=5><tr><th>Name</th><th>Position</th></tr>"
-				for(var/mob/living/carbon/human/H in mob_list)
+				for(var/mob/living/carbon/human/H in GLOB.mob_list)
 					if(H.ckey)
 						dat += text("<tr><td>[]</td><td>[]</td></tr>", H.name, H.get_assignment())
 				dat += "</table>"
@@ -2956,7 +2924,7 @@
 			if("DNA")
 				var/dat = "<B>Showing DNA from blood.</B><HR>"
 				dat += "<table cellspacing=5><tr><th>Name</th><th>DNA</th><th>Blood Type</th></tr>"
-				for(var/mob/living/carbon/human/H in mob_list)
+				for(var/mob/living/carbon/human/H in GLOB.mob_list)
 					if(H.dna && H.ckey)
 						dat += "<tr><td>[H]</td><td>[H.dna.unique_enzymes]</td><td>[H.b_type]</td></tr>"
 				dat += "</table>"
@@ -2964,7 +2932,7 @@
 			if("fingerprints")
 				var/dat = "<B>Showing Fingerprints.</B><HR>"
 				dat += "<table cellspacing=5><tr><th>Name</th><th>Fingerprints</th></tr>"
-				for(var/mob/living/carbon/human/H in mob_list)
+				for(var/mob/living/carbon/human/H in GLOB.mob_list)
 					if(H.ckey)
 						if(H.dna && H.dna.uni_identity)
 							dat += "<tr><td>[H]</td><td>[md5(H.dna.uni_identity)]</td></tr>"
@@ -3010,12 +2978,12 @@
 					dat += "No-one has done anything this round!"
 				usr << browse(dat, "window=admin_log")
 			if("maint_access_brig")
-				for(var/obj/machinery/door/airlock/maintenance/M in airlocks)
+				for(var/obj/machinery/door/airlock/maintenance/M in GLOB.airlocks)
 					if(access_maint_tunnels in M.req_access)
 						M.req_access = list(access_brig)
 				message_admins("[key_name_admin(usr)] made all maint doors brig access-only.")
 			if("maint_access_engiebrig")
-				for(var/obj/machinery/door/airlock/maintenance/M in airlocks)
+				for(var/obj/machinery/door/airlock/maintenance/M in GLOB.airlocks)
 					if(access_maint_tunnels in M.req_access)
 						M.req_access = list()
 						M.req_one_access = list(access_brig,access_engine)
@@ -3249,12 +3217,12 @@
 				return 1
 
 	else if(href_list["viewruntime"])
-		var/datum/ErrorViewer/error_viewer = locate(href_list["viewruntime"])
+		var/datum/ErrorViewer/error_viewer = locateUID(href_list["viewruntime"])
 		if(!istype(error_viewer))
 			to_chat(usr, "<span class='warning'>That runtime viewer no longer exists.</span>")
 			return
 		if(href_list["viewruntime_backto"])
-			error_viewer.showTo(usr, locate(href_list["viewruntime_backto"]), href_list["viewruntime_linear"])
+			error_viewer.showTo(usr, locateUID(href_list["viewruntime_backto"]), href_list["viewruntime_linear"])
 		else
 			error_viewer.showTo(usr, null, href_list["viewruntime_linear"])
 
@@ -3392,19 +3360,13 @@
 /proc/admin_jump_link(var/atom/target)
 	if(!target) return
 	// The way admin jump links handle their src is weirdly inconsistent...
-	var/source = "_src_=holder"
 
+	. = ADMIN_FLW(target,"FLW")
 	if(isAI(target)) // AI core/eye follow links
 		var/mob/living/silicon/ai/A = target
-		. = "<A HREF='?[source];adminplayerobservefollow=\ref[target]'>FLW</A>"
 		if(A.client && A.eyeobj) // No point following clientless AI eyes
-			. += "|<A HREF='?[source];adminplayerobservefollow=\ref[A.eyeobj]'>EYE</A>"
-		return
+			. += "|[ADMIN_FLW(A.eyeobj,"EYE")]"
 	else if(istype(target, /mob/dead/observer))
 		var/mob/dead/observer/O = target
-		. = "<A HREF='?[source];adminplayerobservefollow=\ref[target]'>FLW</A>"
 		if(O.mind && O.mind.current)
-			. += "|<A HREF='?[source];adminplayerobservefollow=\ref[O.mind.current]'>BDY</A>"
-		return
-	else
-		return "<A HREF='?[source];adminplayerobservefollow=\ref[target]'>FLW</A>"
+			. += "|[ADMIN_FLW(O.mind.current,"BDY")]"

code/modules/admin/verbs/SDQL2/SDQL_2_parser.dm

@@ -60,7 +60,7 @@
 
 /datum/SDQL_parser/proc/parse_error(error_message)
 	error = 1
-	to_chat(usr, "<span class='danger'>SQDL2 Parsing Error: [error_message]</span>")
+	to_chat(usr, "<span class='danger'>SDQL2 Parsing Error: [error_message]</span>")
 	return query.len + 1
 
 /datum/SDQL_parser/proc/parse()

code/modules/admin/verbs/adminhelp.dm

@@ -38,7 +38,7 @@ var/list/adminhelp_ignored_words = list("unknown","the","a","an","of","monkey","
 	var/list/surnames = list()
 	var/list/forenames = list()
 	var/list/ckeys = list()
-	for(var/mob/M in mob_list)
+	for(var/mob/M in GLOB.mob_list)
 		var/list/indexing = list(M.real_name, M.name)
 		if(M.mind)	indexing += M.mind.name
 
@@ -86,15 +86,12 @@ var/list/adminhelp_ignored_words = list("unknown","the","a","an","of","monkey","
 
 	if(!mob)	return						//this doesn't happen
 
-	var/ref_mob = "\ref[mob]"
-	var/ref_client = "\ref[src]"
-
 	//send this msg to all admins
 	var/admin_number_afk = 0
 	var/list/mentorholders = list()
 	var/list/modholders = list()
 	var/list/adminholders = list()
-	for(var/client/X in admins)
+	for(var/client/X in GLOB.admins)
 		if(check_rights(R_ADMIN, 0, X.mob))
 			if(X.is_afk())
 				admin_number_afk++
@@ -109,7 +106,7 @@ var/list/adminhelp_ignored_words = list("unknown","the","a","an","of","monkey","
 
 	switch(selected_type)
 		if("Mentorhelp")
-			msg = "<span class='mentorhelp'>[selected_type]: </span><span class='boldnotice'>[key_name(src, TRUE, selected_type)] (<A HREF='?_src_=holder;adminmoreinfo=[ref_mob]'>?</A>) (<A HREF='?_src_=holder;adminplayeropts=[ref_mob]'>PP</A>) (<A HREF='?_src_=vars;Vars=[mob.UID()]'>VV</A>) (<A HREF='?_src_=holder;subtlemessage=[ref_mob]'>SM</A>) ([admin_jump_link(mob)]) (<A HREF='?_src_=holder;check_antagonist=1'>CA</A>) (<A HREF='?_src_=holder;rejectadminhelp=[ref_client]'>REJT</A>) [ai_found ? " (<A HREF='?_src_=holder;adminchecklaws=[ref_mob]'>CL</A>)" : ""] (<A HREF='?_src_=holder;take_question=[mob.UID()];is_mhelp=1'>TAKE</A>) :</span> <span class='mentorhelp'>[msg]</span>"
+			msg = "<span class='mentorhelp'>[selected_type]: </span><span class='boldnotice'>[key_name(src, TRUE, selected_type)] ([ADMIN_QUE(mob,"?")]) ([ADMIN_PP(mob,"PP")]) ([ADMIN_VV(mob,"VV")]) ([ADMIN_SM(mob,"SM")]) ([admin_jump_link(mob)]) (<A HREF='?_src_=holder;check_antagonist=1'>CA</A>) (<A HREF='?_src_=holder;rejectadminhelp=[UID()]'>REJT</A>) [ai_found ? " (<A HREF='?_src_=holder;adminchecklaws=[mob.UID()]'>CL</A>)" : ""] (<A HREF='?_src_=holder;take_question=[mob.UID()];is_mhelp=1'>TAKE</A>) :</span> <span class='mentorhelp'>[msg]</span>"
 			for(var/client/X in mentorholders + modholders + adminholders)
 				if(X.prefs.sound & SOUND_ADMINHELP)
 					X << 'sound/effects/adminhelp.ogg'
@@ -117,15 +114,15 @@ var/list/adminhelp_ignored_words = list("unknown","the","a","an","of","monkey","
 		if("Adminhelp")
 			var/ticketNum // Holder for the ticket number
 			var/prunedmsg ="[usr.client]: [msg]" // Message without links
-			if(globAdminTicketHolder.checkForOpenTicket(usr.client)) // If user already has an open ticket
-				var/datum/admin_ticket/T = globAdminTicketHolder.checkForOpenTicket(usr.client) // Make T equal to the ticket they have open
+			if(SStickets.checkForOpenTicket(usr)) // If user already has an open ticket
+				var/datum/admin_ticket/T = SStickets.checkForOpenTicket(usr) // Make T equal to the ticket they have open
 				ticketNum = T.ticketNum // ticketNum is the number of their ticket.
 				T.addResponse(usr.client, msg)
 			else
-				ticketNum = globAdminTicketHolder.getTicketCounter() // ticketNum is the ticket ready to be assigned.
-			msg = "<span class='adminhelp'>[selected_type]: </span><span class='boldnotice'>[key_name(src, TRUE, selected_type)] (<A HREF='?_src_=holder;adminmoreinfo=[ref_mob]'>?</A>) (<A HREF='?_src_=holder;adminplayeropts=[ref_mob]'>PP</A>) (<A HREF='?_src_=vars;Vars=[mob.UID()]'>VV</A>) (<A HREF='?_src_=holder;subtlemessage=[ref_mob]'>SM</A>) ([admin_jump_link(mob)]) (<A HREF='?_src_=holder;check_antagonist=1'>CA</A>) (<A HREF='?_src_=holder;openadminticket=[ticketNum]'>TICKET</A>) [ai_found ? " (<A HREF='?_src_=holder;adminchecklaws=[ref_mob]'>CL</A>)" : ""](<A HREF='?_src_=holder;take_question=[mob.UID()]'>TAKE</A>) :</span> <span class='adminhelp'>[msg]</span>"
+				ticketNum = SStickets.getTicketCounter() // ticketNum is the ticket ready to be assigned.
+			msg = "<span class='adminhelp'>[selected_type]: </span><span class='boldnotice'>[key_name(src, TRUE, selected_type)] ([ADMIN_QUE(mob,"?")]) ([ADMIN_PP(mob,"PP")]) ([ADMIN_VV(mob,"VV")]) ([ADMIN_SM(mob,"SM")]) ([admin_jump_link(mob)]) (<A HREF='?_src_=holder;check_antagonist=1'>CA</A>) (<A HREF='?_src_=holder;openadminticket=[ticketNum]'>TICKET</A>) [ai_found ? " (<A HREF='?_src_=holder;adminchecklaws=[mob.UID()]'>CL</A>)" : ""](<A HREF='?_src_=holder;take_question=[mob.UID()]'>TAKE</A>) :</span> <span class='adminhelp'>[msg]</span>"
 			//Open a new adminticket and inform the user.
-			globAdminTicketHolder.newTicket(src, prunedmsg, msg)
+			SStickets.newTicket(src, prunedmsg, msg)
 			for(var/client/X in modholders + adminholders)
 				if(X.prefs.sound & SOUND_ADMINHELP)
 					X << 'sound/effects/adminhelp.ogg'
@@ -152,7 +149,7 @@ var/list/adminhelp_ignored_words = list("unknown","the","a","an","of","monkey","
 	var/admin_number_afk = 0		//Holds the number of admins who are afk
 	var/admin_number_ignored = 0	//Holds the number of admins without +BAN (so admins who are not really admins)
 	var/admin_number_decrease = 0	//Holds the number of admins with are afk, ignored or both
-	for(var/client/X in admins)
+	for(var/client/X in GLOB.admins)
 		admin_number_total++;
 		var/invalid = 0
 		if(requiredflags != 0 && !check_rights_for(X, requiredflags))

code/modules/admin/verbs/adminjump.dm

@@ -42,7 +42,7 @@
 	feedback_add_details("admin_verb","JT") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
 	return
 
-/client/proc/jumptomob(var/mob/M in mob_list)
+/client/proc/jumptomob(var/mob/M in GLOB.mob_list)
 	set category = "Admin"
 	set name = "Jump to Mob"
 
@@ -83,7 +83,7 @@
 		return
 
 	var/list/keys = list()
-	for(var/mob/M in player_list)
+	for(var/mob/M in GLOB.player_list)
 		keys += M.client
 	var/selection = input("Please, select a player!", "Admin Jumping", null, null) as null|anything in sortKey(keys)
 	if(!selection)
@@ -98,7 +98,7 @@
 
 	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)
+/client/proc/Getmob(var/mob/M in GLOB.mob_list)
 	set category = "Admin"
 	set name = "Get Mob"
 	set desc = "Mob to teleport"
@@ -120,7 +120,7 @@
 		return
 
 	var/list/keys = list()
-	for(var/mob/M in player_list)
+	for(var/mob/M in GLOB.player_list)
 		keys += M.client
 	var/selection = input("Please, select a player!", "Admin Jumping", null, null) as null|anything in sortKey(keys)
 	if(!selection)
@@ -136,7 +136,7 @@
 		admin_forcemove(usr, 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 mob_list)
+/client/proc/sendmob(var/mob/M in GLOB.mob_list)
 	set category = "Admin"
 	set name = "Send Mob"
 

code/modules/admin/verbs/adminpm.dm

@@ -1,5 +1,5 @@
 //allows right clicking mobs to send an admin PM to their client, forwards the selected mob's client to cmd_admin_pm
-/client/proc/cmd_admin_pm_context(mob/M as mob in mob_list)
+/client/proc/cmd_admin_pm_context(mob/M as mob in GLOB.mob_list)
 	set category = null
 	set name = "Admin PM Mob"
 	if(!holder)
@@ -67,7 +67,7 @@
 	if(istext(whom))
 		if(cmptext(copytext(whom,1,2),"@"))
 			whom = findStealthKey(whom)
-		C = directory[whom]
+		C = GLOB.directory[whom]
 	else if(istype(whom,/client))
 		C = whom
 
@@ -167,7 +167,7 @@
 
 	log_admin("PM: [key_name(src)]->[key_name(C)]: [msg]")
 	//we don't use message_admins here because the sender/receiver might get it too
-	for(var/client/X in admins)
+	for(var/client/X in GLOB.admins)
 		//check client/X is an admin and isn't the sender or recipient
 		if(X == C || X == src)
 			continue
@@ -187,15 +187,15 @@
 		return
 	//Check if the mob being PM'd has any open admin tickets.
 	var/tickets = list()
-	tickets = globAdminTicketHolder.checkForTicket(C)
+	tickets = SStickets.checkForTicket(C)
 	if(tickets)
 		for(var/datum/admin_ticket/i in tickets)
 			i.addResponse(src, msg) // Add this response to their open tickets.
 		return
 
-	tickets = globAdminTicketHolder.checkForTicket(src)
+	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 = globAdminTicketHolder.checkForTicket(src)
+		tickets = SStickets.checkForTicket(C)
 		if(tickets)
 			for(var/datum/admin_ticket/i in tickets)
 				i.addResponse(src, msg)
@@ -224,7 +224,7 @@
 	to_chat(src, "<font color='blue'>IRC PM to-<b>IRC-Admins</b>: [msg]</font>")
 
 	log_admin("PM: [key_name(src)]->IRC: [msg]")
-	for(var/client/X in admins)
+	for(var/client/X in GLOB.admins)
 		if(X == src)
 			continue
 		if(check_rights(R_ADMIN|R_MOD|R_MENTOR, 0, X.mob))

code/modules/admin/verbs/adminsay.dm

@@ -10,7 +10,7 @@
 	log_adminsay(msg, src)
 
 	if(check_rights(R_ADMIN,0))
-		for(var/client/C in admins)
+		for(var/client/C in GLOB.admins)
 			if(R_ADMIN & C.holder.rights)
 				msg = "<span class='emoji_enabled'>[msg]</span>"
 				to_chat(C, "<span class='admin_channel'>ADMIN: <span class='name'>[key_name(usr, 1)]</span> ([admin_jump_link(mob)]): <span class='message'>[msg]</span></span>")
@@ -31,7 +31,7 @@
 	if(!msg)
 		return
 
-	for(var/client/C in admins)
+	for(var/client/C in GLOB.admins)
 		if(check_rights(R_ADMIN|R_MOD|R_MENTOR, 0, C.mob))
 			var/display_name = key
 			if(holder.fakekey)
@@ -62,7 +62,7 @@
 		enabling = TRUE
 		admin_verbs_mentor += msay
 
-	for(var/client/C in admins)
+	for(var/client/C in GLOB.admins)
 		if(check_rights(R_ADMIN|R_MOD, 0, C.mob))
 			continue
 		if(!check_rights(R_MENTOR, 0, C.mob))

code/modules/admin/verbs/alt_check.dm

@@ -7,7 +7,7 @@
 				<HR>"}
 
 	if(dbcon.IsConnected())
-		for(var/client/C in clients)
+		for(var/client/C in GLOB.clients)
 			dat += "<p>[C.ckey] (Player Age: <font color = 'red'>[C.player_age]</font>) - <b>[C.computer_id]</b> / <b>[C.address]</b><br>"
 			if(C.related_accounts_cid.len)
 				dat += "--Accounts associated with CID: "

code/modules/admin/verbs/antag-ooc.dm

@@ -12,7 +12,7 @@
 	if(holder && holder.fakekey)
 		display_name = holder.fakekey
 
-	for(var/mob/M in mob_list)
+	for(var/mob/M in GLOB.mob_list)
 		if((M.mind && M.mind.special_role && M.client) || (M.client && M.client.holder && (M.client.holder.rights & R_ADMIN)) )
 			to_chat(M, "<font color='#960018'><span class='ooc'><span class='prefix'>AOOC:</span> <EM>[display_name]:</EM> <span class='message'>[msg]</span></span></font>")
 

code/modules/admin/verbs/custom_event.dm

@@ -61,7 +61,7 @@
 
 	custom_event_admin_msg = input
 
-	for(var/client/X in admins)
+	for(var/client/X in GLOB.admins)
 		if(check_rights(R_EVENT,0,X.mob))
 			to_chat(X, "<h1 class='alert'>Custom Admin Event Info</h1>")
 			to_chat(X, "<h2 class='alert'>A custom event is starting. OOC Admin Info:</h2>")

code/modules/admin/verbs/debug.dm

@@ -208,7 +208,7 @@ But you can call procs that are of type /mob/living/carbon/human/proc/ for that
 	usr.show_message(t, 1)
 	feedback_add_details("admin_verb","ASL") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
 
-/client/proc/cmd_admin_robotize(var/mob/M in mob_list)
+/client/proc/cmd_admin_robotize(var/mob/M in GLOB.mob_list)
 	set category = "Event"
 	set name = "Make Robot"
 
@@ -226,7 +226,7 @@ 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)
+/client/proc/cmd_admin_animalize(var/mob/M in GLOB.mob_list)
 	set category = "Event"
 	set name = "Make Simple Animal"
 
@@ -250,7 +250,7 @@ But you can call procs that are of type /mob/living/carbon/human/proc/ for that
 		M.Animalize()
 
 
-/client/proc/makepAI(var/turf/T in mob_list)
+/client/proc/makepAI(var/turf/T in GLOB.mob_list)
 	set category = "Event"
 	set name = "Make pAI"
 	set desc = "Specify a location to spawn a pAI device, then specify a key to play that pAI"
@@ -259,7 +259,7 @@ But you can call procs that are of type /mob/living/carbon/human/proc/ for that
 		return
 
 	var/list/available = list()
-	for(var/mob/C in mob_list)
+	for(var/mob/C in GLOB.mob_list)
 		if(C.key)
 			available.Add(C)
 	var/mob/choice = input("Choose a player to play the pAI", "Spawn pAI") in available
@@ -271,7 +271,13 @@ But you can call procs that are of type /mob/living/carbon/human/proc/ for that
 			return 0
 	var/obj/item/paicard/card = new(T)
 	var/mob/living/silicon/pai/pai = new(card)
-	pai.name = input(choice, "Enter your pAI name:", "pAI Name", "Personal AI") as text
+	var/raw_name = input(choice, "Enter your pAI name:", "pAI Name", "Personal AI") as text
+	var/new_name = reject_bad_name(raw_name, 1)
+	if(new_name)
+		pai.name = new_name
+		pai.real_name = new_name
+	else
+		to_chat(usr, "<font color='red'>Invalid name. Your name should be at least 2 and at most [MAX_NAME_LEN] characters long. It may only contain the characters A-Z, a-z, -, ' and .</font>")
 	pai.real_name = pai.name
 	pai.key = choice.key
 	card.setPersonality(pai)
@@ -280,7 +286,7 @@ But you can call procs that are of type /mob/living/carbon/human/proc/ for that
 			paiController.pai_candidates.Remove(candidate)
 	feedback_add_details("admin_verb","MPAI") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
 
-/client/proc/cmd_admin_alienize(var/mob/M in mob_list)
+/client/proc/cmd_admin_alienize(var/mob/M in GLOB.mob_list)
 	set category = "Event"
 	set name = "Make Alien"
 
@@ -300,7 +306,7 @@ But you can call procs that are of type /mob/living/carbon/human/proc/ for that
 	else
 		alert("Invalid mob")
 
-/client/proc/cmd_admin_slimeize(var/mob/M in mob_list)
+/client/proc/cmd_admin_slimeize(var/mob/M in GLOB.mob_list)
 	set category = "Event"
 	set name = "Make slime"
 
@@ -320,7 +326,7 @@ But you can call procs that are of type /mob/living/carbon/human/proc/ for that
 	else
 		alert("Invalid mob")
 
-/client/proc/cmd_admin_super(var/mob/M in mob_list)
+/client/proc/cmd_admin_super(var/mob/M in GLOB.mob_list)
 	set category = "Event"
 	set name = "Make Superhero"
 
@@ -331,8 +337,8 @@ But you can call procs that are of type /mob/living/carbon/human/proc/ for that
 		alert("Wait until the game starts")
 		return
 	if(ishuman(M))
-		var/type = input("Pick the Superhero","Superhero") as null|anything in all_superheroes
-		var/datum/superheroes/S = all_superheroes[type]
+		var/type = input("Pick the Superhero","Superhero") as null|anything in GLOB.all_superheroes
+		var/datum/superheroes/S = GLOB.all_superheroes[type]
 		if(S)
 			S.create(M)
 		log_admin("[key_name(src)] has turned [M.key] into a Superhero.")
@@ -371,7 +377,7 @@ But you can call procs that are of type /mob/living/carbon/human/proc/ for that
 	if(confirm != "Yes")
 		return
 
-	for(var/I in singularities)
+	for(var/I in GLOB.singularities)
 		var/obj/singularity/S = I
 		if(!is_level_reachable(S.z))
 			continue
@@ -392,7 +398,7 @@ But you can call procs that are of type /mob/living/carbon/human/proc/ for that
 	message_admins("[key_name_admin(src)] has remade the powernets. makepowernets() called.", 0)
 	feedback_add_details("admin_verb","MPWN") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
 
-/client/proc/cmd_admin_grantfullaccess(var/mob/M in mob_list)
+/client/proc/cmd_admin_grantfullaccess(var/mob/M in GLOB.mob_list)
 	set category = "Admin"
 	set name = "Grant Full Access"
 
@@ -426,7 +432,7 @@ But you can call procs that are of type /mob/living/carbon/human/proc/ for that
 	log_admin("[key_name(src)] has granted [M.key] full access.")
 	message_admins("<span class='notice'>[key_name_admin(usr)] has granted [M.key] full access.</span>", 1)
 
-/client/proc/cmd_assume_direct_control(var/mob/M in mob_list)
+/client/proc/cmd_assume_direct_control(var/mob/M in GLOB.mob_list)
 	set category = "Admin"
 	set name = "Assume direct control"
 	set desc = "Direct intervention"
@@ -563,7 +569,7 @@ But you can call procs that are of type /mob/living/carbon/human/proc/ for that
 	for(var/areatype in areas_without_camera)
 		to_chat(world, "* [areatype]")
 
-/client/proc/cmd_admin_dress(var/mob/living/carbon/human/M in mob_list)
+/client/proc/cmd_admin_dress(var/mob/living/carbon/human/M in GLOB.mob_list)
 	set category = "Event"
 	set name = "Select equipment"
 
@@ -685,11 +691,11 @@ But you can call procs that are of type /mob/living/carbon/human/proc/ for that
 	if(alert("Are you sure? This will start up the engine. Should only be used during debug!",,"Yes","No") != "Yes")
 		return
 
-	for(var/obj/machinery/power/emitter/E in machines)
+	for(var/obj/machinery/power/emitter/E in GLOB.machines)
 		if(E.anchored)
 			E.active = 1
 
-	for(var/obj/machinery/field/generator/F in machines)
+	for(var/obj/machinery/field/generator/F in GLOB.machines)
 		if(F.active == 0)
 			F.active = 1
 			F.state = 2
@@ -700,13 +706,13 @@ But you can call procs that are of type /mob/living/carbon/human/proc/ for that
 			F.update_icon()
 
 	spawn(30)
-		for(var/obj/machinery/the_singularitygen/G in machines)
+		for(var/obj/machinery/the_singularitygen/G in GLOB.machines)
 			if(G.anchored)
 				var/obj/singularity/S = new /obj/singularity(get_turf(G))
 				S.energy = 800
 				break
 
-	for(var/obj/machinery/power/rad_collector/Rad in machines)
+	for(var/obj/machinery/power/rad_collector/Rad in GLOB.machines)
 		if(Rad.anchored)
 			if(!Rad.P)
 				var/obj/item/tank/plasma/Plasma = new/obj/item/tank/plasma(Rad)
@@ -718,7 +724,7 @@ But you can call procs that are of type /mob/living/carbon/human/proc/ for that
 			if(!Rad.active)
 				Rad.toggle_power()
 
-	for(var/obj/machinery/power/smes/SMES in machines)
+	for(var/obj/machinery/power/smes/SMES in GLOB.machines)
 		if(SMES.anchored)
 			SMES.input_attempt = 1
 
@@ -732,21 +738,21 @@ But you can call procs that are of type /mob/living/carbon/human/proc/ for that
 
 	switch(input("Which list?") in list("Players","Admins","Mobs","Living Mobs","Dead Mobs","Silicons","Clients","Respawnable Mobs"))
 		if("Players")
-			to_chat(usr, jointext(player_list,","))
+			to_chat(usr, jointext(GLOB.player_list,","))
 		if("Admins")
-			to_chat(usr, jointext(admins,","))
+			to_chat(usr, jointext(GLOB.admins,","))
 		if("Mobs")
-			to_chat(usr, jointext(mob_list,","))
+			to_chat(usr, jointext(GLOB.mob_list,","))
 		if("Living Mobs")
-			to_chat(usr, jointext(living_mob_list,","))
+			to_chat(usr, jointext(GLOB.living_mob_list,","))
 		if("Dead Mobs")
-			to_chat(usr, jointext(dead_mob_list,","))
+			to_chat(usr, jointext(GLOB.dead_mob_list,","))
 		if("Silicons")
-			to_chat(usr, jointext(silicon_mob_list,","))
+			to_chat(usr, jointext(GLOB.silicon_mob_list,","))
 		if("Clients")
-			to_chat(usr, jointext(clients,","))
+			to_chat(usr, jointext(GLOB.clients,","))
 		if("Respawnable Mobs")
-			to_chat(usr, jointext(respawnable_list,","))
+			to_chat(usr, jointext(GLOB.respawnable_list,","))
 
 /client/proc/cmd_display_del_log()
 	set category = "Debug"
@@ -860,7 +866,7 @@ But you can call procs that are of type /mob/living/carbon/human/proc/ for that
 		return
 
 	var/list/names = list()
-	for(var/i in ruin_landmarks)
+	for(var/i in GLOB.ruin_landmarks)
 		var/obj/effect/landmark/ruin/ruin_landmark = i
 		var/datum/map_template/ruin/template = ruin_landmark.ruin_template
 

code/modules/admin/verbs/freeze.dm

@@ -6,15 +6,15 @@
 ////////////////////////////////////////////////////////////////////////////////
 ////////////////////////////////////////////////////////////////////////////////
 var/global/list/frozen_mob_list = list()
-/client/proc/freeze(var/mob/living/M as mob in mob_list)
+/client/proc/freeze(var/mob/living/M as mob in GLOB.mob_list)
 	set category = "Admin"
 	set name = "Freeze"
-		
+
 	if(!check_rights(R_ADMIN))
 		return
-		
-	if(!istype(M))	
-		return	
+
+	if(!istype(M))
+		return
 
 	if(M in frozen_mob_list)
 		M.admin_unFreeze(src)
@@ -84,13 +84,13 @@ var/global/list/frozen_mob_list = list()
 
 //////////////////////////Freeze Mech
 
-/client/proc/freezemecha(var/obj/mecha/O as obj in mechas_list)
+/client/proc/freezemecha(var/obj/mecha/O as obj in GLOB.mechas_list)
 	set category = "Admin"
 	set name = "Freeze Mech"
 
 	if(!check_rights(R_ADMIN))
-		return	
-	
+		return
+
 	var/obj/mecha/M = O
 	if(!istype(M,/obj/mecha))
 		to_chat(src, "<span class='danger'>This can only be used on mechs!</span>")
@@ -105,7 +105,7 @@ var/global/list/frozen_mob_list = list()
 						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=\ref[usr.client]'>[key]</a></b></font>")
+							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]")
 						else
@@ -116,7 +116,7 @@ var/global/list/frozen_mob_list = list()
 						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=\ref[usr.client]'>[key]</a></b></font>")
+							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]")
 						else

code/modules/admin/verbs/gimmick_team.dm

@@ -42,7 +42,7 @@
 	var/list/players_to_spawn = list()
 	if(pick_manually)
 		var/list/possible_ghosts = list()
-		for(var/mob/dead/observer/G in player_list)
+		for(var/mob/dead/observer/G in GLOB.player_list)
 			if(!G.client.is_afk())
 				if(!(G.mind && G.mind.current && G.mind.current.stat != DEAD))
 					possible_ghosts += G

code/modules/admin/verbs/honksquad.dm

@@ -38,7 +38,7 @@ var/global/sent_honksquad = 0
 //Generates a list of HONKsquad from active ghosts. Then the user picks which characters to respawn as the commandos.
 	var/list/candidates = list()	//candidates for being a commando out of all the active ghosts in world.
 	var/list/commandos = list()			//actual commando ghosts as picked by the user.
-	for(var/mob/dead/observer/G	 in player_list)
+	for(var/mob/dead/observer/G	 in GLOB.player_list)
 		if(!G.client.holder && !G.client.is_afk())	//Whoever called/has the proc won't be added to the list.
 			if(!(G.mind && G.mind.current && G.mind.current.stat != DEAD))
 				candidates += G.key
@@ -48,7 +48,7 @@ var/global/sent_honksquad = 0
 		commandos += candidate//Add their ghost to commandos.
 
 //Spawns HONKsquad and equips them.
-	for(var/obj/effect/landmark/L in landmarks_list)
+	for(var/obj/effect/landmark/L in GLOB.landmarks_list)
 		if(honksquad_number<=0)	break
 		if(L.name == "HONKsquad")
 			honk_leader_selected = honksquad_number == 1?1:0
@@ -77,7 +77,7 @@ var/global/sent_honksquad = 0
 	var/mob/living/carbon/human/new_honksquad = new(spawn_location.loc)
 	var/honksquad_leader_rank = pick("Lieutenant", "Captain", "Major")
 	var/honksquad_rank = pick("Corporal", "Sergeant", "Staff Sergeant", "Sergeant 1st Class", "Master Sergeant", "Sergeant Major")
-	var/honksquad_name = pick(clown_names)
+	var/honksquad_name = pick(GLOB.clown_names)
 
 	var/datum/preferences/A = new()//Randomize appearance for the commando.
 	if(honk_leader_selected)

code/modules/admin/verbs/infiltratorteam_syndicate.dm

@@ -48,7 +48,7 @@ var/global/sent_syndicate_infiltration_team = 0
 
 	if(pick_manually)
 		var/list/possible_ghosts = list()
-		for(var/mob/dead/observer/G in player_list)
+		for(var/mob/dead/observer/G in GLOB.player_list)
 			if(!G.client.is_afk())
 				if(!(G.mind && G.mind.current && G.mind.current.stat != DEAD))
 					possible_ghosts += G
@@ -69,7 +69,7 @@ var/global/sent_syndicate_infiltration_team = 0
 	var/list/sit_spawns = list()
 	var/list/sit_spawns_leader = list()
 	var/list/sit_spawns_mgmt = list()
-	for(var/obj/effect/landmark/L in landmarks_list)
+	for(var/obj/effect/landmark/L in GLOB.landmarks_list)
 		if(L.name == "Syndicate-Infiltrator")
 			sit_spawns += L
 		if(L.name == "Syndicate-Infiltrator-Leader")

code/modules/admin/verbs/massmodvar.dm

@@ -212,19 +212,19 @@
 		typecache = typecacheof(typecache)
 	. = list()
 	if(ispath(T, /mob))
-		for(var/mob/thing in mob_list)
+		for(var/mob/thing in GLOB.mob_list)
 			if(typecache[thing.type])
 				. += thing
 			CHECK_TICK
 
 	else if(ispath(T, /obj/machinery/door))
-		for(var/obj/machinery/door/thing in airlocks)
+		for(var/obj/machinery/door/thing in GLOB.airlocks)
 			if(typecache[thing.type])
 				. += thing
 			CHECK_TICK
 
 	else if(ispath(T, /obj/machinery))
-		for(var/obj/machinery/thing in machines)
+		for(var/obj/machinery/thing in GLOB.machines)
 			if(typecache[thing.type])
 				. += thing
 			CHECK_TICK
@@ -254,7 +254,7 @@
 			CHECK_TICK
 
 	else if(ispath(T, /client))
-		for(var/client/thing in clients)
+		for(var/client/thing in GLOB.clients)
 			if(typecache[thing.type])
 				. += thing
 			CHECK_TICK

code/modules/admin/verbs/modifyvariables.dm

@@ -195,7 +195,7 @@ var/list/VVpixelmovement = list("step_x", "step_y", "step_size", "bound_height",
 
 
 		if(VV_CLIENT)
-			.["value"] = input("Select reference:", "Reference", current_value) as null|anything in clients
+			.["value"] = input("Select reference:", "Reference", current_value) as null|anything in GLOB.clients
 			if(.["value"] == null)
 				.["class"] = null
 				return
@@ -516,6 +516,24 @@ var/list/VVpixelmovement = list("step_x", "step_y", "step_size", "bound_height",
 	log_admin("[key_name(src)] modified [original_name]'s [objectvar]: [original_var]=[new_var]")
 	message_admins("[key_name_admin(src)] modified [original_name]'s varlist [objectvar]: [original_var]=[new_var]")
 
+/proc/vv_varname_lockcheck(param_var_name)
+	if(param_var_name in VVlocked)
+		if(!check_rights(R_DEBUG))
+			return FALSE
+	if(param_var_name in VVckey_edit)
+		if(!check_rights(R_EVENT | R_DEBUG))
+			return FALSE
+	if(param_var_name in VVicon_edit_lock)
+		if(!check_rights(R_EVENT | R_DEBUG))
+			return FALSE
+	if(param_var_name in VVpixelmovement)
+		if(!check_rights(R_DEBUG))
+			return FALSE
+		var/prompt = alert(usr, "Editing this var may irreparably break tile gliding for the rest of the round. THIS CAN'T BE UNDONE", "DANGER", "ABORT ", "Continue", " ABORT")
+		if(prompt != "Continue")
+			return FALSE
+	return TRUE
+
 /client/proc/modify_variables(atom/O, param_var_name = null, autodetect_class = 0)
 	if(!check_rights(R_VAREDIT))
 		return
@@ -544,25 +562,11 @@ var/list/VVpixelmovement = list("step_x", "step_y", "step_size", "bound_height",
 	if(!O.can_vv_get(variable))
 		return
 
+	if(!vv_varname_lockcheck(variable))
+		return
+
 	var_value = O.vars[variable]
 
-	if(variable in VVlocked)
-		if(!check_rights(R_DEBUG))
-			return
-	if(variable in VVckey_edit)
-		if(!check_rights(R_EVENT | R_DEBUG))
-			return
-	if(variable in VVicon_edit_lock)
-		if(!check_rights(R_EVENT | R_DEBUG))
-			return
-	if(variable in VVpixelmovement)
-		if(!check_rights(R_DEBUG))
-			return
-		var/prompt = alert(src, "Editing this var may irreparably break tile gliding for the rest of the round. THIS CAN'T BE UNDONE", "DANGER", "ABORT ", "Continue", " ABORT")
-		if(prompt != "Continue")
-			return
-
-
 	var/default = vv_get_class(var_value)
 
 	if(isnull(default))

code/modules/admin/verbs/one_click_antag.dm

@@ -32,7 +32,7 @@ client/proc/one_click_antag()
 	if(M.stat || !M.mind || M.mind.special_role)
 		return FALSE
 	if(temp)
-		if(M.mind.assigned_role in temp.restricted_jobs || M.client.prefs.species in temp.protected_species)
+		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)))
@@ -57,7 +57,7 @@ client/proc/one_click_antag()
 	log_admin("[key_name(owner)] tried making [antnum] traitors with One-Click-Antag")
 	message_admins("[key_name_admin(owner)] tried making [antnum] traitors with One-Click-Antag")
 
-	for(var/mob/living/carbon/human/applicant in player_list)
+	for(var/mob/living/carbon/human/applicant in GLOB.player_list)
 		if(CandCheck(ROLE_TRAITOR, applicant, temp))
 			candidates += applicant
 
@@ -88,7 +88,7 @@ client/proc/one_click_antag()
 	log_admin("[key_name(owner)] tried making [antnum] changelings with One-Click-Antag")
 	message_admins("[key_name_admin(owner)] tried making [antnum] changelings with One-Click-Antag")
 
-	for(var/mob/living/carbon/human/applicant in player_list)
+	for(var/mob/living/carbon/human/applicant in GLOB.player_list)
 		if(CandCheck(ROLE_CHANGELING, applicant, temp))
 			candidates += applicant
 
@@ -118,7 +118,7 @@ client/proc/one_click_antag()
 	log_admin("[key_name(owner)] tried making [antnum] revolutionaries with One-Click-Antag")
 	message_admins("[key_name_admin(owner)] tried making [antnum] revolutionaries with One-Click-Antag")
 
-	for(var/mob/living/carbon/human/applicant in player_list)
+	for(var/mob/living/carbon/human/applicant in GLOB.player_list)
 		if(CandCheck(ROLE_REV, applicant, temp))
 			candidates += applicant
 
@@ -166,7 +166,7 @@ client/proc/one_click_antag()
 	log_admin("[key_name(owner)] tried making a Cult with One-Click-Antag")
 	message_admins("[key_name_admin(owner)] tried making a Cult with One-Click-Antag")
 
-	for(var/mob/living/carbon/human/applicant in player_list)
+	for(var/mob/living/carbon/human/applicant in GLOB.player_list)
 		if(CandCheck(ROLE_CULTIST, applicant, temp))
 			candidates += applicant
 
@@ -195,7 +195,7 @@ client/proc/one_click_antag()
 	log_admin("[key_name(owner)] tried making a [antnum] person Nuke Op Team with One-Click-Antag")
 	message_admins("[key_name_admin(owner)] tried making a [antnum] person Nuke Op Team with One-Click-Antag")
 
-	for(var/mob/G in respawnable_list)
+	for(var/mob/G in GLOB.respawnable_list)
 		if(istype(G) && G.client && (ROLE_OPERATIVE in G.client.prefs.be_special))
 			if(!jobban_isbanned(G, "operative") && !jobban_isbanned(G, "Syndicate"))
 				if(player_old_enough_antag(G.client,ROLE_OPERATIVE))
@@ -328,7 +328,7 @@ client/proc/one_click_antag()
 		var/syndicate_leader_selected = 0 //when the leader is chosen. The last person spawned.
 
 		//Generates a list of commandos from active ghosts. Then the user picks which characters to respawn as the commandos.
-		for(var/mob/G in respawnable_list)
+		for(var/mob/G in GLOB.respawnable_list)
 			if(!jobban_isbanned(G, "Syndicate"))
 				spawn(0)
 					switch(alert(G,"Do you wish to be considered for an elite syndicate strike team being sent in?","Please answer in 30 seconds!","Yes","No"))
@@ -399,7 +399,7 @@ client/proc/one_click_antag()
 	var/mob/living/carbon/human/new_syndicate_commando = new(spawn_location.loc)
 	var/syndicate_commando_leader_rank = pick("Lieutenant", "Captain", "Major")
 	var/syndicate_commando_rank = pick("Corporal", "Sergeant", "Staff Sergeant", "Sergeant 1st Class", "Master Sergeant", "Sergeant Major")
-	var/syndicate_commando_name = pick(last_names)
+	var/syndicate_commando_name = pick(GLOB.last_names)
 
 	var/datum/preferences/A = new()//Randomize appearance for the commando.
 	if(syndicate_leader_selected)
@@ -437,7 +437,7 @@ client/proc/one_click_antag()
 	log_admin("[key_name(owner)] tried making Vox Raiders with One-Click-Antag")
 	message_admins("[key_name_admin(owner)] tried making Vox Raiders with One-Click-Antag")
 //Generates a list of candidates from active ghosts.
-	for(var/mob/G in respawnable_list)
+	for(var/mob/G in GLOB.respawnable_list)
 		if(istype(G) && G.client && (ROLE_RAIDER in G.client.prefs.be_special))
 			if(player_old_enough_antag(G.client,ROLE_RAIDER))
 				if(!jobban_isbanned(G, "raider") && !jobban_isbanned(G, "Syndicate"))
@@ -542,7 +542,7 @@ client/proc/one_click_antag()
 	log_admin("[key_name(owner)] tried making Vampires with One-Click-Antag")
 	message_admins("[key_name_admin(owner)] tried making Vampires with One-Click-Antag")
 
-	for(var/mob/living/carbon/human/applicant in player_list)
+	for(var/mob/living/carbon/human/applicant in GLOB.player_list)
 		if(CandCheck(ROLE_VAMPIRE, applicant, temp))
 			candidates += applicant
 
@@ -567,7 +567,7 @@ client/proc/one_click_antag()
 	message_admins("[key_name_admin(owner)] tried making Thunderdone Teams with One-Click-Antag")
 
 	//Generates a list of candidates from active ghosts.
-	for(var/mob/G in respawnable_list)
+	for(var/mob/G in GLOB.respawnable_list)
 		spawn(0)
 			switch(alert(G,"Do you wish to be considered for a Thunderdome match about to start?","Please answer in 30 seconds!","Yes","No"))
 				if("Yes")

code/modules/admin/verbs/onlyone.dm

@@ -4,7 +4,7 @@
 		return
 
 	var/list/incompatible_species = list(/datum/species/plasmaman, /datum/species/vox)
-	for(var/mob/living/carbon/human/H in player_list)
+	for(var/mob/living/carbon/human/H in GLOB.player_list)
 		if(H.stat == DEAD || !(H.client))
 			continue
 		if(is_special_character(H))
@@ -62,7 +62,7 @@
 		alert("The game hasn't started yet!")
 		return
 
-	for(var/mob/living/carbon/human/H in player_list)
+	for(var/mob/living/carbon/human/H in GLOB.player_list)
 		if(H.stat == 2 || !(H.client)) continue
 		if(is_special_character(H)) continue
 

code/modules/admin/verbs/onlyoneteam.dm

@@ -5,7 +5,7 @@
 
 	var/list/incompatible_species = list(/datum/species/plasmaman, /datum/species/vox)
 	var/team_toggle = 0
-	for(var/mob/living/carbon/human/H in player_list)
+	for(var/mob/living/carbon/human/H in GLOB.player_list)
 		if(H.stat == DEAD || !(H.client))
 			continue
 		if(is_special_character(H))

code/modules/admin/verbs/playsound.dm

@@ -10,7 +10,7 @@ var/list/sounds_cache = list()
 
 	log_admin("[key_name(src)] stopped admin sounds.")
 	message_admins("[key_name_admin(src)] stopped admin sounds.", 1)
-	for(var/mob/M in player_list)
+	for(var/mob/M in GLOB.player_list)
 		M << awful_sound
 
 /client/proc/play_sound(S as sound)
@@ -28,7 +28,7 @@ var/list/sounds_cache = list()
 
 	log_admin("[key_name(src)] played sound [S]")
 	message_admins("[key_name_admin(src)] played sound [S]", 1)
-	for(var/mob/M in player_list)
+	for(var/mob/M in GLOB.player_list)
 		if(M.client.prefs.sound & SOUND_MIDI)
 			M << uploaded_sound
 
@@ -92,7 +92,7 @@ var/list/sounds_cache = list()
 	if(C == "Yep")
 		ignore_power = 1
 
-	for(var/O in global_intercoms)
+	for(var/O in GLOB.global_intercoms)
 		var/obj/item/radio/intercom/I = O
 		if(!is_station_level(I.z) && !ignore_z)
 			continue

code/modules/admin/verbs/pray.dm

@@ -28,20 +28,20 @@
 		prayer_type = "CULTIST PRAYER"
 		deity = ticker.cultdat.entity_name
 
-	msg = "<span class='notice'>[bicon(cross)]<b><font color=[font_color]>[prayer_type][deity ? " (to [deity])" : ""]:</font>[key_name(src, 1)] (<A HREF='?_src_=holder;adminmoreinfo=\ref[src]'>?</A>) (<A HREF='?_src_=holder;adminplayeropts=\ref[src]'>PP</A>) (<A HREF='?_src_=vars;Vars=[UID()]'>VV</A>) (<A HREF='?_src_=holder;subtlemessage=\ref[src]'>SM</A>) ([admin_jump_link(src)]) (<A HREF='?_src_=holder;secretsadmin=check_antagonist'>CA</A>) (<A HREF='?_src_=holder;adminspawncookie=\ref[src]'>SC</a>) (<A HREF='?_src_=holder;Bless=[UID()]'>BLESS</A>) (<A HREF='?_src_=holder;Smite=[UID()]'>SMITE</A>):</b> [msg]</span>"
+	log_say("(PRAYER) [msg]", usr)
+	msg = "<span class='notice'>[bicon(cross)]<b><font color=[font_color]>[prayer_type][deity ? " (to [deity])" : ""]:</font>[key_name(src, 1)] ([ADMIN_QUE(src,"?")]) ([ADMIN_PP(src,"PP")]) ([ADMIN_VV(src,"VV")]) ([ADMIN_SM(src,"SM")]) ([admin_jump_link(src)]) (<A HREF='?_src_=holder;secretsadmin=check_antagonist'>CA</A>) ([ADMIN_SC(src,"SC")]) (<A HREF='?_src_=holder;Bless=[UID()]'>BLESS</A>) (<A HREF='?_src_=holder;Smite=[UID()]'>SMITE</A>):</b> [msg]</span>"
 
-	for(var/client/X in admins)
+	for(var/client/X in GLOB.admins)
 		if(check_rights(R_EVENT,0,X.mob))
 			to_chat(X, msg)
 	to_chat(usr, "Your prayers have been received by the gods.")
 
 	feedback_add_details("admin_verb","PR") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
-	//log_admin("HELP: [key_name(src)]: [msg]")
 
 /proc/Centcomm_announce(var/text , var/mob/Sender)
 	var/msg = sanitize(copytext(text, 1, MAX_MESSAGE_LEN))
-	msg = "<span class='boldnotice'><font color=orange>CENTCOMM: </font>[key_name(Sender, 1)] (<A HREF='?_src_=holder;adminplayeropts=\ref[Sender]'>PP</A>) (<A HREF='?_src_=vars;Vars=[Sender.UID()]'>VV</A>) (<A HREF='?_src_=holder;subtlemessage=\ref[Sender]'>SM</A>) ([admin_jump_link(Sender)]) (<A HREF='?_src_=holder;secretsadmin=check_antagonist'>CA</A>) (<A HREF='?_src_=holder;BlueSpaceArtillery=\ref[Sender]'>BSA</A>) (<A HREF='?_src_=holder;CentcommReply=\ref[Sender]'>RPLY</A>):</span> [msg]"
-	for(var/client/X in admins)
+	msg = "<span class='boldnotice'><font color=orange>CENTCOMM: </font>[key_name(Sender, 1)] ([ADMIN_PP(Sender,"PP")]) ([ADMIN_VV(Sender,"VV")]) ([ADMIN_SM(Sender,"SM")]) ([admin_jump_link(Sender)]) (<A HREF='?_src_=holder;secretsadmin=check_antagonist'>CA</A>) ([ADMIN_BSA(Sender,"BSA")]) ([ADMIN_CENTCOM_REPLY(Sender,"RPLY")])):</span> [msg]"
+	for(var/client/X in GLOB.admins)
 		if(R_EVENT & X.holder.rights)
 			to_chat(X, msg)
 			if(X.prefs.sound & SOUND_ADMINHELP)
@@ -49,8 +49,8 @@
 
 /proc/Syndicate_announce(var/text , var/mob/Sender)
 	var/msg = sanitize(copytext(text, 1, MAX_MESSAGE_LEN))
-	msg = "<span class='boldnotice'><font color='#DC143C'>SYNDICATE: </font>[key_name(Sender, 1)] (<A HREF='?_src_=holder;adminplayeropts=\ref[Sender]'>PP</A>) (<A HREF='?_src_=vars;Vars=[Sender.UID()]'>VV</A>) (<A HREF='?_src_=holder;subtlemessage=\ref[Sender]'>SM</A>) ([admin_jump_link(Sender)]) (<A HREF='?_src_=holder;secretsadmin=check_antagonist'>CA</A>) (<A HREF='?_src_=holder;BlueSpaceArtillery=\ref[Sender]'>BSA</A>) (<A HREF='?_src_=holder;SyndicateReply=\ref[Sender]'>REPLY</A>):</span> [msg]"
-	for(var/client/X in admins)
+	msg = "<span class='boldnotice'><font color='#DC143C'>SYNDICATE: </font>[key_name(Sender, 1)] ([ADMIN_PP(Sender,"PP")]) ([ADMIN_VV(Sender,"VV")]) ([ADMIN_SM(Sender,"SM")]) ([admin_jump_link(Sender)]) (<A HREF='?_src_=holder;secretsadmin=check_antagonist'>CA</A>) ([ADMIN_BSA(Sender,"BSA")]) ([ADMIN_SYNDICATE_REPLY(Sender,"RPLY")]):</span> [msg]"
+	for(var/client/X in GLOB.admins)
 		if(check_rights(R_EVENT,0,X.mob))
 			to_chat(X, msg)
 			if(X.prefs.sound & SOUND_ADMINHELP)
@@ -58,8 +58,8 @@
 
 /proc/HONK_announce(var/text , var/mob/Sender)
 	var/msg = sanitize(copytext(text, 1, MAX_MESSAGE_LEN))
-	msg = "<span class='boldnotice'><font color=pink>HONK: </font>[key_name(Sender, 1)] (<A HREF='?_src_=holder;adminplayeropts=\ref[Sender]'>PP</A>) (<A HREF='?_src_=vars;Vars=[Sender.UID()]'>VV</A>) (<A HREF='?_src_=holder;subtlemessage=\ref[Sender]'>SM</A>) ([admin_jump_link(Sender)]) (<A HREF='?_src_=holder;secretsadmin=check_antagonist'>CA</A>) (<A HREF='?_src_=holder;BlueSpaceArtillery=\ref[Sender]'>BSA</A>) (<A HREF='?_src_=holder;HONKReply=\ref[Sender]'>RPLY</A>):</span> [msg]"
-	for(var/client/X in admins)
+	msg = "<span class='boldnotice'><font color=pink>HONK: </font>[key_name(Sender, 1)] ([ADMIN_PP(Sender,"PP")]) ([ADMIN_VV(Sender,"VV")]) ([ADMIN_SM(Sender,"SM")]) ([admin_jump_link(Sender)]) (<A HREF='?_src_=holder;secretsadmin=check_antagonist'>CA</A>) ([ADMIN_BSA(Sender,"BSA")]) (<A HREF='?_src_=holder;HONKReply=[Sender.UID()]'>RPLY</A>):</span> [msg]"
+	for(var/client/X in GLOB.admins)
 		if(R_EVENT & X.holder.rights)
 			to_chat(X, msg)
 			if(X.prefs.sound & SOUND_ADMINHELP)
@@ -67,10 +67,10 @@
 
 /proc/ERT_Announce(var/text , var/mob/Sender, var/repeat_warning)
 	var/msg = sanitize(copytext(text, 1, MAX_MESSAGE_LEN))
-	msg = "<span class='adminnotice'><b><font color=orange>ERT REQUEST: </font>[key_name(Sender, 1)] (<A HREF='?_src_=holder;adminplayeropts=\ref[Sender]'>PP</A>) (<A HREF='?_src_=vars;Vars=[Sender.UID()]'>VV</A>) (<A HREF='?_src_=holder;subtlemessage=\ref[Sender]'>SM</A>) ([admin_jump_link(Sender)]) (<A HREF='?_src_=holder;secretsadmin=check_antagonist'>CA</A>) (<A HREF='?_src_=holder;BlueSpaceArtillery=\ref[Sender]'>BSA</A>) (<A HREF='?_src_=holder;ErtReply=\ref[Sender]'>RESPOND</A>):</b> [msg]</span>"
+	msg = "<span class='adminnotice'><b><font color=orange>ERT REQUEST: </font>[key_name(Sender, 1)] ([ADMIN_PP(Sender,"PP")]) ([ADMIN_VV(Sender,"VV")]) ([ADMIN_SM(Sender,"SM")]) ([admin_jump_link(Sender)]) (<A HREF='?_src_=holder;secretsadmin=check_antagonist'>CA</A>) ([ADMIN_BSA(Sender,"BSA")]) (<A HREF='?_src_=holder;ErtReply=[Sender.UID()]'>RESPOND</A>):</b> [msg]</span>"
 	if(repeat_warning)
 		msg += "<BR><span class='adminnotice'><b>WARNING: ERT request has gone 5 minutes with no reply!</b></span>"
-	for(var/client/X in admins)
+	for(var/client/X in GLOB.admins)
 		if(check_rights(R_EVENT,0,X.mob))
 			to_chat(X, msg)
 			if(X.prefs.sound & SOUND_ADMINHELP)
@@ -79,10 +79,10 @@
 /proc/Nuke_request(text , mob/Sender)
 	var/nuke_code = get_nuke_code()
 	var/msg = sanitize(copytext(text, 1, MAX_MESSAGE_LEN))
-	msg = "<span class='adminnotice'><b><font color=orange>NUKE CODE REQUEST: </font>[key_name(Sender)] (<A HREF='?_src_=holder;adminplayeropts=\ref[Sender]'>PP</A>) (<A HREF='?_src_=vars;Vars=[Sender.UID()]'>VV</A>) (<A HREF='?_src_=holder;subtlemessage=\ref[Sender]'>SM</A>) ([admin_jump_link(Sender)]) (<A HREF='?_src_=holder;secretsadmin=check_antagonist'>CA</A>) (<A HREF='?_src_=holder;BlueSpaceArtillery=\ref[Sender]'>BSA</A>) (<A HREF='?_src_=holder;CentcommReply=\ref[Sender]'>RPLY</A>):</b> [msg]</span>"
-	for(var/client/X in admins)
+	msg = "<span class='adminnotice'><b><font color=orange>NUKE CODE REQUEST: </font>[key_name(Sender)] ([ADMIN_PP(Sender,"PP")]) ([ADMIN_VV(Sender,"VV")]) ([ADMIN_SM(Sender,"SM")]) ([admin_jump_link(Sender)]) (<A HREF='?_src_=holder;secretsadmin=check_antagonist'>CA</A>) ([ADMIN_BSA(Sender,"BSA")]) ([ADMIN_CENTCOM_REPLY(Sender,"RPLY")]):</b> [msg]</span>"
+	for(var/client/X in GLOB.admins)
 		if(check_rights(R_EVENT,0,X.mob))
 			to_chat(X, msg)
 			to_chat(X, "<span class='adminnotice'><b>The nuke code is [nuke_code].</b></span>")
 			if(X.prefs.sound & SOUND_ADMINHELP)
-				X << 'sound/effects/adminhelp.ogg'
+				X << 'sound/effects/adminhelp.ogg'

code/modules/admin/verbs/randomverbs.dm

@@ -1,4 +1,4 @@
-/client/proc/cmd_admin_drop_everything(mob/M as mob in mob_list)
+/client/proc/cmd_admin_drop_everything(mob/M as mob in GLOB.mob_list)
 	set category = null
 	set name = "Drop Everything"
 
@@ -16,7 +16,7 @@
 	message_admins("[key_name_admin(usr)] made [key_name_admin(M)] drop everything!", 1)
 	feedback_add_details("admin_verb","DEVR") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
 
-/client/proc/cmd_admin_prison(mob/M as mob in mob_list)
+/client/proc/cmd_admin_prison(mob/M as mob in GLOB.mob_list)
 	set category = "Admin"
 	set name = "Prison"
 
@@ -44,7 +44,7 @@
 		message_admins("<span class='notice'>[key_name_admin(usr)] sent [key_name_admin(M)] to the prison station.</span>", 1)
 		feedback_add_details("admin_verb","PRISON") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
 
-/client/proc/cmd_admin_subtle_message(mob/M as mob in mob_list)
+/client/proc/cmd_admin_subtle_message(mob/M as mob in GLOB.mob_list)
 	set category = "Event"
 	set name = "Subtle Message"
 
@@ -83,7 +83,7 @@
 
 	var/missing_ages = 0
 	var/msg = ""
-	for(var/client/C in clients)
+	for(var/client/C in GLOB.clients)
 		if(C.player_age == "Requires database")
 			missing_ages = 1
 			continue
@@ -144,13 +144,13 @@
 
 
 
-/client/proc/cmd_admin_headset_message(mob/M in mob_list)
+/client/proc/cmd_admin_headset_message(mob/M in GLOB.mob_list)
 	set category = "Event"
 	set name = "Headset Message"
 
 	admin_headset_message(M)
 
-/client/proc/admin_headset_message(mob/M in mob_list, sender = null)
+/client/proc/admin_headset_message(mob/M in GLOB.mob_list, sender = null)
 	var/mob/living/carbon/human/H = M
 
 	if(!check_rights(R_ADMIN))
@@ -181,7 +181,7 @@
 
 
 
-/client/proc/cmd_admin_godmode(mob/M as mob in mob_list)
+/client/proc/cmd_admin_godmode(mob/M as mob in GLOB.mob_list)
 	set category = "Admin"
 	set name = "Godmode"
 
@@ -342,7 +342,7 @@ Traitors and the like can also be revived with the previous role mostly intact.
 		return
 
 	var/mob/dead/observer/G_found
-	for(var/mob/dead/observer/G in player_list)
+	for(var/mob/dead/observer/G in GLOB.player_list)
 		if(G.ckey == input)
 			G_found = G
 			break
@@ -435,6 +435,7 @@ Traitors and the like can also be revived with the previous role mostly intact.
 	//Now for special roles and equipment.
 	switch(new_character.mind.special_role)
 		if("traitor")
+			job_master.AssignRank(new_character, new_character.mind.assigned_role, 0)
 			job_master.EquipRank(new_character, new_character.mind.assigned_role, 1)
 			ticker.mode.equip_traitor(new_character)
 		if("Wizard")
@@ -465,6 +466,7 @@ Traitors and the like can also be revived with the previous role mostly intact.
 						call(/datum/game_mode/proc/add_law_zero)(new_character)
 				//Add aliens.
 				else
+					job_master.AssignRank(new_character, new_character.mind.assigned_role, 0)
 					job_master.EquipRank(new_character, new_character.mind.assigned_role, 1)//Or we simply equip them.
 
 	//Announces the character on all the systems, based on the record.
@@ -488,7 +490,7 @@ Traitors and the like can also be revived with the previous role mostly intact.
 /proc/create_xeno(ckey)
 	if(!ckey)
 		var/list/candidates = list()
-		for(var/mob/M in player_list)
+		for(var/mob/M in GLOB.player_list)
 			if(M.stat != DEAD)		continue	//we are not dead!
 			if(!(ROLE_ALIEN in M.client.prefs.be_special))	continue	//we don't want to be an alium
 			if(jobban_isbanned(M, "alien") || jobban_isbanned(M, "Syndicate")) continue //we are jobbanned
@@ -523,7 +525,7 @@ Traitors and the like can also be revived with the previous role mostly intact.
 
 	var/list/mobs = list()
 	var/list/ghosts = list()
-	var/list/sortmob = sortAtom(mob_list)                           // get the mob list.
+	var/list/sortmob = sortAtom(GLOB.mob_list)                           // get the mob list.
 	/var/any=0
 	for(var/mob/dead/observer/M in sortmob)
 		mobs.Add(M)                                             //filter it where it's only ghosts
@@ -562,7 +564,7 @@ Traitors and the like can also be revived with the previous role mostly intact.
 
 	feedback_add_details("admin_verb","IONC") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
 
-/client/proc/cmd_admin_rejuvenate(mob/living/M as mob in mob_list)
+/client/proc/cmd_admin_rejuvenate(mob/living/M as mob in GLOB.mob_list)
 	set category = "Event"
 	set name = "Rejuvenate"
 
@@ -661,8 +663,17 @@ Traitors and the like can also be revived with the previous role mostly intact.
 		return
 
 	if(job_master)
+		var/currentpositiontally
+		var/totalpositiontally
+		to_chat(src, "<span class='notice'>Job Name: Filled job slot / Total job slots <b>(Free job slots)</b></span>")
 		for(var/datum/job/job in job_master.occupations)
-			to_chat(src, "[job.title]: [job.total_positions]")
+			to_chat(src, "<span class='notice'>[job.title]: [job.current_positions] / \
+			[job.total_positions == -1 ? "<b>UNLIMITED</b>" : job.total_positions] \
+			 <b>([job.total_positions == -1 ? "UNLIMITED" : job.total_positions - job.current_positions])</b></span>")
+			if(job.total_positions != -1) // Only count position that isn't unlimited
+				currentpositiontally += job.current_positions
+				totalpositiontally += job.total_positions
+		to_chat(src, "<b>Currently filled job slots (Excluding unlimited): [currentpositiontally] / [totalpositiontally] ([totalpositiontally - currentpositiontally])</b>")
 	feedback_add_details("admin_verb","LFS") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
 
 /client/proc/cmd_admin_explosion(atom/O as obj|mob|turf in view())
@@ -719,7 +730,7 @@ Traitors and the like can also be revived with the previous role mostly intact.
 	else
 		return
 
-/client/proc/cmd_admin_gib(mob/M as mob in mob_list)
+/client/proc/cmd_admin_gib(mob/M as mob in GLOB.mob_list)
 	set category = "Admin"
 	set name = "Gib"
 
@@ -759,7 +770,7 @@ Traitors and the like can also be revived with the previous role mostly intact.
 		message_admins("<span class='notice'>[key_name_admin(usr)] used gibself.</span>", 1)
 		feedback_add_details("admin_verb","GIBS") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
 
-/client/proc/cmd_admin_check_contents(mob/living/M as mob in mob_list)
+/client/proc/cmd_admin_check_contents(mob/living/M as mob in GLOB.mob_list)
 	set category = "Admin"
 	set name = "Check Contents"
 
@@ -794,7 +805,7 @@ Traitors and the like can also be revived with the previous role mostly intact.
 	set category = "Admin"
 	set name = "Call Shuttle"
 
-	if(shuttle_master.emergency.mode >= SHUTTLE_DOCKED)
+	if(SSshuttle.emergency.mode >= SHUTTLE_DOCKED)
 		return
 
 	if(!check_rights(R_ADMIN))
@@ -804,11 +815,11 @@ Traitors and the like can also be revived with the previous role mostly intact.
 	if(confirm != "Yes") return
 
 	if(alert("Set Shuttle Recallable (Select Yes unless you know what this does)", "Recallable?", "Yes", "No") == "Yes")
-		shuttle_master.emergency.canRecall = TRUE
+		SSshuttle.emergency.canRecall = TRUE
 	else
-		shuttle_master.emergency.canRecall = FALSE
+		SSshuttle.emergency.canRecall = FALSE
 
-	shuttle_master.emergency.request()
+	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.")
@@ -823,20 +834,20 @@ Traitors and the like can also be revived with the previous role mostly intact.
 		return
 	if(alert(src, "You sure?", "Confirm", "Yes", "No") != "Yes") return
 
-	if(shuttle_master.emergency.mode >= SHUTTLE_DOCKED)
+	if(SSshuttle.emergency.mode >= SHUTTLE_DOCKED)
 		return
 
-	if(shuttle_master.emergency.canRecall == FALSE)
+	if(SSshuttle.emergency.canRecall == FALSE)
 		if(alert("Shuttle is currently set to be nonrecallable. Recalling may break things. Respect Recall Status?", "Override Recall Status?", "Yes", "No") == "Yes")
 			return
 		else
 			var/keepStatus = alert("Maintain recall status on future shuttle calls?", "Maintain Status?", "Yes", "No") == "Yes" //Keeps or drops recallability
-			shuttle_master.emergency.canRecall = TRUE // must be true for cancel proc to work
-			shuttle_master.emergency.cancel()
+			SSshuttle.emergency.canRecall = TRUE // must be true for cancel proc to work
+			SSshuttle.emergency.cancel()
 			if(keepStatus)
-				shuttle_master.emergency.canRecall = FALSE // restores original status
+				SSshuttle.emergency.canRecall = FALSE // restores original status
 	else
-		shuttle_master.emergency.cancel()
+		SSshuttle.emergency.cancel()
 
 	feedback_add_details("admin_verb","CCSHUT") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
 	log_admin("[key_name(usr)] admin-recalled the emergency shuttle.")
@@ -853,13 +864,13 @@ Traitors and the like can also be revived with the previous role mostly intact.
 	if(!check_rights(R_ADMIN))
 		return
 
-	if(shuttle_master)
-		shuttle_master.emergencyNoEscape = !shuttle_master.emergencyNoEscape
+	if(SSshuttle)
+		SSshuttle.emergencyNoEscape = !SSshuttle.emergencyNoEscape
 
-	log_admin("[key_name(src)] has [shuttle_master.emergencyNoEscape ? "denied" : "allowed"] the shuttle to be called.")
-	message_admins("[key_name_admin(usr)] has [shuttle_master.emergencyNoEscape ? "denied" : "allowed"] the shuttle to be called.")
+	log_admin("[key_name(src)] has [SSshuttle.emergencyNoEscape ? "denied" : "allowed"] the shuttle to be called.")
+	message_admins("[key_name_admin(usr)] has [SSshuttle.emergencyNoEscape ? "denied" : "allowed"] the shuttle to be called.")
 
-/client/proc/cmd_admin_attack_log(mob/M as mob in mob_list)
+/client/proc/cmd_admin_attack_log(mob/M as mob in GLOB.mob_list)
 	set category = "Admin"
 	set name = "Attack Log"
 
@@ -940,7 +951,7 @@ Traitors and the like can also be revived with the previous role mostly intact.
 		var/datum/TCS_Compiler/C = S.Compiler
 		S.rawcode = ""
 		C.Compile("")
-	for(var/obj/machinery/computer/telecomms/traffic/T in machines)
+	for(var/obj/machinery/computer/telecomms/traffic/T in GLOB.machines)
 		T.storedcode = ""
 	log_admin("[key_name(usr)] blanked all telecomms scripts.")
 	message_admins("[key_name_admin(usr)] blanked all telecomms scripts.")
@@ -961,7 +972,7 @@ Traitors and the like can also be revived with the previous role mostly intact.
 	var/job_string
 	var/key_string
 	var/role_string
-	for(var/mob/living/carbon/human/H in living_mob_list)
+	for(var/mob/living/carbon/human/H in GLOB.living_mob_list)
 		if(!isLivingSSD(H))
 			continue
 		mins_ssd = round((world.time - H.last_logout) / 600)
@@ -979,7 +990,7 @@ Traitors and the like can also be revived with the previous role mostly intact.
 			if(!H.key && H.mind.key)
 				key_string = H.mind.key
 		msg += "<TR><TD>[key_string]</TD><TD>[H.real_name]</TD><TD>[job_string]</TD><TD>[mins_ssd]</TD><TD>[role_string]</TD>"
-		msg += "<TD>[get_area(H)]</TD><TD><A HREF='?_src_=holder;adminplayeropts=\ref[H]'>PP</A></TD>"
+		msg += "<TD>[get_area(H)]</TD><TD>[ADMIN_PP(H,"PP")]</TD>"
 		if(istype(H.loc, /obj/machinery/cryopod))
 			msg += "<TD>In Cryo</TD>"
 		else

code/modules/admin/verbs/striketeam.dm

@@ -48,7 +48,7 @@ var/global/sent_strike_team = 0
 	var/commando_number = commandos_possible //for selecting a leader
 	var/is_leader = TRUE // set to FALSE after leader is spawned
 
-	for(var/obj/effect/landmark/L in landmarks_list)
+	for(var/obj/effect/landmark/L in GLOB.landmarks_list)
 
 		if(commando_number <= 0)
 			break
@@ -108,7 +108,7 @@ var/global/sent_strike_team = 0
 			commando_number--
 
 	//Spawns the rest of the commando gear.
-	for(var/obj/effect/landmark/L in landmarks_list)
+	for(var/obj/effect/landmark/L in GLOB.landmarks_list)
 		if(L.name == "Commando_Manual")
 			//new /obj/item/gun/energy/pulse_rifle(L.loc)
 			var/obj/item/paper/P = new(L.loc)
@@ -119,7 +119,7 @@ var/global/sent_strike_team = 0
 			P.stamp(stamp)
 			qdel(stamp)
 
-	for(var/obj/effect/landmark/L in landmarks_list)
+	for(var/obj/effect/landmark/L in GLOB.landmarks_list)
 		if(L.name == "Commando-Bomb")
 			new /obj/effect/spawner/newbomb/timer/syndicate(L.loc)
 			qdel(L)
@@ -132,7 +132,7 @@ var/global/sent_strike_team = 0
 	var/mob/living/carbon/human/new_commando = new(spawn_location.loc)
 	var/commando_leader_rank = pick("Lieutenant", "Captain", "Major")
 	var/commando_rank = pick("Corporal", "Sergeant", "Staff Sergeant", "Sergeant 1st Class", "Master Sergeant", "Sergeant Major")
-	var/commando_name = pick(last_names)
+	var/commando_name = pick(GLOB.last_names)
 
 	var/datum/preferences/A = new()//Randomize appearance for the commando.
 	if(is_leader)

code/modules/admin/verbs/striketeam_syndicate.dm

@@ -53,7 +53,7 @@ var/global/sent_syndicate_strike_team = 0
 	sent_syndicate_strike_team = 1
 
 	//Spawns commandos and equips them.
-	for(var/obj/effect/landmark/L in landmarks_list)
+	for(var/obj/effect/landmark/L in GLOB.landmarks_list)
 
 		if(syndicate_commando_number <= 0)
 			break
@@ -88,7 +88,7 @@ var/global/sent_syndicate_strike_team = 0
 			is_leader = FALSE
 			syndicate_commando_number--
 
-	for(var/obj/effect/landmark/L in landmarks_list)
+	for(var/obj/effect/landmark/L in GLOB.landmarks_list)
 		if(L.name == "Syndicate-Commando-Bomb")
 			new /obj/effect/spawner/newbomb/timer/syndicate(L.loc)
 			qdel(L)
@@ -101,7 +101,7 @@ var/global/sent_syndicate_strike_team = 0
 	var/mob/living/carbon/human/new_syndicate_commando = new(spawn_location.loc)
 	var/syndicate_commando_leader_rank = pick("Lieutenant", "Captain", "Major")
 	var/syndicate_commando_rank = pick("Corporal", "Sergeant", "Staff Sergeant", "Sergeant 1st Class", "Master Sergeant", "Sergeant Major")
-	var/syndicate_commando_name = pick(last_names)
+	var/syndicate_commando_name = pick(GLOB.last_names)
 
 	var/datum/preferences/A = new()//Randomize appearance for the commando.
 	if(is_leader)