From 9064b6e7b294a4cfd51c8add9957d4c059fd2e37 Mon Sep 17 00:00:00 2001 From: Adrer Date: Mon, 19 Feb 2024 12:40:46 +0100 Subject: [PATCH] Evidence bag now respects nodrop (#24171) Co-authored-by: adrermail@gmail.com --- code/modules/detective_work/evidence.dm | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/code/modules/detective_work/evidence.dm b/code/modules/detective_work/evidence.dm index e5954b0e1b2..104e1130d23 100644 --- a/code/modules/detective_work/evidence.dm +++ b/code/modules/detective_work/evidence.dm @@ -41,11 +41,7 @@ if(isstorage(I.loc)) //in a container. var/obj/item/storage/U = I.loc U.remove_from_storage(I, src) - else if(user.l_hand == I) //in a hand - user.drop_l_hand() - else if(user.r_hand == I) //in a hand - user.drop_r_hand() - else + else if(!user.is_holding(I) || !user.unEquip(I)) //in a hand return user.visible_message("[user] puts [I] into [src].", "You put [I] inside [src].",\