cyberpresidentvanellope/Yogstation
1
0
Fork 0
mirror of https://github.com/yogstation13/Yogstation.git synced 2025-02-26 09:04:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Anim bugfixes (#39311)

Browse Source 
* Adds juice to picking up stuff

Stolen completely from https://github.com/OracleStation/OracleStation/pull/1072

* perfection

* Pickup animation now tweens to the correct spot if you move

* mutable appearance

* Fixes the item pickup animation

* eh whatever

* Update atoms_movable.dm
This commit is contained in:
Iamgoofball
2018-07-25 17:54:35 -07:00
committed by Ling
parent 18623f212e
commit 8d1c48a78e
3 changed files with 13 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
code/modules/mob/inventory.dm
View File

@@ -170,9 +170,9 @@
return FALSE
return !held_items[hand_index]
/mob/proc/put_in_hand(obj/item/I, hand_index, forced = FALSE)
/mob/proc/put_in_hand(obj/item/I, hand_index, forced = FALSE, ignore_anim = TRUE)
if(forced || can_put_in_hand(I, hand_index))
if(isturf(I.loc))
if(isturf(I.loc) && !ignore_anim)
I.do_pickup_animation(src)
if(hand_index == null)
return FALSE
@@ -210,8 +210,8 @@
//Puts the item into our active hand if possible. returns TRUE on success.
/mob/proc/put_in_active_hand(obj/item/I, forced = FALSE)
return put_in_hand(I, active_hand_index, forced)
/mob/proc/put_in_active_hand(obj/item/I, forced = FALSE, ignore_animation = TRUE)
return put_in_hand(I, active_hand_index, forced, ignore_animation)
//Puts the item into our inactive hand if possible, returns TRUE on success