diff --git a/code/datums/world_topic.dm b/code/datums/world_topic.dm index ef7b1f27765..93193f964aa 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 f77de02d1af..c1be7dbf90c 100755 --- a/code/game/machinery/computer/communications.dm +++ b/code/game/machinery/computer/communications.dm @@ -135,7 +135,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) @@ -735,4 +736,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 a080145d959..a48cac6f8ff 100644 --- a/code/modules/admin/verbs/adminhelp.dm +++ b/code/modules/admin/verbs/adminhelp.dm @@ -603,7 +603,7 @@ GLOBAL_DATUM_INIT(ahelp_tickets, /datum/admin_help_tickets, new) message["message"] = msg message["source"] = "([CONFIG_GET(string/cross_comms_name)])" message["key"] = comms_key - message["crossmessage"] = type + message += type var/list/servers = CONFIG_GET(keyed_string_list/cross_server) for(var/I in servers)