From 0525d9b6eac766dd8e9564280ab72e471260aaef Mon Sep 17 00:00:00 2001 From: Kyep Date: Tue, 15 Sep 2020 13:31:10 -0700 Subject: [PATCH 1/2] Tweaks canister admin alerts --- code/game/machinery/atmoalter/canister.dm | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/code/game/machinery/atmoalter/canister.dm b/code/game/machinery/atmoalter/canister.dm index 3c09da548f5..83491d96a08 100644 --- a/code/game/machinery/atmoalter/canister.dm +++ b/code/game/machinery/atmoalter/canister.dm @@ -352,8 +352,8 @@ update_flag valve_open = !valve_open if(valve_open) logmsg = "Valve was opened by [key_name(usr)], starting a transfer into the [holding || "air"].
" - if(!holding) - logmsg = "Valve was opened by [key_name(usr)], starting a transfer into the [holding || "air"].
" + if(!holding && !connected_port) + logmsg = "Valve was opened by [key_name(usr)], starting a transfer into the air.
" if(air_contents.toxins > 0) message_admins("[key_name_admin(usr)] opened a canister that contains plasma in [get_area(src)]! (JMP)") log_admin("[key_name(usr)] opened a canister that contains plasma at [get_area(src)]: [x], [y], [z]") @@ -367,8 +367,9 @@ 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
" - message_admins("[ADMIN_LOOKUPFLW(usr)] removed [holding] from [src] with valve still open at [ADMIN_VERBOSEJMP(src)] releasing contents into the air.") investigate_log("[key_name(usr)] removed the [holding], leaving the valve open and transferring into the air.", "atmos") replace_tank(usr, FALSE) if("recolor") From 7a9c759f3d6c300a3d71e3d77aa249284b87b9d3 Mon Sep 17 00:00:00 2001 From: Kyep Date: Tue, 15 Sep 2020 13:47:20 -0700 Subject: [PATCH 2/2] deletes change 1 --- code/game/machinery/atmoalter/canister.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/machinery/atmoalter/canister.dm b/code/game/machinery/atmoalter/canister.dm index 83491d96a08..ea273850d90 100644 --- a/code/game/machinery/atmoalter/canister.dm +++ b/code/game/machinery/atmoalter/canister.dm @@ -352,7 +352,7 @@ update_flag valve_open = !valve_open if(valve_open) logmsg = "Valve was opened by [key_name(usr)], starting a transfer into the [holding || "air"].
" - if(!holding && !connected_port) + if(!holding) logmsg = "Valve was opened by [key_name(usr)], starting a transfer into the air.
" if(air_contents.toxins > 0) message_admins("[key_name_admin(usr)] opened a canister that contains plasma in [get_area(src)]! (JMP)")