From f806aed945ba3aa9a6339fb25e889264aefd19d1 Mon Sep 17 00:00:00 2001 From: Adrer Date: Fri, 24 Nov 2023 16:36:40 +0100 Subject: [PATCH] Scrubber/pump eject into hand (#23283) Co-authored-by: Adrer --- .../modules/atmospherics/machinery/portable/portable_pump.dm | 5 +---- code/modules/atmospherics/machinery/portable/scrubber.dm | 4 +--- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/code/modules/atmospherics/machinery/portable/portable_pump.dm b/code/modules/atmospherics/machinery/portable/portable_pump.dm index 9ec0f1461fd..b4601e55aea 100644 --- a/code/modules/atmospherics/machinery/portable/portable_pump.dm +++ b/code/modules/atmospherics/machinery/portable/portable_pump.dm @@ -167,10 +167,7 @@ return TRUE if("remove_tank") - if(holding_tank) - on = FALSE - holding_tank.forceMove(get_turf(src)) - holding_tank = null + replace_tank(ui.user, TRUE) update_icon() return TRUE diff --git a/code/modules/atmospherics/machinery/portable/scrubber.dm b/code/modules/atmospherics/machinery/portable/scrubber.dm index 9a798b8ef06..8b7a38cca7c 100644 --- a/code/modules/atmospherics/machinery/portable/scrubber.dm +++ b/code/modules/atmospherics/machinery/portable/scrubber.dm @@ -151,9 +151,7 @@ return TRUE if("remove_tank") - if(holding_tank) - holding_tank.forceMove(get_turf(src)) - holding_tank = null + replace_tank(ui.user, TRUE) update_icon() return TRUE