Merge pull request #4699 from Citadel-Station-13/upstream-merge-34157

[MIRROR] Fixes comms console dchat announcing announcements even if they didn't happen for whatever reason
This commit is contained in:
deathride58
2018-01-08 04:13:47 +00:00
committed by GitHub
@@ -131,7 +131,6 @@
if(authenticated==2)
playsound(src, 'sound/machines/terminal_prompt.ogg', 50, 0)
make_announcement(usr)
deadchat_broadcast("<span class='deadsay bold'>[usr.name] made an priority announcement.</span>", usr)
if("crossserver")
if(authenticated==2)
@@ -701,6 +700,7 @@
if(!input || !user.canUseTopic(src))
return
SScommunications.make_announcement(user, is_silicon, input)
deadchat_broadcast("<span class='deadsay bold'>[user.name] made an priority announcement.</span>", user)
/obj/machinery/computer/communications/proc/post_status(command, data1, data2)