pickpocketing place_in_hand (#22695)

Author: ynot01

code/datums/elements/strippable.dm

@@ -151,7 +151,7 @@
 	return TRUE
 
 /// The proc that unequips the item from the source. This should not yield.
-/datum/strippable_item/proc/finish_unequip(atom/source, mob/user)
+/datum/strippable_item/proc/finish_unequip(atom/source, mob/user, place_in_hand = FALSE)
 
 /// Returns a STRIPPABLE_OBSCURING_* define to report on whether or not this is obscured.
 /datum/strippable_item/proc/get_obscuring(atom/source)
@@ -277,15 +277,15 @@
 
 	return start_unequip_mob(get_item(source), source, user)
 
-/datum/strippable_item/mob_item_slot/finish_unequip(atom/source, mob/user)
+/datum/strippable_item/mob_item_slot/finish_unequip(atom/source, mob/user, place_in_hand = FALSE)
 	var/obj/item/item = get_item(source)
 	if (isnull(item))
 		return FALSE
 
 	if (!ismob(source))
 		return FALSE
 
-	return finish_unequip_mob(item, source, user)
+	return finish_unequip_mob(item, source, user, place_in_hand)
 
 /// Returns the delay of equipping this item to a mob
 /datum/strippable_item/mob_item_slot/proc/get_equip_delay(obj/item/equipping)
@@ -300,8 +300,11 @@
 	return TRUE
 
 /// A utility function for `/datum/strippable_item`s to finish unequipping an item from a mob.
-/proc/finish_unequip_mob(obj/item/item, mob/source, mob/user)
-	if (!item.doStrip(user, source))
+/proc/finish_unequip_mob(obj/item/item, mob/source, mob/user, place_in_hand = FALSE)
+	if (place_in_hand && (!source.temporarilyRemoveItemFromInventory(item) || !user.put_in_hands(item, no_sound = TRUE)))
+		place_in_hand = FALSE // drop to ground if we cant put it in hands
+
+	if (!place_in_hand && !item.doStrip(user, source))
 		return FALSE
 
 	source.log_message("[key_name(source)] has been stripped of [item] by [key_name(user)]", LOG_ATTACK, color="red")
@@ -562,3 +565,5 @@
 	loot.add_fingerprint(user)
 
 	living_source.dropItemToGround(loot)
+
+	finish_unequip_mob(loot, living_source, user, TRUE)

code/modules/mob/living/carbon/carbon_stripping.dm

@@ -124,15 +124,15 @@
 
 	return start_unequip_mob(get_item(source), source, user)
 
-/datum/strippable_item/hand/finish_unequip(atom/source, mob/user)
+/datum/strippable_item/hand/finish_unequip(atom/source, mob/user, place_in_hand = FALSE)
 	var/obj/item/item = get_item(source)
 	if (isnull(item))
 		return FALSE
 
 	if (!ismob(source))
 		return FALSE
 
-	return finish_unequip_mob(item, source, user)
+	return finish_unequip_mob(item, source, user, place_in_hand)
 
 /datum/strippable_item/hand/left
 	key = STRIPPABLE_ITEM_LHAND

code/modules/mob/living/carbon/human/human_stripping.dm

@@ -159,6 +159,9 @@ GLOBAL_LIST_INIT(strippable_human_items, create_strippable_list(list(
 	if (!.)
 		warn_owner(source)
 
+/datum/strippable_item/mob_item_slot/pocket/finish_unequip(atom/source, mob/user, place_in_hand = FALSE)
+	. = ..(source, user, TRUE)
+
 /datum/strippable_item/mob_item_slot/pocket/start_unequip(atom/source, mob/user)
 	var/obj/item/item = get_item(source)
 	if (isnull(item))

code/modules/mob/living/simple_animal/friendly/dog.dm

@@ -169,7 +169,7 @@ GLOBAL_LIST_INIT(strippable_corgi_items, create_strippable_list(list(
 
 	corgi_source.place_on_head(equipping, user)
 
-/datum/strippable_item/corgi_head/finish_unequip(atom/source, mob/user)
+/datum/strippable_item/corgi_head/finish_unequip(atom/source, mob/user, place_in_hand = FALSE)
 	var/mob/living/simple_animal/pet/dog/corgi/corgi_source = source
 	if (!istype(corgi_source))
 		return
@@ -215,7 +215,7 @@ GLOBAL_LIST_INIT(strippable_corgi_items, create_strippable_list(list(
 	corgi_source.update_corgi_fluff()
 	corgi_source.regenerate_icons()
 
-/datum/strippable_item/corgi_back/finish_unequip(atom/source, mob/user)
+/datum/strippable_item/corgi_back/finish_unequip(atom/source, mob/user, place_in_hand = FALSE)
 	var/mob/living/simple_animal/pet/dog/corgi/corgi_source = source
 	if (!istype(corgi_source))
 		return
@@ -254,7 +254,7 @@ GLOBAL_LIST_INIT(strippable_corgi_items, create_strippable_list(list(
 	corgi_source.add_collar(equipping, user)
 	corgi_source.update_corgi_fluff()
 
-/datum/strippable_item/corgi_collar/finish_unequip(atom/source, mob/user)
+/datum/strippable_item/corgi_collar/finish_unequip(atom/source, mob/user, place_in_hand = FALSE)
 	var/mob/living/simple_animal/pet/dog/corgi/corgi_source = source
 	if (!istype(corgi_source))
 		return
@@ -293,7 +293,7 @@ GLOBAL_LIST_INIT(strippable_corgi_items, create_strippable_list(list(
 	equipping.forceMove(source)
 	corgi_source.access_card = equipping
 
-/datum/strippable_item/corgi_id/finish_unequip(atom/source, mob/user)
+/datum/strippable_item/corgi_id/finish_unequip(atom/source, mob/user, place_in_hand = FALSE)
 	var/mob/living/simple_animal/pet/dog/corgi/corgi_source = source
 	if (!istype(corgi_source))
 		return

code/modules/mob/living/simple_animal/parrot.dm

@@ -255,7 +255,7 @@ GLOBAL_LIST_INIT(strippable_parrot_items, create_strippable_list(list(
 
 	return TRUE
 
-/datum/strippable_item/parrot_headset/finish_unequip(atom/source, mob/user)
+/datum/strippable_item/parrot_headset/finish_unequip(atom/source, mob/user, place_in_hand = FALSE)
 	var/mob/living/simple_animal/parrot/parrot_source = source
 	if (!istype(parrot_source))
 		return

code/modules/mob/living/simple_animal/simple_animal.dm

@@ -529,7 +529,7 @@
 		if(H)
 			H.update_appearance(UPDATE_ICON)
 
-/mob/living/simple_animal/put_in_hands(obj/item/I, del_on_fail = FALSE, merge_stacks = TRUE)
+/mob/living/simple_animal/put_in_hands(obj/item/I, del_on_fail = FALSE, merge_stacks = TRUE, forced = FALSE, no_sound = FALSE)
 	. = ..(I, del_on_fail, merge_stacks)
 	update_inv_hands()