From 2c705a7ba40d3e3a98403b726d139853539248d0 Mon Sep 17 00:00:00 2001 From: deathride58 Date: Wed, 13 Feb 2019 23:59:51 -0500 Subject: [PATCH] QOL for pickpocketing - Stripping items off of someone will now place them in your hands if possible (#7994) --- code/modules/mob/living/carbon/human/human.dm | 2 ++ code/modules/mob/living/living.dm | 4 ++++ 2 files changed, 6 insertions(+) diff --git a/code/modules/mob/living/carbon/human/human.dm b/code/modules/mob/living/carbon/human/human.dm index 7582d7fb0e..8c8c8e2d0c 100644 --- a/code/modules/mob/living/carbon/human/human.dm +++ b/code/modules/mob/living/carbon/human/human.dm @@ -264,6 +264,8 @@ if(pocket_item) if(pocket_item == (pocket_id == SLOT_R_STORE ? r_store : l_store)) //item still in the pocket we search dropItemToGround(pocket_item) + if(!put_in_hands(pocket_item)) + pocket_item.forceMove(drop_location()) else if(place_item) if(place_item.mob_can_equip(src, usr, pocket_id, FALSE, TRUE)) diff --git a/code/modules/mob/living/living.dm b/code/modules/mob/living/living.dm index 0c50b7ef60..c32b6ace78 100644 --- a/code/modules/mob/living/living.dm +++ b/code/modules/mob/living/living.dm @@ -700,9 +700,13 @@ var/list/L = where if(what == who.get_item_for_held_index(L[2])) if(who.dropItemToGround(what)) + if(!put_in_hands(what)) + what.forceMove(drop_location()) log_combat(src, who, "stripped [what] off") if(what == who.get_item_by_slot(where)) if(who.dropItemToGround(what)) + if(!put_in_hands(what)) + what.forceMove(drop_location()) log_combat(src, who, "stripped [what] off") // The src mob is trying to place an item on someone