From b648c31d83896c7928d994a8b95204ea78f09111 Mon Sep 17 00:00:00 2001 From: mwerezak Date: Thu, 25 Dec 2014 15:46:48 -0500 Subject: [PATCH] Fixes #7111 --- code/modules/recycling/disposal.dm | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/code/modules/recycling/disposal.dm b/code/modules/recycling/disposal.dm index 04fa4f6b7a..396d92a200 100644 --- a/code/modules/recycling/disposal.dm +++ b/code/modules/recycling/disposal.dm @@ -364,18 +364,13 @@ if(flush && air_contents.return_pressure() >= SEND_PRESSURE ) // flush can happen even without power flush() - if(mode != 1) // if off or ready, no need to charge + if(mode != 1) //if off or ready, no need to charge update_use_power(1) - return - - // otherwise charge - src.pressurize() - - // if full enough, switch to ready mode - if(air_contents.return_pressure() >= SEND_PRESSURE) - mode = 2 + else if(air_contents.return_pressure() >= SEND_PRESSURE) + mode = 2 //if full enough, switch to ready mode update() - return + else + src.pressurize() //otherwise charge /obj/machinery/disposal/proc/pressurize() if(stat & NOPOWER) // won't charge if no power