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 e02a5f0e2a..2cb4528de4 100755 --- a/code/game/machinery/computer/communications.dm +++ b/code/game/machinery/computer/communications.dm @@ -136,8 +136,6 @@ 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 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 diff --git a/code/modules/admin/verbs/adminhelp.dm b/code/modules/admin/verbs/adminhelp.dm index 2d57ee0965..2bbf730b8f 100644 --- a/code/modules/admin/verbs/adminhelp.dm +++ b/code/modules/admin/verbs/adminhelp.dm @@ -615,15 +615,18 @@ GLOBAL_DATUM_INIT(ahelp_tickets, /datum/admin_help_tickets, new) /proc/send2otherserver(source,msg,type = "Ahelp") var/comms_key = CONFIG_GET(string/comms_key) - 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 + 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 - world.Export("[CONFIG_GET(string/cross_server_address)]?[list2params(message)]") + var/list/servers = CONFIG_GET(keyed_string_list/cross_server) + for(var/I in servers) + world.Export("[servers[I]]?[list2params(message)]") /proc/ircadminwho()