diff --git a/code/modules/client/preferences_savefile.dm b/code/modules/client/preferences_savefile.dm index 1ebfd9ecf5b..33ff7efcaed 100644 --- a/code/modules/client/preferences_savefile.dm +++ b/code/modules/client/preferences_savefile.dm @@ -2,7 +2,7 @@ #define SAVEFILE_VERSION_MIN 8 //This is the current version, anything below this will attempt to update (if it's not obsolete) -#define SAVEFILE_VERSION_MAX 14 +#define SAVEFILE_VERSION_MAX 15 /* SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Carn This proc checks if the current directory of the savefile S needs updating @@ -101,6 +101,8 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car toggles = TOGGLES_DEFAULT if(current_version < 12) ignoring = list() + if(current_version < 15) + toggles |= SOUND_ANNOUNCEMENTS //should this proc get fairly long (say 3 versions long), //just increase SAVEFILE_VERSION_MIN so it's not as far behind diff --git a/code/modules/client/preferences_toggles.dm b/code/modules/client/preferences_toggles.dm index 409a66922c3..bf3071d1dda 100644 --- a/code/modules/client/preferences_toggles.dm +++ b/code/modules/client/preferences_toggles.dm @@ -330,6 +330,6 @@ var/global/list/ghost_orbits = list(GHOST_ORBIT_CIRCLE,GHOST_ORBIT_TRIANGLE,GHOS set category = "Preferences" 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"]." + src << "You will now [(prefs.toggles & SOUND_ANNOUNCEMENTS) ? "hear announcement sounds" : "no longer hear announcements"]." 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 diff --git a/code/modules/mob/living/silicon/ai/say.dm b/code/modules/mob/living/silicon/ai/say.dm index d2016caaf76..e9854777e3e 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_ANNOUNCEMENTS)) + 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 6d2cb32e326..38e1a24d5d3 100644 --- a/code/orphaned procs/priority_announce.dm +++ b/code/orphaned procs/priority_announce.dm @@ -27,9 +27,8 @@ for(var/mob/M in player_list) if(!istype(M,/mob/new_player) && !M.ear_deaf) M << announcement - if(!(M.client.prefs.toggles & SOUND_ANNOUNCEMENTS)) - continue - M << sound(sound) + if(M.client.prefs.toggles & SOUND_ANNOUNCEMENTS) + M << sound(sound) /proc/print_command_report(text = "", title = "Central Command Update") for (var/obj/machinery/computer/communications/C in machines) @@ -49,8 +48,7 @@ if(!istype(M,/mob/new_player) && !M.ear_deaf) M << "[title]
[message]

" if(M.client.prefs.toggles & SOUND_ANNOUNCEMENTS) - continue - if(alert) - M << sound('sound/misc/notice1.ogg') - else - M << sound('sound/misc/notice2.ogg') + if(alert) + M << sound('sound/misc/notice1.ogg') + else + M << sound('sound/misc/notice2.ogg')