From 610a18ac880965bdc40a83a384b7d5c5af228741 Mon Sep 17 00:00:00 2001 From: Sun-Soaked <45698967+Sun-Soaked@users.noreply.github.com> Date: Thu, 12 Feb 2026 14:01:47 -0500 Subject: [PATCH] heroic 4 line bugfix strikes again --- code/controllers/subsystems/tickets/tickets.dm | 3 ++- code/modules/admin/verbs/adminpm.dm | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/code/controllers/subsystems/tickets/tickets.dm b/code/controllers/subsystems/tickets/tickets.dm index b918451461e..feef1eab69d 100644 --- a/code/controllers/subsystems/tickets/tickets.dm +++ b/code/controllers/subsystems/tickets/tickets.dm @@ -257,7 +257,8 @@ SUBSYSTEM_DEF(tickets) ckey = astype(ckey, /client).ckey for(var/datum/ticket/T in allTickets) - if(T.client_ckey == ckey && T.ticketState == TICKET_OPEN && (T.ticketCooldown > world.time)) + //todo: remove the stupid staling system alltogether or do monke admin tickets god please I beg + if(T.client_ckey == ckey && (T.ticketState == TICKET_OPEN || T.ticketState == TICKET_STALE) && (T.ticketCooldown > world.time)) return T return FALSE diff --git a/code/modules/admin/verbs/adminpm.dm b/code/modules/admin/verbs/adminpm.dm index 6621c0f7eff..ee6e81779d2 100644 --- a/code/modules/admin/verbs/adminpm.dm +++ b/code/modules/admin/verbs/adminpm.dm @@ -131,10 +131,10 @@ i.addResponse(src, msg) // Add this response to their open tickets. return if(type == "Mentorhelp") - if(check_rights(R_ADMIN|R_MENTOR, 0, C.mob)) //Is the person being pm'd an admin? If so we check if the pm'er has open tickets + if(check_rights_for(C, R_ADMIN|R_MENTOR)) //Is the person being pm'd an admin? If so we check if the pm'er has open tickets tickets = SSmentor_tickets.checkForTicket(src) else // Ahelp - if(check_rights(R_ADMIN, 0, C.mob)) //Is the person being pm'd an admin? If so we check if the pm'er has open tickets + if(check_rights_for(C, R_ADMIN)) //Is the person being pm'd an admin? If so we check if the pm'er has open tickets tickets = SStickets.checkForTicket(src) if(tickets)