diff --git a/code/game/atoms_movable.dm b/code/game/atoms_movable.dm index 1b65425a927..be1b9db2254 100644 --- a/code/game/atoms_movable.dm +++ b/code/game/atoms_movable.dm @@ -336,8 +336,7 @@ set waitfor = FALSE if(!isturf(loc)) return - var/image/I = image(icon = src, loc = loc, layer = layer + 0.1) - I.plane = -1 + var/image/I = image(icon, loc, icon_state, layer + 0.1, dir, pixel_x, pixel_y) I.transform *= 0.75 I.appearance_flags = (RESET_COLOR|RESET_TRANSFORM|NO_CLIENT_COLOR|RESET_ALPHA|PIXEL_SCALE) var/turf/T = get_turf(src) @@ -366,4 +365,4 @@ M.Turn(pick(-30, 30)) animate(I, alpha = 175, pixel_x = to_x, pixel_y = to_y, time = 3, transform = M, easing = CUBIC_EASING) sleep(1) - animate(I, alpha = 0, transform = matrix(), time = 1) + animate(I, alpha = 0, transform = matrix(), time = 1) \ No newline at end of file diff --git a/code/game/objects/items.dm b/code/game/objects/items.dm index 26163de18ea..ec0dd58c066 100644 --- a/code/game/objects/items.dm +++ b/code/game/objects/items.dm @@ -326,7 +326,7 @@ /obj/item/proc/pickup(mob/user) pixel_x = 0 pixel_y = 0 - return + 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) diff --git a/code/modules/mob/inventory.dm b/code/modules/mob/inventory.dm index 844b1276503..68f29587a75 100644 --- a/code/modules/mob/inventory.dm +++ b/code/modules/mob/inventory.dm @@ -171,8 +171,6 @@ var/list/slot_equipment_priority = list( \ /mob/proc/put_in_hands(var/obj/item/W) if(!W || !istype(W)) return 0 - if(isturf(W.loc)) - W.do_pickup_animation(src) W.forceMove(get_turf(src)) W.layer = initial(W.layer) W.dropped() diff --git a/html/changelogs/geeves-pickup_animation_fix.yml b/html/changelogs/geeves-pickup_animation_fix.yml new file mode 100644 index 00000000000..efd80295601 --- /dev/null +++ b/html/changelogs/geeves-pickup_animation_fix.yml @@ -0,0 +1,6 @@ +author: Geeves + +delete-after: True + +changes: + - bugfix: "Pick-up animations now work." \ No newline at end of file