From ec2078d4482984000d7f06bb191f9ad46d5916c8 Mon Sep 17 00:00:00 2001 From: LetterJay Date: Tue, 14 Nov 2017 13:40:45 -0600 Subject: [PATCH] Update machinery_sounds.dm --- code/datums/looping_sounds/machinery_sounds.dm | 4 ---- 1 file changed, 4 deletions(-) diff --git a/code/datums/looping_sounds/machinery_sounds.dm b/code/datums/looping_sounds/machinery_sounds.dm index c0aa24830f..53d7cbffe1 100644 --- a/code/datums/looping_sounds/machinery_sounds.dm +++ b/code/datums/looping_sounds/machinery_sounds.dm @@ -21,9 +21,6 @@ mid_sounds = list('sound/machines/generator/generator_mid1.ogg'=1, 'sound/machines/generator/generator_mid2.ogg'=1, 'sound/machines/generator/generator_mid3.ogg'=1) mid_length = 4 end_sound = 'sound/machines/generator/generator_end.ogg' -<<<<<<< HEAD - volume = 40 -======= volume = 40 @@ -74,4 +71,3 @@ mid_length = 17 range_modifier = -4.5 volume = 70 ->>>>>>> 5946689... Improves the deep fryer (#32482)