cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-08-25 14:00:18 +01:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Pick up fixes (#10922)" (#10949)

Browse Source
This commit is contained in:
Werner
2021-01-10 15:01:58 +01:00
committed by GitHub
parent 2fadb6995c
commit 6aff536a84
7 changed files with 39 additions and 83 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items.dm
+3 -5
View File
@@ -324,11 +324,9 @@
// called just as an item is picked up (loc is not yet changed)
/obj/item/proc/pickup(mob/user)
throwing = 0
var/atom/old_loc = loc
if(user.put_in_active_hand(src) && old_loc)
if((user != old_loc) && (user != old_loc.get_holding_mob()))
do_pickup_animation(user, old_loc)
pixel_x = 0
pixel_y = 0
do_pickup_animation(user)
// called when this item is removed from a storage item, which is passed on as S. The loc variable is already set to the new destination before this is called.
/obj/item/proc/on_exit_storage(obj/item/storage/S as obj)