From 2e242bfc84586e68d4aad139f6b37603eef8bc8c Mon Sep 17 00:00:00 2001 From: Tayyyyyyy Date: Mon, 21 May 2018 17:40:05 -0700 Subject: [PATCH 1/2] Fix ticket bleed --- code/modules/admin/tickets/admintickets.dm | 6 ++---- code/modules/admin/verbs/adminpm.dm | 2 ++ 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/code/modules/admin/tickets/admintickets.dm b/code/modules/admin/tickets/admintickets.dm index 5ef1f58dbf5..f5a24226d48 100644 --- a/code/modules/admin/tickets/admintickets.dm +++ b/code/modules/admin/tickets/admintickets.dm @@ -104,11 +104,9 @@ var/global/datum/adminTicketHolder/globAdminTicketHolder = new /datum/adminTicke /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) + if(T.clientName == C && (T.ticketState == ADMIN_TICKET_OPEN || T.ticketState == ADMIN_TICKET_STALE)) tickets += T - if(tickets.len) - return tickets - return FALSE + return tickets //return the client of a ticket number /datum/adminTicketHolder/proc/returnClient(var/N) diff --git a/code/modules/admin/verbs/adminpm.dm b/code/modules/admin/verbs/adminpm.dm index 2533eab0570..600a53d81eb 100644 --- a/code/modules/admin/verbs/adminpm.dm +++ b/code/modules/admin/verbs/adminpm.dm @@ -183,6 +183,8 @@ if(check_rights(R_ADMIN|R_MOD, 0, X.mob)) to_chat(X, "[type]: [key_name(src, TRUE, type)]->[key_name(C, TRUE, type)]: [emoji_msg]") + if(type == "Mentorhelp") + return //Check if the mob being PM'd has any open admin tickets. var/tickets = list() tickets = globAdminTicketHolder.checkForTicket(C) From 50aceae04dbd9eac817d9ce4f5ff82d83e7c18a2 Mon Sep 17 00:00:00 2001 From: Tayyyyyyy Date: Fri, 25 May 2018 19:02:13 -0700 Subject: [PATCH 2/2] Revert unwanted style change --- code/modules/admin/tickets/admintickets.dm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/code/modules/admin/tickets/admintickets.dm b/code/modules/admin/tickets/admintickets.dm index f5a24226d48..ea5f7003870 100644 --- a/code/modules/admin/tickets/admintickets.dm +++ b/code/modules/admin/tickets/admintickets.dm @@ -106,7 +106,9 @@ var/global/datum/adminTicketHolder/globAdminTicketHolder = new /datum/adminTicke for(var/datum/admin_ticket/T in allTickets) if(T.clientName == C && (T.ticketState == ADMIN_TICKET_OPEN || T.ticketState == ADMIN_TICKET_STALE)) tickets += T - return tickets + if(tickets.len) + return tickets + return FALSE //return the client of a ticket number /datum/adminTicketHolder/proc/returnClient(var/N)