From 2b1e308e314e91dd1c57119a6bdb06d35ad5a7c3 Mon Sep 17 00:00:00 2001 From: Rob Nelson Date: Thu, 9 Jan 2014 14:52:42 -0800 Subject: [PATCH] Fix #384 - Fridges can be opened while welded shut. Also discovered this extended to secure lockers. Conflicts: code/game/objects/structures/crates_lockers/closets/secure/secure_closets.dm html/changelog.html --- .../structures/crates_lockers/closets/secure/secure_closets.dm | 2 ++ 1 file changed, 2 insertions(+) diff --git a/code/game/objects/structures/crates_lockers/closets/secure/secure_closets.dm b/code/game/objects/structures/crates_lockers/closets/secure/secure_closets.dm index f6ce5d6d81e..23dc36da2a1 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/secure_closets.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/secure_closets.dm @@ -17,6 +17,8 @@ health = 200 /obj/structure/closet/secure_closet/can_open() + if(!..()) + return 0 if(src.locked) return 0 return ..()