From 07565ffaa55edf6ec5facde699c1a51a728b639b Mon Sep 17 00:00:00 2001
From: Shadowlight213 <Shadowlight213@users.noreply.github.com>
Date: Sat, 20 Feb 2016 15:59:15 -0300
Subject: [PATCH] Reverses Announcement sound pref to hopefully fix it starting
 off.

---
 code/__DEFINES/preferences.dm              |  4 ++--
 code/modules/client/preferences_toggles.dm | 12 ++++++------
 code/modules/mob/living/silicon/ai/say.dm  |  2 +-
 code/orphaned procs/priority_announce.dm   | 16 +++++++++-------
 4 files changed, 18 insertions(+), 16 deletions(-)

diff --git a/code/__DEFINES/preferences.dm b/code/__DEFINES/preferences.dm
index 44e1807715d..207c01db0dc 100644
--- a/code/__DEFINES/preferences.dm
+++ b/code/__DEFINES/preferences.dm
@@ -11,9 +11,9 @@
 #define SOUND_SHIP_AMBIENCE 256
 #define SOUND_PRAYERS 512
 #define ANNOUNCE_LOGIN 1024
-#define SOUND_ANNOUNCMENTS 2048
+#define SOUND_ANNOUNCEMENTS 2048
 
-#define TOGGLES_DEFAULT (SOUND_ADMINHELP|SOUND_MIDI|SOUND_AMBIENCE|SOUND_LOBBY|MEMBER_PUBLIC|INTENT_STYLE|MIDROUND_ANTAG|SOUND_INSTRUMENTS|SOUND_SHIP_AMBIENCE|SOUND_PRAYERS|SOUND_ANNOUNCMENTS)
+#define TOGGLES_DEFAULT (SOUND_ADMINHELP|SOUND_MIDI|SOUND_AMBIENCE|SOUND_LOBBY|MEMBER_PUBLIC|INTENT_STYLE|MIDROUND_ANTAG|SOUND_INSTRUMENTS|SOUND_SHIP_AMBIENCE|SOUND_PRAYERS|SOUND_ANNOUNCEMENTS)
 
 //Chat toggles
 #define CHAT_OOC		1
diff --git a/code/modules/client/preferences_toggles.dm b/code/modules/client/preferences_toggles.dm
index f4f57223dd4..7bc1302fa19 100644
--- a/code/modules/client/preferences_toggles.dm
+++ b/code/modules/client/preferences_toggles.dm
@@ -280,11 +280,11 @@ var/global/list/ghost_orbits = list(GHOST_ORBIT_CIRCLE,GHOST_ORBIT_TRIANGLE,GHOS
 	else
 		src << "<span class='notice'>You will no longer examine things you click on.</span>"
 
-/client/verb/toggle_announcment_sound()
-	set name = "Hear/Silence Announcments"
+/client/verb/toggle_announcement_sound()
+	set name = "Hear/Silence Announcements"
 	set category = "Preferences"
-	set desc = ".Toggles hearing Central Command, Captain, VOX, and other announcment sounds"
-	prefs.toggles ^= SOUND_ANNOUNCMENTS
-	src << "You will now [(prefs.toggles & SOUND_ANNOUNCMENTS) ? "hear announcment sounds" : "no longer hear announcments"]."
+	set desc = ".Toggles hearing Central Command, Captain, VOX, and other announcement sounds"
+	prefs.toggles ^= SOUND_ANNOUNCEMENTS
+	src << "You will now [(prefs.toggles & SOUND_ANNOUNCEMENTS) ? "no longer hear announcements" : "hear announcement sounds"]."
 	prefs.save_preferences()
-	feedback_add_details("admin_verb","TAS") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
\ No newline at end of file
+	feedback_add_details("admin_verb","TAS") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
diff --git a/code/modules/mob/living/silicon/ai/say.dm b/code/modules/mob/living/silicon/ai/say.dm
index 269efb94bdd..d2016caaf76 100644
--- a/code/modules/mob/living/silicon/ai/say.dm
+++ b/code/modules/mob/living/silicon/ai/say.dm
@@ -157,7 +157,7 @@ var/const/VOX_DELAY = 600
 		if(!only_listener)
 			// Play voice for all mobs in the z level
 			for(var/mob/M in player_list)
-				if(M.client && !M.ear_deaf && (M.client.prefs.toggles & SOUND_ANNOUNCMENTS))
+				if(M.client && !M.ear_deaf && !(M.client.prefs.toggles & SOUND_ANNOUNCEMENTS))
 					var/turf/T = get_turf(M)
 					if(T.z == z_level)
 						M << voice
diff --git a/code/orphaned procs/priority_announce.dm b/code/orphaned procs/priority_announce.dm
index c92245acc6f..4f6b31f3b3d 100644
--- a/code/orphaned procs/priority_announce.dm	
+++ b/code/orphaned procs/priority_announce.dm	
@@ -27,8 +27,9 @@
 	for(var/mob/M in player_list)
 		if(!istype(M,/mob/new_player) && !M.ear_deaf)
 			M << announcement
-			if(M.client.prefs.toggles & SOUND_ANNOUNCMENTS)
-				M << sound(sound)
+			if(M.client.prefs.toggles & SOUND_ANNOUNCEMENTS)
+				return
+			M << sound(sound)
 
 /proc/print_command_report(text = "", title = "Central Command Update")
 	for (var/obj/machinery/computer/communications/C in machines)
@@ -46,8 +47,9 @@
 	for(var/mob/M in player_list)
 		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_ANNOUNCMENTS)
-				if(alert)
-					M << sound('sound/misc/notice1.ogg')
-				else
-					M << sound('sound/misc/notice2.ogg')
\ No newline at end of file
+			if(M.client.prefs.toggles & SOUND_ANNOUNCEMENTS)
+				return
+			if(alert)
+				M << sound('sound/misc/notice1.ogg')
+			else
+				M << sound('sound/misc/notice2.ogg')
\ No newline at end of file