diff --git a/code/controllers/subsystem/tickets/mentor_tickets.dm b/code/controllers/subsystem/tickets/mentor_tickets.dm index 19ce7d32d96..40246f99c84 100644 --- a/code/controllers/subsystem/tickets/mentor_tickets.dm +++ b/code/controllers/subsystem/tickets/mentor_tickets.dm @@ -9,7 +9,13 @@ GLOBAL_REAL(SSmentor_tickets, /datum/controller/subsystem/tickets/mentor_tickets ticket_system_name = "Mentor Tickets" ticket_name = "Mentor Ticket" span_text = "" - + close_rights = R_MENTOR /datum/controller/subsystem/tickets/mentor_tickets/message_staf(var/msg) message_mentorTicket(msg) + +/datum/controller/subsystem/tickets/mentor_tickets/Initialize() + close_messages = list("- [ticket_name] Closed -", + "Please try to be as descriptive as possible in mentor helps. Mentors do not know the full situation you're in and need more information to give you a helpful response.", + "[span_text]Your [ticket_name] has now been closed.") + return ..() diff --git a/code/controllers/subsystem/tickets/tickets.dm b/code/controllers/subsystem/tickets/tickets.dm index bec9050a30a..aa72e89b7c9 100644 --- a/code/controllers/subsystem/tickets/tickets.dm +++ b/code/controllers/subsystem/tickets/tickets.dm @@ -15,7 +15,8 @@ SUBSYSTEM_DEF(tickets) var/span_text = "" var/ticket_system_name = "Admin Tickets" var/ticket_name = "Admin Ticket" - + var/close_rights = R_ADMIN + var/list/close_messages init_order = INIT_ORDER_TICKETS wait = 300 priority = FIRE_PRIORITY_TICKETS @@ -27,6 +28,9 @@ SUBSYSTEM_DEF(tickets) var/ticketCounter = 1 /datum/controller/subsystem/tickets/Initialize() + close_messages = list("- [ticket_name] Rejected! -", + "Please try to be calm, clear, and descriptive in admin helps, do not assume the staf member has seen any related events, and clearly state the names of anybody you are reporting. If you asked a question, please ensure it was clear what you were asking.", + "[span_text]Your [ticket_name] has now been closed.") LAZYINITLIST(allTickets) return ..() @@ -375,19 +379,15 @@ UI STUFF showDetailUI(usr, indexNum) if(href_list["detailclose"]) - if(!check_rights(R_ADMIN)) - to_chat(usr, "Admin status is required to close tickets.") - return var/indexNum = text2num(href_list["detailclose"]) + if(!check_rights(close_rights)) + to_chat(usr, "Not enough rights to close this ticket.") + return if(alert("Are you sure? This will send a negative message.",,"Yes","No") != "Yes") return if(closeTicket(indexNum)) message_staf("[usr.client] / ([usr]) closed [ticket_name] number [indexNum]") - to_chat_safe(returnClient(indexNum), list( - "- [ticket_name] Rejected! -", - "Please try to be calm, clear, and descriptive in admin helps, do not assume the staf member has seen any related events, and clearly state the names of anybody you are reporting. If you asked a question, please ensure it was clear what you were asking.", - "[span_text]Your [ticket_name] has now been closed." - )) + to_chat_safe(returnClient(indexNum), close_messages) showDetailUI(usr, indexNum) @@ -405,4 +405,4 @@ UI STUFF /datum/controller/subsystem/tickets/proc/takeTicket(var/index) if(assignStafToTicket(usr.client, index)) message_staf("[usr.client] / ([usr]) has taken [ticket_name] number [index]") - to_chat_safe(returnClient(index), "[span_text]Your [ticket_name] is being handled by [usr.client].") \ No newline at end of file + to_chat_safe(returnClient(index), "[span_text]Your [ticket_name] is being handled by [usr.client].") diff --git a/code/modules/admin/admin_verbs.dm b/code/modules/admin/admin_verbs.dm index f6051587bc6..0f738ecffab 100644 --- a/code/modules/admin/admin_verbs.dm +++ b/code/modules/admin/admin_verbs.dm @@ -954,9 +954,9 @@ var/list/admin_verbs_ticket = list( prefs.toggles ^= CHAT_NO_MENTORTICKETLOGS prefs.save_preferences(src) if(prefs.toggles & CHAT_NO_MENTORTICKETLOGS) - to_chat(usr, "You now won't get admin ticket messages.") + to_chat(usr, "You now won't get mentor ticket messages.") else - to_chat(usr, "You now will get admin ticket messages.") + to_chat(usr, "You now will get mentor ticket messages.") /client/proc/toggleticketlogs() set name = "Toggle Admin Ticket Messgaes"