diff --git a/code/__DEFINES/preferences.dm b/code/__DEFINES/preferences.dm index 05200eea7dd..b59b2a94182 100644 --- a/code/__DEFINES/preferences.dm +++ b/code/__DEFINES/preferences.dm @@ -25,6 +25,7 @@ #define MEMBER_PUBLIC 8192 #define CHAT_NO_ADMINLOGS 16384 #define DONATOR_PUBLIC 32768 +#define CHAT_NO_TICKETLOGS 65536 #define TOGGLES_DEFAULT (CHAT_OOC|CHAT_DEAD|CHAT_GHOSTEARS|CHAT_GHOSTSIGHT|CHAT_PRAYER|CHAT_RADIO|CHAT_ATTACKLOGS|CHAT_LOOC|MEMBER_PUBLIC|DONATOR_PUBLIC) diff --git a/code/modules/admin/admin.dm b/code/modules/admin/admin.dm index d05cc25a476..ce5ac02b85a 100644 --- a/code/modules/admin/admin.dm +++ b/code/modules/admin/admin.dm @@ -21,6 +21,13 @@ var/global/nologevent = 0 var/msg = rendered to_chat(C, msg) +/proc/message_adminTicket(var/msg) + msg = "ADMIN TICKET: [msg]" + for(var/client/C in admins) + if(R_ADMIN & C.holder.rights) + if(C.prefs && !(C.prefs.toggles & CHAT_NO_TICKETLOGS)) + to_chat(C, msg) + ///////////////////////////////////////////////////////////////////////////////////////////////Panels diff --git a/code/modules/admin/admin_verbs.dm b/code/modules/admin/admin_verbs.dm index e89d333771e..f9f48fb303c 100644 --- a/code/modules/admin/admin_verbs.dm +++ b/code/modules/admin/admin_verbs.dm @@ -173,7 +173,8 @@ var/list/admin_verbs_debug = list( /client/proc/admin_serialize, /client/proc/admin_deserialize, /client/proc/jump_to_ruin, - /client/proc/toggle_medal_disable + /client/proc/toggle_medal_disable, + /client/proc/startadmintickets, ) var/list/admin_verbs_possess = list( /proc/possess, @@ -220,6 +221,11 @@ var/list/admin_verbs_snpc = list( /client/proc/customiseSNPC, /client/proc/hide_snpc_verbs ) +var/list/admin_verbs_ticket = list( + /client/proc/openTicketUI, + /client/proc/toggleticketlogs, + /client/proc/resolveAllTickets +) /client/proc/on_holder_add() if(chatOutput && chatOutput.loaded) @@ -232,6 +238,7 @@ var/list/admin_verbs_snpc = list( verbs += /client/proc/togglebuildmodeself if(holder.rights & R_ADMIN) verbs += admin_verbs_admin + verbs += admin_verbs_ticket spawn(1) control_freak = 0 if(holder.rights & R_BAN) @@ -282,7 +289,8 @@ var/list/admin_verbs_snpc = list( admin_verbs_show_debug_verbs, /client/proc/readmin, admin_verbs_snpc, - /client/proc/hide_snpc_verbs + /client/proc/hide_snpc_verbs, + admin_verbs_ticket ) /client/proc/hide_verbs() @@ -919,6 +927,20 @@ var/list/admin_verbs_snpc = list( else to_chat(usr, "You now will get admin log messages.") +/client/proc/toggleticketlogs() + set name = "Toggle Admin Ticket Messgaes" + set category = "Preferences" + + if(!check_rights(R_ADMIN)) + return + + prefs.toggles ^= CHAT_NO_TICKETLOGS + prefs.save_preferences(src) + if(prefs.toggles & CHAT_NO_TICKETLOGS) + to_chat(usr, "You now won't get admin ticket messages.") + else + to_chat(usr, "You now will get admin ticket messages.") + /client/proc/toggledrones() set name = "Toggle Maintenance Drones" set category = "Server" diff --git a/code/modules/admin/tickets/admintickets.dm b/code/modules/admin/tickets/admintickets.dm new file mode 100644 index 00000000000..5ef1f58dbf5 --- /dev/null +++ b/code/modules/admin/tickets/admintickets.dm @@ -0,0 +1,185 @@ +/* +Admin ticket system by Birdtalon +*/ +//Global holder + +var/global/datum/adminTicketHolder/globAdminTicketHolder = new /datum/adminTicketHolder + +//Defines +//Deciseconds until ticket becomes stale if unanswered. Alerts admins. +#define ADMIN_TICKET_TIMEOUT 6000 // 10 minutes +//Decisecions before the user is allowed to open another ticket while their existing one is open. +#define ADMIN_TICKET_DUPLICATE_COOLDOWN 3000 // 5 minutes + +//Status defines +#define ADMIN_TICKET_OPEN 1 +#define ADMIN_TICKET_CLOSED 2 +#define ADMIN_TICKET_RESOLVED 3 +#define ADMIN_TICKET_STALE 4 + +//Datum holding all tickets +/datum/adminTicketHolder + var/ticketCounter = 1 // Counts the tickets and used to assign the id number + var/list/allTickets = list() + +//Return the current ticket number ready to be called off. +/datum/adminTicketHolder/proc/getTicketCounter() + return ticketCounter + +//Return the ticket counter and increment +/datum/adminTicketHolder/proc/getTicketCounterAndInc() + . = ticketCounter + ticketCounter++ + return + +/datum/adminTicketHolder/proc/resolveAllOpenTickets() // Resolve all open tickets + for(var/i in allTickets) + var/datum/admin_ticket/T = i + resolveTicket(T.ticketNum) + +//Open a new ticket and populate details then add to the list of open tickets +/datum/adminTicketHolder/proc/newTicket(var/client/C, var/passedContent, var/title) + if(!C || !passedContent) + return + + //Check if the user has an open ticket already within the cooldown period, if so we don't create a new one and re-set the cooldown period + var/datum/admin_ticket/existingTicket = checkForOpenTicket(C) + if(existingTicket) + existingTicket.setCooldownPeriod() + to_chat(C, "Your ticket #[existingTicket.ticketNum] remains open! Visit \"My tickets\" under the Admin Tab to view it.") + return + + if(!title) + title = passedContent + + var/datum/admin_ticket/T = new /datum/admin_ticket + T.clientName = C + T.timeOpened = worldtime2text() + T.title = title + T.content += passedContent + T.locationSent = C.mob.loc.loc.name + T.mobControlled = C.mob + T.ticketState = ADMIN_TICKET_OPEN + T.timeUntilStale = world.time + ADMIN_TICKET_TIMEOUT + T.setCooldownPeriod() + T.ticketNum = getTicketCounterAndInc() + allTickets += T + + //Inform the user that they have opened a ticket + to_chat(C, "You have opened admin ticket number #[(globAdminTicketHolder.getTicketCounter() - 1)]! Please be patient and we will help you soon!") + + //Begin the stale count for this ticket. + spawn(0) + T.beginStaleCount() + +//Set ticket state with key N to open +/datum/adminTicketHolder/proc/openTicket(var/N) + var/datum/admin_ticket/T = globAdminTicketHolder.allTickets[N] + if(T.ticketState != ADMIN_TICKET_OPEN) + T.ticketState = ADMIN_TICKET_OPEN + return TRUE + +//Set ticket state with key N to resolved +/datum/adminTicketHolder/proc/resolveTicket(var/N) + var/datum/admin_ticket/T = globAdminTicketHolder.allTickets[N] + if(T.ticketState != ADMIN_TICKET_RESOLVED) + T.ticketState = ADMIN_TICKET_RESOLVED + return TRUE + +//Set ticket state with key N to closed +/datum/adminTicketHolder/proc/closeTicket(var/N) + var/datum/admin_ticket/T = globAdminTicketHolder.allTickets[N] + if(T.ticketState != ADMIN_TICKET_CLOSED) + T.ticketState = ADMIN_TICKET_CLOSED + return TRUE + +//Check if the user already has a ticket open and within the cooldown period. +/datum/adminTicketHolder/proc/checkForOpenTicket(var/client/C) + for(var/datum/admin_ticket/T in allTickets) + if(T.clientName == C && T.ticketState == ADMIN_TICKET_OPEN && (T.ticketCooldown > world.time)) + return T + return FALSE + +//Check if the user has ANY ticket not resolved or closed. +/datum/adminTicketHolder/proc/checkForTicket(var/client/C) + var/list/tickets = list() + for(var/datum/admin_ticket/T in allTickets) + if(T.clientName == C && T.ticketState == ADMIN_TICKET_OPEN || T.ticketState == ADMIN_TICKET_STALE) + tickets += T + if(tickets.len) + return tickets + return FALSE + +//return the client of a ticket number +/datum/adminTicketHolder/proc/returnClient(var/N) + var/datum/admin_ticket/T = globAdminTicketHolder.allTickets[N] + return T.clientName + +/datum/adminTicketHolder/proc/assignAdminToTicket(var/client/C, var/N) + var/datum/admin_ticket/T = globAdminTicketHolder.allTickets[N] + T.assignAdmin(C) + return TRUE + +//Single admin ticket + +/datum/admin_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 = list() // content of the admin help + var/lastAdminResponse // Last admin who responded + var/lastResponseTime // When the admin 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/adminAssigned // Admin who has assigned themselves to this ticket + +//Ticker called when a ticket is created, checks for stale-ness. +/datum/admin_ticket/proc/beginStaleCount() + while(world.time < timeUntilStale || !lastAdminResponse || !adminAssigned) // While within the stale period OR no admin responded OR no admin assigned. + + if(!src) + return + + sleep(200) // Check every 20 seconds. + if(ticketState == ADMIN_TICKET_OPEN && world.time > timeUntilStale) + message_adminTicket("Ticket #[ticketNum] has been open for [ADMIN_TICKET_TIMEOUT * 0.1] seconds. Changing status to stale.") + ticketState = ADMIN_TICKET_STALE + break + +//Set the cooldown period for the ticket. The time when it's created plus the defined cooldown time. +/datum/admin_ticket/proc/setCooldownPeriod() + ticketCooldown = world.time + ADMIN_TICKET_DUPLICATE_COOLDOWN + +//Set the last admin who responded as the client passed as an arguement. +/datum/admin_ticket/proc/setLastAdminResponse(var/client/C) + lastAdminResponse = C + lastResponseTime = worldtime2text() + +//Return the ticket state as a colour coded text string. +/datum/admin_ticket/proc/state2text() + switch(ticketState) + if(ADMIN_TICKET_OPEN) + return "OPEN" + if(ADMIN_TICKET_RESOLVED) + return "RESOLVED" + if(ADMIN_TICKET_CLOSED) + return "CLOSED" + if(ADMIN_TICKET_STALE) + return "STALE" + +//Assign the client passed to var/adminAsssigned +/datum/admin_ticket/proc/assignAdmin(var/client/C, var/N) + if(!C) + return + adminAssigned = C + return TRUE + +/datum/admin_ticket/proc/addResponse(var/client/C, var/M as text) + if(C.holder) + setLastAdminResponse(C) + M = "[C]: [M]" + content += M \ No newline at end of file diff --git a/code/modules/admin/tickets/adminticketsUI.dm b/code/modules/admin/tickets/adminticketsUI.dm new file mode 100644 index 00000000000..750fa13e6cb --- /dev/null +++ b/code/modules/admin/tickets/adminticketsUI.dm @@ -0,0 +1,172 @@ +/datum/adminTicketHolder/proc/returnUI(var/tab = ADMIN_TICKET_OPEN) + set name = "Open Ticket Interface" + set category = "Tickets" + +//dat + var/trStyle = "border-top:2px solid; border-bottom:2px solid; padding-top: 5px; padding-bottom: 5px;" + var/tdStyleleft = "border-top:2px solid; border-bottom:2px solid; width:150px; text-align:center;" + var/tdStyle = "border-top:2px solid; border-bottom:2px solid;" + var/datum/admin_ticket/ticket + var/dat + dat += "" + dat += "

Admin Tickets

" + + dat +="Refresh
Open TicketsResolved TicketsClosed Tickets" + if(tab == ADMIN_TICKET_OPEN) + dat += "

Open Tickets

" + dat += "" + dat +="" + if(tab == ADMIN_TICKET_OPEN) + for(var/T in allTickets) + ticket = T + if(ticket.ticketState == ADMIN_TICKET_OPEN || ticket.ticketState == ADMIN_TICKET_STALE) + dat += "" + else + continue + else if(tab == ADMIN_TICKET_RESOLVED) + dat += "

Resolved Tickets

" + for(var/T in allTickets) + ticket = T + if(ticket.ticketState == ADMIN_TICKET_RESOLVED) + dat += "" + else + continue + else if(tab == ADMIN_TICKET_CLOSED) + dat += "

Closed Tickets

" + for(var/T in allTickets) + ticket = T + if(ticket.ticketState == ADMIN_TICKET_CLOSED) + dat += "" + else + continue + + dat += "
ControlTicket
ResolveDetails
#[ticket.ticketNum] ([ticket.timeOpened]) [ticket.ticketState == ADMIN_TICKET_STALE ? "STALE" : ""] 		[ticket.title]
ResolveDetails
#[ticket.ticketNum] ([ticket.timeOpened]) 		[ticket.title]
ResolveDetails
#[ticket.ticketNum] ([ticket.timeOpened]) 		[ticket.title]
" + + return dat + +/datum/adminTicketHolder/proc/showUI(var/client/user, var/tab) + var/dat = null + dat = returnUI(tab) + var/datum/browser/popup = new(user, "admintickets", "Admin Tickets", 1400, 600) + popup.set_content(dat) + popup.open() + +/datum/adminTicketHolder/proc/showDetailUI(var/client/user, var/ticketID) + var/datum/admin_ticket/T = globAdminTicketHolder.allTickets[ticketID] + var/status = "[T.state2text()]" + + var/dat = "

Admin Tickets

" + + dat +="Show AllRefresh" + + dat += "

Ticket #[T.ticketNum]

" + + dat += "

[T.clientName] / [T.mobControlled] opened this ticket at [T.timeOpened] at location [T.locationSent]

" + dat += "

Ticket Status: [status]" + dat += "" + dat += "" + + if(T.content.len > 1) + for(var/i = 2, i <= T.content.len, i++) + dat += "" + + dat += "
[T.title]
[T.content[i]]


" + dat += "Re-OpenResolve

" + + if(!T.adminAssigned) + dat += "No admin assigned to this ticket - Take Ticket
" + else + dat += "[T.adminAssigned] is assigned to this Ticket. - Take Ticket
" + + if(T.lastAdminResponse) + dat += "Last Admin Response: [T.lastAdminResponse] at [T.lastResponseTime]" + else + dat +="No Admin Response" + + dat += "

" + + dat += "Close Ticket" + + var/datum/browser/popup = new(user, "adminticketsdetail", "Admin Ticket #[T.ticketNum]", 1000, 600) + popup.set_content(dat) + popup.open() + +/datum/adminTicketHolder/proc/userDetailUI(var/client/user) +//dat + var/tickets = checkForTicket(user) + var/dat + dat += "

Your open tickets

" + dat += "" + for(var/datum/admin_ticket/T in tickets) + dat += "" + for(var/i = 1, i <= T.content.len, i++) + dat += "" + dat += "

Ticket #[T.ticketNum]

[T.content[i]]
" + + var/datum/browser/popup = new(user, "userticketsdetail", "Tickets", 1000, 600) + popup.set_content(dat) + popup.open() + +/datum/adminTicketHolder/Topic(href, href_list) + + if(href_list["refresh"]) + showUI(usr) + return + + if(href_list["refreshdetail"]) + var/indexNum = text2num(href_list["refreshdetail"]) + showDetailUI(usr, indexNum) + return + + if(href_list["showopen"]) + showUI(usr, ADMIN_TICKET_OPEN) + return + if(href_list["showresolved"]) + showUI(usr, ADMIN_TICKET_RESOLVED) + return + if(href_list["showclosed"]) + showUI(usr, ADMIN_TICKET_CLOSED) + return + + if(href_list["details"]) + var/indexNum = text2num(href_list["details"]) + showDetailUI(usr.client, indexNum) + return + + if(href_list["resolve"]) + var/indexNum = text2num(href_list["resolve"]) + if(globAdminTicketHolder.resolveTicket(indexNum)) + message_adminTicket("[usr.client] / ([usr]) resolved admin ticket number [indexNum]") + to_chat(returnClient(indexNum), "Your admin ticket has now been resolved.") + showUI(usr) + + if(href_list["detailresolve"]) + var/indexNum = text2num(href_list["detailresolve"]) + if(globAdminTicketHolder.resolveTicket(indexNum)) + message_adminTicket("[usr.client] / ([usr]) resolved admin ticket number [indexNum]") + to_chat(returnClient(indexNum), "Your admin ticket has now been resolved.") + showDetailUI(usr, indexNum) + + if(href_list["detailclose"]) + var/indexNum = text2num(href_list["detailclose"]) + if(alert("Are you sure? This will send a negative message.",,"Yes","No") != "Yes") + return + if(globAdminTicketHolder.closeTicket(indexNum)) + message_adminTicket("[usr.client] / ([usr]) closed admin ticket number [indexNum]") + to_chat(returnClient(indexNum), "- AdminHelp Rejected! -") + to_chat(returnClient(indexNum), "Please try to be calm, clear, and descriptive in admin helps, do not assume the admin 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.") + to_chat(returnClient(indexNum), "Your ticket has now been closed.") + showDetailUI(usr, indexNum) + + if(href_list["detailreopen"]) + var/indexNum = text2num(href_list["detailreopen"]) + if(globAdminTicketHolder.openTicket(indexNum)) + message_adminTicket("[usr.client] / ([usr]) re-opened admin ticket number [indexNum]") + showDetailUI(usr, indexNum) + + if(href_list["assignadmin"]) + var/indexNum = text2num(href_list["assignadmin"]) + if(globAdminTicketHolder.assignAdminToTicket(usr.client, indexNum)) + message_adminTicket("[usr.client] / ([usr]) has taken ticket number [indexNum]") + to_chat(returnClient(indexNum), "Your ticket is being handled by [usr.client].") + showDetailUI(usr, indexNum) \ No newline at end of file diff --git a/code/modules/admin/tickets/adminticketsverbs.dm b/code/modules/admin/tickets/adminticketsverbs.dm new file mode 100644 index 00000000000..1b782b5047c --- /dev/null +++ b/code/modules/admin/tickets/adminticketsverbs.dm @@ -0,0 +1,46 @@ +//Verbs + +/client/proc/startadmintickets() + set name = "Restart Admin Ticket System" + set category = "Debug" + + if(!holder && !check_rights(R_DEBUG)) + return + + if(!globAdminTicketHolder) + var/global/datum/adminTicketHolder/globAdminTicketHolder = new /datum/adminTicketHolder + else + if(alert("Are you sure you want to reboot the admin ticket system?","Reboot Admin Tickets?","Yes","No") != "Yes") + return + message_admins("Restarting Admin Ticket System!") + globAdminTicketHolder = new /datum/adminTicketHolder + message_admins("Admin Ticket System Restarted!") + +/client/proc/openTicketUI() + + set name = "Open Ticket Interface" + set category = "Admin" + + if(!holder && !check_rights(R_ADMIN)) + return + + globAdminTicketHolder.showUI() + +/client/proc/resolveAllTickets() + set name = "Resolve All Open Tickets" + set category = "Admin" + + if(!holder && !check_rights(R_ADMIN)) + return + + if(alert("Are you sure you want to resolve ALL open tickets?","Resolve all open tickets?","Yes","No") != "Yes") + return + + globAdminTicketHolder.resolveAllOpenTickets() + +/client/verb/openUserUI() + + set name = "My Tickets" + set category = "Admin" + + globAdminTicketHolder.userDetailUI(usr.client) \ No newline at end of file diff --git a/code/modules/admin/topic.dm b/code/modules/admin/topic.dm index 2375cdebf7b..e3cb19fb6e9 100644 --- a/code/modules/admin/topic.dm +++ b/code/modules/admin/topic.dm @@ -26,6 +26,12 @@ message_admins("[key_name_admin(usr)] rejected [key_name_admin(C.mob)]'s admin help") log_admin("[key_name(usr)] rejected [key_name(C.mob)]'s admin help") + if(href_list["openadminticket"]) + if(!check_rights(R_ADMIN)) + return + var/ticketID = text2num(href_list["openadminticket"]) + globAdminTicketHolder.showDetailUI(usr, ticketID) + if(href_list["stickyban"]) stickyban(href_list["stickyban"],href_list) diff --git a/code/modules/admin/verbs/adminhelp.dm b/code/modules/admin/verbs/adminhelp.dm index bf6575b6659..3d0d067f5b5 100644 --- a/code/modules/admin/verbs/adminhelp.dm +++ b/code/modules/admin/verbs/adminhelp.dm @@ -115,7 +115,17 @@ var/list/adminhelp_ignored_words = list("unknown","the","a","an","of","monkey"," X << 'sound/effects/adminhelp.ogg' to_chat(X, msg) if("Adminhelp") - msg = "[selected_type]: [key_name(src, 1, 1, selected_type)] (?) (PP) (VV) (SM) ([admin_jump_link(mob)]) (CA) (REJT) [ai_found ? " (CL)" : ""] (TAKE) : [msg]" + var/ticketNum // Holder for the ticket number + var/prunedmsg ="[usr.client]: [msg]" // Message without links + if(globAdminTicketHolder.checkForOpenTicket(usr.client)) // If user already has an open ticket + var/datum/admin_ticket/T = globAdminTicketHolder.checkForOpenTicket(usr.client) // Make T equal to the ticket they have open + ticketNum = T.ticketNum // ticketNum is the number of their ticket. + T.addResponse(usr.client, msg) + else + ticketNum = globAdminTicketHolder.getTicketCounter() // ticketNum is the ticket ready to be assigned. + msg = "[selected_type]: [key_name(src, 1, 1, selected_type)] (?) (PP) (VV) (SM) ([admin_jump_link(mob)]) (CA) (TICKET) [ai_found ? " (CL)" : ""] : [msg]" + //Open a new adminticket and inform the user. + globAdminTicketHolder.newTicket(src, prunedmsg, msg) for(var/client/X in modholders + adminholders) if(X.prefs.sound & SOUND_ADMINHELP) X << 'sound/effects/adminhelp.ogg' diff --git a/code/modules/admin/verbs/adminpm.dm b/code/modules/admin/verbs/adminpm.dm index 9976c7d10b9..4c045e193c8 100644 --- a/code/modules/admin/verbs/adminpm.dm +++ b/code/modules/admin/verbs/adminpm.dm @@ -183,6 +183,23 @@ if(check_rights(R_ADMIN|R_MOD, 0, X.mob)) to_chat(X, "[type]: [key_name(src, X, 0, type)]->[key_name(C, X, 0, type)]: [emoji_msg]") + //Check if the mob being PM'd has any open admin tickets. + var/tickets = list() + tickets = globAdminTicketHolder.checkForTicket(C) + if(tickets) + for(var/datum/admin_ticket/i in tickets) + i.addResponse(src, msg) // Add this response to their open tickets. + return + + tickets = globAdminTicketHolder.checkForTicket(src) + if(check_rights(R_ADMIN|R_MOD, 0, C.mob)) //Is the person being pm'd an admin? If so we check if the pm'er has open tickets + tickets = globAdminTicketHolder.checkForTicket(src) + if(tickets) + for(var/datum/admin_ticket/i in tickets) + i.addResponse(src, msg) + return + + /client/proc/cmd_admin_irc_pm() if(prefs.muted & MUTE_ADMINHELP) to_chat(src, "Error: Private-Message: You are unable to use PM-s (muted).") diff --git a/goon/browserassets/css/browserOutput.css b/goon/browserassets/css/browserOutput.css index 967b88ae13a..bd6472f2315 100644 --- a/goon/browserassets/css/browserOutput.css +++ b/goon/browserassets/css/browserOutput.css @@ -379,3 +379,7 @@ h1.alert, h2.alert {color: #000000;} /* EMOJI STUFF */ .emoji {max-height: 16px; max-width: 16px} + +/* ADMIN TICKETS */ + +.adminticket {color: #3daf21; font-weight: bold} \ No newline at end of file diff --git a/nano/styles/_misc.less b/nano/styles/_misc.less index f54408f6e48..17af95368ce 100644 --- a/nano/styles/_misc.less +++ b/nano/styles/_misc.less @@ -75,7 +75,7 @@ div.notice { float: left; white-space: nowrap; cursor: default !important; - + &.disabled { background: none; border: none; @@ -124,7 +124,7 @@ div.clock { background: none !important; color: #555 !important; } - + .uiLinkPendingIcon { position: absolute; width: 33%; diff --git a/paradise.dme b/paradise.dme index c0520b5e639..c80822177ac 100644 --- a/paradise.dme +++ b/paradise.dme @@ -1047,6 +1047,9 @@ #include "code\modules\admin\watchlist.dm" #include "code\modules\admin\DB ban\functions.dm" #include "code\modules\admin\permissionverbs\permissionedit.dm" +#include "code\modules\admin\tickets\admintickets.dm" +#include "code\modules\admin\tickets\adminticketsUI.dm" +#include "code\modules\admin\tickets\adminticketsverbs.dm" #include "code\modules\admin\verbs\adminhelp.dm" #include "code\modules\admin\verbs\adminjump.dm" #include "code\modules\admin\verbs\adminpm.dm"