diff --git a/check_regex.yaml b/check_regex.yaml
index 396cf9a20961..86faec7e1091 100644
--- a/check_regex.yaml
+++ b/check_regex.yaml
@@ -38,7 +38,7 @@ standards:
 
     - exactly:
           [
-              292,
+              291,
               "non-bitwise << uses",
               '(?<!\d)(?<!\d\s)(?<!<)<<(?!=|\s\d|\d|<|\/)',
           ]
diff --git a/code/__DEFINES/dcs/signals.dm b/code/__DEFINES/dcs/signals.dm
index 6aac7f6d7c8f..6a93f0c7145c 100644
--- a/code/__DEFINES/dcs/signals.dm
+++ b/code/__DEFINES/dcs/signals.dm
@@ -544,6 +544,13 @@
 #define COMSIG_ITEM_SPLIT_PROFIT "item_split_profits" //Called when getting the item's exact ratio for cargo's profit.
 #define COMSIG_ITEM_SPLIT_PROFIT_DRY "item_split_profits_dry" //Called when getting the item's exact ratio for cargo's profit, without selling the item.
 
+/// Admin helps
+/// From /datum/admin_help/RemoveActive().
+/// Fired when an adminhelp is made inactive either due to closing or resolving.
+#define COMSIG_ADMIN_HELP_MADE_INACTIVE "admin_help_made_inactive"
+
+/// Called when the player replies. From /client/proc/cmd_admin_pm().
+#define COMSIG_ADMIN_HELP_REPLIED "admin_help_replied"
 
 // /obj/item/clothing signals
 #define COMSIG_SHOES_STEP_ACTION "shoes_step_action" //from base of obj/item/clothing/shoes/proc/step_action(): ()
diff --git a/code/__DEFINES/layers.dm b/code/__DEFINES/layers.dm
index 5222c3c653d0..780348dd8498 100644
--- a/code/__DEFINES/layers.dm
+++ b/code/__DEFINES/layers.dm
@@ -155,4 +155,7 @@
 
 #define SPLASHSCREEN_LAYER 54
 #define SPLASHSCREEN_PLANE 54
+
+#define ADMIN_POPUP_LAYER 1
+
 #define SPLASHSCREEN_RENDER_TARGET "SPLASHSCREEN_PLANE"
diff --git a/code/controllers/configuration/entries/general.dm b/code/controllers/configuration/entries/general.dm
index eb17e9f921da..5c372b3cf91a 100644
--- a/code/controllers/configuration/entries/general.dm
+++ b/code/controllers/configuration/entries/general.dm
@@ -140,7 +140,8 @@
 
 /datum/config_entry/flag/allow_metadata	// Metadata is supported.
 
-/datum/config_entry/flag/popup_admin_pm	// adminPMs to non-admins show in a pop-up 'reply' window when set
+/// Gives the ability to send players a maptext popup.
+/datum/config_entry/flag/popup_admin_pm
 
 /datum/config_entry/number/fps
 	config_entry_value = 20
diff --git a/code/controllers/subsystem/blackbox.dm b/code/controllers/subsystem/blackbox.dm
index 9c262cde56a9..68c92e84658c 100644
--- a/code/controllers/subsystem/blackbox.dm
+++ b/code/controllers/subsystem/blackbox.dm
@@ -283,7 +283,7 @@ Versioning
 	key = new_key
 	key_type = new_key_type
 
-/datum/controller/subsystem/blackbox/proc/LogAhelp(ticket, action, message, recipient, sender)
+/datum/controller/subsystem/blackbox/proc/log_ahelp(ticket, action, message, recipient, sender)
 	if(!SSdbcore.Connect())
 		return
 
diff --git a/code/datums/components/admin_popup.dm b/code/datums/components/admin_popup.dm
new file mode 100644
index 000000000000..65b97e09b1a2
--- /dev/null
+++ b/code/datums/components/admin_popup.dm
@@ -0,0 +1,125 @@
+/// Applied to clients when they receive an admin popup, alerting them to
+/// their ticket.
+/datum/component/admin_popup
+	/// The user's most active ticket. If this is resolved, closed, or replied to,
+	/// then the component will delete itself.
+	var/datum/admin_help/ticket
+
+	var/atom/movable/screen/admin_popup/admin_popup
+
+/datum/component/admin_popup/Initialize(datum/admin_help/ticket)
+	if (!istype(parent, /client))
+		return COMPONENT_INCOMPATIBLE
+
+	if (!istype(ticket))
+		return COMPONENT_INCOMPATIBLE
+
+	create_notice()
+
+	RegisterSignal(
+		ticket,
+		list(
+			COMSIG_ADMIN_HELP_MADE_INACTIVE,
+			COMSIG_ADMIN_HELP_REPLIED,
+			COMSIG_PARENT_QDELETING,
+		),
+		.proc/delete_self,
+	)
+
+/datum/component/admin_popup/Destroy(force, silent)
+	var/client/parent_client = parent
+
+	parent_client?.screen -= admin_popup
+	QDEL_NULL(admin_popup)
+
+	if (!QDELETED(ticket))
+		UnregisterSignal(ticket, list(
+			COMSIG_ADMIN_HELP_MADE_INACTIVE,
+			COMSIG_ADMIN_HELP_REPLIED,
+			COMSIG_PARENT_QDELETING,
+		))
+
+		ticket = null
+
+	return ..()
+
+/datum/component/admin_popup/proc/create_notice()
+	if(admin_popup)
+		qdel(admin_popup)
+	admin_popup = new
+
+	var/client/parent_client = parent
+	admin_popup.maptext_width = getviewsize(parent_client.view_size.getView())[1] * world.icon_size
+	parent_client.screen += admin_popup
+
+/datum/component/admin_popup/proc/delete_self()
+	SIGNAL_HANDLER
+	qdel(src)
+
+/// The UI element for admin popups
+/atom/movable/screen/admin_popup
+	icon = null
+	icon_state = null
+	plane = ABOVE_HUD_PLANE
+	layer = ADMIN_POPUP_LAYER
+	mouse_opacity = MOUSE_OPACITY_TRANSPARENT
+	screen_loc = "TOP-5,LEFT"
+	maptext_height = 480
+	maptext_width = 480
+	maptext = ""
+
+	var/static/list/colors = list(
+		COLOR_RED,
+		COLOR_ORANGE,
+		COLOR_YELLOW,
+		COLOR_LIME,
+		COLOR_CYAN,
+		COLOR_PURPLE,
+	)
+
+	/// The last color chosen in the animation, sourced from the static list colors.
+	var/last_color_index = 0
+
+	/// The `world.time` when the last color update occurred.
+	var/last_update_time = 0
+
+/atom/movable/screen/admin_popup/New(loc, ...)
+	. = ..()
+
+	START_PROCESSING(SSobj, src)
+	update_text()
+
+/atom/movable/screen/admin_popup/Destroy()
+	STOP_PROCESSING(SSobj, src)
+	return ..()
+
+/atom/movable/screen/admin_popup/process(delta_time)
+	update_text()
+
+/atom/movable/screen/admin_popup/proc/update_text()
+	// Even if processing time changes, we want this to remain slow.
+	// We want to pester them into reading their ticket, not give them a seizure!
+	if (world.time - last_update_time < 2 SECONDS)
+		return
+
+	last_color_index = (last_color_index % colors.len) + 1
+
+	var/message = "<b style='color: [colors[last_color_index]]; text-align: center; font-size: 32px'>"
+	message += "HEY! An admin is trying to talk to you!<br>Check your chat window, and click their name to respond!"
+	message += "</b>"
+
+	maptext = MAPTEXT(message)
+	last_update_time = world.time
+
+/// Tries to give the target an admin popup.
+/// If it fails, will send the error to the passed admin.
+/proc/give_admin_popup(client/target, client/admin, message)
+	log_admin("[key_name(admin)] sent an admin popup to [key_name(target)].")
+
+	var/datum/admin_help/current_ticket = target.current_ticket
+	if (!current_ticket)
+		to_chat(admin, span_warning("[key_name(target)] had no active ahelp, aborting."))
+		return
+
+	admin.cmd_admin_pm(target, message)
+	target.AddComponent(/datum/component/admin_popup, current_ticket)
diff --git a/code/modules/admin/chat_commands.dm b/code/modules/admin/chat_commands.dm
index 4f20564d8fe5..baa52e38c7da 100644
--- a/code/modules/admin/chat_commands.dm
+++ b/code/modules/admin/chat_commands.dm
@@ -66,7 +66,7 @@
 	all_params.Cut(1, 2)
 	var/id = text2num(target)
 	if(id != null)
-		var/datum/admin_help/AH = GLOB.ahelp_tickets.TicketByID(id)
+		var/datum/admin_help/AH = GLOB.ahelp_tickets.ticket_by_id(id)
 		if(AH)
 			target = AH.initiator_ckey
 		else
diff --git a/code/modules/admin/sql_ban_system.dm b/code/modules/admin/sql_ban_system.dm
index b10a5a4feb03..bde0a7676fac 100644
--- a/code/modules/admin/sql_ban_system.dm
+++ b/code/modules/admin/sql_ban_system.dm
@@ -549,7 +549,7 @@
 		if(roles_to_ban[1] == "Server" && (!is_admin || (is_admin && applies_to_admins)))
 			qdel(C)
 	if(roles_to_ban[1] == "Server" && AH)
-		AH.Resolve()
+		AH.resolve()
 	for(var/client/i in GLOB.clients - C)
 		if(i.address == player_ip || i.computer_id == player_cid)
 			build_ban_cache(i)
diff --git a/code/modules/admin/topic.dm b/code/modules/admin/topic.dm
index 056e5c168f03..012be5da1e51 100644
--- a/code/modules/admin/topic.dm
+++ b/code/modules/admin/topic.dm
@@ -29,12 +29,12 @@
 		var/ahelp_ref = href_list["ahelp"]
 		var/datum/admin_help/AH = locate(ahelp_ref)
 		if(AH)
-			AH.Action(href_list["ahelp_action"])
+			AH.action(usr, href_list["ahelp_action"])
 		else
 			to_chat(usr, "Ticket [ahelp_ref] has been deleted!", confidential = TRUE)
 
 	else if(href_list["ahelp_tickets"])
-		GLOB.ahelp_tickets.BrowseTickets(text2num(href_list["ahelp_tickets"]))
+		GLOB.ahelp_tickets.browse_tickets(text2num(href_list["ahelp_tickets"]))
 
 	else if(href_list["stickyban"])
 		stickyban(href_list["stickyban"],href_list)
@@ -1260,6 +1260,22 @@
 			message_admins("[key_name(H)] has their hands full, so they did not receive their [initial(cookiealt.name)], spawned by [key_name(src.owner)].")
 		// WS - End
 
+	else if (href_list["adminpopup"])
+		if (!check_rights(R_ADMIN))
+			return
+
+		var/message = input(owner, "As well as a popup, they'll also be sent a message to reply to. What do you want that to be?", "Message") as text|null
+		if (!message)
+			to_chat(owner, span_notice("Popup cancelled."))
+			return
+
+		var/client/target = locate(href_list["adminpopup"])
+		if (!istype(target))
+			to_chat(owner, span_notice("The mob doesn't exist anymore!"))
+			return
+
+		give_admin_popup(target, owner, message)
+
 	else if(href_list["adminsmite"])
 		if(!check_rights(R_ADMIN|R_FUN))
 			return
diff --git a/code/modules/admin/verbs/adminhelp.dm b/code/modules/admin/verbs/adminhelp.dm
index 267dde41ea9c..1b9b41d773b1 100644
--- a/code/modules/admin/verbs/adminhelp.dm
+++ b/code/modules/admin/verbs/adminhelp.dm
@@ -26,7 +26,7 @@ GLOBAL_DATUM_INIT(ahelp_tickets, /datum/admin_help_tickets, new)
 	QDEL_NULL(rstatclick)
 	return ..()
 
-/datum/admin_help_tickets/proc/TicketByID(id)
+/datum/admin_help_tickets/proc/ticket_by_id(id)
 	var/list/lists = list(active_tickets, closed_tickets, resolved_tickets)
 	for(var/I in lists)
 		for(var/J in I)
@@ -34,7 +34,7 @@ GLOBAL_DATUM_INIT(ahelp_tickets, /datum/admin_help_tickets, new)
 			if(AH.id == id)
 				return J
 
-/datum/admin_help_tickets/proc/TicketsByCKey(ckey)
+/datum/admin_help_tickets/proc/tickets_by_ckey(ckey)
 	. = list()
 	var/list/lists = list(active_tickets, closed_tickets, resolved_tickets)
 	for(var/I in lists)
@@ -44,7 +44,7 @@ GLOBAL_DATUM_INIT(ahelp_tickets, /datum/admin_help_tickets, new)
 				. += AH
 
 //private
-/datum/admin_help_tickets/proc/ListInsert(datum/admin_help/new_ticket)
+/datum/admin_help_tickets/proc/list_insert(datum/admin_help/new_ticket)
 	var/list/ticket_list
 	switch(new_ticket.state)
 		if(AHELP_ACTIVE)
@@ -65,7 +65,7 @@ GLOBAL_DATUM_INIT(ahelp_tickets, /datum/admin_help_tickets, new)
 	ticket_list += new_ticket
 
 //opens the ticket listings for one of the 3 states
-/datum/admin_help_tickets/proc/BrowseTickets(state)
+/datum/admin_help_tickets/proc/browse_tickets(state)
 	var/list/l2b
 	var/title
 	switch(state)
@@ -94,8 +94,8 @@ GLOBAL_DATUM_INIT(ahelp_tickets, /datum/admin_help_tickets, new)
 	SHOULD_NOT_SLEEP(TRUE)
 	var/list/L = list()
 	var/num_disconnected = 0
-	L[++L.len] = list("Active Tickets:", "[astatclick.update("[active_tickets.len]")]", null, REF(astatclick))
-	astatclick.update("[active_tickets.len]")
+	L[++L.len] = list("Active Tickets:", "[astatclick.update("[length(active_tickets)]")]", null, REF(astatclick))
+	astatclick.update("[length(active_tickets)]")
 	for(var/I in active_tickets)
 		var/datum/admin_help/AH = I
 		if(AH.initiator)
@@ -107,34 +107,35 @@ GLOBAL_DATUM_INIT(ahelp_tickets, /datum/admin_help_tickets, new)
 					message_admins("Ticket #[AH.id] had a null statclick, this message will only be shown once.")
 					AH.error_screamed = TRUE
 
-			L[++L.len] = list("#[AH.id]. [AH.initiator_key_name]:", "[AH.statclick.update()]", REF(AH))
+			L[++L.len] = list("#[AH.id]. [AH.initiator_key_name] (Claimed by [AH.claimed_by || "nobody"]):", "[AH.statclick.update()]", REF(AH))
 		else
 			++num_disconnected
+
 	if(num_disconnected)
 		L[++L.len] = list("Disconnected:", "[astatclick.update("[num_disconnected]")]", null, REF(astatclick))
-	L[++L.len] = list("Closed Tickets:", "[cstatclick.update("[closed_tickets.len]")]", null, REF(cstatclick))
-	L[++L.len] = list("Resolved Tickets:", "[rstatclick.update("[resolved_tickets.len]")]", null, REF(rstatclick))
+	L[++L.len] = list("Closed Tickets:", "[cstatclick.update("[length(closed_tickets)]")]", null, REF(cstatclick))
+	L[++L.len] = list("Resolved Tickets:", "[rstatclick.update("[length(resolved_tickets)]")]", null, REF(rstatclick))
 	L[++L.len] = list("Statclick Errors:", "[total_statclick_errors]", null, null)
 	return L
 
 //Reassociate still open ticket if one exists
-/datum/admin_help_tickets/proc/ClientLogin(client/C)
-	C.current_ticket = CKey2ActiveTicket(C.ckey)
+/datum/admin_help_tickets/proc/client_login(client/C)
+	C.current_ticket = ckey2active_ticket(C.ckey)
 	if(C.current_ticket)
 		C.current_ticket.initiator = C
-		C.current_ticket.AddInteraction("Client reconnected.")
-		SSblackbox.LogAhelp(C.current_ticket.id, "Reconnected", "Client reconnected", C.ckey)
+		C.current_ticket.add_interaction("Client reconnected.")
+		SSblackbox.log_ahelp(C.current_ticket.id, "Reconnected", "Client reconnected", C.ckey)
 
 //Dissasociate ticket
-/datum/admin_help_tickets/proc/ClientLogout(client/C)
+/datum/admin_help_tickets/proc/client_logout(client/C)
 	if(C.current_ticket)
 		var/datum/admin_help/T = C.current_ticket
-		T.AddInteraction("Client disconnected.")
-		SSblackbox.LogAhelp(T.id, "Disconnected", "Client disconnected", C.ckey)
+		T.add_interaction("Client disconnected.")
+		SSblackbox.log_ahelp(T.id, "Disconnected", "Client disconnected", C.ckey)
 		T.initiator = null
 
 //Get a ticket given a ckey
-/datum/admin_help_tickets/proc/CKey2ActiveTicket(ckey)
+/datum/admin_help_tickets/proc/ckey2active_ticket(ckey)
 	for(var/I in active_tickets)
 		var/datum/admin_help/AH = I
 		if(AH.initiator_ckey == ckey)
@@ -152,7 +153,7 @@ GLOBAL_DATUM_INIT(ahelp_tickets, /datum/admin_help_tickets, new)
 	..()
 
 /obj/effect/statclick/ticket_list/Click()
-	GLOB.ahelp_tickets.BrowseTickets(current_state)
+	GLOB.ahelp_tickets.browse_tickets(current_state)
 
 //called by admin topic
 /obj/effect/statclick/ticket_list/proc/Action()
@@ -173,9 +174,10 @@ GLOBAL_DATUM_INIT(ahelp_tickets, /datum/admin_help_tickets, new)
 	var/client/initiator	//semi-misnomer, it's the person who ahelped/was bwoinked
 	var/initiator_ckey
 	var/initiator_key_name
+	var/claimed_by
 	var/heard_by_no_admins = FALSE
 
-	var/list/_interactions	//use AddInteraction() or, preferably, admin_ticket_log()
+	var/list/_interactions	//use add_interaction() or, preferably, admin_ticket_log()
 
 	var/obj/effect/statclick/ahelp/statclick
 	var/error_screamed = FALSE
@@ -202,20 +204,21 @@ GLOBAL_DATUM_INIT(ahelp_tickets, /datum/admin_help_tickets, new)
 	initiator_key_name = key_name(initiator, FALSE, TRUE)
 	if(initiator.current_ticket)	//This is a bug
 		stack_trace("Multiple ahelp current_tickets")
-		initiator.current_ticket.AddInteraction("Ticket erroneously left open by code")
-		initiator.current_ticket.Close()
+		initiator.current_ticket.add_interaction("Ticket erroneously left open by code")
+		initiator.current_ticket.close()
 	initiator.current_ticket = src
 
-	TimeoutVerb()
+	timeout_verb()
 
 	statclick = new(null, src)
 	_interactions = list()
 
 	if(is_bwoink)
-		AddInteraction("<font color='blue'>[key_name_admin(usr)] PM'd [LinkedReplyName()]</font>")
-		message_admins("<font color='blue'>Ticket [TicketHref("#[id]")] created</font>")
+		add_interaction("<font color='blue'>[key_name_admin(usr)] PM'd [linked_reply_name()]</font>")
+		message_admins("<font color='blue'>Ticket [ticket_href("#[id]")] created</font>")
+		claimed_by = usr.key
 	else
-		MessageNoRecipient(msg)
+		message_no_recipient(msg)
 
 		SSredbot.send_discord_message("admin", "Ticket #[id] created by [usr.ckey] ([usr.real_name]): [name]", "ticket")
 
@@ -228,60 +231,66 @@ GLOBAL_DATUM_INIT(ahelp_tickets, /datum/admin_help_tickets, new)
 	GLOB.ahelp_tickets.active_tickets += src
 
 /datum/admin_help/Destroy()
-	RemoveActive()
+	remove_active()
+	QDEL_NULL(statclick)
 	GLOB.ahelp_tickets.closed_tickets -= src
 	GLOB.ahelp_tickets.resolved_tickets -= src
 	return ..()
 
-/datum/admin_help/proc/AddInteraction(formatted_message)
+/datum/admin_help/proc/add_interaction(formatted_message)
 	if(heard_by_no_admins && usr && usr.ckey != initiator_ckey)
 		heard_by_no_admins = FALSE
 		send2tgs(initiator_ckey, "Ticket #[id]: Answered by [key_name(usr)]")
 	_interactions += "[time_stamp()]: [formatted_message]"
 
 //Removes the ahelp verb and returns it after 2 minutes
-/datum/admin_help/proc/TimeoutVerb()
+/datum/admin_help/proc/timeout_verb()
 	remove_verb(initiator, /client/verb/adminhelp)
 	initiator.adminhelptimerid = addtimer(CALLBACK(initiator, /client/proc/giveadminhelpverb), 1200, TIMER_STOPPABLE) //2 minute cooldown of admin helps
 
 //private
-/datum/admin_help/proc/FullMonty(ref_src)
+/datum/admin_help/proc/full_monty(ref_src)
 	if(!ref_src)
 		ref_src = "[REF(src)]"
 	. = ADMIN_FULLMONTY_NONAME(initiator.mob)
 	if(state == AHELP_ACTIVE)
-		. += ClosureLinks(ref_src)
+		. += ticket_actions(ref_src)
+
+		if (CONFIG_GET(flag/popup_admin_pm))
+			. += " (<A HREF='?_src_=holder;[HrefToken(TRUE)];adminpopup=[REF(initiator)]'>POPUP</A>)"
 
 //private
-/datum/admin_help/proc/ClosureLinks(ref_src)
+/datum/admin_help/proc/ticket_actions(ref_src)
 	if(!ref_src)
 		ref_src = "[REF(src)]"
-	. = " (<A HREF='?_src_=holder;[HrefToken(TRUE)];ahelp=[ref_src];ahelp_action=reject'>REJT</A>)"
-	. += " (<A HREF='?_src_=holder;[HrefToken(TRUE)];ahelp=[ref_src];ahelp_action=icissue'>IC</A>)"
-	. += " (<A HREF='?_src_=holder;[HrefToken(TRUE)];ahelp=[ref_src];ahelp_action=skillissue'>SKILL</A>)"
-	. += " (<A HREF='?_src_=holder;[HrefToken(TRUE)];ahelp=[ref_src];ahelp_action=close'>CLOSE</A>)"
-	. += " (<A HREF='?_src_=holder;[HrefToken(TRUE)];ahelp=[ref_src];ahelp_action=resolve'>RSLVE</A>)"
+	. = "<br />"
+	. += " ([ticket_href("REJT", ref_src, "reject")])"
+	. += " ([ticket_href("IC", ref_src, "icissue")])"
+	. += " ([ticket_href("SKILL", ref_src, "skillissue")])"
+	. += " ([ticket_href("CLOSE", ref_src, "close")])"
+	. += " ([ticket_href("RSLVE", ref_src, "resolve")])"
+	. += " ([ticket_href("CLAIM", ref_src, "claim")])"
 
 //private
-/datum/admin_help/proc/LinkedReplyName(ref_src)
+/datum/admin_help/proc/linked_reply_name(ref_src)
 	if(!ref_src)
 		ref_src = "[REF(src)]"
 	return "<A HREF='?_src_=holder;[HrefToken(TRUE)];ahelp=[ref_src];ahelp_action=reply'>[initiator_key_name]</A>"
 
 //private
-/datum/admin_help/proc/TicketHref(msg, ref_src, action = "ticket")
+/datum/admin_help/proc/ticket_href(msg, ref_src, action = "ticket")
 	if(!ref_src)
 		ref_src = "[REF(src)]"
 	return "<A HREF='?_src_=holder;[HrefToken(TRUE)];ahelp=[ref_src];ahelp_action=[action]'>[msg]</A>"
 
 //message from the initiator without a target, all admins will see this
 //won't bug irc/discord
-/datum/admin_help/proc/MessageNoRecipient(msg)
+/datum/admin_help/proc/message_no_recipient(msg)
 	var/ref_src = "[REF(src)]"
 	//Message to be sent to all admins
-	var/admin_msg = "<span class='adminnotice'><span class='adminhelp'>Ticket [TicketHref("#[id]", ref_src)]</span><b>: [LinkedReplyName(ref_src)] [FullMonty(ref_src)]:</b> <span class='linkify'>[keywords_lookup(msg)]</span></span>"
+	var/admin_msg = "<span class='adminnotice'><span class='adminhelp'>Ticket [ticket_href("#[id]", ref_src)]</span><b>: [linked_reply_name(ref_src)] [full_monty(ref_src)]:</b> <span class='linkify'>[keywords_lookup(msg)]</span></span>"
 
-	AddInteraction("<font color='red'>[LinkedReplyName(ref_src)]: [msg]</font>")
+	add_interaction("<font color='red'>[linked_reply_name(ref_src)]: [msg]</font>")
 	log_admin_private("Ticket #[id]: [key_name(initiator)]: [msg]")
 
 	//send this msg to all admins
@@ -299,19 +308,18 @@ GLOBAL_DATUM_INIT(ahelp_tickets, /datum/admin_help_tickets, new)
 		type = MESSAGE_TYPE_ADMINPM,
 		html = "<span class='adminnotice'>PM to-<b>Admins</b>: <span class='linkify'>[msg]</span></span>",
 		confidential = TRUE)
-	SSblackbox.LogAhelp(id, "Ticket Opened", msg, null, initiator.ckey)
+	SSblackbox.log_ahelp(id, "Ticket Opened", msg, null, initiator.ckey)
 
 //Reopen a closed ticket
-/datum/admin_help/proc/Reopen()
+/datum/admin_help/proc/reopen()
 	if(state == AHELP_ACTIVE)
 		to_chat(usr, "<span class='warning'>This ticket is already open.</span>", confidential = TRUE)
 		return
 
-	if(GLOB.ahelp_tickets.CKey2ActiveTicket(initiator_ckey))
+	if(GLOB.ahelp_tickets.ckey2active_ticket(initiator_ckey))
 		to_chat(usr, "<span class='warning'>This user already has an active ticket, cannot reopen this one.</span>", confidential = TRUE)
 		return
 
-	statclick = new(null, src)
 	GLOB.ahelp_tickets.active_tickets += src
 	GLOB.ahelp_tickets.closed_tickets -= src
 	GLOB.ahelp_tickets.resolved_tickets -= src
@@ -325,61 +333,91 @@ GLOBAL_DATUM_INIT(ahelp_tickets, /datum/admin_help_tickets, new)
 	if(initiator)
 		initiator.current_ticket = src
 
-	AddInteraction("<font color='purple'>Reopened by [key_name_admin(usr)]</font>")
-	var/msg = "<span class='adminhelp'>Ticket [TicketHref("#[id]")] reopened by [key_name_admin(usr)].</span>"
+	add_interaction("<font color='purple'>Reopened by [key_name_admin(usr)]</font>")
+	var/msg = "<span class='adminhelp'>Ticket [ticket_href("#[id]")] reopened by [key_name_admin(usr)].</span>"
 	message_admins(msg)
 	log_admin_private(msg)
-	SSblackbox.LogAhelp(id, "Reopened", "Reopened by [usr.key]", usr.ckey)
+	SSblackbox.log_ahelp(id, "Reopened", "Reopened by [usr.key]", usr.ckey)
 	SSblackbox.record_feedback("tally", "ahelp_stats", 1, "reopened")
-	TicketPanel()	//can only be done from here, so refresh it
+	ticket_panel()	//can only be done from here, so refresh it
 
 //private
-/datum/admin_help/proc/RemoveActive()
+/datum/admin_help/proc/remove_active()
 	if(state != AHELP_ACTIVE)
 		stack_trace("Attempt to remove non-active ticket")
 		return
 	closed_at = world.time
-	QDEL_NULL(statclick)
 	GLOB.ahelp_tickets.active_tickets -= src
 	if(initiator && initiator.current_ticket == src)
 		initiator.current_ticket = null
+	SEND_SIGNAL(src, COMSIG_ADMIN_HELP_MADE_INACTIVE)
+
+/datum/admin_help/proc/claim(key_name = key_name_admin(usr))
+	if(state != AHELP_ACTIVE)
+		return FALSE
+	if(claimed_by && claimed_by != usr.key && alert(usr, "Ticket #[id] already claimed by [claimed_by]. Override?", "Adminhelp", "Yes", "No") != "Yes")
+		return FALSE
+	if(claimed_by == usr.key)
+		return TRUE
+	add_interaction(span_grey("Claimed by [key_name]."))
+	to_chat(initiator, span_adminhelp("Your ticket has been claimed by an admin. Expect a response shortly."), confidential = TRUE)
+	claimed_by = usr.key
+	SSblackbox.record_feedback("tally", "ahelp_stats", 1, "claimed")
+	var/msg = "Ticket [ticket_href("#[id]")] claimed by [key_name]."
+	message_admins(msg)
+	SSblackbox.log_ahelp(id, "Claimed", "Claimed by [usr.key]", null, usr.ckey)
+	log_admin_private(msg)
+	return TRUE
+
+/datum/admin_help/proc/unclaim(key_name = key_name_admin(usr))
+	if(state != AHELP_ACTIVE)
+		return
+	if(claimed_by != usr.key)
+		return
+	add_interaction(span_grey("Unclaimed by [key_name]."))
+	claimed_by = null
+	SSblackbox.record_feedback("tally", "ahelp_stats", 1, "unclaimed")
+	var/msg = "Ticket [ticket_href("#[id]")] unclaimed by [key_name]."
+	message_admins(msg)
+	SSblackbox.log_ahelp(id, "Unclaimed", "Unclaimed by [usr.key]", null, usr.ckey)
+	log_admin_private(msg)
 
 //Mark open ticket as closed/meme
-/datum/admin_help/proc/Close(key_name = key_name_admin(usr), silent = FALSE)
+/datum/admin_help/proc/close(key_name = key_name_admin(usr), silent = FALSE)
 	if(state != AHELP_ACTIVE)
 		return
-	RemoveActive()
+	remove_active()
 	state = AHELP_CLOSED
-	GLOB.ahelp_tickets.ListInsert(src)
-	AddInteraction("<font color='red'>Closed by [key_name].</font>")
+	GLOB.ahelp_tickets.list_insert(src)
+	add_interaction("<font color='red'>Closed by [key_name].</font>")
 	if(!silent)
 		SSblackbox.record_feedback("tally", "ahelp_stats", 1, "closed")
-		var/msg = "Ticket [TicketHref("#[id]")] closed by [key_name]."
+		var/msg = "Ticket [ticket_href("#[id]")] closed by [key_name]."
 		message_admins(msg)
-		SSblackbox.LogAhelp(id, "Closed", "Closed by [usr.key]", null, usr.ckey)
+		SSblackbox.log_ahelp(id, "Closed", "Closed by [usr.key]", null, usr.ckey)
 		log_admin_private(msg)
 
 //Mark open ticket as resolved/legitimate, returns ahelp verb
-/datum/admin_help/proc/Resolve(key_name = key_name_admin(usr), silent = FALSE)
+/datum/admin_help/proc/resolve(key_name = key_name_admin(usr), silent = FALSE)
 	if(state != AHELP_ACTIVE)
 		return
-	RemoveActive()
+	remove_active()
 	state = AHELP_RESOLVED
-	GLOB.ahelp_tickets.ListInsert(src)
+	GLOB.ahelp_tickets.list_insert(src)
 
 	addtimer(CALLBACK(initiator, /client/proc/giveadminhelpverb), 50)
 
-	AddInteraction("<font color='green'>Resolved by [key_name].</font>")
+	add_interaction("<font color='green'>Resolved by [key_name].</font>")
 	to_chat(initiator, "<span class='adminhelp'>Your ticket has been resolved by an admin. The Adminhelp verb will be returned to you shortly.</span>", confidential = TRUE)
 	if(!silent)
 		SSblackbox.record_feedback("tally", "ahelp_stats", 1, "resolved")
-		var/msg = "Ticket [TicketHref("#[id]")] resolved by [key_name]"
+		var/msg = "Ticket [ticket_href("#[id]")] resolved by [key_name]"
 		message_admins(msg)
-		SSblackbox.LogAhelp(id, "Resolved", "Resolved by [usr.key]", null, usr.ckey)
+		SSblackbox.log_ahelp(id, "Resolved", "Resolved by [usr.key]", null, usr.ckey)
 		log_admin_private(msg)
 
 //Close and return ahelp verb, use if ticket is incoherent
-/datum/admin_help/proc/Reject(key_name = key_name_admin(usr))
+/datum/admin_help/proc/reject(key_name = key_name_admin(usr))
 	if(state != AHELP_ACTIVE)
 		return
 
@@ -393,15 +431,15 @@ GLOBAL_DATUM_INIT(ahelp_tickets, /datum/admin_help_tickets, new)
 		to_chat(initiator, "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.", confidential = TRUE)
 
 	SSblackbox.record_feedback("tally", "ahelp_stats", 1, "rejected")
-	var/msg = "Ticket [TicketHref("#[id]")] rejected by [key_name]"
+	var/msg = "Ticket [ticket_href("#[id]")] rejected by [key_name]"
 	message_admins(msg)
 	log_admin_private(msg)
-	AddInteraction("Rejected by [key_name].")
-	SSblackbox.LogAhelp(id, "Rejected", "Rejected by [usr.key]", null, usr.ckey)
-	Close(silent = TRUE)
+	add_interaction("Rejected by [key_name].")
+	SSblackbox.log_ahelp(id, "Rejected", "Rejected by [usr.key]", null, usr.ckey)
+	close(silent = TRUE)
 
 //Resolve ticket with IC Issue message
-/datum/admin_help/proc/ICIssue(key_name = key_name_admin(usr))
+/datum/admin_help/proc/ic_issue(key_name = key_name_admin(usr))
 	if(state != AHELP_ACTIVE)
 		return
 
@@ -412,15 +450,15 @@ GLOBAL_DATUM_INIT(ahelp_tickets, /datum/admin_help_tickets, new)
 		to_chat(initiator, msg, confidential = TRUE)
 
 	SSblackbox.record_feedback("tally", "ahelp_stats", 1, "IC")
-	msg = "Ticket [TicketHref("#[id]")] marked as IC by [key_name]"
+	msg = "Ticket [ticket_href("#[id]")] marked as IC by [key_name]"
 	message_admins(msg)
 	log_admin_private(msg)
-	AddInteraction("Marked as IC issue by [key_name]")
-	SSblackbox.LogAhelp(id, "IC Issue", "Marked as IC issue by [usr.key]", null,  usr.ckey)
-	Resolve(silent = TRUE)
+	add_interaction("Marked as IC issue by [key_name]")
+	SSblackbox.log_ahelp(id, "IC Issue", "Marked as IC issue by [usr.key]", null,  usr.ckey)
+	resolve(silent = TRUE)
 
 //Resolve ticket and inform user that they have a skill issue
-/datum/admin_help/proc/SkillIssue(key_name = key_name_admin(usr))
+/datum/admin_help/proc/skill_issue(key_name = key_name_admin(usr))
 	if(state != AHELP_ACTIVE)
 		return
 
@@ -431,18 +469,18 @@ GLOBAL_DATUM_INIT(ahelp_tickets, /datum/admin_help_tickets, new)
 		to_chat(initiator, msg, confidential = TRUE)
 
 	SSblackbox.record_feedback("tally", "ahelp_stats", 1, "Skill")
-	msg = "Ticket [TicketHref("#[id]")] marked as skill issue by [key_name]"
+	msg = "Ticket [ticket_href("#[id]")] marked as skill issue by [key_name]"
 	message_admins(msg)
 	log_admin_private(msg)
-	AddInteraction("Marked as skill issue by [key_name]")
-	SSblackbox.LogAhelp(id, "Skill Issue", "Marked as skill issue by [usr.key]", null,  usr.ckey)
-	Resolve(silent = TRUE)
+	add_interaction("Marked as skill issue by [key_name]")
+	SSblackbox.log_ahelp(id, "Skill Issue", "Marked as skill issue by [usr.key]", null,  usr.ckey)
+	resolve(silent = TRUE)
 
 //Show the ticket panel
-/datum/admin_help/proc/TicketPanel()
-	var/list/dat = list("<html><head><meta http-equiv='Content-Type' content='text/html; charset=UTF-8'><title>Ticket #[id]</title></head>")
+/datum/admin_help/proc/ticket_panel()
+	var/list/dat = list()
 	var/ref_src = "[REF(src)]"
-	dat += "<h4>Admin Help Ticket #[id]: [LinkedReplyName(ref_src)]</h4>"
+	dat += "<h4>Admin Help Ticket #[id]: [linked_reply_name(ref_src)] (Claimed by [claimed_by || "nobody"])</h4>"
 	dat += "<b>State: "
 	switch(state)
 		if(AHELP_ACTIVE)
@@ -453,55 +491,64 @@ GLOBAL_DATUM_INIT(ahelp_tickets, /datum/admin_help_tickets, new)
 			dat += "CLOSED"
 		else
 			dat += "UNKNOWN"
-	dat += "</b>[FOURSPACES][TicketHref("Refresh", ref_src)][FOURSPACES][TicketHref("Re-Title", ref_src, "retitle")]"
+	dat += "</b>[FOURSPACES][ticket_href("Refresh", ref_src)][FOURSPACES][ticket_href("Re-Title", ref_src, "retitle")]"
 	if(state != AHELP_ACTIVE)
-		dat += "[FOURSPACES][TicketHref("Reopen", ref_src, "reopen")]"
+		dat += "[FOURSPACES][ticket_href("Reopen", ref_src, "reopen")]"
 	dat += "<br><br>Opened at: [gameTimestamp(wtime = opened_at)] (Approx [DisplayTimeText(world.time - opened_at)] ago)"
 	if(closed_at)
 		dat += "<br>Closed at: [gameTimestamp(wtime = closed_at)] (Approx [DisplayTimeText(world.time - closed_at)] ago)"
 	dat += "<br><br>"
 	if(initiator)
-		dat += "<b>Actions:</b> [FullMonty(ref_src)]<br>"
+		dat += "<b>Actions:</b><br>[full_monty(ref_src)]<br>"
 	else
-		dat += "<b>DISCONNECTED</b>[FOURSPACES][ClosureLinks(ref_src)]<br>"
+		dat += "<b>DISCONNECTED</b>[ticket_actions(ref_src)]<br>"
 	dat += "<br><b>Log:</b><br><br>"
 	for(var/I in _interactions)
 		dat += "[I]<br>"
 
-	usr << browse(dat.Join(), "window=ahelp[id];size=620x480")
+	var/datum/browser/popup = new(usr, "ahelp[id]", "Ticket #[id]", 620, 480)
+	popup.set_content(dat.Join())
+	popup.open()
 
-/datum/admin_help/proc/Retitle()
+/datum/admin_help/proc/retitle()
 	var/new_title = input(usr, "Enter a title for the ticket", "Rename Ticket", name) as text|null
 	if(new_title)
 		name = new_title
 		//not saying the original name cause it could be a long ass message
-		var/msg = "Ticket [TicketHref("#[id]")] titled [name] by [key_name_admin(usr)]"
+		var/msg = "Ticket [ticket_href("#[id]")] titled [name] by [key_name_admin(usr)]"
 		message_admins(msg)
 		log_admin_private(msg)
-	TicketPanel()	//we have to be here to do this
+	ticket_panel()	//we have to be here to do this
 
 //Forwarded action from admin/Topic
-/datum/admin_help/proc/Action(action)
+/datum/admin_help/proc/action(mob/user, action)
 	testing("Ahelp action: [action]")
 	switch(action)
+		if("claim")
+			if(user.key == claimed_by)
+				unclaim()
+				return
+			claim()
 		if("ticket")
-			TicketPanel()
+			ticket_panel()
 		if("retitle")
-			Retitle()
+			retitle()
 		if("reject")
-			Reject()
+			reject()
 		if("reply")
-			usr.client.cmd_ahelp_reply(initiator)
+			if(!claim())
+				return
+			user.client.cmd_ahelp_reply(initiator)
 		if("icissue")
-			ICIssue()
+			ic_issue()
 		if("skillissue")
-			SkillIssue()
+			skill_issue()
 		if("close")
-			Close()
+			close()
 		if("resolve")
-			Resolve()
+			resolve()
 		if("reopen")
-			Reopen()
+			reopen()
 
 //
 // TICKET STATCLICK
@@ -518,7 +565,7 @@ GLOBAL_DATUM_INIT(ahelp_tickets, /datum/admin_help_tickets, new)
 	return ..(ahelp_datum.name)
 
 /obj/effect/statclick/ahelp/Click()
-	ahelp_datum.TicketPanel()
+	ahelp_datum.ticket_panel()
 
 /obj/effect/statclick/ahelp/Destroy()
 	ahelp_datum = null
@@ -562,14 +609,14 @@ GLOBAL_DATUM_INIT(ahelp_tickets, /datum/admin_help_tickets, new)
 	if(current_ticket)
 		if(alert(usr, "You already have a ticket open. Is this for the same issue?",,"Yes","No") != "No")
 			if(current_ticket)
-				current_ticket.MessageNoRecipient(msg)
-				current_ticket.TimeoutVerb()
+				current_ticket.message_no_recipient(msg)
+				current_ticket.timeout_verb()
 				return
 			else
 				to_chat(usr, "<span class='warning'>Ticket not found, creating new one...</span>", confidential = TRUE)
 		else
-			current_ticket.AddInteraction("[key_name_admin(usr)] opened a new ticket.")
-			current_ticket.Close()
+			current_ticket.add_interaction("[key_name_admin(usr)] opened a new ticket.")
+			current_ticket.close()
 
 	//Extremely simple system of suggesting mentorhelp instead of adminhelp
 	var/msg_lower = lowertext(msg)
@@ -594,12 +641,12 @@ GLOBAL_DATUM_INIT(ahelp_tickets, /datum/admin_help_tickets, new)
 	else
 		C = what
 	if(istype(C) && C.current_ticket)
-		C.current_ticket.AddInteraction(message)
+		C.current_ticket.add_interaction(message)
 		return C.current_ticket
 	if(istext(what))	//ckey
-		var/datum/admin_help/AH = GLOB.ahelp_tickets.CKey2ActiveTicket(what)
+		var/datum/admin_help/AH = GLOB.ahelp_tickets.ckey2active_ticket(what)
 		if(AH)
-			AH.AddInteraction(message)
+			AH.add_interaction(message)
 			return AH
 
 //
@@ -638,8 +685,8 @@ GLOBAL_DATUM_INIT(ahelp_tickets, /datum/admin_help_tickets, new)
 
 
 /proc/send2tgs(msg,msg2)
-	msg = replacetext(replacetext(msg, "\proper", ""), "\improper", "")
-	msg2 = replacetext(replacetext(msg2, "\proper", ""), "\improper", "")
+	msg = format_text(msg)
+	msg2 = format_text(msg2)
 	world.TgsTargetedChatBroadcast("[msg] | [msg2]", TRUE)
 
 /**
@@ -823,7 +870,7 @@ GLOBAL_DATUM_INIT(ahelp_tickets, /datum/admin_help_tickets, new)
 				if(!possible_ticket_id)
 					continue
 
-				var/datum/admin_help/ahelp_check = GLOB.ahelp_tickets?.TicketByID(possible_ticket_id)
+				var/datum/admin_help/ahelp_check = GLOB.ahelp_tickets?.ticket_by_id(possible_ticket_id)
 				if(!ahelp_check)
 					continue
 
diff --git a/code/modules/admin/verbs/adminpm.dm b/code/modules/admin/verbs/adminpm.dm
index b4e5653b0076..d227d44e18b0 100644
--- a/code/modules/admin/verbs/adminpm.dm
+++ b/code/modules/admin/verbs/adminpm.dm
@@ -82,7 +82,7 @@
 				type = MESSAGE_TYPE_ADMINPM,
 				html = "<span class='danger'><b>Message not sent:</b></span><br>[msg]",
 				confidential = TRUE)
-			AH.AddInteraction("<b>No client found, message not sent:</b><br>[msg]")
+			AH.add_interaction("<b>No client found, message not sent:</b><br>[msg]")
 			return
 	cmd_admin_pm(whom, msg)
 
@@ -169,10 +169,10 @@
 						html = "<span class='danger'><b>Message not sent:</b></span><br>[msg]",
 						confidential = TRUE)
 					if(recipient_ticket)
-						recipient_ticket.AddInteraction("<b>No client found, message not sent:</b><br>[msg]")
+						recipient_ticket.add_interaction("<b>No client found, message not sent:</b><br>[msg]")
 					return
 				else
-					current_ticket.MessageNoRecipient(msg)
+					current_ticket.message_no_recipient(msg)
 					return
 
 
@@ -212,6 +212,8 @@
 		if(holder && recipient.holder && !current_ticket) //Both are admins, and this is not a reply to our own ticket.
 			badmin = TRUE
 		if(recipient.holder && !badmin)
+			SEND_SIGNAL(current_ticket, COMSIG_ADMIN_HELP_REPLIED)
+
 			if(holder)
 				to_chat(recipient,
 					type = MESSAGE_TYPE_ADMINPM,
@@ -226,7 +228,7 @@
 				admin_ticket_log(src, interaction_message)
 				if(recipient != src)	//reeee
 					admin_ticket_log(recipient, interaction_message)
-				SSblackbox.LogAhelp(current_ticket.id, "Reply", msg, recipient.ckey, src.ckey)
+				SSblackbox.log_ahelp(current_ticket.id, "Reply", msg, recipient.ckey, src.ckey)
 			else		//recipient is an admin but sender is not
 				var/replymsg = "Reply PM from-<b>[key_name(src, recipient, 1)]</b>: <span class='linkify'>[keywordparsedmsg]</span>"
 				admin_ticket_log(src, "<font color='red'>[replymsg]</font>")
@@ -238,19 +240,18 @@
 					type = MESSAGE_TYPE_ADMINPM,
 					html = "<span class='notice'>PM to-<b>Admins</b>: <span class='linkify'>[msg]</span></span>",
 					confidential = TRUE)
-				SSblackbox.LogAhelp(current_ticket.id, "Reply", msg, recipient.ckey, src.ckey)
+				SSblackbox.log_ahelp(current_ticket.id, "Reply", msg, recipient.ckey, src.ckey)
 
 			//play the receiving admin the adminhelp sound (if they have them enabled)
 			if(recipient.prefs.toggles & SOUND_ADMINHELP)
 				SEND_SOUND(recipient, sound('sound/effects/adminhelp.ogg'))
-
 		else
 			if(holder)	//sender is an admin but recipient is not. Do BIG RED TEXT
 				var/already_logged = FALSE
 				if(!recipient.current_ticket)
 					new /datum/admin_help(msg, recipient, TRUE)
 					already_logged = TRUE
-					SSblackbox.LogAhelp(recipient.current_ticket.id, "Ticket Opened", msg, recipient.ckey, src.ckey)
+					SSblackbox.log_ahelp(recipient.current_ticket.id, "Ticket Opened", msg, recipient.ckey, src.ckey)
 
 				to_chat(recipient,
 					type = MESSAGE_TYPE_ADMINPM,
@@ -272,21 +273,23 @@
 				admin_ticket_log(recipient, "<font color='purple'>PM From [key_name_admin(src)]: [keywordparsedmsg]</font>")
 
 				if(!already_logged) //Reply to an existing ticket
-					SSblackbox.LogAhelp(recipient.current_ticket.id, "Reply", msg, recipient.ckey, src.ckey)
+					SSblackbox.log_ahelp(recipient.current_ticket.id, "Reply", msg, recipient.ckey, src.ckey)
 
 				//always play non-admin recipients the adminhelp sound
 				SEND_SOUND(recipient, sound('sound/effects/adminhelp.ogg'))
 
-				//AdminPM popup for ApocStation and anybody else who wants to use it. Set it with POPUP_ADMIN_PM in config.txt ~Carn
-				if(CONFIG_GET(flag/popup_admin_pm))
-					INVOKE_ASYNC(src, .proc/popup_admin_pm, recipient, msg)
-
-			else		//neither are admins
-				to_chat(src,
-					type = MESSAGE_TYPE_ADMINPM,
-					html = "<span class='danger'>Error: Admin-PM: Non-admin to non-admin PM communication is forbidden.</span>",
-					confidential = TRUE)
-				return
+			else //neither are admins
+				if(!current_ticket)
+					to_chat(src,
+						type = MESSAGE_TYPE_ADMINPM,
+						html = span_danger("Error: Admin-PM: Non-admin to non-admin PM communication is forbidden."),
+						confidential = TRUE)
+					to_chat(src,
+						type = MESSAGE_TYPE_ADMINPM,
+						html = "[span_danger("<b>Message not sent:</b>")]<br>[msg]",
+						confidential = TRUE)
+					return
+				current_ticket.message_no_recipient(msg)
 
 	if(external)
 		log_admin_private("PM: [key_name(src)]->External: [rawmsg]")
@@ -306,22 +309,12 @@
 					html = "<span class='notice'><B>PM: [key_name(src, X, 0)]-&gt;[key_name(recipient, X, 0)]:</B> [keywordparsedmsg]</span>" ,
 					confidential = TRUE)
 
-/client/proc/popup_admin_pm(client/recipient, msg)
-	var/sender = src
-	var/sendername = key
-	var/reply = input(recipient, msg,"Admin PM from-[sendername]", "") as message|null	//show message and await a reply
-	if(recipient && reply)
-		if(sender)
-			recipient.cmd_admin_pm(sender,reply)										//sender is still about, let's reply to them
-		else
-			adminhelp(reply)													//sender has left, adminhelp instead
-
 #define TGS_AHELP_USAGE "Usage: ticket <close|resolve|icissue|skill|reject|reopen \[ticket #\]|list>"
 /proc/TgsPm(target,msg,sender)
 	target = ckey(target)
 	var/client/C = GLOB.directory[target]
 
-	var/datum/admin_help/ticket = C ? C.current_ticket : GLOB.ahelp_tickets.CKey2ActiveTicket(target)
+	var/datum/admin_help/ticket = C ? C.current_ticket : GLOB.ahelp_tickets.ckey2active_ticket(target)
 	var/compliant_msg = trim(lowertext(msg))
 	var/tgs_tagged = "[sender](TGS/External)"
 	var/list/splits = splittext(compliant_msg, " ")
@@ -331,23 +324,23 @@
 		switch(splits[2])
 			if("close")
 				if(ticket)
-					ticket.Close(tgs_tagged)
+					ticket.close(tgs_tagged)
 					return "Ticket #[ticket.id] successfully closed"
 			if("resolve")
 				if(ticket)
-					ticket.Resolve(tgs_tagged)
+					ticket.resolve(tgs_tagged)
 					return "Ticket #[ticket.id] successfully resolved"
 			if("icissue")
 				if(ticket)
-					ticket.ICIssue(tgs_tagged)
+					ticket.ic_issue(tgs_tagged)
 					return "Ticket #[ticket.id] successfully marked as IC issue"
 			if("skill")
 				if(ticket)
-					ticket.SkillIssue(tgs_tagged)
+					ticket.skill_issue(tgs_tagged)
 					return "Ticket #[ticket.id] successfully marked as skill issue"
 			if("reject")
 				if(ticket)
-					ticket.Reject(tgs_tagged)
+					ticket.reject(tgs_tagged)
 					return "Ticket #[ticket.id] successfully rejected"
 			if("reopen")
 				if(ticket)
@@ -357,15 +350,15 @@
 					fail = text2num(splits[3])
 				if(isnull(fail))
 					return "Error: No/Invalid ticket id specified. [TGS_AHELP_USAGE]"
-				var/datum/admin_help/AH = GLOB.ahelp_tickets.TicketByID(fail)
+				var/datum/admin_help/AH = GLOB.ahelp_tickets.ticket_by_id(fail)
 				if(!AH)
 					return "Error: Ticket #[fail] not found"
 				if(AH.initiator_ckey != target)
 					return "Error: Ticket #[fail] belongs to [AH.initiator_ckey]"
-				AH.Reopen()
+				AH.reopen()
 				return "Ticket #[ticket.id] successfully reopened"
 			if("list")
-				var/list/tickets = GLOB.ahelp_tickets.TicketsByCKey(target)
+				var/list/tickets = GLOB.ahelp_tickets.tickets_by_ckey(target)
 				if(!tickets.len)
 					return "None"
 				. = ""
diff --git a/code/modules/client/client_procs.dm b/code/modules/client/client_procs.dm
index 6b5e62e9681f..5c5553df2755 100644
--- a/code/modules/client/client_procs.dm
+++ b/code/modules/client/client_procs.dm
@@ -220,7 +220,7 @@ GLOBAL_LIST_INIT(blacklisted_builds, list(
 	// Instantiate tgui panel
 	tgui_panel = new(src)
 
-	GLOB.ahelp_tickets.ClientLogin(src)
+	GLOB.ahelp_tickets.client_login(src)
 	GLOB.interviews.client_login(src)
 	var/connecting_admin = FALSE //because de-admined admins connecting should be treated like admins.
 	//Admin Authorisation
@@ -489,7 +489,7 @@ GLOBAL_LIST_INIT(blacklisted_builds, list(
 	GLOB.clients -= src
 	GLOB.directory -= ckey
 	log_access("Logout: [key_name(src)]")
-	GLOB.ahelp_tickets.ClientLogout(src)
+	GLOB.ahelp_tickets.client_logout(src)
 	GLOB.interviews.client_logout(src)
 	SSserver_maint.UpdateHubStatus()
 	if(credits)
diff --git a/config/config.txt b/config/config.txt
index 0fe49324ec07..89dd495066eb 100644
--- a/config/config.txt
+++ b/config/config.txt
@@ -309,9 +309,9 @@ CHECK_RANDOMIZER
 ## Uncomment this to forbid admins from possessing the singularity.
 #FORBID_SINGULO_POSSESSION
 
-## Uncomment to show a popup 'reply to' window to every non-admin that receives an adminPM.
-## The intention is to make adminPMs more visible. (although I fnd popups annoying so this defaults to off)
-#POPUP_ADMIN_PM
+## Uncomment to give admins the ability to send a maptext popup to players.
+## Only fires when an admin requests it, not every ahelp.
+POPUP_ADMIN_PM
 
 ## Uncomment to allow special 'Easter-egg' events on special holidays such as seasonal holidays and stuff like 'Talk Like a Pirate Day' :3 YAARRR
 ALLOW_HOLIDAYS
diff --git a/shiptest.dme b/shiptest.dme
index c7c663be5a99..dfeb323f63c6 100644
--- a/shiptest.dme
+++ b/shiptest.dme
@@ -438,6 +438,7 @@
 #include "code\datums\brain_damage\special.dm"
 #include "code\datums\brain_damage\split_personality.dm"
 #include "code\datums\components\_component.dm"
+#include "code\datums\components\admin_popup.dm"
 #include "code\datums\components\anti_magic.dm"
 #include "code\datums\components\armor_plate.dm"
 #include "code\datums\components\art.dm"