Skip to content

Commit

Permalink
Merge branch 'master' of https://github.com/tgstation/-tg-station int…
Browse files Browse the repository at this point in the history
…o PARANOIA
  • Loading branch information
AndrewJacksonThe2nd committed Feb 21, 2016
2 parents 5d5d242 + 114e5f1 commit 576bc68
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions code/orphaned procs/priority_announce.dm
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
if(!istype(M,/mob/new_player) && !M.ear_deaf)
M << announcement
if(M.client.prefs.toggles & SOUND_ANNOUNCEMENTS)
return
continue
M << sound(sound)

/proc/print_command_report(text = "", title = "Central Command Update")
Expand All @@ -48,7 +48,7 @@
if(!istype(M,/mob/new_player) && !M.ear_deaf)
M << "<b><font size = 3><font color = red>[title]</font color><BR>[message]</font size></b><BR>"
if(M.client.prefs.toggles & SOUND_ANNOUNCEMENTS)
return
continue
if(alert)
M << sound('sound/misc/notice1.ogg')
else
Expand Down

0 comments on commit 576bc68

Please sign in to comment.