From e64bdb02c1c9a88ed93fc30bddeb14d8e3397a38 Mon Sep 17 00:00:00 2001 From: Kyep <16434066+Kyep@users.noreply.github.com> Date: Fri, 25 Sep 2020 20:13:56 +0000 Subject: [PATCH] Reverts canister tank ejection functionality (#14434) * Reverts canister tank ejection functionality * remove red button coloring Co-authored-by: Kyep --- code/game/machinery/atmoalter/canister.dm | 6 ++---- tgui/packages/tgui/interfaces/Canister.js | 1 - tgui/packages/tgui/public/tgui.bundle.js | 2 +- 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/code/game/machinery/atmoalter/canister.dm b/code/game/machinery/atmoalter/canister.dm index ea273850d90..b950f3d51a3 100644 --- a/code/game/machinery/atmoalter/canister.dm +++ b/code/game/machinery/atmoalter/canister.dm @@ -367,10 +367,8 @@ update_flag if("eject") if(holding) if(valve_open) - if(air_contents && (air_contents.toxins > 0 || air_contents.sleeping_agent > 0)) - message_admins("[ADMIN_LOOKUPFLW(usr)] removed [holding] from [src] with valve still open at [ADMIN_VERBOSEJMP(src)] releasing contents into the air.") - release_log += "[key_name(usr)] removed the [holding], leaving the valve open and transferring into the air
" - investigate_log("[key_name(usr)] removed the [holding], leaving the valve open and transferring into the air.", "atmos") + valve_open = FALSE + release_log += "Valve was closed by [key_name(usr)], stopping the transfer into the [holding]
" replace_tank(usr, FALSE) if("recolor") if(can_label) diff --git a/tgui/packages/tgui/interfaces/Canister.js b/tgui/packages/tgui/interfaces/Canister.js index 8c184f71e68..621637b4cc2 100644 --- a/tgui/packages/tgui/interfaces/Canister.js +++ b/tgui/packages/tgui/interfaces/Canister.js @@ -221,7 +221,6 @@ export const Canister = (props, context) => { buttons={!!hasHoldingTank && (