diff --git a/code/controllers/subsystem/tickets/tickets.dm b/code/controllers/subsystem/tickets/tickets.dm
index 1b1735b34c1..a5623775b5e 100644
--- a/code/controllers/subsystem/tickets/tickets.dm
+++ b/code/controllers/subsystem/tickets/tickets.dm
@@ -99,6 +99,7 @@ SUBSYSTEM_DEF(tickets)
/datum/controller/subsystem/tickets/proc/openTicket(N)
var/datum/ticket/T = allTickets[N]
if(T.ticketState != TICKET_OPEN)
+ message_staff("[usr.client] / ([usr]) re-opened [ticket_name] number [N]")
T.ticketState = TICKET_OPEN
return TRUE
@@ -107,12 +108,16 @@ SUBSYSTEM_DEF(tickets)
var/datum/ticket/T = allTickets[N]
if(T.ticketState != TICKET_RESOLVED)
T.ticketState = TICKET_RESOLVED
+ message_staff("[usr.client] / ([usr]) resolved [ticket_name] number [N]")
+ to_chat_safe(returnClient(N), "Your [ticket_name] has now been resolved.")
return TRUE
//Set ticket state with key N to closed
/datum/controller/subsystem/tickets/proc/closeTicket(N)
var/datum/ticket/T = allTickets[N]
if(T.ticketState != TICKET_CLOSED)
+ message_staff("[usr.client] / ([usr]) closed [ticket_name] number [N]")
+ to_chat_safe(returnClient(N), close_messages)
T.ticketState = TICKET_CLOSED
return TRUE
@@ -369,15 +374,11 @@ UI STUFF
if(href_list["resolve"])
var/indexNum = text2num(href_list["resolve"])
if(resolveTicket(indexNum))
- message_staff("[usr.client] / ([usr]) resolved [ticket_name] number [indexNum]")
- to_chat_safe(returnClient(indexNum), "Your [ticket_name] has now been resolved.")
showUI(usr)
if(href_list["detailresolve"])
var/indexNum = text2num(href_list["detailresolve"])
if(resolveTicket(indexNum))
- message_staff("[usr.client] / ([usr]) resolved [ticket_name] number [indexNum]")
- to_chat_safe(returnClient(indexNum), "Your [ticket_name] has now been resolved.")
showDetailUI(usr, indexNum)
if(href_list["detailclose"])
@@ -388,15 +389,12 @@ UI STUFF
if(alert("Are you sure? This will send a negative message.",,"Yes","No") != "Yes")
return
if(closeTicket(indexNum))
- message_staff("[usr.client] / ([usr]) closed [ticket_name] number [indexNum]")
- to_chat_safe(returnClient(indexNum), close_messages)
showDetailUI(usr, indexNum)
if(href_list["detailreopen"])
var/indexNum = text2num(href_list["detailreopen"])
if(openTicket(indexNum))
- message_staff("[usr.client] / ([usr]) re-opened [ticket_name] number [indexNum]")
showDetailUI(usr, indexNum)
if(href_list["assignstaff"])
diff --git a/code/modules/admin/topic.dm b/code/modules/admin/topic.dm
index cb10ba4d335..c7a362592f4 100644
--- a/code/modules/admin/topic.dm
+++ b/code/modules/admin/topic.dm
@@ -1571,6 +1571,13 @@
else //Ahelp
SStickets.takeTicket(index)
+ else if(href_list["resolve"])
+ var/index = text2num(href_list["resolve"])
+ if(href_list["is_mhelp"])
+ SSmentor_tickets.resolveTicket(index)
+ else //Ahelp
+ SStickets.resolveTicket(index)
+
else if(href_list["cult_nextobj"])
if(alert(usr, "Validate the current Cult objective and unlock the next one?", "Cult Cheat Code", "Yes", "No") != "Yes")
return
diff --git a/code/modules/admin/verbs/adminhelp.dm b/code/modules/admin/verbs/adminhelp.dm
index 853b367e15b..ef180f8b2c7 100644
--- a/code/modules/admin/verbs/adminhelp.dm
+++ b/code/modules/admin/verbs/adminhelp.dm
@@ -125,7 +125,7 @@ var/list/adminhelp_ignored_words = list("unknown","the","a","an","of","monkey","
ticketNum = T.ticketNum // ticketNum is the number of their ticket.
T.addResponse(src, msg)
- msg = "[span][selected_type]: [key_name(src, TRUE, selected_type)] ([ADMIN_QUE(mob,"?")]) ([ADMIN_PP(mob,"PP")]) ([ADMIN_VV(mob,"VV")]) ([ADMIN_SM(mob,"SM")]) ([admin_jump_link(mob)]) (CA) (TICKET) [ai_found ? "(CL)" : ""] (TAKE) : [span][msg]"
+ msg = "[span][selected_type]: [key_name(src, TRUE, selected_type)] ([ADMIN_QUE(mob,"?")]) ([ADMIN_PP(mob,"PP")]) ([ADMIN_VV(mob,"VV")]) ([ADMIN_SM(mob,"SM")]) ([admin_jump_link(mob)]) (CA) (TICKET) [ai_found ? "(CL)" : ""] (TAKE) (RESOLVE) : [span][msg]"
if(isMhelp)
//Open a new adminticket and inform the user.
SSmentor_tickets.newTicket(src, prunedmsg, msg)