diff --git a/code/WorkInProgress/recycling/disposal.dm b/code/WorkInProgress/recycling/disposal.dm index c891428e6cb..95dc5c0c75a 100644 --- a/code/WorkInProgress/recycling/disposal.dm +++ b/code/WorkInProgress/recycling/disposal.dm @@ -18,6 +18,7 @@ var/flush = 0 // true if flush handle is pulled var/obj/structure/disposalpipe/trunk/trunk = null // the attached pipe trunk var/flushing = 0 // true if flushing in progress + var/timeleft = 0 //used to give a delay after the last item was put in before flushing // create a new disposal // find the attached trunk (if present) and init gas resvr. @@ -80,7 +81,7 @@ if(M == user) continue M.show_message("[user.name] places \the [I] into the [src].", 3) - + timeleft = 5 update() // mouse drop another mob or self @@ -117,6 +118,7 @@ continue C.show_message(msg, 3) + timeleft = 5 update() return @@ -268,6 +270,12 @@ process() if(stat & BROKEN) // nothing can happen if broken return + + if(length(src.contents) > 0) + if(timeleft == 0) + flush = 1 + else + timeleft-- src.updateDialog() diff --git a/code/defines/obj/vending.dm b/code/defines/obj/vending.dm index ecbc2b3c119..37b67c6cda3 100644 --- a/code/defines/obj/vending.dm +++ b/code/defines/obj/vending.dm @@ -29,7 +29,7 @@ var/emagged = 0 //Ignores if somebody doesn't have card access to that machine. var/seconds_electrified = 0 //Shock customers like an airlock. var/shoot_inventory = 0 //Fire items at customers! We're broken! - var/shut_up = 0 //Stop spouting those godawful pitches! + var/shut_up = 1 //Stop spouting those godawful pitches! var/extended_inventory = 0 //can we access the hidden inventory? var/panel_open = 0 //Hacking that vending machine. Gonna get a free candy bar. var/wires = 15