cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-22 12:41:09 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1186 from VistaPOWA/disposals

Browse Source 
Added delay to Disposals sounds
This commit is contained in:
Cael Aislinn
2013-08-19 03:22:04 -07:00
parent 635454486a cb6fb7703d
commit 01e87ce2a9
2 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/recycling/disposal.dm
+8 -4
View File
@@ -1212,6 +1212,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()
..()
@@ -1229,10 +1230,13 @@
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
code/modules/recycling/sortingmachinery.dm
+4 -1
View File
@@ -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