From 49dd259cbc212232d60dbae5cd382d2b6c57cd0d Mon Sep 17 00:00:00 2001 From: Nerd Lord Date: Thu, 28 Apr 2016 22:34:37 -0400 Subject: [PATCH] Attacking a locker or crate with an ID-containing object will toggle the lock instead of opening it --- code/game/objects/structures/crates_lockers/closets.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/objects/structures/crates_lockers/closets.dm b/code/game/objects/structures/crates_lockers/closets.dm index a1e5baf8450..b49a7ac580d 100644 --- a/code/game/objects/structures/crates_lockers/closets.dm +++ b/code/game/objects/structures/crates_lockers/closets.dm @@ -251,7 +251,7 @@ "You hear welding.") update_icon() else if(user.a_intent != "harm" && !(W.flags & NOBLUDGEON)) - if(!toggle(user)) + if(W.GetID() || !toggle(user)) togglelock(user) return 1 else