Sound pref tweaks (#885)

Author: MrMelbert

code/controllers/subsystem/ambience.dm

@@ -112,10 +112,10 @@ SUBSYSTEM_DEF(ambience)
 
 	var/area/my_area = get_area(src)
 	var/sound_to_use = my_area.ambient_buzz
-	var/volume_modifier = client.prefs.read_preference(/datum/preference/numeric/volume/sound_ship_ambience_volume)
+	var/volume_modifier = client.prefs.read_preference(/datum/preference/numeric/volume/sound_ship_ambience_volume) || 0
 
-	if(!sound_to_use || !(client.prefs.read_preference(/datum/preference/numeric/volume/sound_ship_ambience_volume)))
-		SEND_SOUND(src, sound(null, repeat = 0, volume = volume_modifier, wait = 0, channel = CHANNEL_BUZZ))
+	if(!sound_to_use || volume_modifier <= 0)
+		SEND_SOUND(src, sound(null, repeat = 0, wait = 0, channel = CHANNEL_BUZZ))
 		client.current_ambient_sound = null
 		return
 
@@ -126,4 +126,4 @@ SUBSYSTEM_DEF(ambience)
 		return
 	else if(sound_to_use != client.current_ambient_sound) // Don't reset current loops
 		client.current_ambient_sound = sound_to_use
-		SEND_SOUND(src, sound(my_area.ambient_buzz, repeat = 1, wait = 0, volume = my_area.ambient_buzz_vol, channel = CHANNEL_BUZZ))
+		SEND_SOUND(src, sound(my_area.ambient_buzz, repeat = 1, wait = 0, volume = my_area.ambient_buzz_vol * (volume_modifier / 100), channel = CHANNEL_BUZZ))

code/modules/client/preferences/sounds.dm

@@ -53,11 +53,17 @@
 /datum/preference/choiced/sound_tts/create_default_value()
 	return TTS_SOUND_ENABLED
 
+/datum/preference/choiced/sound_tts/is_accessible(datum/preferences/preferences)
+	return ..() && SStts.tts_enabled
+
 /datum/preference/numeric/volume/sound_tts_volume
 	category = PREFERENCE_CATEGORY_GAME_PREFERENCES
 	savefile_key = "sound_tts_volume"
 	savefile_identifier = PREFERENCE_PLAYER
 
+/datum/preference/numeric/volume/sound_tts_volume/is_accessible(datum/preferences/preferences)
+	return ..() && SStts.tts_enabled
+
 /datum/preference/choiced/sound_achievement
 	category = PREFERENCE_CATEGORY_GAME_PREFERENCES
 	savefile_key = "sound_achievement"
@@ -99,6 +105,7 @@
 	savefile_identifier = PREFERENCE_PLAYER
 
 /datum/preference/numeric/volume/sound_ship_ambience_volume/apply_to_client_updated(client/client, value)
+	client.current_ambient_sound = null
 	client.mob.refresh_looping_ambience()
 
 /// Heartbeats

tgui/packages/tgui/interfaces/PreferencesMenu/preferences/features/game_preferences/_hear_radio_sounds.tsx

@@ -1,8 +1,9 @@
 import { CheckboxInput, type FeatureToggle } from '../base';
 
 export const hear_radio_sounds: FeatureToggle = {
-  name: 'Toggle Radio Sounds',
+  name: 'Enable Radio Sounds',
   category: 'SOUND',
-  description: 'When unchecked, you will no longer hear radio sounds.',
+  description:
+    'When enabled, you will hear a sound when you receive a radio message.',
   component: CheckboxInput,
 };

tgui/packages/tgui/interfaces/PreferencesMenu/preferences/features/game_preferences/_hear_speech_sounds.tsx

@@ -1,8 +1,8 @@
 import { CheckboxInput, type FeatureToggle } from '../base';
 
 export const hear_speech_sounds: FeatureToggle = {
-  name: 'Toggle Speech Sounds',
+  name: 'Enable Speech Sounds',
   category: 'SOUND',
-  description: 'When unchecked, you will no longer hear speech sounds.',
+  description: 'When enabled, mobs will make sounds when they speak.',
   component: CheckboxInput,
 };