From 80a84db9194830468fc7cd7f243143fb36ee3f7d Mon Sep 17 00:00:00 2001 From: LetterJay Date: Sun, 1 Oct 2017 02:39:24 -0500 Subject: [PATCH] Update adminhelp.dm --- code/modules/admin/verbs/adminhelp.dm | 7 ------- 1 file changed, 7 deletions(-) diff --git a/code/modules/admin/verbs/adminhelp.dm b/code/modules/admin/verbs/adminhelp.dm index 40a68acaa1..3a343b7f06 100644 --- a/code/modules/admin/verbs/adminhelp.dm +++ b/code/modules/admin/verbs/adminhelp.dm @@ -587,15 +587,8 @@ GLOBAL_DATUM_INIT(ahelp_tickets, /datum/admin_help_tickets, new) /proc/send2irc(msg,msg2) -<<<<<<< HEAD - if(world.RunningService()) - world.ExportService("[SERVICE_REQUEST_IRC_ADMIN_CHANNEL_MESSAGE] [msg] | [msg2]") - else if(CONFIG_GET(flag/useircbot)) - shell("python nudge.py [msg] [msg2]") -======= if(SERVER_TOOLS_PRESENT) SERVER_TOOLS_RELAY_BROADCAST("[msg] | [msg2]") ->>>>>>> 62f788f... Server tools API v3.1 (#31000) /proc/send2otherserver(source,msg,type = "Ahelp") var/comms_key = CONFIG_GET(string/comms_key)