From 1ea237c9aa70f2b6d96cd84fa119cc1fa5b8e37b Mon Sep 17 00:00:00 2001 From: Seth Scherer Date: Mon, 10 Jan 2022 14:26:14 -0500 Subject: [PATCH] Clicking an open locker on combat mode will no longer deposit your item (#63951) * fix * fix * FIX --- code/game/objects/structures/crates_lockers/closets.dm | 2 ++ 1 file changed, 2 insertions(+) diff --git a/code/game/objects/structures/crates_lockers/closets.dm b/code/game/objects/structures/crates_lockers/closets.dm index 2b4cdcff4e9..6c2403da1e8 100644 --- a/code/game/objects/structures/crates_lockers/closets.dm +++ b/code/game/objects/structures/crates_lockers/closets.dm @@ -390,6 +390,8 @@ span_notice("You cut \the [src] apart with \the [W].")) deconstruct(TRUE) return + if (user.combat_mode) + return FALSE if(user.transferItemToLoc(W, drop_location())) // so we put in unlit welder too return else if(W.tool_behaviour == TOOL_WELDER && can_weld_shut)