diff --git a/code/game/objects/items/items_icon.dm b/code/game/objects/items/items_icon.dm index 726ea39fb9e..e18b8fe18f7 100644 --- a/code/game/objects/items/items_icon.dm +++ b/code/game/objects/items/items_icon.dm @@ -4,7 +4,10 @@ var/list/mob_icon_icon_states = list() // If we don't actually need to offset this, don't bother with any of the generation/caching. if(!mob_icon_icon_states[mob_icon]) mob_icon_icon_states[mob_icon] = icon_states(mob_icon) - if(LAZYLEN(H.species.equip_adjust) && H.species.equip_adjust[slot] && length(H.species.equip_adjust[slot]) && (mob_state in mob_icon_icon_states[mob_icon]) && !(H.species.bodytype in sprite_sheets)) + var/needs_shift = !(H.species.bodytype in sprite_sheets) + if(!needs_shift && length(item_icons)) + needs_shift = (slot in item_icons) + if(LAZYLEN(H.species.equip_adjust) && H.species.equip_adjust[slot] && length(H.species.equip_adjust[slot]) && (mob_state in mob_icon_icon_states[mob_icon]) && needs_shift) // Check the cache for previously made icons. var/image_key_mod = get_image_key_mod() var/image_key = "[mob_icon]-[mob_state]-[color]-[slot][!isnull(image_key_mod) ? "-[image_key_mod]" : ""]" diff --git a/html/changelogs/geeves-backpack_inhand.yml b/html/changelogs/geeves-backpack_inhand.yml new file mode 100644 index 00000000000..6aa849b0c68 --- /dev/null +++ b/html/changelogs/geeves-backpack_inhand.yml @@ -0,0 +1,6 @@ +author: Geeves + +delete-after: True + +changes: + - bugfix: "Backpacks now properly spriteshift into the hand position." \ No newline at end of file diff --git a/icons/mob/human_races/vaurca/r_vaurcae.dmi b/icons/mob/human_races/vaurca/r_vaurcae.dmi index 9767c453cd4..a3a8677a5eb 100644 Binary files a/icons/mob/human_races/vaurca/r_vaurcae.dmi and b/icons/mob/human_races/vaurca/r_vaurcae.dmi differ