From 47174097e190ffbab7dde6a1dd809f1931329f7f Mon Sep 17 00:00:00 2001 From: LetterJay Date: Sat, 30 Dec 2017 13:32:19 -0600 Subject: [PATCH] Update communications.dm --- code/game/machinery/computer/communications.dm | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/code/game/machinery/computer/communications.dm b/code/game/machinery/computer/communications.dm index 0229841aee..e02a5f0e2a 100755 --- a/code/game/machinery/computer/communications.dm +++ b/code/game/machinery/computer/communications.dm @@ -136,12 +136,9 @@ to_chat(usr, "Arrays recycling. Please stand by.") playsound(src, 'sound/machines/terminal_prompt_deny.ogg', 50, 0) return -<<<<<<< HEAD - 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.", "") ->>>>>>> f2dbe5c... Replace explicit z-level checks with defines (#33829) if(!input || !(usr in view(1,src))) return playsound(src, 'sound/machines/terminal_prompt_confirm.ogg', 50, 0) @@ -744,4 +741,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