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

[MIRROR] Fixes sending cross station messages during wait period. (#5311)

Browse Source 
* Merge pull request #35286 from DaxDupont/commsfix

Fixes sending cross station messages during wait period.

* Fixes sending cross station messages during wait period.
This commit is contained in:
CitadelStationBot
2018-02-05 00:49:03 -06:00
committed by Poojawa
parent e45aa5aa68
commit e95269398c
1 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/machinery/computer/communications.dm
+2 -3
View File
@@ -136,13 +136,12 @@
if("crossserver")
if(authenticated==2)
if(CM.lastTimeUsed + 600 > world.time)
if(!checkCCcooldown())
to_chat(usr, "<span class='warning'>Arrays recycling. Please stand by.</span>")
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)))
if(!input || !(usr in view(1,src)) || !checkCCcooldown())
return
playsound(src, 'sound/machines/terminal_prompt_confirm.ogg', 50, 0)
send2otherserver("[station_name()]", input,"Comms_Console")