From 6c5774724d0ba51a4502f9badb21aec0854222f7 Mon Sep 17 00:00:00 2001 From: LetterJay Date: Tue, 12 Sep 2017 23:15:48 -0500 Subject: [PATCH] Update sound.dm --- code/game/sound.dm | 3 --- 1 file changed, 3 deletions(-) diff --git a/code/game/sound.dm b/code/game/sound.dm index 714f8ff5b2..cf6d4707a7 100644 --- a/code/game/sound.dm +++ b/code/game/sound.dm @@ -146,7 +146,6 @@ soundin = pick('sound/hallucinations/im_here1.ogg', 'sound/hallucinations/im_here2.ogg') if ("can_open") soundin = pick('sound/effects/can_open1.ogg', 'sound/effects/can_open2.ogg', 'sound/effects/can_open3.ogg') -<<<<<<< HEAD if ("struggle_sound") soundin = pick( 'sound/vore/pred/struggle_01.ogg','sound/vore/pred/struggle_02.ogg','sound/vore/pred/struggle_03.ogg', 'sound/vore/pred/struggle_04.ogg','sound/vore/pred/struggle_05.ogg') @@ -177,8 +176,6 @@ 'sound/vore/prey/death_04.ogg','sound/vore/prey/death_05.ogg','sound/vore/prey/death_06.ogg', 'sound/vore/prey/death_07.ogg','sound/vore/prey/death_08.ogg','sound/vore/prey/death_09.ogg', 'sound/vore/prey/death_10.ogg') -======= if("bullet_miss") soundin = pick('sound/weapons/bulletflyby.ogg', 'sound/weapons/bulletflyby2.ogg', 'sound/weapons/bulletflyby3.ogg') ->>>>>>> 35279a3... Nightmare (#30415) return soundin