From 0e3645a27d6480e3fdbd3c9cba97913ff375ea36 Mon Sep 17 00:00:00 2001 From: Ty-Omaha Date: Sun, 19 May 2019 14:24:12 -0400 Subject: [PATCH 1/3] taketickets --- code/controllers/subsystem/tickets/tickets.dm | 7 ++++--- code/modules/admin/admin.dm | 7 +++++-- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/code/controllers/subsystem/tickets/tickets.dm b/code/controllers/subsystem/tickets/tickets.dm index 73279033849..ea210b95ee7 100644 --- a/code/controllers/subsystem/tickets/tickets.dm +++ b/code/controllers/subsystem/tickets/tickets.dm @@ -335,8 +335,8 @@ UI STUFF return TRUE //Sends a message to the designated staff -/datum/controller/subsystem/tickets/proc/message_staff(var/msg) - message_adminTicket(msg) +/datum/controller/subsystem/tickets/proc/message_staff(var/msg, var/alt = FALSE) + message_adminTicket(msg, alt) /datum/controller/subsystem/tickets/Topic(href, href_list) @@ -404,5 +404,6 @@ UI STUFF /datum/controller/subsystem/tickets/proc/takeTicket(var/index) if(assignStaffToTicket(usr.client, index)) - message_staff("[span_text][usr.client] / ([usr]) has taken [ticket_name] number [index]") + span_text = "" + message_staff("[span_text][usr.client] / ([usr]) has taken [ticket_name] number [index]", TRUE) to_chat_safe(returnClient(index), "[span_text]Your [ticket_name] is being handled by [usr.client].") diff --git a/code/modules/admin/admin.dm b/code/modules/admin/admin.dm index 2a981e8b9c4..1a9f38b1486 100644 --- a/code/modules/admin/admin.dm +++ b/code/modules/admin/admin.dm @@ -21,8 +21,11 @@ var/global/nologevent = 0 to_chat(C, msg) -/proc/message_adminTicket(var/msg) - msg = "ADMIN TICKET: [msg]" +/proc/message_adminTicket(var/msg, var/alt = FALSE) + if(alt) + msg = "ADMIN TICKET: [msg]" + else + msg = "ADMIN TICKET: [msg]" for(var/client/C in GLOB.admins) if(R_ADMIN & C.holder.rights) if(C.prefs && !(C.prefs.toggles & CHAT_NO_TICKETLOGS)) From 0a65713126b25114749470c409094713fdcb7604 Mon Sep 17 00:00:00 2001 From: Ty-Omaha Date: Sun, 19 May 2019 14:54:03 -0400 Subject: [PATCH 2/3] fix --- code/controllers/subsystem/tickets/tickets.dm | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/code/controllers/subsystem/tickets/tickets.dm b/code/controllers/subsystem/tickets/tickets.dm index ea210b95ee7..7363d8e0ffd 100644 --- a/code/controllers/subsystem/tickets/tickets.dm +++ b/code/controllers/subsystem/tickets/tickets.dm @@ -404,6 +404,5 @@ UI STUFF /datum/controller/subsystem/tickets/proc/takeTicket(var/index) if(assignStaffToTicket(usr.client, index)) - span_text = "" - message_staff("[span_text][usr.client] / ([usr]) has taken [ticket_name] number [index]", TRUE) + message_staff("[usr.client] / ([usr]) has taken [ticket_name] number [index]", TRUE) to_chat_safe(returnClient(index), "[span_text]Your [ticket_name] is being handled by [usr.client].") From 94afabee9c7830d2de2903e9dd2b3e5cf9c531ef Mon Sep 17 00:00:00 2001 From: Ty-Omaha Date: Sun, 19 May 2019 15:13:00 -0400 Subject: [PATCH 3/3] fix2 --- code/controllers/subsystem/tickets/tickets.dm | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/code/controllers/subsystem/tickets/tickets.dm b/code/controllers/subsystem/tickets/tickets.dm index 7363d8e0ffd..cf9aed29e83 100644 --- a/code/controllers/subsystem/tickets/tickets.dm +++ b/code/controllers/subsystem/tickets/tickets.dm @@ -404,5 +404,8 @@ UI STUFF /datum/controller/subsystem/tickets/proc/takeTicket(var/index) if(assignStaffToTicket(usr.client, index)) - message_staff("[usr.client] / ([usr]) has taken [ticket_name] number [index]", TRUE) + if(span_text == "") + message_staff("[span_text][usr.client] / ([usr]) has taken [ticket_name] number [index]") + else + message_staff("[usr.client] / ([usr]) has taken [ticket_name] number [index]", TRUE) to_chat_safe(returnClient(index), "[span_text]Your [ticket_name] is being handled by [usr.client].")