diff --git a/code/controllers/subsystem/tickets/mentor_tickets.dm b/code/controllers/subsystem/tickets/mentor_tickets.dm index 40246f99c84..708bc682634 100644 --- a/code/controllers/subsystem/tickets/mentor_tickets.dm +++ b/code/controllers/subsystem/tickets/mentor_tickets.dm @@ -11,7 +11,7 @@ GLOBAL_REAL(SSmentor_tickets, /datum/controller/subsystem/tickets/mentor_tickets span_text = "" close_rights = R_MENTOR -/datum/controller/subsystem/tickets/mentor_tickets/message_staf(var/msg) +/datum/controller/subsystem/tickets/mentor_tickets/message_staff(var/msg) message_mentorTicket(msg) /datum/controller/subsystem/tickets/mentor_tickets/Initialize() diff --git a/code/controllers/subsystem/tickets/tickets.dm b/code/controllers/subsystem/tickets/tickets.dm index aa72e89b7c9..99130025786 100644 --- a/code/controllers/subsystem/tickets/tickets.dm +++ b/code/controllers/subsystem/tickets/tickets.dm @@ -29,7 +29,7 @@ SUBSYSTEM_DEF(tickets) /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.", + "Please try to be calm, clear, and descriptive in admin helps, do not assume the staff 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 ..() @@ -40,7 +40,7 @@ SUBSYSTEM_DEF(tickets) var/report for(var/num in stales) report += "[num], " - message_staf("[span_text]Tickets [report] have been open for over [TICKET_TIMEOUT / 600] minutes. Changing status to stale.") + message_staff("[span_text]Tickets [report] have been open for over [TICKET_TIMEOUT / 600] minutes. Changing status to stale.") /datum/controller/subsystem/tickets/stat_entry() ..("Tickets: [LAZYLEN(allTickets)]") @@ -51,7 +51,7 @@ SUBSYSTEM_DEF(tickets) var/datum/ticket/ticket = T if(!(ticket.ticketState == TICKET_OPEN)) continue - if(world.time > ticket.timeUntilStale && (!ticket.lastStafResponse || !ticket.stafAssigned)) + if(world.time > ticket.timeUntilStale && (!ticket.lastStaffResponse || !ticket.staffAssigned)) var/id = ticket.makeStale() stales += id return stales @@ -138,27 +138,27 @@ SUBSYSTEM_DEF(tickets) var/datum/ticket/T = allTickets[N] return T.clientName -/datum/controller/subsystem/tickets/proc/assignStafToTicket(client/C, var/N) +/datum/controller/subsystem/tickets/proc/assignStaffToTicket(client/C, var/N) var/datum/ticket/T = allTickets[N] - T.assignStaf(C) + T.assignStaff(C) return TRUE -//Single staf ticket +//Single staff ticket /datum/ticket var/ticketNum // Ticket number var/clientName // Client which opened the ticket var/timeOpened // Time the ticket was opened var/title //The initial message with links - var/list/content // content of the staf help - var/lastStafResponse // Last staf member who responded - var/lastResponseTime // When the staf last responded + var/list/content // content of the staff help + var/lastStaffResponse // Last staff member who responded + var/lastResponseTime // When the staff last responded var/locationSent // Location the player was when they send the ticket var/mobControlled // Mob they were controlling var/ticketState // State of the ticket, open, closed, resolved etc var/timeUntilStale // When the ticket goes stale var/ticketCooldown // Cooldown before allowing the user to open another ticket. - var/stafAssigned // Staf member who has assigned themselves to this ticket + var/staffAssigned // Staff member who has assigned themselves to this ticket /datum/ticket/New(tit, cont, num) title = tit @@ -174,9 +174,9 @@ SUBSYSTEM_DEF(tickets) /datum/ticket/proc/setCooldownPeriod() ticketCooldown = world.time + TICKET_DUPLICATE_COOLDOWN -//Set the last staf who responded as the client passed as an arguement. -/datum/ticket/proc/setLastStafResponse(client/C) - lastStafResponse = C +//Set the last staff who responded as the client passed as an arguement. +/datum/ticket/proc/setLastStaffResponse(client/C) + lastStaffResponse = C lastResponseTime = worldtime2text() //Return the ticket state as a colour coded text string. @@ -191,16 +191,16 @@ SUBSYSTEM_DEF(tickets) if(TICKET_STALE) return "STALE" -//Assign the client passed to var/stafAsssigned -/datum/ticket/proc/assignStaf(client/C) +//Assign the client passed to var/staffAsssigned +/datum/ticket/proc/assignStaff(client/C) if(!C) return - stafAssigned = C + staffAssigned = C return TRUE /datum/ticket/proc/addResponse(client/C, msg) if(C.holder) - setLastStafResponse(C) + setLastStaffResponse(C) msg = "[C]: [msg]" content += msg @@ -289,15 +289,15 @@ UI STUFF dat += "

" dat += "Re-OpenResolve

" - if(!T.stafAssigned) - dat += "No staf member assigned to this [ticket_name] - Take Ticket
" + if(!T.staffAssigned) + dat += "No staff member assigned to this [ticket_name] - Take Ticket
" else - dat += "[T.stafAssigned] is assigned to this Ticket. - Take Ticket
" + dat += "[T.staffAssigned] is assigned to this Ticket. - Take Ticket
" - if(T.lastStafResponse) - dat += "Last Staf response Response: [T.lastStafResponse] at [T.lastResponseTime]" + if(T.lastStaffResponse) + dat += "Last Staff response Response: [T.lastStaffResponse] at [T.lastResponseTime]" else - dat +="No Staf Response" + dat +="No Staff Response" dat += "

" @@ -334,8 +334,8 @@ UI STUFF to_chat(target, text) return TRUE -//Sends a message to the designated staf -/datum/controller/subsystem/tickets/proc/message_staf(var/msg) +//Sends a message to the designated staff +/datum/controller/subsystem/tickets/proc/message_staff(var/msg) message_adminTicket(msg) /datum/controller/subsystem/tickets/Topic(href, href_list) @@ -367,14 +367,14 @@ UI STUFF if(href_list["resolve"]) var/indexNum = text2num(href_list["resolve"]) if(resolveTicket(indexNum)) - message_staf("[usr.client] / ([usr]) resolved [ticket_name] number [indexNum]") + message_staff("[usr.client] / ([usr]) resolved [ticket_name] number [indexNum]") to_chat_safe(returnClient(indexNum), "[span_text]Your [ticket_name] has now been resolved.") showUI(usr) if(href_list["detailresolve"]) var/indexNum = text2num(href_list["detailresolve"]) if(resolveTicket(indexNum)) - message_staf("[usr.client] / ([usr]) resolved [ticket_name] number [indexNum]") + message_staff("[usr.client] / ([usr]) resolved [ticket_name] number [indexNum]") to_chat_safe(returnClient(indexNum), "[span_text]Your [ticket_name] has now been resolved.") showDetailUI(usr, indexNum) @@ -386,7 +386,7 @@ UI STUFF 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]") + message_staff("[usr.client] / ([usr]) closed [ticket_name] number [indexNum]") to_chat_safe(returnClient(indexNum), close_messages) showDetailUI(usr, indexNum) @@ -394,15 +394,15 @@ UI STUFF if(href_list["detailreopen"]) var/indexNum = text2num(href_list["detailreopen"]) if(openTicket(indexNum)) - message_staf("[usr.client] / ([usr]) re-opened [ticket_name] number [indexNum]") + message_staff("[usr.client] / ([usr]) re-opened [ticket_name] number [indexNum]") showDetailUI(usr, indexNum) - if(href_list["assignstaf"]) - var/indexNum = text2num(href_list["assignstaf"]) + if(href_list["assignstaff"]) + var/indexNum = text2num(href_list["assignstaff"]) takeTicket(indexNum) showDetailUI(usr, indexNum) /datum/controller/subsystem/tickets/proc/takeTicket(var/index) - if(assignStafToTicket(usr.client, index)) - message_staf("[usr.client] / ([usr]) has taken [ticket_name] number [index]") + if(assignStaffToTicket(usr.client, index)) + message_staff("[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].") diff --git a/code/modules/admin/verbs/adminhelp.dm b/code/modules/admin/verbs/adminhelp.dm index cdf9710e570..a1f56c52c78 100644 --- a/code/modules/admin/verbs/adminhelp.dm +++ b/code/modules/admin/verbs/adminhelp.dm @@ -124,6 +124,7 @@ var/list/adminhelp_ignored_words = list("unknown","the","a","an","of","monkey"," if(T) 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]" if(isMhelp) //Open a new adminticket and inform the user.