From c325378da9192d0a5251ac54788f5e18dd0c829b Mon Sep 17 00:00:00 2001 From: VistaPOWA Date: Mon, 19 Aug 2013 02:38:44 +0200 Subject: [PATCH 1/2] Added delay to Disposals sound Fixed mining (and disposals) being a noise hazard. Their sound shouldn't 'pile' up now like before. --- code/modules/recycling/disposal.dm | 11 ++++++++--- code/modules/recycling/sortingmachinery.dm | 5 ++++- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/code/modules/recycling/disposal.dm b/code/modules/recycling/disposal.dm index c819a11ec92..4aff9cc42d9 100644 --- a/code/modules/recycling/disposal.dm +++ b/code/modules/recycling/disposal.dm @@ -1211,6 +1211,7 @@ var/active = 0 var/turf/target // this will be where the output objects are 'thrown' to. var/mode = 0 + var/start_eject = 0 New() ..() @@ -1228,10 +1229,14 @@ proc/expel(var/obj/structure/disposalholder/H) flick("outlet-open", src) - playsound(src, 'sound/machines/warning-buzzer.ogg', 50, 0, 0) - sleep(20) //wait until correct animation frame - playsound(src, 'sound/machines/hiss.ogg', 50, 0, 0) + if((start_eject + 30) < world.time) + start_eject = world.time + playsound(src, 'sound/machines/warning-buzzer.ogg', 50, 0, 0) + sleep(20) + playsound(src, 'sound/machines/hiss.ogg', 50, 0, 0) + else + sleep(20) if(H) for(var/atom/movable/AM in H) AM.loc = src.loc diff --git a/code/modules/recycling/sortingmachinery.dm b/code/modules/recycling/sortingmachinery.dm index 5edda0037b3..357d4032e90 100644 --- a/code/modules/recycling/sortingmachinery.dm +++ b/code/modules/recycling/sortingmachinery.dm @@ -212,6 +212,7 @@ density = 1 icon_state = "intake" + var/start_flush = 0 var/c_mode = 0 New() @@ -267,7 +268,9 @@ air_contents = new() // new empty gas resv. sleep(10) - playsound(src, 'sound/machines/disposalflush.ogg', 50, 0, 0) + if((start_flush + 15) < world.time) + start_flush = world.time + playsound(src, 'sound/machines/disposalflush.ogg', 50, 0, 0) sleep(5) // wait for animation to finish H.init(src) // copy the contents of disposer to holder From cb6fb7703dde7a476f6e38868671a38e980ada33 Mon Sep 17 00:00:00 2001 From: VistaPOWA Date: Mon, 19 Aug 2013 02:40:59 +0200 Subject: [PATCH 2/2] removed extra newline --- code/modules/recycling/disposal.dm | 1 - 1 file changed, 1 deletion(-) diff --git a/code/modules/recycling/disposal.dm b/code/modules/recycling/disposal.dm index 4aff9cc42d9..8d6ba2ffee3 100644 --- a/code/modules/recycling/disposal.dm +++ b/code/modules/recycling/disposal.dm @@ -1234,7 +1234,6 @@ playsound(src, 'sound/machines/warning-buzzer.ogg', 50, 0, 0) sleep(20) playsound(src, 'sound/machines/hiss.ogg', 50, 0, 0) - else sleep(20) if(H)