diff --git a/code/game/objects/structures/crates_lockers/closets.dm b/code/game/objects/structures/crates_lockers/closets.dm index 9acb5572918..3dde46e83a2 100644 --- a/code/game/objects/structures/crates_lockers/closets.dm +++ b/code/game/objects/structures/crates_lockers/closets.dm @@ -190,6 +190,9 @@ if(!user.drop_item()) //couldn't drop the item to_chat(user, "\The [W] is stuck to your hand, you cannot put it in \the [src]!") return + if(W.loc != user.loc) + // It went somewhere else, don't teleport it back. + return if(W) W.forceMove(loc) return TRUE // It's resolved. No afterattack needed. Stops you from emagging lockers when putting in an emag