From 7dcf0dc7016c67bf30510bd2d3a122132afb9a27 Mon Sep 17 00:00:00 2001 From: "johnsonmt88@gmail.com" Date: Mon, 10 Sep 2012 00:42:00 +0000 Subject: [PATCH] Fixed mobs who tried to walk whilst inside an unlocked, wrapped locker would disappear into nullspace. Fixes issue 905. git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4671 316c924e-a436-60f5-8080-3fe189b3f50e --- code/game/objects/structures/crates_lockers/closets.dm | 2 +- .../crates_lockers/closets/secure/secure_closets.dm | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/code/game/objects/structures/crates_lockers/closets.dm b/code/game/objects/structures/crates_lockers/closets.dm index 2c45213ec44..5634bb8dfe5 100644 --- a/code/game/objects/structures/crates_lockers/closets.dm +++ b/code/game/objects/structures/crates_lockers/closets.dm @@ -224,7 +224,7 @@ return /obj/structure/closet/relaymove(mob/user as mob) - if(user.stat) + if(user.stat || !isturf(src.loc)) return if(!src.open()) 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 aca03793d9d..5701501eedd 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 @@ -99,11 +99,9 @@ togglelock(user) /obj/structure/closet/secure_closet/relaymove(mob/user as mob) - if(user.stat) + if(user.stat || !isturf(src.loc)) return - if(user.stat) - return if(!(src.locked)) for(var/obj/item/I in src) I.loc = src.loc