From a834287d651994220f85765b93baf3a9fba263a0 Mon Sep 17 00:00:00 2001 From: Jordan Brown Date: Sun, 17 Dec 2017 16:05:24 -0500 Subject: [PATCH 1/2] Fixes cross comms --- code/datums/world_topic.dm | 6 +++--- code/game/machinery/computer/communications.dm | 5 +++-- code/modules/admin/verbs/adminhelp.dm | 15 +++++++++++++++ 3 files changed, 21 insertions(+), 5 deletions(-) diff --git a/code/datums/world_topic.dm b/code/datums/world_topic.dm index ef7b1f2776..93193f964a 100644 --- a/code/datums/world_topic.dm +++ b/code/datums/world_topic.dm @@ -75,14 +75,14 @@ C.AnnouncePR(final_composed) /datum/world_topic/ahelp_relay - keyword = "ahelp_relay" + keyword = "Ahelp" require_comms_key = TRUE /datum/world_topic/ahelp_relay/Run(list/input) relay_msg_admins("HELP: [input["source"]] [input["message_sender"]]: [input["message"]]") /datum/world_topic/comms_console - keyword = "comms_console" + keyword = "Comms_Console" require_comms_key = TRUE /datum/world_topic/comms_console/Run(list/input) @@ -91,7 +91,7 @@ CM.overrideCooldown() /datum/world_topic/news_report - keyword = "news_report" + keyword = "News_Report" require_comms_key = TRUE /datum/world_topic/news_report/Run(list/input) diff --git a/code/game/machinery/computer/communications.dm b/code/game/machinery/computer/communications.dm index 6223011736..ed0f0535ef 100755 --- a/code/game/machinery/computer/communications.dm +++ b/code/game/machinery/computer/communications.dm @@ -136,7 +136,8 @@ to_chat(usr, "Arrays recycling. Please stand by.") playsound(src, 'sound/machines/terminal_prompt_deny.ogg', 50, 0) return - var/input = stripped_multiline_input(usr, "Please choose a message to transmit to an allied station. Please be aware that this process is very expensive, and abuse will lead to... termination.", "Send a message to an allied station.", "") + + var/input = stripped_multiline_input(usr, "Please choose a message to transmit to allied stations. Please be aware that this process is very expensive, and abuse will lead to... termination.", "Send a message to an allied station.", "") if(!input || !(usr in view(1,src))) return playsound(src, 'sound/machines/terminal_prompt_confirm.ogg', 50, 0) @@ -739,4 +740,4 @@ if(content) content = new_content if(new_possible_answers) - possible_answers = new_possible_answers \ No newline at end of file + possible_answers = new_possible_answers diff --git a/code/modules/admin/verbs/adminhelp.dm b/code/modules/admin/verbs/adminhelp.dm index 2d57ee0965..77832386ab 100644 --- a/code/modules/admin/verbs/adminhelp.dm +++ b/code/modules/admin/verbs/adminhelp.dm @@ -615,6 +615,7 @@ GLOBAL_DATUM_INIT(ahelp_tickets, /datum/admin_help_tickets, new) /proc/send2otherserver(source,msg,type = "Ahelp") var/comms_key = CONFIG_GET(string/comms_key) +<<<<<<< HEAD if(comms_key) var/list/message = list() message["message_sender"] = source @@ -624,6 +625,20 @@ GLOBAL_DATUM_INIT(ahelp_tickets, /datum/admin_help_tickets, new) message["crossmessage"] = type world.Export("[CONFIG_GET(string/cross_server_address)]?[list2params(message)]") +======= + if(!comms_key) + return + var/list/message = list() + message["message_sender"] = source + message["message"] = msg + message["source"] = "([CONFIG_GET(string/cross_comms_name)])" + message["key"] = comms_key + message += type + + var/list/servers = CONFIG_GET(keyed_string_list/cross_server) + for(var/I in servers) + world.Export("[servers[I]]?[list2params(message)]") +>>>>>>> 8e0caa6... Fixes cross comms (#33601) /proc/ircadminwho() From 245545c134ceffefe7e354f3af71fb5fc1f51555 Mon Sep 17 00:00:00 2001 From: LetterJay Date: Sun, 17 Dec 2017 15:53:13 -0600 Subject: [PATCH 2/2] Update adminhelp.dm --- code/modules/admin/verbs/adminhelp.dm | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/code/modules/admin/verbs/adminhelp.dm b/code/modules/admin/verbs/adminhelp.dm index 77832386ab..2bbf730b8f 100644 --- a/code/modules/admin/verbs/adminhelp.dm +++ b/code/modules/admin/verbs/adminhelp.dm @@ -615,17 +615,6 @@ GLOBAL_DATUM_INIT(ahelp_tickets, /datum/admin_help_tickets, new) /proc/send2otherserver(source,msg,type = "Ahelp") var/comms_key = CONFIG_GET(string/comms_key) -<<<<<<< HEAD - if(comms_key) - var/list/message = list() - message["message_sender"] = source - message["message"] = msg - message["source"] = "([CONFIG_GET(string/cross_comms_name)])" - message["key"] = comms_key - message["crossmessage"] = type - - world.Export("[CONFIG_GET(string/cross_server_address)]?[list2params(message)]") -======= if(!comms_key) return var/list/message = list() @@ -638,7 +627,6 @@ GLOBAL_DATUM_INIT(ahelp_tickets, /datum/admin_help_tickets, new) var/list/servers = CONFIG_GET(keyed_string_list/cross_server) for(var/I in servers) world.Export("[servers[I]]?[list2params(message)]") ->>>>>>> 8e0caa6... Fixes cross comms (#33601) /proc/ircadminwho()