Skip to content

Commit

Permalink
shower sounds (#141)
Browse files Browse the repository at this point in the history
  • Loading branch information
AndroBetel committed Mar 12, 2024
1 parent cf458c6 commit 104a1b4
Show file tree
Hide file tree
Showing 6 changed files with 8 additions and 0 deletions.
6 changes: 6 additions & 0 deletions code/game/objects/structures/watercloset.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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)
Expand Down
2 changes: 2 additions & 0 deletions code/game/sound.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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')
Expand Down
Binary file added sound/effects/gurgle1.ogg
Binary file not shown.
Binary file added sound/effects/gurgle2.ogg
Binary file not shown.
Binary file added sound/effects/gurgle3.ogg
Binary file not shown.
Binary file added sound/effects/gurgle4.ogg
Binary file not shown.

0 comments on commit 104a1b4

Please sign in to comment.