diff --git a/code/game/objects/items/stacks/medical.dm b/code/game/objects/items/stacks/medical.dm index 6204fcd0084..ce683034784 100644 --- a/code/game/objects/items/stacks/medical.dm +++ b/code/game/objects/items/stacks/medical.dm @@ -11,6 +11,10 @@ Contains: name = "medical pack" singular_name = "medical pack" icon = 'icons/obj/stacks/medical.dmi' + item_icons = list( + slot_l_hand_str = 'icons/mob/items/stacks/lefthand_medical.dmi', + slot_r_hand_str = 'icons/mob/items/stacks/righthand_medical.dmi', + ) drop_sound = 'sound/items/drop/box.ogg' amount = 5 max_amount = 5 diff --git a/code/game/objects/items/stacks/nanopaste.dm b/code/game/objects/items/stacks/nanopaste.dm index eaeca5f3c4b..0912d2b2a41 100644 --- a/code/game/objects/items/stacks/nanopaste.dm +++ b/code/game/objects/items/stacks/nanopaste.dm @@ -3,6 +3,10 @@ singular_name = "nanite swarm" desc = "A tube of paste containing swarms of repair nanites. Very effective in repairing robotic machinery." icon = 'icons/obj/stacks/nanopaste.dmi' + item_icons = list( + slot_l_hand_str = 'icons/mob/items/stacks/lefthand_nanopaste.dmi', + slot_r_hand_str = 'icons/mob/items/stacks/righthand_nanopaste.dmi', + ) icon_state = "tube" origin_tech = list(TECH_MATERIAL = 4, TECH_ENGINEERING = 3) amount = 10 diff --git a/code/game/objects/items/stacks/stack.dm b/code/game/objects/items/stacks/stack.dm index 36c7721cfc4..de9fd330172 100644 --- a/code/game/objects/items/stacks/stack.dm +++ b/code/game/objects/items/stacks/stack.dm @@ -23,6 +23,10 @@ var/list/datum/matter_synth/synths = null var/icon_has_variants = FALSE icon = 'icons/obj/stacks/materials.dmi' + item_icons = list( + slot_l_hand_str = 'icons/mob/items/stacks/lefthand_materials.dmi', + slot_r_hand_str = 'icons/mob/items/stacks/righthand_materials.dmi', + ) /obj/item/stack/Initialize(mapload, amount) . = ..() diff --git a/code/game/objects/items/stacks/tiles/tile_types.dm b/code/game/objects/items/stacks/tiles/tile_types.dm index b3ebb768dc2..2f2426518a9 100644 --- a/code/game/objects/items/stacks/tiles/tile_types.dm +++ b/code/game/objects/items/stacks/tiles/tile_types.dm @@ -13,6 +13,10 @@ w_class = 3 max_amount = 60 icon = 'icons/obj/stacks/tiles.dmi' + item_icons = list( + slot_l_hand_str = 'icons/mob/items/stacks/lefthand_tiles.dmi', + slot_r_hand_str = 'icons/mob/items/stacks/righthand_tiles.dmi', + ) randpixel = 7 drop_sound = 'sound/items/drop/axe.ogg' diff --git a/code/game/objects/items/stacks/wrap.dm b/code/game/objects/items/stacks/wrap.dm index 61ee0403901..8c383a418f4 100644 --- a/code/game/objects/items/stacks/wrap.dm +++ b/code/game/objects/items/stacks/wrap.dm @@ -2,6 +2,10 @@ name = "wrapping paper" desc = "You can use this to wrap items in." icon = 'icons/obj/stacks/wrap.dmi' + item_icons = list( + slot_l_hand_str = 'icons/mob/items/stacks/lefthand_wrap.dmi', + slot_r_hand_str = 'icons/mob/items/stacks/righthand_wrap.dmi', + ) icon_state = "wrap_paper" singular_name = "square unit" amount = 20.0 diff --git a/html/changelogs/wezzy_stack_inhands.yml b/html/changelogs/wezzy_stack_inhands.yml new file mode 100644 index 00000000000..c06dfb60b88 --- /dev/null +++ b/html/changelogs/wezzy_stack_inhands.yml @@ -0,0 +1,41 @@ +################################ +# Example Changelog File +# +# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb. +# +# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.) +# When it is, any changes listed below will disappear. +# +# Valid Prefixes: +# bugfix +# wip (For works in progress) +# tweak +# soundadd +# sounddel +# rscadd (general adding of nice things) +# rscdel (general deleting of nice things) +# imageadd +# imagedel +# maptweak +# spellcheck (typo fixes) +# experiment +# balance +# admin +# backend +# security +# refactor +################################# + +# Your name. +author: Wowzewow (Wezzy) + +# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again. +delete-after: True + +# Any changes you've made. See valid prefix list above. +# INDENT WITH TWO SPACES. NOT TABS. SPACES. +# SCREW THIS UP AND IT WON'T WORK. +# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries. +# Please surround your changes in double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog. +changes: + - imageadd: "Adds inhand sprites for stackable items, namely material sheets, tiles, medical kits, wrapping paper and nanopaste." diff --git a/icons/mob/items/lefthand.dmi b/icons/mob/items/lefthand.dmi index 8a7dc243bc1..e03bd8e57ad 100644 Binary files a/icons/mob/items/lefthand.dmi and b/icons/mob/items/lefthand.dmi differ diff --git a/icons/mob/items/lefthand_nanopaste.dmi b/icons/mob/items/lefthand_nanopaste.dmi new file mode 100644 index 00000000000..cf74d73796c Binary files /dev/null and b/icons/mob/items/lefthand_nanopaste.dmi differ diff --git a/icons/mob/items/lefthand_sheets.dmi b/icons/mob/items/lefthand_sheets.dmi new file mode 100644 index 00000000000..281d46a3d80 Binary files /dev/null and b/icons/mob/items/lefthand_sheets.dmi differ diff --git a/icons/mob/items/righthand.dmi b/icons/mob/items/righthand.dmi index ef9207c1f56..7994313b670 100644 Binary files a/icons/mob/items/righthand.dmi and b/icons/mob/items/righthand.dmi differ diff --git a/icons/mob/items/righthand_sheets.dmi b/icons/mob/items/righthand_sheets.dmi new file mode 100644 index 00000000000..cf74d73796c Binary files /dev/null and b/icons/mob/items/righthand_sheets.dmi differ diff --git a/icons/mob/items/stacks/lefthand_materials.dmi b/icons/mob/items/stacks/lefthand_materials.dmi new file mode 100644 index 00000000000..c0d3e80df78 Binary files /dev/null and b/icons/mob/items/stacks/lefthand_materials.dmi differ diff --git a/icons/mob/items/stacks/lefthand_medical.dmi b/icons/mob/items/stacks/lefthand_medical.dmi new file mode 100644 index 00000000000..1756edb68e4 Binary files /dev/null and b/icons/mob/items/stacks/lefthand_medical.dmi differ diff --git a/icons/mob/items/stacks/lefthand_nanopaste.dmi b/icons/mob/items/stacks/lefthand_nanopaste.dmi new file mode 100644 index 00000000000..50ee391f417 Binary files /dev/null and b/icons/mob/items/stacks/lefthand_nanopaste.dmi differ diff --git a/icons/mob/items/stacks/lefthand_tiles.dmi b/icons/mob/items/stacks/lefthand_tiles.dmi new file mode 100644 index 00000000000..c1c7ac9a0f2 Binary files /dev/null and b/icons/mob/items/stacks/lefthand_tiles.dmi differ diff --git a/icons/mob/items/stacks/lefthand_wrap.dmi b/icons/mob/items/stacks/lefthand_wrap.dmi new file mode 100644 index 00000000000..2c589bcbc2c Binary files /dev/null and b/icons/mob/items/stacks/lefthand_wrap.dmi differ diff --git a/icons/mob/items/stacks/righthand_materials.dmi b/icons/mob/items/stacks/righthand_materials.dmi new file mode 100644 index 00000000000..d1439af0a2b Binary files /dev/null and b/icons/mob/items/stacks/righthand_materials.dmi differ diff --git a/icons/mob/items/stacks/righthand_medical.dmi b/icons/mob/items/stacks/righthand_medical.dmi new file mode 100644 index 00000000000..edae6f94233 Binary files /dev/null and b/icons/mob/items/stacks/righthand_medical.dmi differ diff --git a/icons/mob/items/stacks/righthand_nanopaste.dmi b/icons/mob/items/stacks/righthand_nanopaste.dmi new file mode 100644 index 00000000000..49cc4a5a56f Binary files /dev/null and b/icons/mob/items/stacks/righthand_nanopaste.dmi differ diff --git a/icons/mob/items/stacks/righthand_tiles.dmi b/icons/mob/items/stacks/righthand_tiles.dmi new file mode 100644 index 00000000000..d4bdd6d0df1 Binary files /dev/null and b/icons/mob/items/stacks/righthand_tiles.dmi differ diff --git a/icons/mob/items/stacks/righthand_wrap.dmi b/icons/mob/items/stacks/righthand_wrap.dmi new file mode 100644 index 00000000000..6fef189751d Binary files /dev/null and b/icons/mob/items/stacks/righthand_wrap.dmi differ diff --git a/icons/obj/stacks/materials.dmi b/icons/obj/stacks/materials.dmi index 04f7cb1cd86..dbd41bb42df 100644 Binary files a/icons/obj/stacks/materials.dmi and b/icons/obj/stacks/materials.dmi differ diff --git a/icons/obj/stacks/medical.dmi b/icons/obj/stacks/medical.dmi index 4ad3fcfafc7..dd2a2ab6408 100644 Binary files a/icons/obj/stacks/medical.dmi and b/icons/obj/stacks/medical.dmi differ diff --git a/icons/obj/stacks/wrap.dmi b/icons/obj/stacks/wrap.dmi index 473504c703b..5bef52aa7c3 100644 Binary files a/icons/obj/stacks/wrap.dmi and b/icons/obj/stacks/wrap.dmi differ