diff --git a/code/game/objects/structures/crates_lockers/closets.dm b/code/game/objects/structures/crates_lockers/closets.dm index 7f02a93bd38..92a80e56c47 100644 --- a/code/game/objects/structures/crates_lockers/closets.dm +++ b/code/game/objects/structures/crates_lockers/closets.dm @@ -262,7 +262,8 @@ return if(isrobot(user)) return - if(!usr.drop_item()) + 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) W.forceMove(loc) 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 cf7c2eec052..04444a18a8f 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 @@ -78,7 +78,9 @@ to_chat(user, "The locker is too small to stuff [W:affecting] into!") if(isrobot(user)) return - user.drop_item() + 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) W.forceMove(loc) else if((istype(W, /obj/item/weapon/card/emag)||istype(W, /obj/item/weapon/melee/energy/blade)) && !broken)