Merge pull request #31 from outer-haven/upstream-merge-33154

[MIRROR] SM Sound Tweak
outer-haven · Nov 30, 2017 · 1b6223f · 1b6223f
2 parents c4b9aec + bcc4285
commit 1b6223f
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/code/datums/looping_sounds/machinery_sounds.dm b/code/datums/looping_sounds/machinery_sounds.dm
@@ -10,7 +10,7 @@
 
 /datum/looping_sound/supermatter
 	mid_sounds = list('sound/machines/sm/supermatter1.ogg'=1,'sound/machines/sm/supermatter2.ogg'=1,'sound/machines/sm/supermatter3.ogg'=1)
-	mid_length = 6
+	mid_length = 10
 	volume = 1
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////

diff --git a/code/modules/power/supermatter/supermatter.dm b/code/modules/power/supermatter/supermatter.dm
@@ -258,7 +258,7 @@ GLOBAL_DATUM(main_supermatter_engine, /obj/machinery/power/supermatter_shard)
 		return  //Yeah just stop.
 
 	if(power)
-		soundloop.volume = min(50, (round(power, 50)/50)+1) // 5 +1 volume per 20 power. 2500 power is max
+		soundloop.volume = min(40, (round(power/100)/50)+1) // 5 +1 volume per 20 power. 2500 power is max
 
 	//Ok, get the air from the turf
 	var/datum/gas_mixture/env = T.return_air()