Item pickup/drop animations play in many more appropriate places (#817)

Author: MrMelbert

code/datums/elements/bed_tucking.dm

@@ -45,7 +45,7 @@
 	if(!istype(target_bed))
 		return
 
-	if(!tucker.transferItemToLoc(tucked, target_bed.drop_location(), silent = FALSE))
+	if(!tucker.transfer_item_to_turf(tucked, target_bed.drop_location()))
 		return
 
 	to_chat(tucker, span_notice("You lay [tucked] out on [target_bed]."))

code/datums/storage/storage.dm

@@ -443,6 +443,8 @@ GLOBAL_LIST_EMPTY(cached_storage_typecaches)
 	SEND_SIGNAL(src, COMSIG_STORAGE_STORED_ITEM, to_insert, user, force)
 	to_insert.forceMove(real_location)
 	item_insertion_feedback(user, to_insert, override)
+	if(get(real_location, /mob) != user)
+		to_insert.do_pickup_animation(real_location, user)
 	return TRUE
 
 /// Since items inside storages ignore transparency for QOL reasons, we're tracking when things are dropped onto them instead of our UI elements

code/game/machinery/_machinery.dm

@@ -414,18 +414,28 @@
 /**
  * Puts passed object in to user's hand
  *
- * Puts the passed object in to the users hand if they are adjacent.
- * If the user is not adjacent then place the object on top of the machine.
+ * The passed object is usually something that was in the object and is being ejected
+ *
+ * Handles checking if the user can hold the item and if they are in range,
+ * otherwise dumps the item on the ground of src
  *
  * Vars:
  * * object (obj) The object to be moved in to the users hand.
  * * user (mob/living) The user to recive the object
+ *
+ * Returns TRUE if the object was put in to the users hand, FALSE if it was dropped on the ground.
  */
-/obj/machinery/proc/try_put_in_hand(obj/object, mob/living/user)
-	if(!issilicon(user) && in_range(src, user))
-		user.put_in_hands(object)
-	else
-		object.forceMove(drop_location())
+/obj/proc/try_put_in_hand(obj/item/object, mob/living/user)
+	if(user?.can_hold_items(object) && in_range(src, user))
+		object.add_fingerprint(user)
+		add_fingerprint(user)
+		if(user.put_in_hands(object, ignore_animation = TRUE))
+			if(get(src, /mob) != user) // Only play pickup if we aren't also being held
+				object.do_pickup_animation(user, src)
+			return TRUE
+	object.forceMove(drop_location())
+	object.do_drop_animation(src)
+	return FALSE
 
 /obj/machinery/proc/can_be_occupant(atom/movable/occupant_atom)
 	return occupant_typecache ? is_type_in_typecache(occupant_atom, occupant_typecache) : isliving(occupant_atom)

code/game/machinery/cell_charger.dm

@@ -92,8 +92,7 @@
 	if(!charging)
 		return
 
-	user.put_in_hands(charging)
-	charging.add_fingerprint(user)
+	try_put_in_hand(charging, user)
 
 	user.visible_message(span_notice("[user] removes [charging] from [src]."), span_notice("You remove [charging] from [src]."))
 

code/game/machinery/civilian_bounties.dm

@@ -250,9 +250,7 @@
 		to_chat(user, span_warning("That slot is empty!"))
 		return FALSE
 	else
-		target.forceMove(drop_location())
-		if(!issilicon(user) && Adjacent(user))
-			user.put_in_hands(target)
+		try_put_in_hand(target, user)
 		user.visible_message(span_notice("[user] gets \the [target] from \the [src]."), \
 							span_notice("You get \the [target] from \the [src]."))
 		playsound(src, 'sound/machines/terminal_insert_disc.ogg', 50, FALSE)

code/game/machinery/recharger.dm

@@ -125,10 +125,9 @@
 	if(.)
 		return
 
-	add_fingerprint(user)
-	if(isnull(charging) || user.put_in_hands(charging))
+	if(isnull(charging))
 		return
-	charging.forceMove(drop_location())
+	try_put_in_hand(charging, user)
 
 /obj/machinery/recharger/attack_tk(mob/user)
 	if(isnull(charging))

code/game/machinery/slotmachine.dm

@@ -100,7 +100,7 @@
 		var/obj/item/coin/inserted_coin = inserted
 		if(paymode == COIN)
 			if(prob(2))
-				if(!user.transferItemToLoc(inserted_coin, drop_location(), silent = FALSE))
+				if(!user.transfer_item_to_turf(inserted_coin, drop_location()))
 					return ITEM_INTERACT_BLOCKING
 				inserted_coin.throw_at(user, 3, 10)
 				if(prob(10))

code/game/objects/items.dm

@@ -596,18 +596,16 @@
 
 	//If the item is in a storage item, take it out
 	var/outside_storage = !loc.atom_storage
-	var/turf/storage_turf
-	if(loc.atom_storage)
-		//We want the pickup animation to play even if we're moving the item between movables. Unless the mob is not located on a turf.
-		if(isturf(user.loc))
-			storage_turf = get_turf(loc)
-		if(!loc.atom_storage.remove_single(user, src, user, silent = TRUE))
-			return
+	var/atom/anim_loc = loc
+	if(loc.atom_storage && !loc.atom_storage?.remove_single(user, src, user, silent = TRUE))
+		return
 	if(QDELETED(src)) //moving it out of the storage destroyed it.
 		return
 
-	if(storage_turf)
-		do_pickup_animation(user, storage_turf)
+	if(isturf(user.loc))
+		// Animation only plays if the user is on a turf
+		// However if the anim_loc is not on a turf (ie held by a mob) we need to use user loc
+		do_pickup_animation(user, (isturf(anim_loc) || isturf(anim_loc.loc)) ? anim_loc : user.loc)
 
 	if(throwing)
 		throwing.finalize(FALSE)
@@ -618,7 +616,7 @@
 	. = FALSE
 	pickup(user)
 	add_fingerprint(user)
-	if(!user.put_in_active_hand(src, ignore_animation = !outside_storage))
+	if(!user.put_in_active_hand(src, ignore_animation = TRUE))
 		user.dropItemToGround(src)
 		return TRUE
 
@@ -1272,9 +1270,11 @@
 
 ///Called by the carbon throw_item() proc. Returns null if the item negates the throw, or a reference to the thing to suffer the throw else.
 /obj/item/proc/on_thrown(mob/living/carbon/user, atom/target)
-	if((item_flags & ABSTRACT) || HAS_TRAIT(src, TRAIT_NODROP))
+	if(item_flags & ABSTRACT)
+		return
+	// Skip animation is important here because it interferes with the throwing animation.
+	if(!user.transferItemToLoc(src, drop_location(), silent = TRUE, animated = FALSE))
 		return
-	user.dropItemToGround(src, silent = TRUE)
 	if(throwforce && HAS_TRAIT(user, TRAIT_PACIFISM))
 		to_chat(user, span_notice("You set [src] down gently on the ground."))
 		return
@@ -1463,8 +1463,8 @@
 	pickup_animation.appearance_flags = APPEARANCE_UI_IGNORE_ALPHA
 
 	var/direction = get_dir(source, target)
-	var/to_x = target.base_pixel_x
-	var/to_y = target.base_pixel_y
+	var/to_x = (target.pixel_x + target.pixel_w) - (source.pixel_x + source.pixel_w)
+	var/to_y = (target.pixel_y + target.pixel_z) - (source.pixel_y + source.pixel_z)
 
 	if(direction & NORTH)
 		to_y += 32
@@ -1495,8 +1495,8 @@
 
 	var/turf/current_turf = get_turf(src)
 	var/direction = get_dir(moving_from, current_turf)
-	var/from_x = moving_from.base_pixel_x
-	var/from_y = moving_from.base_pixel_y
+	var/from_x = moving_from.pixel_x + moving_from.pixel_w
+	var/from_y = moving_from.pixel_y + moving_from.pixel_z
 
 	if(direction & NORTH)
 		from_y -= 32

code/game/objects/items/tail_pin.dm

@@ -35,15 +35,16 @@
 
 MAPPING_DIRECTIONAL_HELPERS(/obj/structure/sign/poster/party_game, 32)
 
-/obj/structure/sign/poster/party_game/attackby(obj/item/I, mob/user, params)
+/obj/structure/sign/poster/party_game/attackby(obj/item/attacking_item, mob/user, list/modifiers, list/attack_modifiers)
 	. = ..()
-	if(!istype(I,/obj/item/tail_pin))//We're using the same trick that tables use for placing objects x and y onto the click location.
+	if(!istype(attacking_item, /obj/item/tail_pin))//We're using the same trick that tables use for placing objects x and y onto the click location.
 		return
-	if(!user.transferItemToLoc(I, drop_location(), silent = FALSE))
-		return
-	var/list/modifiers = params2list(params)
-	if(!LAZYACCESS(modifiers, ICON_X) || !LAZYACCESS(modifiers, ICON_Y))
+
+	var/x_offset = 0
+	var/y_offset = 0
+	if(LAZYACCESS(modifiers, ICON_X) && LAZYACCESS(modifiers, ICON_Y))
+		x_offset = clamp(text2num(LAZYACCESS(modifiers, ICON_X)) - 16, -(ICON_SIZE_X/2), ICON_SIZE_X/2)
+		y_offset = clamp(text2num(LAZYACCESS(modifiers, ICON_Y)) - 16, -(ICON_SIZE_Y/2), ICON_SIZE_Y/2)
+	if(!user.transfer_item_to_turf(attacking_item, drop_location(), x_offset, y_offset))
 		return
-	I.pixel_x = clamp(text2num(LAZYACCESS(modifiers, ICON_X)) - 16, -(world.icon_size/2), world.icon_size/2)
-	I.pixel_y = clamp(text2num(LAZYACCESS(modifiers, ICON_Y)) - 16, -(world.icon_size/2), world.icon_size/2)
 	return TRUE

code/game/objects/structures/beds_chairs/chair.dm

@@ -347,7 +347,7 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/structure/chair/stool, 0)
 	var/obj/item/C = new item_chair(loc)
 	C.set_custom_materials(custom_materials)
 	TransferComponents(C)
-	user.put_in_hands(C)
+	try_put_in_hand(C, user)
 	qdel(src)
 
 /obj/structure/chair/user_buckle_mob(mob/living/M, mob/user, check_loc = TRUE)