cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-21 20:20:33 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixes announcement prefs, fixes SOUND_ANNOUNCEMENTS (#17626)

Browse Source 
* Actually fixes announcements the right way

* Flips the SOUND_ANNOUNCEMENTS bitflag so that having it means you hear announcements

* Updates the save file version
This commit is contained in:
Shaps
2016-05-14 00:55:50 +02:00
committed by phil235
parent c79c7f0d86
commit cbc7a8b654
4 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/client/preferences_savefile.dm
+3 -1
View File
@@ -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
code/modules/client/preferences_toggles.dm
+1 -1
View File
@@ -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!
code/modules/mob/living/silicon/ai/say.dm
+1 -1
View File
@@ -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
code/orphaned procs/priority_announce.dm
+6 -8
View File
@@ -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 << "<b><font size = 3><font color = red>[title]</font color><BR>[message]</font size></b><BR>"
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')