Revert "Adds animations for picking up and placing items. (#18702)" (#18824)

This reverts commit 2945bed697.
This commit is contained in:
AffectedArc07
2022-08-17 16:18:12 +01:00
committed by GitHub
parent 8cc30e63e9
commit e80f0e1d8d
5 changed files with 11 additions and 113 deletions
+1 -12
View File
@@ -95,22 +95,11 @@
//If both fail it drops it on the floor and returns 0.
//This is probably the main one you need to know :)
//Just puts stuff on the floor for most mobs, since all mobs have hands but putting stuff in the AI/corgi/ghost hand is VERY BAD.
/**
* Try to put an item into a mob's hands.
*
* Put the item into our active hand if possible. Failing that, try to put it into our inactive hand. Failing that as well, drop it onto the ground.
* Should return TRUE if the item is successfully put into our hands, and failing that, the item will be dropped and FALSE will be returned.
*
* Arguments
* * W - The item to try to put into your hands
* * ignore_anim - If TRUE, the pickup animation of the item moving to you will be suppressed.
*/
/mob/proc/put_in_hands(obj/item/W, ignore_anim = TRUE)
/mob/proc/put_in_hands(obj/item/W)
W.forceMove(drop_location())
W.layer = initial(W.layer)
W.plane = initial(W.plane)
W.dropped()
return FALSE
/mob/proc/drop_item_v() //this is dumb.
if(stat == CONSCIOUS && isturf(loc))
@@ -302,15 +302,9 @@
else
to_chat(src, "<span class='warning'>You are trying to equip this item to an unsupported inventory slot. Report this to a coder!</span>")
/mob/living/carbon/human/put_in_hands(obj/item/I, ignore_anim = FALSE)
/mob/living/carbon/human/put_in_hands(obj/item/I)
if(!I)
return FALSE
if(gloves)
var/obj/item/clothing/gloves/G = gloves
if(istype(G) && G.pickpocket)
ignore_anim = TRUE
if(isturf(I.loc) && !ignore_anim)
I.do_pickup_animation(src)
if(istype(I, /obj/item/stack))
var/obj/item/stack/S = I
if(!S.get_amount())