diff --git a/code/game/objects/structures/watercloset.dm b/code/game/objects/structures/watercloset.dm index 872b9be15d..3f87f2c31a 100644 --- a/code/game/objects/structures/watercloset.dm +++ b/code/game/objects/structures/watercloset.dm @@ -213,6 +213,8 @@ var/mobpresent = 0 //true if there is a mob on the shower's loc, this is to ease process() var/is_washing = 0 + COOLDOWN_DECLARE(last_sound) + /obj/structure/machinery/shower/Initialize() . = ..() create_reagents(2) @@ -379,6 +381,10 @@ /obj/structure/machinery/shower/process() if(!on) return + + if(COOLDOWN_FINISHED(src, last_sound)) + COOLDOWN_START(src, last_sound, 8 SECONDS) + playsound(src, "gurgle", 25, FALSE) wash_floor() if(!mobpresent) return for(var/mob/living/carbon/C in loc) diff --git a/code/game/sound.dm b/code/game/sound.dm index 6adaab1097..02be8dbace 100644 --- a/code/game/sound.dm +++ b/code/game/sound.dm @@ -238,6 +238,8 @@ S = pick('sound/effects/thud1.ogg','sound/effects/thud2.ogg','sound/effects/thud3.ogg') if("paper_writing") S = pick('sound/items/writing_noises/paper_writing_1.wav', 'sound/items/writing_noises/paper_writing_2.wav', 'sound/items/writing_noises/paper_writing_3.wav', 'sound/items/writing_noises/paper_writing_4.ogg') + if("gurgle") + S = pick('sound/effects/gurgle1.ogg', 'sound/effects/gurgle2.ogg', 'sound/effects/gurgle3.ogg', 'sound/effects/gurgle4.ogg') // Weapons/bullets if("shell_load") S = pick('sound/weapons/shell_load1.ogg','sound/weapons/shell_load2.ogg','sound/weapons/shell_load3.ogg','sound/weapons/shell_load4.ogg') diff --git a/sound/effects/gurgle1.ogg b/sound/effects/gurgle1.ogg new file mode 100644 index 0000000000..b8fa4b9e5e Binary files /dev/null and b/sound/effects/gurgle1.ogg differ diff --git a/sound/effects/gurgle2.ogg b/sound/effects/gurgle2.ogg new file mode 100644 index 0000000000..a564b2c45c Binary files /dev/null and b/sound/effects/gurgle2.ogg differ diff --git a/sound/effects/gurgle3.ogg b/sound/effects/gurgle3.ogg new file mode 100644 index 0000000000..42a9af7202 Binary files /dev/null and b/sound/effects/gurgle3.ogg differ diff --git a/sound/effects/gurgle4.ogg b/sound/effects/gurgle4.ogg new file mode 100644 index 0000000000..5daff36726 Binary files /dev/null and b/sound/effects/gurgle4.ogg differ