From d620bd194d6ecb9a694dde74832e92c064d0f8c0 Mon Sep 17 00:00:00 2001
From: Ron <ron_timmy1@yahoo.com>
Date: Sat, 27 Jan 2018 13:17:44 -0500
Subject: [PATCH] Adds a toggle for the announcer voice. (#4143)

Adds a toggle for the announcer voice as some people find them annoying. Related thread: https://forums.aurorastation.org/viewtopic.php?f=18&t=10212
---
 code/__defines/misc.dm                      |  4 ++--
 code/defines/procs/announce.dm              |  2 +-
 code/modules/client/preferences_ambience.dm | 12 +++++++++++-
 html/changelogs/Printer16-voxtog.yml        |  4 ++++
 4 files changed, 18 insertions(+), 4 deletions(-)
 create mode 100644 html/changelogs/Printer16-voxtog.yml

diff --git a/code/__defines/misc.dm b/code/__defines/misc.dm
index a5d7744a513..c35dbf72abf 100644
--- a/code/__defines/misc.dm
+++ b/code/__defines/misc.dm
@@ -76,15 +76,15 @@ Will print: "/mob/living/carbon/human/death" (you can optionally embed it in a s
 //Gun safety check.
 #define SAFETY_CHECK 0x10
 
-
 #define TOGGLES_DEFAULT (SOUND_ADMINHELP|SOUND_MIDI|SOUND_AMBIENCE|SOUND_LOBBY|CHAT_OOC|CHAT_DEAD|CHAT_GHOSTEARS|CHAT_GHOSTSIGHT|CHAT_PRAYER|CHAT_RADIO|CHAT_ATTACKLOGS|CHAT_LOOC)
 
 //Sound effects toggles
 #define ASFX_AMBIENCE	1
 #define ASFX_FOOTSTEPS	2
 #define ASFX_VOTE		4
+#define ASFX_VOX		8
 
-#define ASFX_DEFAULT (ASFX_AMBIENCE|ASFX_FOOTSTEPS|ASFX_VOTE)
+#define ASFX_DEFAULT (ASFX_AMBIENCE|ASFX_FOOTSTEPS|ASFX_VOTE|ASFX_VOX)
 
 // For secHUDs and medHUDs and variants. The number is the location of the image on the list hud_list of humans.
 #define      HEALTH_HUD 1 // A simple line rounding the mob's number health.
diff --git a/code/defines/procs/announce.dm b/code/defines/procs/announce.dm
index 8ab520f98b8..f5a52b7ae0c 100644
--- a/code/defines/procs/announce.dm
+++ b/code/defines/procs/announce.dm
@@ -100,7 +100,7 @@ datum/announcement/proc/PlaySound(var/message_sound)
 	if(!message_sound)
 		return
 	for(var/mob/M in player_list)
-		if(!istype(M,/mob/abstract/new_player) && !isdeaf(M))
+		if(!istype(M,/mob/abstract/new_player) && !isdeaf(M) && (M.client.prefs.asfx_togs & ASFX_VOX))
 			M << message_sound
 
 datum/announcement/proc/Sound(var/message_sound)
diff --git a/code/modules/client/preferences_ambience.dm b/code/modules/client/preferences_ambience.dm
index 7b68efa4cfd..9c10a32af43 100644
--- a/code/modules/client/preferences_ambience.dm
+++ b/code/modules/client/preferences_ambience.dm
@@ -1,7 +1,8 @@
 /var/global/asfx_togs = list(
 //	/client/proc/Toggle_asfx,
 //	/client/proc/Toggle_footsteps,
-	/client/proc/Toggle_asfx_vote
+	/client/proc/Toggle_asfx_vote,
+	/client/proc/toggle_vox_voice
 )
 
 /client/verb/asf_toggle()
@@ -51,3 +52,12 @@
 	else
 		src << "<font color='red'>You will no longer hear the vote alarm.</font>"
 	feedback_add_details("admin_verb","TSFXFV") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
+
+/client/proc/toggle_vox_voice()
+	set name = "Toggle VOX Voice"
+	set category = "SoundFx Prefs"
+	set desc = "Toggles the announcement voice."
+
+	prefs.asfx_togs ^= ASFX_VOX
+	prefs.save_preferences()
+	src << "You will [(prefs.toggles_secondary & ASFX_VOX) ? "now" : "no longer"] hear the VOX voice."
diff --git a/html/changelogs/Printer16-voxtog.yml b/html/changelogs/Printer16-voxtog.yml
new file mode 100644
index 00000000000..8edc84df1bd
--- /dev/null
+++ b/html/changelogs/Printer16-voxtog.yml
@@ -0,0 +1,4 @@
+author: Printer16
+delete-after: True
+changes: 
+  - rscadd: "You can now toggle the announcement voice. The option is in the ASFX menu."