diff --git a/code/modules/admin/verbs/adminhelp.dm b/code/modules/admin/verbs/adminhelp.dm index 256bdaf0..269d96ec 100644 --- a/code/modules/admin/verbs/adminhelp.dm +++ b/code/modules/admin/verbs/adminhelp.dm @@ -249,6 +249,7 @@ GLOBAL_DATUM_INIT(ahelp_tickets, /datum/admin_help_tickets, new) if(!ref_src) ref_src = "[REF(src)]" . = " (REJT)" + . = " (MENTOR)" . += " (IC)" . += " (CLOSE)" . += " (RSLVE)" @@ -379,6 +380,27 @@ GLOBAL_DATUM_INIT(ahelp_tickets, /datum/admin_help_tickets, new) AddInteraction("Rejected by [key_name].") Close(silent = TRUE) +//Resolve ticket with mentor +/datum/admin_help/proc/Mentor(key_name = key_name_admin(usr)) + if(state != AHELP_ACTIVE) + return + + if(initiator) + initiator.giveadminhelpverb() + + SEND_SOUND(initiator, sound('sound/effects/adminhelp.ogg')) + + to_chat(initiator, "- AdminHelp Declined -") + to_chat(initiator, "Your admin help was declined. The adminhelp verb has been returned to you so that you may try again later.") + to_chat(initiator, "The question/request is considered a mentor issue, please direct questions on how to play to the in-games mentor help, or asking in the discord without revealing infomation of the round.") + + SSblackbox.record_feedback("tally", "ahelp_stats", 1, "rejected") + var/msg = "Ticket [TicketHref("#[id]")] rejected (Mentor) by [key_name]" + message_admins(msg) + log_admin_private(msg) + AddInteraction("Rejected by [key_name].") + Close(silent = TRUE) + //Resolve ticket with IC Issue message /datum/admin_help/proc/ICIssue(key_name = key_name_admin(usr)) if(state != AHELP_ACTIVE) @@ -465,6 +487,8 @@ GLOBAL_DATUM_INIT(ahelp_tickets, /datum/admin_help_tickets, new) Retitle() if("reject") Reject() + if("mentor") + Mentor() if("reply") usr.client.cmd_ahelp_reply(initiator) if("icissue") diff --git a/code/modules/admin/verbs/adminpm.dm b/code/modules/admin/verbs/adminpm.dm index bbd6b55e..d302467f 100644 --- a/code/modules/admin/verbs/adminpm.dm +++ b/code/modules/admin/verbs/adminpm.dm @@ -217,7 +217,7 @@ -#define IRC_AHELP_USAGE "Usage: ticket " +#define IRC_AHELP_USAGE "Usage: ticket " /proc/IrcPm(target,msg,sender) target = ckey(target) var/client/C = GLOB.directory[target] @@ -246,6 +246,10 @@ if(ticket) ticket.Reject(irc_tagged) return "Ticket #[ticket.id] successfully rejected" + if("mentor") + if(ticket) + ticket.Mentor(irc_tagged) + return "Ticket #[ticket.id] successfully rejected" if("reopen") if(ticket) return "Error: [target] already has ticket #[ticket.id] open"