From 3f05a894b0a6fa143bfcd8e78df5ff628e51ecf7 Mon Sep 17 00:00:00 2001 From: Leo Date: Fri, 3 Nov 2017 18:30:41 -0200 Subject: [PATCH] Proper and improper macros are removed before sending to irc (#32347) * Proper and improper macros are removed before sending to irc * Removes leftover check --- code/modules/admin/verbs/adminhelp.dm | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/code/modules/admin/verbs/adminhelp.dm b/code/modules/admin/verbs/adminhelp.dm index a36be8196b1..fac60e6bc0f 100644 --- a/code/modules/admin/verbs/adminhelp.dm +++ b/code/modules/admin/verbs/adminhelp.dm @@ -489,9 +489,9 @@ GLOBAL_DATUM_INIT(ahelp_tickets, /datum/admin_help_tickets, new) return if(handle_spam_prevention(msg,MUTE_ADMINHELP)) return - + msg = trim(msg) - + if(!msg) return @@ -590,8 +590,9 @@ GLOBAL_DATUM_INIT(ahelp_tickets, /datum/admin_help_tickets, new) /proc/send2irc(msg,msg2) - if(SERVER_TOOLS_PRESENT) - SERVER_TOOLS_RELAY_BROADCAST("[msg] | [msg2]") + msg = replacetext(replacetext(msg, "\proper", ""), "\improper", "") + msg2 = replacetext(replacetext(msg2, "\proper", ""), "\improper", "") + SERVER_TOOLS_RELAY_BROADCAST("[msg] | [msg2]") /proc/send2otherserver(source,msg,type = "Ahelp") var/comms_key = CONFIG_GET(string/comms_key)