From 0c5d15cb28c5b5a082943d8935e77915355b59af Mon Sep 17 00:00:00 2001
From: CHOMPStation2StaffMirrorBot
 <94713762+CHOMPStation2StaffMirrorBot@users.noreply.github.com>
Date: Tue, 14 Oct 2025 13:11:50 -0700
Subject: [PATCH] [MIRROR] ticket change (#11818)

Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com>
---
 code/modules/admin/verbs/adminpm.dm | 11 +++++++----
 code/modules/tickets/procs.dm       | 16 +++++++++-------
 2 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/code/modules/admin/verbs/adminpm.dm b/code/modules/admin/verbs/adminpm.dm
index dcb8d2cd65..11a593f37b 100644
--- a/code/modules/admin/verbs/adminpm.dm
+++ b/code/modules/admin/verbs/adminpm.dm
@@ -56,7 +56,7 @@
 
 	if(T)
 		message_admins(span_pm("[key_name_admin(src)] has started replying to [key_name(C, 0, 0)]'s admin help."))
-	var/msg = tgui_input_text(src,"Message:", "Private message to [key_name(C, 0, 0)]", multiline = TRUE)
+	var/msg = tgui_input_text(src,"Message:", "Private message to [key_name(C, 0, 0)]", multiline = TRUE, encode = FALSE)
 	if (!msg)
 		message_admins(span_pm("[key_name_admin(src)] has cancelled their reply to [key_name(C, 0, 0)]'s admin help."))
 		return
@@ -71,6 +71,8 @@
 
 	if(!holder && !current_ticket)	//no ticket? https://www.youtube.com/watch?v=iHSPf6x1Fdo
 		to_chat(src, span_admin_pm_warning("You can no longer reply to this ticket, please open another one by using the Adminhelp verb if need be."))
+		if(!holder)
+			msg = trim(sanitize(copytext(msg,1,MAX_MESSAGE_LEN)))
 		to_chat(src, span_admin_pm_notice("Message: [msg]"))
 		return
 
@@ -119,11 +121,12 @@
 			return
 
 		if(!recipient)
-			if(holder)
+			if(!current_ticket)
 				to_chat(src, span_admin_pm_warning("Error: Admin-PM: Client not found."))
 				to_chat(src, msg)
-			else
-				current_ticket.MessageNoRecipient(msg)
+				return
+			log_admin("Adminhelp: [key_name(src)]: [msg]")
+			current_ticket.MessageNoRecipient(msg)
 			return
 
 	var/rawmsg = msg
diff --git a/code/modules/tickets/procs.dm b/code/modules/tickets/procs.dm
index 2d553db785..39b99f2d60 100644
--- a/code/modules/tickets/procs.dm
+++ b/code/modules/tickets/procs.dm
@@ -222,8 +222,10 @@ ADMIN_VERB(cmd_mentor_ticket_panel, (R_ADMIN|R_SERVER|R_MOD|R_MENTOR), "Mentor T
 		return
 
 	//Not a mentor and no open ticket
-	if(!src.holder && !current_ticket)
+	if(!holder && !current_ticket)
 		to_chat(src, span_mentor_warning("You can no longer reply to this ticket, please open another one by using the Mentorhelp verb if need be."))
+		if(!holder)
+			msg = trim(sanitize(copytext(msg,1,MAX_MESSAGE_LEN)))
 		to_chat(src, span_mentor_notice("Message: [msg]"))
 		return
 
@@ -237,7 +239,7 @@ ADMIN_VERB(cmd_mentor_ticket_panel, (R_ADMIN|R_SERVER|R_MOD|R_MENTOR), "Mentor T
 
 	//get message text, limit it's length.and clean/escape html
 	if(!msg)
-		msg = tgui_input_text(src,"Message:", "Mentor-PM to [whom]", multiline = TRUE, encode = FALSE)
+		msg = tgui_input_text(src, "Message:", "Mentor-PM to [whom]", multiline = TRUE, encode = FALSE)
 
 		if(!msg)
 			return
@@ -247,12 +249,12 @@ ADMIN_VERB(cmd_mentor_ticket_panel, (R_ADMIN|R_SERVER|R_MOD|R_MENTOR), "Mentor T
 			return
 
 	if(!recipient)
-		if(src.holder)
-			to_chat(src, span_mentor_warning("Error:Mentor-PM: Client not found."))
+		if(!current_ticket)
+			to_chat(src, span_mentor_warning("Error: Mentor-PM: Client not found."))
 			to_chat(src, msg)
-		else
-			log_admin("Mentorhelp: [key_name(src)]: [msg]")
-			current_ticket.MessageNoRecipient(msg)
+			return
+		log_admin("Mentorhelp: [key_name(src)]: [msg]")
+		current_ticket.MessageNoRecipient(msg)
 		return
 
 	//Has mentor powers but the recipient no longer has an open ticket