Revert "Merge pull request #16240 from ShadowLarkens/revert"

This reverts commit 885171f985, reversing
changes made to 3e314f8064.
This commit is contained in:
ShadowLarkens
2024-09-07 14:11:15 -07:00
parent 49dda94177
commit f9052dbb60
186 changed files with 5029 additions and 2255 deletions
+1 -1
View File
@@ -100,7 +100,7 @@
if(direct)
if(ismob(thing))
var/mob/M = thing
if(pref_check && !M.is_preference_enabled(pref_check))
if(M.check_sound_preference(pref_check))
continue
SEND_SOUND(thing, S)
else
@@ -13,7 +13,7 @@
mid_length = 60
volume = 40
extra_range = 10
pref_check = /datum/client_preference/supermatter_hum
pref_check = /datum/preference/toggle/supermatter_hum
///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
@@ -104,7 +104,7 @@
mid_length = 70
end_sound = 'sound/machines/air_pump/airpumpshutdown.ogg'
volume = 15
pref_check = /datum/client_preference/air_pump_noise
pref_check = /datum/preference/toggle/air_pump_noise
////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+2 -2
View File
@@ -1,5 +1,5 @@
/datum/looping_sound/weather
pref_check = /datum/client_preference/weather_sounds
pref_check = /datum/preference/toggle/weather_sounds
/datum/looping_sound/weather/outside_blizzard
mid_sounds = list(
@@ -95,4 +95,4 @@
volume = 20 //Sound is already quieter in file
/datum/looping_sound/weather/rain/indoors/heavy
volume = 40
volume = 40