From 0ea62fe2f1e43e8e7163cd425fdfaa4f2a0dd75c Mon Sep 17 00:00:00 2001
From: Atermonera <atermonera@gmail.com>
Date: Sun, 2 May 2021 20:53:09 -0700
Subject: [PATCH] Merge pull request #8056 from Greenjoe12345/weather-sounds

weather sounds adjustments
---
 code/datums/looping_sounds/weather_sounds.dm | 28 ++++++++++++++------
 code/modules/planet/sif.dm                   | 17 +++++++++---
 2 files changed, 33 insertions(+), 12 deletions(-)

diff --git a/code/datums/looping_sounds/weather_sounds.dm b/code/datums/looping_sounds/weather_sounds.dm
index 106c25643a..4a02993058 100644
--- a/code/datums/looping_sounds/weather_sounds.dm
+++ b/code/datums/looping_sounds/weather_sounds.dm
@@ -11,7 +11,7 @@
 	start_sound = 'sound/effects/weather/snowstorm/outside/active_start.ogg'
 	start_length = 13 SECONDS
 	end_sound = 'sound/effects/weather/snowstorm/outside/active_end.ogg'
-	volume = 80
+	volume = 40
 
 /datum/looping_sound/weather/inside_blizzard
 	mid_sounds = list(
@@ -23,7 +23,7 @@
 	start_sound = 'sound/effects/weather/snowstorm/inside/active_start.ogg'
 	start_length = 13 SECONDS
 	end_sound = 'sound/effects/weather/snowstorm/inside/active_end.ogg'
-	volume = 60
+	volume = 20
 
 /datum/looping_sound/weather/outside_snow
 	mid_sounds = list(
@@ -35,7 +35,7 @@
 	start_sound = 'sound/effects/weather/snowstorm/outside/weak_start.ogg'
 	start_length = 13 SECONDS
 	end_sound = 'sound/effects/weather/snowstorm/outside/weak_end.ogg'
-	volume = 50
+	volume = 20
 
 /datum/looping_sound/weather/inside_snow
 	mid_sounds = list(
@@ -47,7 +47,7 @@
 	start_sound = 'sound/effects/weather/snowstorm/inside/weak_start.ogg'
 	start_length = 13 SECONDS
 	end_sound = 'sound/effects/weather/snowstorm/inside/weak_end.ogg'
-	volume = 30
+	volume = 10
 
 /datum/looping_sound/weather/wind
 	mid_sounds = list(
@@ -59,11 +59,17 @@
 		'sound/effects/weather/wind/wind_5_1.ogg' = 1
 		)
 	mid_length = 10 SECONDS // The lengths for the files vary, but the longest is ten seconds, so this will make it sound like intermittent wind.
-	volume = 50
+	volume = 45
 
 // Don't have special sounds so we just make it quieter indoors.
 /datum/looping_sound/weather/wind/indoors
-	volume = 30
+	volume = 25
+
+/datum/looping_sound/weather/wind/gentle
+	volume = 15
+
+/datum/looping_sound/weather/wind/gentle/indoors
+	volume = 5
 
 /datum/looping_sound/weather/rain
 	mid_sounds = list(
@@ -73,7 +79,13 @@
 	start_sound = 'sound/effects/weather/acidrain_start.ogg'
 	start_length = 13 SECONDS
 	end_sound = 'sound/effects/weather/acidrain_end.ogg'
-	volume = 50
+	volume = 20
 
 /datum/looping_sound/weather/rain/indoors
-	volume = 30
\ No newline at end of file
+	volume = 10
+
+/datum/looping_sound/weather/rain/heavy
+	volume = 40
+
+/datum/looping_sound/weather/rain/heavy/indoors
+	volume = 20
\ No newline at end of file
diff --git a/code/modules/planet/sif.dm b/code/modules/planet/sif.dm
index 798cebcaac..cefc549d2a 100644
--- a/code/modules/planet/sif.dm
+++ b/code/modules/planet/sif.dm
@@ -156,6 +156,9 @@ var/datum/planet/sif/planet_sif = null
 	sky_visible = TRUE
 	observed_message = "The sky is clear."
 
+	outdoor_sounds_type = /datum/looping_sound/weather/wind/gentle
+	indoor_sounds_type = /datum/looping_sound/weather/wind/gentle/indoors
+
 /datum/weather/sif/overcast
 	name = "overcast"
 	light_modifier = 0.8
@@ -174,6 +177,9 @@ var/datum/planet/sif/planet_sif = null
 		"It's very cloudy."
 		)
 
+	outdoor_sounds_type = /datum/looping_sound/weather/wind/gentle
+	indoor_sounds_type = /datum/looping_sound/weather/wind/gentle/indoors
+
 /datum/weather/sif/light_snow
 	name = "light snow"
 	icon_state = "snowfall_light"
@@ -192,6 +198,9 @@ var/datum/planet/sif/planet_sif = null
 		"It begins to snow lightly.",
 		)
 
+	outdoor_sounds_type = /datum/looping_sound/weather/wind/gentle
+	indoor_sounds_type = /datum/looping_sound/weather/wind/gentle/indoors
+
 /datum/weather/sif/snow
 	name = "moderate snow"
 	icon_state = "snowfall_med"
@@ -282,8 +291,8 @@ var/datum/planet/sif/planet_sif = null
 	transition_messages = list(
 		"The sky is dark, and rain falls down upon you."
 	)
-//	outdoor_sounds_type = /datum/looping_sound/weather/rain
-//	indoor_sounds_type = /datum/looping_sound/weather/rain/indoors
+	outdoor_sounds_type = /datum/looping_sound/weather/rain
+	indoor_sounds_type = /datum/looping_sound/weather/rain/indoors
 
 /datum/weather/sif/rain/process_effects()
 	..()
@@ -327,8 +336,8 @@ var/datum/planet/sif/planet_sif = null
 		"Loud thunder is heard in the distance.",
 		"A bright flash heralds the approach of a storm."
 	)
-//	outdoor_sounds_type = /datum/looping_sound/weather/rain
-//	indoor_sounds_type = /datum/looping_sound/weather/rain/indoors
+	outdoor_sounds_type = /datum/looping_sound/weather/rain/heavy
+	indoor_sounds_type = /datum/looping_sound/weather/rain/heavy/indoors
 
 
 	transition_chances = list(