Merge pull request #5617 from Poojawa/admin_reforms

Admin ticket system (for real this time)
2025-12-29 03:21:42 +00:00 · 2018-10-09 15:30:29 -05:00
parent da6909011e 501f3a05ce
commit 039d34c946
21 changed files with 1098 additions and 176 deletions
--- a/code/modules/admin/admin_verbs.dm
+++ b/code/modules/admin/admin_verbs.dm
@@ -585,6 +585,25 @@ var/list/admin_verbs_event_manager = list(
 	feedback_add_details("admin_verb","OC") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
 	return

+/client/proc/findStealthKey(txt)
+	if(txt)
+		for(var/P in GLOB.stealthminID)
+			if(GLOB.stealthminID[P] == txt)
+				return P
+	txt = GLOB.stealthminID[ckey]
+	return txt
+
+/client/proc/createStealthKey()
+	var/num = (rand(0,1000))
+	var/i = 0
+	while(i == 0)
+		i = 1
+		for(var/P in GLOB.stealthminID)
+			if(num == GLOB.stealthminID[P])
+				num++
+				i = 0
+	GLOB.stealthminID["[ckey]"] = "@[num2text(num)]"
+
 /client/proc/stealth()
 	set category = "Admin"
 	set name = "Stealth Mode"
@@ -595,10 +614,12 @@ var/list/admin_verbs_event_manager = list(
 				mob.name = capitalize(ckey)
 		else
 			var/new_key = ckeyEx(input("Enter your desired display name.", "Fake Key", key) as text|null)
-			if(!new_key)	return
+			if(!new_key)
+				return
 			if(length(new_key) >= 26)
 				new_key = copytext(new_key, 1, 26)
 			holder.fakekey = new_key
+			createStealthKey()
 			if(istype(mob, /mob/new_player))
 				mob.name = new_key
 		log_admin("[key_name(usr)] has turned stealth mode [holder.fakekey ? "ON" : "OFF"]")
--- a/code/modules/admin/topic.dm
+++ b/code/modules/admin/topic.dm
@@ -10,6 +10,20 @@
 		check_antagonists()
 		return

+	if(href_list["ahelp"])
+		if(!check_rights(R_ADMIN))
+			return
+
+		var/ahelp_ref = href_list["ahelp"]
+		var/datum/admin_help/AH = locate(ahelp_ref)
+		if(AH)
+			AH.Action(href_list["ahelp_action"])
+		else
+			to_chat(usr, "Ticket [ahelp_ref] has been deleted!")
+
+	else if(href_list["ahelp_tickets"])
+		GLOB.ahelp_tickets.BrowseTickets(text2num(href_list["ahelp_tickets"]))
+
 	if(href_list["dbsearchckey"] || href_list["dbsearchadmin"])

 		var/adminckey = href_list["dbsearchadmin"]
@@ -841,7 +855,9 @@
 					M << "<font color='red'>No ban appeals URL has been set.</font>"
 				log_admin("[usr.client.ckey] has banned [M.ckey].\nReason: [reason]\nThis will be removed in [mins] minutes.")
 				message_admins("<font color='blue'>[usr.client.ckey] has banned [M.ckey].\nReason: [reason]\nThis will be removed in [mins] minutes.</font>")
-
+				var/datum/admin_help/AH = M.client ? M.client.current_ticket : null
+				if(AH)
+					AH.Resolve()
 				qdel(M.client)
 				//qdel(M)	// See no reason why to delete mob. Important stuff can be lost. And ban can be lifted before round ends.
 			if("No")
@@ -867,7 +883,9 @@
 				message_admins("<font color='blue'>[usr.client.ckey] has banned [M.ckey].\nReason: [reason]\nThis is a permanent ban.</font>")
 				feedback_inc("ban_perma",1)
 				DB_ban_record(BANTYPE_PERMA, M, -1, reason)
-
+				var/datum/admin_help/AH = M.client ? M.client.current_ticket : null
+				if(AH)
+					AH.Resolve()
 				qdel(M.client)
 				//qdel(M)
 			if("Cancel")
--- a/code/modules/admin/verbs/adminhelp.dm
+++ b/code/modules/admin/verbs/adminhelp.dm
@@ -1,32 +1,599 @@
+/client/var/datum/admin_help/current_ticket	//the current ticket the (usually) not-admin client is dealing with

-//This is a list of words which are ignored by the parser when comparing message contents for names. MUST BE IN LOWER CASE!
-var/list/adminhelp_ignored_words = list("unknown","the","a","an","of","monkey","alien","as")
+//
+//TICKET MANAGER
+//
+
+GLOBAL_DATUM_INIT(ahelp_tickets, /datum/admin_help_tickets, new)
+
+/datum/admin_help_tickets
+	var/list/active_tickets = list()
+	var/list/closed_tickets = list()
+	var/list/resolved_tickets = list()
+
+	var/obj/effect/statclick/ticket_list/astatclick = new(null, null, AHELP_ACTIVE)
+	var/obj/effect/statclick/ticket_list/cstatclick = new(null, null, AHELP_CLOSED)
+	var/obj/effect/statclick/ticket_list/rstatclick = new(null, null, AHELP_RESOLVED)
+
+/datum/admin_help_tickets/Destroy()
+	QDEL_LIST(active_tickets)
+	QDEL_LIST(closed_tickets)
+	QDEL_LIST(resolved_tickets)
+	QDEL_NULL(astatclick)
+	QDEL_NULL(cstatclick)
+	QDEL_NULL(rstatclick)
+	return ..()
+
+//private
+/datum/admin_help_tickets/proc/ListInsert(datum/admin_help/new_ticket)
+	var/list/ticket_list
+	switch(new_ticket.state)
+		if(AHELP_ACTIVE)
+			ticket_list = active_tickets
+		if(AHELP_CLOSED)
+			ticket_list = closed_tickets
+		if(AHELP_RESOLVED)
+			ticket_list = resolved_tickets
+		else
+			CRASH("Invalid ticket state: [new_ticket.state]")
+	var/num_closed = ticket_list.len
+	if(num_closed)
+		for(var/I in 1 to num_closed)
+			var/datum/admin_help/AH = ticket_list[I]
+			if(AH.id > new_ticket.id)
+				ticket_list.Insert(I, new_ticket)
+				return
+	ticket_list += new_ticket
+
+//opens the ticket listings for one of the 3 states
+/datum/admin_help_tickets/proc/BrowseTickets(state)
+	var/list/l2b
+	var/title
+	switch(state)
+		if(AHELP_ACTIVE)
+			l2b = active_tickets
+			title = "Active Tickets"
+		if(AHELP_CLOSED)
+			l2b = closed_tickets
+			title = "Closed Tickets"
+		if(AHELP_RESOLVED)
+			l2b = resolved_tickets
+			title = "Resolved Tickets"
+	if(!l2b)
+		return
+	var/list/dat = list("<html><head><title>[title]</title></head>")
+	dat += "<A HREF='?_src_=holder;ahelp_tickets=[state]'>Refresh</A><br><br>"
+	for(var/I in l2b)
+		var/datum/admin_help/AH = I
+		dat += "<span class='adminnotice'><span class='adminhelp'>Ticket #[AH.id]</span>: <A HREF='?_src_=holder;ahelp=\ref[AH];ahelp_action=ticket'>[AH.initiator_key_name]: [AH.name]</A></span><br>"
+
+	usr << browse(dat.Join(), "window=ahelp_list[state];size=600x480")
+
+//Tickets statpanel
+/datum/admin_help_tickets/proc/stat_entry()
+	var/num_disconnected = 0
+	stat("Active Tickets:", astatclick.update("[active_tickets.len]"))
+	for(var/I in active_tickets)
+		var/datum/admin_help/AH = I
+		if(AH.initiator)
+			stat("#[AH.id]. [AH.initiator_key_name]:", AH.statclick.update())
+		else
+			++num_disconnected
+	if(num_disconnected)
+		stat("Disconnected:", astatclick.update("[num_disconnected]"))
+	stat("Closed Tickets:", cstatclick.update("[closed_tickets.len]"))
+	stat("Resolved Tickets:", rstatclick.update("[resolved_tickets.len]"))
+
+//Reassociate still open ticket if one exists
+/datum/admin_help_tickets/proc/ClientLogin(client/C)
+	C.current_ticket = CKey2ActiveTicket(C.ckey)
+	if(C.current_ticket)
+		C.current_ticket.AddInteraction("Client reconnected.")
+		C.current_ticket.initiator = C
+
+//Dissasociate ticket
+/datum/admin_help_tickets/proc/ClientLogout(client/C)
+	if(C.current_ticket)
+		C.current_ticket.AddInteraction("Client disconnected.")
+		C.current_ticket.initiator = null
+		C.current_ticket = null
+
+//Get a ticket given a ckey
+/datum/admin_help_tickets/proc/CKey2ActiveTicket(ckey)
+	for(var/I in active_tickets)
+		var/datum/admin_help/AH = I
+		if(AH.initiator_ckey == ckey)
+			return AH
+
+//
+//TICKET LIST STATCLICK
+//
+
+/obj/effect/statclick/ticket_list
+	var/current_state
+
+/obj/effect/statclick/ticket_list/New(loc, name, state)
+	current_state = state
+	..()
+
+/obj/effect/statclick/ticket_list/Click()
+	GLOB.ahelp_tickets.BrowseTickets(current_state)
+
+//
+//TICKET DATUM
+//
+
+/datum/admin_help
+	var/id
+	var/name
+	var/state = AHELP_ACTIVE
+
+	var/opened_at
+	var/closed_at
+
+	var/client/initiator	//semi-misnomer, it's the person who ahelped/was bwoinked
+	var/initiator_ckey
+	var/initiator_key_name
+
+	var/list/_interactions	//use AddInteraction() or, preferably, admin_ticket_log()
+
+	var/obj/effect/statclick/ahelp/statclick
+
+	var/static/ticket_counter = 0
+
+//call this on its own to create a ticket, don't manually assign current_ticket
+//msg is the title of the ticket: usually the ahelp text
+//is_bwoink is TRUE if this ticket was started by an admin PM
+/datum/admin_help/New(msg, client/C, is_bwoink)
+	//clean the input msg
+	msg = sanitize(copytext(msg,1,MAX_MESSAGE_LEN))
+	if(!msg || !C || !C.mob)
+		qdel(src)
+		return
+
+	id = ++ticket_counter
+	opened_at = world.time
+
+	name = msg
+
+	initiator = C
+	initiator_ckey = initiator.ckey
+	initiator_key_name = key_name(initiator, FALSE, TRUE)
+	if(initiator.current_ticket)	//This is a bug
+		log_debug("Multiple ahelp current_tickets")
+		initiator.current_ticket.AddInteraction("Ticket erroneously left open by code")
+		initiator.current_ticket.Close()
+	initiator.current_ticket = src
+
+	var/parsed_message = keywords_lookup(msg)
+
+	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>")
+	else
+		MessageNoRecipient(parsed_message)
+
+		//show it to the person adminhelping too
+		to_chat(C, "<span class='adminnotice'>PM to-<b>Admins</b>: [name]</span>")
+
+		//send it to irc if nobody is on and tell us how many were on
+		var/admin_number_present = send2irc_adminless_only(initiator_ckey, name)
+		log_admin("Ticket #[id]: [key_name(initiator)]: [name] - heard by [admin_number_present] non-AFK admins who have +BAN.")
+		if(admin_number_present <= 0)
+			to_chat(C, "<span class='notice'>No active admins are online, your adminhelp was sent to the admin irc.</span>")
+
+	GLOB.ahelp_tickets.active_tickets += src
+
+/datum/admin_help/Destroy()
+	RemoveActive()
+	GLOB.ahelp_tickets.closed_tickets -= src
+	GLOB.ahelp_tickets.resolved_tickets -= src
+	return ..()
+
+/datum/admin_help/proc/AddInteraction(formatted_message)
+	_interactions += "[gameTimestamp()]: [formatted_message]"
+
+//private
+/datum/admin_help/proc/FullMonty(ref_src)
+	if(!ref_src)
+		ref_src = "\ref[src]"
+	. = ADMIN_FULLMONTY_NONAME(initiator.mob)
+	if(state == AHELP_ACTIVE)
+		. += ClosureLinks(ref_src)
+
+//private
+/datum/admin_help/proc/ClosureLinks(ref_src)
+	if(!ref_src)
+		ref_src = "\ref[src]"
+	. = " (<A HREF='?_src_=holder;ahelp=[ref_src];ahelp_action=reject'>REJT</A>)"
+	. += " (<A HREF='?_src_=holder;ahelp=[ref_src];ahelp_action=icissue'>IC</A>)"
+	. += " (<A HREF='?_src_=holder;ahelp=[ref_src];ahelp_action=close'>CLOSE</A>)"
+	. += " (<A HREF='?_src_=holder;ahelp=[ref_src];ahelp_action=resolve'>RSLVE</A>)"
+	. += " (<A HREF='?_src_=holder;ahelp=[ref_src];ahelp_action=handleissue'>HANDLE</A>)"
+
+//private
+/datum/admin_help/proc/LinkedReplyName(ref_src)
+	if(!ref_src)
+		ref_src = "\ref[src]"
+	return "<A HREF='?_src_=holder;ahelp=[ref_src];ahelp_action=reply'>[initiator_key_name]</A>"
+
+//private
+/datum/admin_help/proc/TicketHref(msg, ref_src, action = "ticket")
+	if(!ref_src)
+		ref_src = "\ref[src]"
+	return "<A HREF='?_src_=holder;ahelp=[ref_src];ahelp_action=[action]'>[msg]</A>"
+
+//message from the initiator without a target, all admins will see this
+//won't bug irc
+/datum/admin_help/proc/MessageNoRecipient(msg)
+	var/ref_src = "\ref[src]"
+	var/chat_msg = "<span class='adminnotice'><span class='adminhelp'>Ticket [TicketHref("#[id]", ref_src)]</span><b>: [LinkedReplyName(ref_src)] [FullMonty(ref_src)]:</b> [msg]</span>"
+
+	AddInteraction("<font color='red'>[LinkedReplyName(ref_src)]: [msg]</font>")
+	//send this msg to all admins
+
+	for(var/client/X in admins)
+		if(X.is_preference_enabled(/datum/client_preference/holder/play_adminhelp_ping))
+			X << 'sound/effects/adminhelp.ogg'
+		window_flash(X)
+		to_chat(X, chat_msg)
+
+//Reopen a closed ticket
+/datum/admin_help/proc/Reopen()
+	if(state == AHELP_ACTIVE)
+		to_chat(usr, "<span class='warning'>This ticket is already open.</span>")
+		return
+
+	if(GLOB.ahelp_tickets.CKey2ActiveTicket(initiator_ckey))
+		to_chat(usr, "<span class='warning'>This user already has an active ticket, cannot reopen this one.</span>")
+		return
+
+	statclick = new(null, src)
+	GLOB.ahelp_tickets.active_tickets += src
+	GLOB.ahelp_tickets.closed_tickets -= src
+	GLOB.ahelp_tickets.resolved_tickets -= src
+	switch(state)
+		if(AHELP_CLOSED)
+			feedback_dec("ahelp_close")
+		if(AHELP_RESOLVED)
+			feedback_dec("ahelp_resolve")
+	state = AHELP_ACTIVE
+	closed_at = null
+	if(initiator)
+		initiator.current_ticket = src
+
+	AddInteraction("<font color='purple'>Reopened by [key_name_admin(usr)]</font>")
+	if(initiator)
+		to_chat(initiator, "<font color='purple'>Ticket [TicketHref("#[id]")] was reopened by [key_name(usr)].</font>")
+	var/msg = "<span class='adminhelp'>Ticket [TicketHref("#[id]")] reopened by [key_name_admin(usr)].</span>"
+	message_admins(msg)
+	log_admin(msg)
+	feedback_inc("ahelp_reopen")
+	TicketPanel()	//can only be done from here, so refresh it
+
+//private
+/datum/admin_help/proc/RemoveActive()
+	if(state != AHELP_ACTIVE)
+		return
+	closed_at = world.time
+	QDEL_NULL(statclick)
+	GLOB.ahelp_tickets.active_tickets -= src
+	if(initiator && initiator.current_ticket == src)
+		initiator.current_ticket = null
+
+//Mark open ticket as closed/meme
+/datum/admin_help/proc/Close(silent = FALSE)
+	if(state != AHELP_ACTIVE)
+		return
+	RemoveActive()
+	state = AHELP_CLOSED
+	GLOB.ahelp_tickets.ListInsert(src)
+	AddInteraction("<font color='red'>Closed by [key_name_admin(usr)].</font>")
+	if(initiator)
+		to_chat(initiator, "<font color='red'>Ticket [TicketHref("#[id]")] was closed by [key_name(usr)].</font>")
+	if(!silent)
+		feedback_inc("ahelp_close")
+		var/msg = "Ticket [TicketHref("#[id]")] closed by [key_name_admin(usr)]."
+		message_admins(msg)
+		log_admin(msg)
+
+//Mark open ticket as resolved/legitimate, returns ahelp verb
+/datum/admin_help/proc/Resolve(silent = FALSE)
+	if(state != AHELP_ACTIVE)
+		return
+	RemoveActive()
+	state = AHELP_RESOLVED
+	GLOB.ahelp_tickets.ListInsert(src)
+
+	AddInteraction("<font color='green'>Resolved by [key_name_admin(usr)].</font>")
+	if(initiator)
+		to_chat(initiator, "<font color='green'>Ticket [TicketHref("#[id]")] was marked resolved by [key_name(usr)].</font>")
+	if(!silent)
+		feedback_inc("ahelp_resolve")
+		var/msg = "Ticket [TicketHref("#[id]")] resolved by [key_name_admin(usr)]"
+		message_admins(msg)
+		log_admin(msg)
+
+//Close and return ahelp verb, use if ticket is incoherent
+/datum/admin_help/proc/Reject(key_name = key_name_admin(usr))
+	if(state != AHELP_ACTIVE)
+		return
+
+	if(initiator)
+		initiator << 'sound/effects/adminhelp.ogg'
+
+		to_chat(initiator, "<font color='red' size='4'><b>- AdminHelp Rejected! -</b></font>")
+		to_chat(initiator, "<font color='red'><b>Your admin help was rejected.</b></font>")
+		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.")
+
+	feedback_inc("ahelp_reject")
+	var/msg = "Ticket [TicketHref("#[id]")] rejected by [key_name_admin(usr)]"
+	message_admins(msg)
+	log_admin(msg)
+	AddInteraction("Rejected by [key_name_admin(usr)].")
+	Close(silent = TRUE)
+
+//Resolve ticket with IC Issue message
+/datum/admin_help/proc/ICIssue(key_name = key_name_admin(usr))
+	if(state != AHELP_ACTIVE)
+		return
+
+	var/msg = "<font color='red' size='4'><b>- AdminHelp marked as IC issue! -</b></font><br>"
+	msg += "<font color='red'><b>Losing is part of the game!</b></font><br>"
+	msg += "<font color='red'>Your AdminHelp may also be unabled to be answered due to ongoing events.</font>"
+
+	if(initiator)
+		to_chat(initiator, msg)
+
+	feedback_inc("ahelp_icissue")
+	msg = "Ticket [TicketHref("#[id]")] marked as IC by [key_name_admin(usr)]"
+	message_admins(msg)
+	log_admin(msg)
+	AddInteraction("Marked as IC issue by [key_name_admin(usr)]")
+	Resolve(silent = TRUE)
+
+//Resolve ticket with IC Issue message
+/datum/admin_help/proc/HandleIssue()
+	if(state != AHELP_ACTIVE)
+		return
+
+	var/msg = "<font color='red'>Your AdminHelp is being handled by [key_name(usr)] please be patient.</font>"
+
+	if(initiator)
+		to_chat(initiator, msg)
+
+	feedback_inc("ahelp_icissue")
+	msg = "Ticket [TicketHref("#[id]")] being handled by [key_name(usr)]"
+	message_admins(msg)
+	log_admin(msg)
+	AddInteraction("[key_name_admin(usr)] is now handling this ticket.")
+
+//Show the ticket panel
+/datum/admin_help/proc/TicketPanel()
+	var/list/dat = list("<html><head><title>Ticket #[id]</title></head>")
+	var/ref_src = "\ref[src]"
+	dat += "<h4>Admin Help Ticket #[id]: [LinkedReplyName(ref_src)]</h4>"
+	dat += "<b>State: "
+	switch(state)
+		if(AHELP_ACTIVE)
+			dat += "<font color='red'>OPEN</font>"
+		if(AHELP_RESOLVED)
+			dat += "<font color='green'>RESOLVED</font>"
+		if(AHELP_CLOSED)
+			dat += "CLOSED"
+		else
+			dat += "UNKNOWN"
+	dat += "</b>[GLOB.TAB][TicketHref("Refresh", ref_src)][GLOB.TAB][TicketHref("Re-Title", ref_src, "retitle")]"
+	if(state != AHELP_ACTIVE)
+		dat += "[GLOB.TAB][TicketHref("Reopen", ref_src, "reopen")]"
+	dat += "<br><br>Opened at: [gameTimestamp(wtime = opened_at)] (Approx [(world.time - opened_at) / 600] minutes ago)"
+	if(closed_at)
+		dat += "<br>Closed at: [gameTimestamp(wtime = closed_at)] (Approx [(world.time - closed_at) / 600] minutes ago)"
+	dat += "<br><br>"
+	if(initiator)
+		dat += "<b>Actions:</b> [FullMonty(ref_src)]<br>"
+	else
+		dat += "<b>DISCONNECTED</b>[GLOB.TAB][ClosureLinks(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")
+
+/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)]"
+		message_admins(msg)
+		log_admin(msg)
+	TicketPanel()	//we have to be here to do this
+
+//Forwarded action from admin/Topic
+/datum/admin_help/proc/Action(action)
+	testing("Ahelp action: [action]")
+	switch(action)
+		if("ticket")
+			TicketPanel()
+		if("retitle")
+			Retitle()
+		if("reject")
+			Reject()
+		if("reply")
+			usr.client.cmd_ahelp_reply(initiator)
+		if("icissue")
+			ICIssue()
+		if("close")
+			Close()
+		if("resolve")
+			Resolve()
+		if("handleissue")
+			HandleIssue()
+		if("reopen")
+			Reopen()
+
+//
+// TICKET STATCLICK
+//
+
+/obj/effect/statclick/ahelp
+	var/datum/admin_help/ahelp_datum
+
+/obj/effect/statclick/ahelp/New(loc, datum/admin_help/AH)
+	ahelp_datum = AH
+	..(loc)
+
+/obj/effect/statclick/ahelp/update()
+	return ..(ahelp_datum.name)
+
+/obj/effect/statclick/ahelp/Click()
+	ahelp_datum.TicketPanel()
+
+/obj/effect/statclick/ahelp/Destroy()
+	ahelp_datum = null
+	return ..()
+
+//
+// CLIENT PROCS
+//

 /client/verb/adminhelp(msg as text)
 	set category = "Admin"
 	set name = "Adminhelp"

 	if(say_disabled)	//This is here to try to identify lag problems
-		usr << "<font color='red'>Speech is currently admin-disabled.</font>"
+		to_chat(usr, "<span class='danger'>Speech is currently admin-disabled.</span>")
 		return

 	//handle muting and automuting
 	if(prefs.muted & MUTE_ADMINHELP)
-		src << "<font color='red'>Error: Admin-PM: You cannot send adminhelps (Muted).</font>"
+		to_chat(src, "<span class='danger'>Error: Admin-PM: You cannot send adminhelps (Muted).</span>")
+		return
+	if(handle_spam_prevention(msg,MUTE_ADMINHELP))
 		return

-	adminhelped = 1 //Determines if they get the message to reply by clicking the name.
-
-	if(msg)
-		handle_spam_prevention(MUTE_ADMINHELP)
-
-	//clean the input msg
 	if(!msg)
 		return
-	msg = sanitize(msg)
-	if(!msg)
+
+	//remove out adminhelp verb temporarily to prevent spamming of admins.
+	src.verbs -= /client/verb/adminhelp
+	spawn(1200)
+		src.verbs += /client/verb/adminhelp	// 2 minute cool-down for adminhelps
+
+	feedback_add_details("admin_verb","Adminhelp") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
+	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)
+				return
+			else
+				to_chat(usr, "<span class='warning'>Ticket not found, creating new one...</span>")
+		else
+			current_ticket.AddInteraction("[key_name_admin(usr)] opened a new ticket.")
+			current_ticket.Close()
+
+	new /datum/admin_help(msg, src, FALSE)
+
+//admin proc
+/client/proc/cmd_admin_ticket_panel()
+	set name = "Show Ticket List"
+	set category = "Admin"
+
+	if(!check_rights(R_ADMIN, TRUE))
 		return
-	var/original_msg = msg
+
+	var/browse_to
+
+	switch(input("Display which ticket list?") as null|anything in list("Active Tickets", "Closed Tickets", "Resolved Tickets"))
+		if("Active Tickets")
+			browse_to = AHELP_ACTIVE
+		if("Closed Tickets")
+			browse_to = AHELP_CLOSED
+		if("Resolved Tickets")
+			browse_to = AHELP_RESOLVED
+		else
+			return
+
+	GLOB.ahelp_tickets.BrowseTickets(browse_to)
+
+//
+// LOGGING
+//
+
+//Use this proc when an admin takes action that may be related to an open ticket on what
+//what can be a client, ckey, or mob
+/proc/admin_ticket_log(what, message)
+	var/client/C
+	var/mob/Mob = what
+	if(istype(Mob))
+		C = Mob.client
+	else
+		C = what
+	if(istype(C) && C.current_ticket)
+		C.current_ticket.AddInteraction(message)
+		return C.current_ticket
+	if(istext(what))	//ckey
+		var/datum/admin_help/AH = GLOB.ahelp_tickets.CKey2ActiveTicket(what)
+		if(AH)
+			AH.AddInteraction(message)
+			return AH
+
+//
+// HELPER PROCS
+//
+
+/proc/get_admin_counts(requiredflags = R_BAN)
+	. = list("total" = list(), "noflags" = list(), "afk" = list(), "stealth" = list(), "present" = list())
+	for(var/client/X in admins)
+		.["total"] += X
+		if(requiredflags != 0 && !check_rights(X))
+			.["noflags"] += X
+		else if(X.is_afk())
+			.["afk"] += X
+		else if(X.holder.fakekey)
+			.["stealth"] += X
+		else
+			.["present"] += X
+
+/proc/send2irc_adminless_only(source, msg, requiredflags = R_BAN)
+	var/list/adm = get_admin_counts()
+	var/list/activemins = adm["present"]
+	. = activemins.len
+	if(. <= 0)
+		var/final = ""
+		var/list/afkmins = adm["afk"]
+		var/list/stealthmins = adm["stealth"]
+		var/list/powerlessmins = adm["noflags"]
+		var/list/allmins = adm["total"]
+		if(!afkmins.len && !stealthmins.len && !powerlessmins.len)
+			final = "[msg] - No admins online"
+		else
+			final = "[msg] - All admins stealthed\[[english_list(stealthmins)]\], AFK\[[english_list(afkmins)]\], or lacks +BAN\[[english_list(powerlessmins)]\]! Total: [allmins.len] "
+		send2irc(source,final)
+
+/proc/ircadminwho()
+	var/list/message = list("Admins: ")
+	var/list/admin_keys = list()
+	for(var/adm in admins)
+		var/client/C = adm
+		admin_keys += "[C][C.holder.fakekey ? "(Stealth)" : ""][C.is_afk() ? "(AFK)" : ""]"
+
+	for(var/admin in admin_keys)
+		if(LAZYLEN(admin_keys) > 1)
+			message += ", [admin]"
+		else
+			message += "[admin]"
+
+	return jointext(message, "")
+
+/proc/keywords_lookup(msg,irc)
+
+	//This is a list of words which are ignored by the parser when comparing message contents for names. MUST BE IN LOWER CASE!
+	var/list/adminhelp_ignored_words = list("unknown","the","a","an","of","monkey","alien","as", "i")

 	//explode the input msg into a list
 	var/list/msglist = splittext(msg, " ")
@@ -35,9 +602,11 @@ var/list/adminhelp_ignored_words = list("unknown","the","a","an","of","monkey","
 	var/list/surnames = list()
 	var/list/forenames = list()
 	var/list/ckeys = list()
+	var/founds = ""
 	for(var/mob/M in mob_list)
 		var/list/indexing = list(M.real_name, M.name)
-		if(M.mind)	indexing += M.mind.name
+		if(M.mind)
+			indexing += M.mind.name

 		for(var/string in indexing)
 			var/list/L = splittext(string, " ")
@@ -77,41 +646,17 @@ var/list/adminhelp_ignored_words = list("unknown","the","a","an","of","monkey","
 							mobs_found += found
 							if(!ai_found && isAI(found))
 								ai_found = 1
-							msg += "<b><font color='black'>[original_word] (<A HREF='?_src_=holder;adminmoreinfo=\ref[found]'>?</A>)</font></b> "
+							var/is_antag = 0
+							if(found.mind && found.mind.special_role)
+								is_antag = 1
+							founds += "Name: [found.name]([found.real_name]) Ckey: [found.ckey] [is_antag ? "(Antag)" : null] "
+							msg += "[original_word]<font size='1' color='[is_antag ? "red" : "black"]'>(<A HREF='?_src_=holder;adminmoreinfo=\ref[found]'>?</A>|<A HREF='?_src_=holder;adminplayerobservefollow=\ref[found]'>F</A>)</font> "
 							continue
-			msg += "[original_word] "
-
-	if(!mob) //this doesn't happen
-		return
-
-	var/ai_cl
-	if(ai_found)
-		ai_cl = " (<A HREF='?_src_=holder;adminchecklaws=\ref[mob]'>CL</A>)"
-
-			//Options bar:  mob, details ( admin = 2, dev = 3, event manager = 4, character name (0 = just ckey, 1 = ckey and character name), link? (0 no don't make it a link, 1 do so),
-			//		highlight special roles (0 = everyone has same looking name, 1 = antags / special roles get a golden name)
-
-	msg = "<b><font color=red>Request for Help: </font></b><font color='blue'><b>[get_options_bar(mob, 2, 1, 1)][ai_cl]</b> [msg]</font>"
-
-	var/admin_number_afk = 0
-
-	for(var/client/X in admins)
-		if((R_ADMIN|R_MOD|R_EVENT|R_SERVER) & X.holder.rights)
-			if(X.is_afk())
-				admin_number_afk++
-			X << msg
-			if(X.is_preference_enabled(/datum/client_preference/holder/play_adminhelp_ping))
-				X << 'sound/effects/adminhelp.ogg'
-
-	//show it to the person adminhelping too
-	src << "<font color='blue'>PM to-<b>Staff </b>: [original_msg]</font>"
-
-	var/admin_number_present = admins.len - admin_number_afk
-	log_admin("HELP: [key_name(src)]: [original_msg] - heard by [admin_number_present] non-AFK admins.")
-	if(admin_number_present <= 0)
-		send2adminirc("Request for Help from [key_name(src)]: [html_decode(original_msg)] - !![admin_number_afk ? "All admins AFK ([admin_number_afk])" : "No admins online"]!!")
-	else
-		send2adminirc("Request for Help from [key_name(src)]: [html_decode(original_msg)]")
-	feedback_add_details("admin_verb","AH") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
-	return
+		msg += "[original_word] "
+	if(irc)
+		if(founds == "")
+			return "Search Failed"
+		else
+			return founds

+	return msg
--- a/code/modules/admin/verbs/adminjump.dm
+++ b/code/modules/admin/verbs/adminjump.dm
@@ -109,8 +109,10 @@
 	if(!check_rights(R_ADMIN|R_MOD|R_DEBUG))
 		return
 	if(config.allow_admin_jump)
-		log_admin("[key_name(usr)] teleported [key_name(M)]")
-		message_admins("[key_name_admin(usr)] teleported [key_name_admin(M)]", 1)
+		log_admin("[key_name(usr)] jumped to [key_name(M)]")
+		var/msg = "[key_name_admin(usr)] jumped to [key_name_admin(M)]"
+		message_admins(msg)
+		admin_ticket_log(M, msg)
 		M.on_mob_jump()
 		M.loc = get_turf(usr)
 		feedback_add_details("admin_verb","GM") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
@@ -137,7 +139,9 @@
 		if(!M)
 			return
 		log_admin("[key_name(usr)] teleported [key_name(M)]")
-		message_admins("[key_name_admin(usr)] teleported [key_name(M)]", 1)
+		var/msg = "[key_name_admin(usr)] teleported [ADMIN_LOOKUPFLW(M)]"
+		message_admins(msg)
+		admin_ticket_log(M, msg)
 		if(M)
 			M.on_mob_jump()
 			M.loc = get_turf(usr)
@@ -157,7 +161,9 @@
 			M.loc = pick(get_area_turfs(A))
 			feedback_add_details("admin_verb","SMOB") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!

-			log_admin("[key_name(usr)] teleported [key_name(M)] to [A]")
-			message_admins("[key_name_admin(usr)] teleported [key_name_admin(M)] to [A]", 1)
+			log_admin("[key_name(usr)] teleported [key_name(M)]")
+			var/msg = "[key_name_admin(usr)] teleported [ADMIN_LOOKUPFLW(M)]"
+			message_admins(msg)
+			admin_ticket_log(M, msg)
 		else
-			alert("Admin jumping disabled")
+			alert("Admin jumping disabled")
--- a/code/modules/admin/verbs/adminpm.dm
+++ b/code/modules/admin/verbs/adminpm.dm
@@ -1,145 +1,286 @@
+#define IRCREPLYCOUNT 2
+
+
 //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 in mob_list)
 	set category = null
 	set name = "Admin PM Mob"
 	if(!holder)
-		src << "<font color='red'>Error: Admin-PM-Context: Only administrators may use this command.</font>"
+		to_chat(src, "<font color='red'>Error: Admin-PM-Context: Only administrators may use this command.</font>")
+		return
+	if( !ismob(M) || !M.client )
 		return
-	if( !ismob(M) || !M.client )	return
 	cmd_admin_pm(M.client,null)
-	feedback_add_details("admin_verb","APMM") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
+	feedback_add_details("admin_verb","Admin PM Mob") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!

 //shows a list of clients we could send PMs to, then forwards our choice to cmd_admin_pm
 /client/proc/cmd_admin_pm_panel()
 	set category = "Admin"
 	set name = "Admin PM"
 	if(!holder)
-		src << "<font color='red'>Error: Admin-PM-Panel: Only administrators may use this command.</font>"
+		to_chat(src, "<font color='red'>Error: Admin-PM-Panel: Only administrators may use this command.</font>")
 		return
 	var/list/client/targets[0]
 	for(var/client/T)
 		if(T.mob)
-			if(istype(T.mob, /mob/new_player))
+			if(isnewplayer(T.mob))
 				targets["(New Player) - [T]"] = T
-			else if(istype(T.mob, /mob/observer/dead))
+			else if(isobserver(T.mob))
 				targets["[T.mob.name](Ghost) - [T]"] = T
 			else
 				targets["[T.mob.real_name](as [T.mob.name]) - [T]"] = T
 		else
 			targets["(No Mob) - [T]"] = T
-	var/list/sorted = sortList(targets)
-	var/target = input(src,"To whom shall we send a message?","Admin PM",null) in sorted|null
+	var/target = input(src,"To whom shall we send a message?","Admin PM",null) as null|anything in sortList(targets)
 	cmd_admin_pm(targets[target],null)
-	feedback_add_details("admin_verb","APM") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
+	feedback_add_details("admin_verb","Admin PM") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!

+/client/proc/cmd_ahelp_reply(whom)
+	if(prefs.muted & MUTE_ADMINHELP)
+		to_chat(src, "<font color='red'>Error: Admin-PM: You are unable to use admin PM-s (muted).</font>")
+		return
+	var/client/C
+	if(istext(whom))
+		if(cmptext(copytext(whom,1,2),"@"))
+			whom = findStealthKey(whom)
+		C = GLOB.directory[whom]
+	else if(istype(whom,/client))
+		C = whom
+	if(!C)
+		if(holder)
+			to_chat(src, "<font color='red'>Error: Admin-PM: Client not found.</font>")
+		return
+
+	var/datum/admin_help/AH = C.current_ticket
+
+	if(AH)
+		message_admins("[key_name_admin(src)] has started replying to [key_name(C, 0, 0)]'s admin help.")
+	var/msg = input(src,"Message:", "Private message to [key_name(C, 0, 0)]") as text|null
+	if (!msg)
+		message_admins("[key_name_admin(src)] has cancelled their reply to [key_name(C, 0, 0)]'s admin help.")
+		return
+	cmd_admin_pm(whom, msg, AH)

 //takes input from cmd_admin_pm_context, cmd_admin_pm_panel or /client/Topic and sends them a PM.
 //Fetching a message if needed. src is the sender and C is the target client
-
-/client/proc/cmd_admin_pm(var/client/C, var/msg = null)
+/client/proc/cmd_admin_pm(whom, msg, datum/admin_help/AH)
 	if(prefs.muted & MUTE_ADMINHELP)
-		src << "<font color='red'>Error: Private-Message: You are unable to use PM-s (muted).</font>"
+		to_chat(src, "<font color='red'>Error: Admin-PM: You are unable to use admin PM-s (muted).</font>")
 		return

-	if(!istype(C,/client))
-		if(holder)	src << "<font color='red'>Error: Private-Message: Client not found.</font>"
-		else		src << "<font color='red'>Error: Private-Message: Client not found. They may have lost connection, so try using an adminhelp!</font>"
+	if(!holder && !current_ticket)	//no ticket? https://www.youtube.com/watch?v=iHSPf6x1Fdo
+		to_chat(src, "<font color='red'>You can no longer reply to this ticket, please open another one by using the Adminhelp verb if need be.</font>")
+		to_chat(src, "<font color='blue'>Message: [msg]</font>")
 		return

-	//get message text, limit it's length.and clean/escape html
-	if(!msg)
-		msg = input(src,"Message:", "Private message to [key_name(C, 0, holder ? 1 : 0)]") as text|null
+	var/client/recipient
+	var/irc = 0
+	if(istext(whom))
+		if(cmptext(copytext(whom,1,2),"@"))
+			whom = findStealthKey(whom)
+		if(whom == "IRCKEY")
+			irc = 1
+		else
+			recipient = GLOB.directory[whom]
+	else if(istype(whom,/client))
+		recipient = whom

-		if(!msg)	return
-		if(!C)
-			if(holder)	src << "<font color='red'>Error: Admin-PM: Client not found.</font>"
-			else		src << "<font color='red'>Error: Private-Message: Client not found. They may have lost connection, so try using an adminhelp!</font>"
+
+	if(irc)
+		if(!ircreplyamount)	//to prevent people from spamming irc
+			return
+		if(!msg)
+			msg = input(src,"Message:", "Private message to Administrator") as text|null
+
+		if(!msg)
+			return
+		if(holder)
+			to_chat(src, "<font color='red'>Error: Use the admin IRC channel, nerd.</font>")
 			return

-	//clean the message if it's not sent by a high-rank admin
-	//todo: sanitize for all???
-	if(!check_rights(R_SERVER|R_DEBUG,0))
-		msg = sanitize(msg)
-		if(!msg)	return

-	var/recieve_pm_type = "Player"
-	if(holder)
-		//mod PMs are maroon
-		//PMs sent from admins and mods display their rank
-		if(holder)
-			if(!C.holder && holder && holder.fakekey)
-				recieve_pm_type = "Admin"
+	else
+		if(!recipient)
+			if(holder)
+				to_chat(src, "<font color='red'>Error: Admin-PM: Client not found.</font>")
+				to_chat(src, msg)
 			else
-				recieve_pm_type = holder.rank
+				current_ticket.MessageNoRecipient(msg)
+			return

-	else if(!C.holder)
-		src << "<font color='red'>Error: Admin-PM: Non-admin to non-admin PM communication is forbidden.</font>"
-		return
+		//get message text, limit it's length.and clean/escape html
+		if(!msg)
+			msg = input(src,"Message:", "Private message to [key_name(recipient, 0, 0)]") as text|null

-	var/recieve_message
-
-	if(holder && !C.holder)
-		recieve_message = "<span class='pm'><span class='howto'><b>-- Click the [recieve_pm_type]'s name to reply --</b></span></span>\n"
-		if(C.adminhelped)
-			C << recieve_message
-			C.adminhelped = 0
-
-		//AdminPM popup for ApocStation and anybody else who wants to use it. Set it with POPUP_ADMIN_PM in config.txt ~Carn
-		if(config.popup_admin_pm)
-			spawn(0)	//so we don't hold the caller proc up
-				var/sender = src
-				var/sendername = key
-				var/reply = sanitize(input(C, msg,"[recieve_pm_type] PM from [sendername]", "") as text|null)		//show message and await a reply
-				if(C && reply)
-					if(sender)
-						C.cmd_admin_pm(sender,reply)										//sender is still about, let's reply to them
-					else
-						adminhelp(reply)													//sender has left, adminhelp instead
+			if(!msg)
 				return
-	src << "<span class='pm'><span class='out'>" + create_text_tag("pm_out_alt", "PM", src) + " to <span class='name'>[get_options_bar(C, holder ? 1 : 0, holder ? 1 : 0, 1)]</span>: <span class='message'>[msg]</span></span></span>"
-	C << "<span class='pm'><span class='in'>" + create_text_tag("pm_in", "", C) + " <b>\[[recieve_pm_type] PM\]</b> <span class='name'>[get_options_bar(src, C.holder ? 1 : 0, C.holder ? 1 : 0, 1)]</span>: <span class='message'>[msg]</span></span></span>"

-	//play the recieving admin the adminhelp sound (if they have them enabled)
-	//non-admins shouldn't be able to disable this
-	if(C.is_preference_enabled(/datum/client_preference/holder/play_adminhelp_ping))
-		C << 'sound/effects/adminhelp.ogg'
+			if(prefs.muted & MUTE_ADMINHELP)
+				to_chat(src, "<font color='red'>Error: Admin-PM: You are unable to use admin PM-s (muted).</font>")
+				return

-	log_adminpm(msg,src,C)
-	send2adminirc("Reply: [key_name(src)]->[key_name(C)]: [html_decode(msg)]")
+			if(!recipient)
+				if(holder)
+					to_chat(src, "<font color='red'>Error: Admin-PM: Client not found.</font>")
+				else
+					current_ticket.MessageNoRecipient(msg)
+				return

-	//we don't use message_admins here because the sender/receiver might get it too
-	for(var/client/X in admins)
-		//check client/X is an admin and isn't the sender or recipient
-		if(X == C || X == src)
-			continue
-		if(X.key != key && X.key != C.key && (X.holder.rights & R_ADMIN|R_MOD|R_EVENT))
-			X << "<span class='pm'><span class='other'>" + create_text_tag("pm_other", "PM:", X) + " <span class='name'>[key_name(src, X, 0)]</span> to <span class='name'>[key_name(C, X, 0)]</span>: <span class='message'>[msg]</span></span></span>"
-
-/client/proc/cmd_admin_irc_pm(sender)
-	if(prefs.muted & MUTE_ADMINHELP)
-		src << "<font color='red'>Error: Private-Message: You are unable to use PM-s (muted).</font>"
+	if (src.handle_spam_prevention(msg,MUTE_ADMINHELP))
 		return

-	var/msg = input(src,"Message:", "Reply private message to [sender] on IRC / 400 character limit") as text|null
+	//clean the message if it's not sent by a high-rank admin
+	if(!check_rights(R_SERVER|R_DEBUG,0)||irc)//no sending html to the poor bots
+		msg = trim(sanitize(copytext(msg,1,MAX_MESSAGE_LEN)))
+		if(!msg)
+			return

+	var/rawmsg = msg
+
+	var/keywordparsedmsg = keywords_lookup(msg)
+
+	if(irc)
+		to_chat(src, "<font color='blue'>PM to-<b>Admins</b>: [rawmsg]</font>")
+		admin_ticket_log(src, "<font color='red'>Reply PM from-<b>[key_name(src, TRUE, TRUE)]</b> to <i>IRC</i>: [keywordparsedmsg]</font>")
+		ircreplyamount--
+		send2irc("Reply: [ckey]",rawmsg)
+	else
+		if(recipient.holder)
+			if(holder)	//both are admins
+				to_chat(recipient, "<font color='red'>Admin PM from-<b>[key_name(src, recipient, 1)]</b>: [keywordparsedmsg]</font>")
+				to_chat(src, "<font color='blue'>Admin PM to-<b>[key_name(recipient, src, 1)]</b>: [keywordparsedmsg]</font>")
+
+				//omg this is dumb, just fill in both their tickets
+				var/interaction_message = "<font color='purple'>PM from-<b>[key_name(src, recipient, 1)]</b> to-<b>[key_name(recipient, src, 1)]</b>: [keywordparsedmsg]</font>"
+				admin_ticket_log(src, interaction_message)
+				if(recipient != src)	//reeee
+					admin_ticket_log(recipient, interaction_message)
+
+			else		//recipient is an admin but sender is not
+				var/replymsg = "<font color='red'>Reply PM from-<b>[key_name(src, recipient, 1)]</b>: [keywordparsedmsg]</font>"
+				admin_ticket_log(src, replymsg)
+				to_chat(recipient, replymsg)
+				to_chat(src, "<font color='blue'>PM to-<b>Admins</b>: [msg]</font>")
+
+			//play the recieving admin the adminhelp sound (if they have them enabled)
+			if(recipient.is_preference_enabled(/datum/client_preference/holder/play_adminhelp_ping))
+				recipient << 'sound/effects/adminhelp.ogg'
+
+		else
+			if(holder)	//sender is an admin but recipient is not. Do BIG RED TEXT
+				if(!recipient.current_ticket)
+					new /datum/admin_help(msg, recipient, TRUE)
+
+				to_chat(recipient, "<font color='red' size='4'><b>-- Administrator private message --</b></font>")
+				to_chat(recipient, "<font color='red'>Admin PM from-<b>[key_name(src, recipient, 0)]</b>: [msg]</font>")
+				to_chat(recipient, "<font color='red'><i>Click on the administrator's name to reply.</i></font>")
+				to_chat(src, "<font color='blue'>Admin PM to-<b>[key_name(recipient, src, 1)]</b>: [msg]</font>")
+
+				admin_ticket_log(recipient, "<font color='blue'>PM From [key_name_admin(src)]: [keywordparsedmsg]</font>")
+
+				//always play non-admin recipients the adminhelp sound
+				recipient << '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.popup_admin_pm)
+					spawn()	//so we don't hold the caller proc up
+						var/sender = src
+						var/sendername = key
+						var/reply = input(recipient, msg,"Admin PM from-[sendername]", "") as text|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
+						return
+
+			else		//neither are admins
+				to_chat(src, "<font color='red'>Error: Admin-PM: Non-admin to non-admin PM communication is forbidden.</font>")
+				return
+
+	if(irc)
+		log_admin("PM: [key_name(src)]->IRC: [rawmsg]")
+		for(var/client/X in admins)
+			to_chat(X, "<font color='blue'><B>PM: [key_name(src, X, 0)]-&gt;IRC:</B> [keywordparsedmsg]</font>")
+	else
+		log_admin("PM: [key_name(src)]->[key_name(recipient)]: [rawmsg]")
+		//we don't use message_admins here because the sender/receiver might get it too
+		for(var/client/X in admins)
+			if(X.key!=key && X.key!=recipient.key)	//check client/X is an admin and isn't the sender or recipient
+				to_chat(X, "<font color='blue'><B>PM: [key_name(src, X, 0)]-&gt;[key_name(recipient, X, 0)]:</B> [keywordparsedmsg]</font>" )
+
+/proc/IrcPm(target,msg,sender)
+	var/client/C = GLOB.directory[target]
+
+	var/datum/admin_help/ticket = C ? C.current_ticket : GLOB.ahelp_tickets.CKey2ActiveTicket(target)
+	var/compliant_msg = trim(lowertext(msg))
+	var/irc_tagged = "[sender](IRC)"
+	var/list/splits = splittext(compliant_msg, " ")
+	if(splits.len && splits[1] == "ticket")
+		if(splits.len < 2)
+			return "Usage: ticket <close|resolve|icissue|reject>"
+		switch(splits[2])
+			if("close")
+				if(ticket)
+					ticket.Close(irc_tagged)
+					return "Ticket #[ticket.id] successfully closed"
+			if("resolve")
+				if(ticket)
+					ticket.Resolve(irc_tagged)
+					return "Ticket #[ticket.id] successfully resolved"
+			if("icissue")
+				if(ticket)
+					ticket.ICIssue(irc_tagged)
+					return "Ticket #[ticket.id] successfully marked as IC issue"
+			if("reject")
+				if(ticket)
+					ticket.Reject(irc_tagged)
+					return "Ticket #[ticket.id] successfully rejected"
+			else
+				return "Usage: ticket <close|resolve|icissue|reject>"
+		return "Error: Ticket could not be found"
+
+	var/static/stealthkey
+	var/adminname = "Administrator"
+
+	if(!C)
+		return "Error: No client"
+
+	if(!stealthkey)
+		stealthkey = GenIrcStealthKey()
+
+	msg = sanitize(copytext(msg,1,MAX_MESSAGE_LEN))
 	if(!msg)
-		return
+		return "Error: No message"

-	sanitize(msg)
+	message_admins("IRC message from [sender] to [key_name_admin(C)] : [msg]")
+	log_admin("IRC PM: [sender] -> [key_name(C)] : [msg]")

-	// Handled on Bot32's end, unsure about other bots
-//	if(length(msg) > 400) // TODO: if message length is over 400, divide it up into seperate messages, the message length restriction is based on IRC limitations.  Probably easier to do this on the bots ends.
-//		src << "<span class='warning'>Your message was not sent because it was more then 400 characters find your message below for ease of copy/pasting</span>"
-//		src << "<span class='notice'>[msg]</span>"
-//		return
+	to_chat(C, "<font color='red' size='4'><b>-- Administrator private message --</b></font>")
+	to_chat(C, "<font color='red'>Admin PM from-<b><a href='?priv_msg=[stealthkey]'>[adminname]</A></b>: [msg]</font>")
+	to_chat(C, "<font color='red'><i>Click on the administrator's name to reply.</i></font>")

-	send2adminirc("PlayerPM to [sender] from [key_name(src)]: [html_decode(msg)]")
+	admin_ticket_log(C, "<font color='blue'>PM From [irc_tagged]: [msg]</font>")

-	src << "<span class='pm'><span class='out'>" + create_text_tag("pm_out_alt", "", src) + " to <span class='name'>IRC-[sender]</span>: <span class='message'>[msg]</span></span></span>"
+	window_flash(C, ignorepref = TRUE)
+	//always play non-admin recipients the adminhelp sound
+	C << 'sound/effects/adminhelp.ogg'

-	log_admin("PM: [key_name(src)]->IRC-[sender]: [msg]")
-	for(var/client/X in admins)
-		if(X == src)
-			continue
-		if(X.holder.rights & R_ADMIN|R_MOD)
-			X << "<span class='pm'><span class='other'>" + create_text_tag("pm_other", "PM:", X) + " <span class='name'>[key_name(src, X, 0)]</span> to <span class='name'>IRC-[sender]</span>: <span class='message'>[msg]</span></span></span>"
+	C.ircreplyamount = IRCREPLYCOUNT
+
+	return "Message Successful"
+
+/proc/GenIrcStealthKey()
+	var/num = (rand(0,1000))
+	var/i = 0
+	while(i == 0)
+		i = 1
+		for(var/P in GLOB.stealthminID)
+			if(num == GLOB.stealthminID[P])
+				num++
+				i = 0
+	var/stealth = "@[num2text(num)]"
+	GLOB.stealthminID["IRCKEY"] = stealth
+	return	stealth
+
+#undef IRCREPLYCOUNT
--- a/code/modules/admin/verbs/randomverbs.dm
+++ b/code/modules/admin/verbs/randomverbs.dm
@@ -96,7 +96,9 @@
 				M << "<B>You hear a voice in your head...</B> <i>[msg]</i>"

 	log_admin("SubtlePM: [key_name(usr)] -> [key_name(M)] : [msg]")
-	message_admins("<font color='blue'><B>SubtleMessage: [key_name_admin(usr)] -> [key_name_admin(M)] : [msg]</B></font>", 1)
+	msg = "<span class='adminnotice'><b> SubtleMessage: [key_name_admin(usr)] -> [key_name_admin(M)] :</b> [msg]</span>"
+	message_admins(msg)
+	admin_ticket_log(M, msg)
 	feedback_add_details("admin_verb","SMS") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!

 /client/proc/cmd_admin_world_narrate() // Allows administrators to fluff events a little easier -- TLE
@@ -135,9 +137,11 @@
 	if( !msg )
 		return

-	M << msg
+	to_chat(M, msg)
 	log_admin("DirectNarrate: [key_name(usr)] to ([M.name]/[M.key]): [msg]")
-	message_admins("<font color='blue'><B> DirectNarrate: [key_name(usr)] to ([M.name]/[M.key]): [msg]<BR></B></font>", 1)
+	msg = "<span class='adminnotice'><b> DirectNarrate: [key_name(usr)] to ([M.name]/[M.key]):</b> [msg]<BR></span>"
+	message_admins(msg)
+	admin_ticket_log(M, msg)
 	feedback_add_details("admin_verb","DIRN") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!

 /client/proc/cmd_admin_godmode(mob/M as mob in mob_list)
@@ -150,7 +154,9 @@
 	usr << "<font color='blue'> Toggled [(M.status_flags & GODMODE) ? "ON" : "OFF"]</font>"

 	log_admin("[key_name(usr)] has toggled [key_name(M)]'s nodamage to [(M.status_flags & GODMODE) ? "On" : "Off"]")
-	message_admins("[key_name_admin(usr)] has toggled [key_name_admin(M)]'s nodamage to [(M.status_flags & GODMODE) ? "On" : "Off"]", 1)
+	var/msg = "[key_name_admin(usr)] has toggled [ADMIN_LOOKUPFLW(M)]'s nodamage to [(M.status_flags & GODMODE) ? "On" : "Off"]"
+	message_admins(msg)
+	admin_ticket_log(M, msg)
 	feedback_add_details("admin_verb","GOD") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!


@@ -540,7 +546,9 @@ Traitors and the like can also be revived with the previous role mostly intact.
 		M.revive()

 		log_admin("[key_name(usr)] healed / revived [key_name(M)]")
-		message_admins("<font color='red'>Admin [key_name_admin(usr)] healed / revived [key_name_admin(M)]!</font>", 1)
+		var/msg = "<span class='danger'>Admin [key_name_admin(usr)] healed / revived [ADMIN_LOOKUPFLW(M)]!</span>"
+		message_admins(msg)
+		admin_ticket_log(M, msg)
 	else
 		alert("Admin revive disabled")
 	feedback_add_details("admin_verb","REJU") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
--- a/code/modules/client/client
+++ b/code/modules/client/client
@@ -12,6 +12,7 @@

 	var/last_message	= "" //Contains the last message sent by this client - used to protect against copy-paste spamming.
 	var/last_message_count = 0 //contins a number of how many times a message identical to last_message was sent.
+	var/ircreplyamount = 0

 		/////////
 		//OTHER//
--- a/code/modules/client/client
+++ b/code/modules/client/client
@@ -57,7 +57,7 @@
 		if(mute_irc)
 			usr << "<span class='warning'You cannot use this as your client has been muted from sending messages to the admins on IRC</span>"
 			return
-		cmd_admin_irc_pm(href_list["irc_msg"])
+		send2adminirc(href_list["irc_msg"])
 		return


@@ -111,6 +111,8 @@
 	clients += src
 	directory[ckey] = src

+	GLOB.ahelp_tickets.ClientLogin(src)
+
 	//Admin Authorisation
 	holder = admin_datums[ckey]
 	if(holder)
@@ -176,6 +178,7 @@
 	if(holder)
 		holder.owner = null
 		admins -= src
+	GLOB.ahelp_tickets.ClientLogout(src)
 	directory -= ckey
 	clients -= src
 	return ..()
--- a/code/modules/mob/mob.dm
+++ b/code/modules/mob/mob.dm
@@ -695,7 +695,10 @@
 					stat(null)
 					for(var/datum/controller/subsystem/SS in Master.subsystems)
 						SS.stat_entry()
-
+						
+			if(statpanel("Tickets"))
+				GLOB.ahelp_tickets.stat_entry()
+				
 		if(listed_turf && client)
 			if(!TurfAdjacent(listed_turf))
 				listed_turf = null