diff --git a/code/game/objects/items/stacks/medical.dm b/code/game/objects/items/stacks/medical.dm index 69991007d45..9d3bf6e1a4b 100644 --- a/code/game/objects/items/stacks/medical.dm +++ b/code/game/objects/items/stacks/medical.dm @@ -9,10 +9,6 @@ Contains: name = "medical pack" singular_name = "medical pack" icon = 'icons/obj/item/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/cardboardbox.ogg' pickup_sound = 'sound/items/pickup/cardboardbox.ogg' amount = 5 diff --git a/code/game/objects/items/stacks/stack.dm b/code/game/objects/items/stacks/stack.dm index a714008d934..de24659d780 100644 --- a/code/game/objects/items/stacks/stack.dm +++ b/code/game/objects/items/stacks/stack.dm @@ -27,10 +27,7 @@ var/list/datum/matter_synth/synths = null var/icon_has_variants = FALSE icon = 'icons/obj/item/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', - ) + contained_sprite = TRUE /obj/item/stack/feedback_hints(mob/user, distance, is_adjacent) . += ..() diff --git a/code/game/objects/items/stacks/tiles/tile_types.dm b/code/game/objects/items/stacks/tiles/tile_types.dm index 8d6e0f6c7e8..c137e5d002c 100644 --- a/code/game/objects/items/stacks/tiles/tile_types.dm +++ b/code/game/objects/items/stacks/tiles/tile_types.dm @@ -16,10 +16,6 @@ max_amount = 60 recyclable = TRUE icon = 'icons/obj/item/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' pickup_sound = 'sound/items/pickup/axe.ogg' @@ -314,7 +310,7 @@ /obj/item/stack/tile/phoron name = "phoron floor tile" singular_name = "phoron floor tile" - icon_state = "tile_plasma" + icon_state = "tile_phoron" matter = list(MATERIAL_PHORON = TILE_MATERIAL_AMOUNT) /obj/item/stack/tile/diamond diff --git a/code/game/objects/items/stacks/wrap.dm b/code/game/objects/items/stacks/wrap.dm index 0d18ea1627c..8baa5df1969 100644 --- a/code/game/objects/items/stacks/wrap.dm +++ b/code/game/objects/items/stacks/wrap.dm @@ -2,10 +2,6 @@ name = "wrapping paper" desc = "You can use this to wrap items in." icon = 'icons/obj/item/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 @@ -97,10 +93,6 @@ /obj/item/stack/packageWrap name = "package wrapper" icon = 'icons/obj/item/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 = "deliveryPaper" desc = "A roll of paper used to enclose an object for delivery." singular_name = "length" @@ -210,10 +202,6 @@ name = "cardboard tube" desc = "A tube of cardboard." icon = 'icons/obj/item/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 = "c_tube" throwforce = 1 w_class = WEIGHT_CLASS_SMALL diff --git a/code/game/objects/items/weapons/handcuffs.dm b/code/game/objects/items/weapons/handcuffs.dm index f3280f415f4..dbfe8f30329 100644 --- a/code/game/objects/items/weapons/handcuffs.dm +++ b/code/game/objects/items/weapons/handcuffs.dm @@ -151,15 +151,12 @@ icon_state = "cablecuff" item_state = "coil" color = COLOR_RED - 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', - ) breakouttime = 30 SECONDS cuff_sound = 'sound/weapons/cablecuff.ogg' cuff_type = "cable restraint handcuffs" var/can_be_cut = TRUE elastic = TRUE + contained_sprite = TRUE build_from_parts = TRUE worn_overlay = "end" diff --git a/code/modules/power/cable.dm b/code/modules/power/cable.dm index 6004b167a6f..5f27640bc07 100644 --- a/code/modules/power/cable.dm +++ b/code/modules/power/cable.dm @@ -513,6 +513,7 @@ By design, d1 is the smallest direction and d2 is the highest drop_sound = 'sound/items/drop/accessory.ogg' pickup_sound = 'sound/items/pickup/accessory.ogg' surgerysound = 'sound/items/surgery/fixovein.ogg' + contained_sprite = TRUE build_from_parts = TRUE worn_overlay = "end" diff --git a/code/modules/reagents/reagent_containers/pill.dm b/code/modules/reagents/reagent_containers/pill.dm index c61214c40cd..9b8a45d5541 100644 --- a/code/modules/reagents/reagent_containers/pill.dm +++ b/code/modules/reagents/reagent_containers/pill.dm @@ -5,10 +5,6 @@ name = "pill" desc = "a pill." icon = 'icons/obj/chemical.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', - ) icon_state = null item_state = "pill" possible_transfer_amounts = null @@ -18,6 +14,7 @@ drop_sound = 'sound/items/drop/food.ogg' pickup_sound = 'sound/items/pickup/food.ogg' storage_slot_sort_by_name = TRUE + contained_sprite = TRUE /obj/item/reagent_containers/pill/New() ..() diff --git a/html/changelogs/wezzy_material_inhands.yml b/html/changelogs/wezzy_material_inhands.yml new file mode 100644 index 00000000000..46f2ed31bf3 --- /dev/null +++ b/html/changelogs/wezzy_material_inhands.yml @@ -0,0 +1,58 @@ +################################ +# 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 +# - (fixes bugs) +# wip +# - (work in progress) +# qol +# - (quality of life) +# soundadd +# - (adds a sound) +# sounddel +# - (removes a sound) +# rscadd +# - (adds a feature) +# rscdel +# - (removes a feature) +# imageadd +# - (adds an image or sprite) +# imagedel +# - (removes an image or sprite) +# spellcheck +# - (fixes spelling or grammar) +# experiment +# - (experimental change) +# balance +# - (balance changes) +# code_imp +# - (misc internal code change) +# refactor +# - (refactors code) +# config +# - (makes a change to the config files) +# admin +# - (makes changes to administrator tools) +# server +# - (miscellaneous changes to server) +################################# + +# 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, this gets changed to [] after reading. Just remove the brackets when you add new shit. +# Please surround your changes in double quotes ("). It works without them, but if you use certain characters it screws up compiling. The quotes will not show up in the changelog. +changes: + - imageadd: "Updates stack inhand sprites, makes them use contained sprites, and touches up the tile sprites to be more accurate." diff --git a/icons/mob/items/stacks/lefthand_materials.dmi b/icons/mob/items/stacks/lefthand_materials.dmi deleted file mode 100644 index 34a8652ee3a..00000000000 Binary files a/icons/mob/items/stacks/lefthand_materials.dmi and /dev/null differ diff --git a/icons/mob/items/stacks/lefthand_medical.dmi b/icons/mob/items/stacks/lefthand_medical.dmi deleted file mode 100644 index 1756edb68e4..00000000000 Binary files a/icons/mob/items/stacks/lefthand_medical.dmi and /dev/null differ diff --git a/icons/mob/items/stacks/lefthand_tiles.dmi b/icons/mob/items/stacks/lefthand_tiles.dmi deleted file mode 100644 index c1c7ac9a0f2..00000000000 Binary files a/icons/mob/items/stacks/lefthand_tiles.dmi and /dev/null differ diff --git a/icons/mob/items/stacks/lefthand_wrap.dmi b/icons/mob/items/stacks/lefthand_wrap.dmi deleted file mode 100644 index 2c589bcbc2c..00000000000 Binary files a/icons/mob/items/stacks/lefthand_wrap.dmi and /dev/null differ diff --git a/icons/mob/items/stacks/righthand_materials.dmi b/icons/mob/items/stacks/righthand_materials.dmi deleted file mode 100644 index 1f6a1091b6e..00000000000 Binary files a/icons/mob/items/stacks/righthand_materials.dmi and /dev/null differ diff --git a/icons/mob/items/stacks/righthand_medical.dmi b/icons/mob/items/stacks/righthand_medical.dmi deleted file mode 100644 index edae6f94233..00000000000 Binary files a/icons/mob/items/stacks/righthand_medical.dmi and /dev/null differ diff --git a/icons/mob/items/stacks/righthand_tiles.dmi b/icons/mob/items/stacks/righthand_tiles.dmi deleted file mode 100644 index d4bdd6d0df1..00000000000 Binary files a/icons/mob/items/stacks/righthand_tiles.dmi and /dev/null differ diff --git a/icons/mob/items/stacks/righthand_wrap.dmi b/icons/mob/items/stacks/righthand_wrap.dmi deleted file mode 100644 index 6fef189751d..00000000000 Binary files a/icons/mob/items/stacks/righthand_wrap.dmi and /dev/null differ diff --git a/icons/obj/handcuffs.dmi b/icons/obj/handcuffs.dmi index 50ecc5d5bb1..62812582939 100644 Binary files a/icons/obj/handcuffs.dmi and b/icons/obj/handcuffs.dmi differ diff --git a/icons/obj/item/stacks/materials.dmi b/icons/obj/item/stacks/materials.dmi index ac83fb92792..943b0f9d134 100644 Binary files a/icons/obj/item/stacks/materials.dmi and b/icons/obj/item/stacks/materials.dmi differ diff --git a/icons/obj/item/stacks/medical.dmi b/icons/obj/item/stacks/medical.dmi index c4059dd6e2f..5c9c39a56a8 100644 Binary files a/icons/obj/item/stacks/medical.dmi and b/icons/obj/item/stacks/medical.dmi differ diff --git a/icons/obj/item/stacks/tiles.dmi b/icons/obj/item/stacks/tiles.dmi index 5d3855b8352..bea20f71b71 100644 Binary files a/icons/obj/item/stacks/tiles.dmi and b/icons/obj/item/stacks/tiles.dmi differ diff --git a/icons/obj/item/stacks/wrap.dmi b/icons/obj/item/stacks/wrap.dmi index 5bef52aa7c3..8d7002c67ce 100644 Binary files a/icons/obj/item/stacks/wrap.dmi and b/icons/obj/item/stacks/wrap.dmi differ diff --git a/icons/obj/power.dmi b/icons/obj/power.dmi index 7c2ee3f6edb..844b1fce200 100644 Binary files a/icons/obj/power.dmi and b/icons/obj/power.dmi differ