Merge branch 'master' into void-but-for-real

2021-03-09 12:29:50 -08:00
parent 0d696de7cd 84ffac8d4f
commit 3b92e33112
772 changed files with 32091 additions and 23389 deletions
@@ -8,7 +8,7 @@
 	start_sound = 'sound/weather/ashstorm/outside/active_start.ogg'
 	start_length = 130
 	end_sound = 'sound/weather/ashstorm/outside/active_end.ogg'
-	volume = 80
+	volume = 60

 /datum/looping_sound/active_inside_ashstorm
 	mid_sounds = list(
@@ -20,7 +20,7 @@
 	start_sound = 'sound/weather/ashstorm/inside/active_start.ogg'
 	start_length = 130
 	end_sound = 'sound/weather/ashstorm/inside/active_end.ogg'
-	volume = 60
+	volume = 20

 /datum/looping_sound/weak_outside_ashstorm
 	mid_sounds = list(