shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update communications.dm

Browse Source
This commit is contained in:
LetterJay
2017-12-30 13:32:19 -06:00
committed by GitHub
parent a160997587
commit 47174097e1
1 changed files with 2 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/machinery/computer/communications.dm
+2 -5
View File
@@ -136,12 +136,9 @@
to_chat(usr, "<span class='warning'>Arrays recycling. Please stand by.</span>")
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
possible_answers = new_possible_answers