diff --git a/code/modules/clothing/wrists/watches.dm b/code/modules/clothing/wrists/watches.dm index 0bffcea3911..4b5d40b1b4f 100644 --- a/code/modules/clothing/wrists/watches.dm +++ b/code/modules/clothing/wrists/watches.dm @@ -4,9 +4,6 @@ desc_extended = "For those who want too much time on their wrists instead." icon_state = "watch" item_state = "watch" - sprite_sheets = list( - BODYTYPE_VAURCA_BULWARK = 'icons/mob/species/bulwark/wrist.dmi' - ) var/wired = TRUE var/screwed = TRUE diff --git a/code/modules/clothing/wrists/wrists.dm b/code/modules/clothing/wrists/wrists.dm index 3d0ffd70894..499c26ff949 100644 --- a/code/modules/clothing/wrists/wrists.dm +++ b/code/modules/clothing/wrists/wrists.dm @@ -2,11 +2,7 @@ /obj/item/clothing/wrists name = "wrists" w_class = ITEMSIZE_TINY - icon = 'icons/obj/clothing/wrists.dmi' - item_icons = list( - slot_l_hand_str = 'icons/mob/items/clothing/lefthand_wrists.dmi', - slot_r_hand_str = 'icons/mob/items/clothing/righthand_wrists.dmi' - ) + icon = 'icons/obj/item/clothing/wrists/wrist.dmi' sprite_sheets = list( BODYTYPE_VAURCA_BULWARK = 'icons/mob/species/bulwark/wrist.dmi' ) @@ -16,6 +12,7 @@ siemens_coefficient = 1.0 var/flipped = 0 var/mob_wear_layer = WRISTS_LAYER_OVER + contained_sprite = TRUE /obj/item/clothing/wrists/update_clothing_icon() if (ismob(src.loc)) diff --git a/html/changelogs/SimpleMaroon-containedwristsprites.yml b/html/changelogs/SimpleMaroon-containedwristsprites.yml new file mode 100644 index 00000000000..cb83622889d --- /dev/null +++ b/html/changelogs/SimpleMaroon-containedwristsprites.yml @@ -0,0 +1,59 @@ +################################ +# 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: SimpleMaroon + +# 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: + - refactor: "Made wrist item sprites into contained sprites." + - bugfix: "Bulwark wrist item sprites now work as intended." diff --git a/icons/mob/items/clothing/lefthand_wrists.dmi b/icons/mob/items/clothing/lefthand_wrists.dmi deleted file mode 100644 index 87498694351..00000000000 Binary files a/icons/mob/items/clothing/lefthand_wrists.dmi and /dev/null differ diff --git a/icons/mob/items/clothing/righthand_wrists.dmi b/icons/mob/items/clothing/righthand_wrists.dmi deleted file mode 100644 index cd5b144cb2f..00000000000 Binary files a/icons/mob/items/clothing/righthand_wrists.dmi and /dev/null differ diff --git a/icons/mob/species/bulwark/wrist.dmi b/icons/mob/species/bulwark/wrist.dmi index efd796c3ed2..e8fb2c353d3 100644 Binary files a/icons/mob/species/bulwark/wrist.dmi and b/icons/mob/species/bulwark/wrist.dmi differ diff --git a/icons/mob/wrist.dmi b/icons/mob/wrist.dmi index 03f4f1dde28..e474e484895 100644 Binary files a/icons/mob/wrist.dmi and b/icons/mob/wrist.dmi differ diff --git a/icons/obj/clothing/wrists.dmi b/icons/obj/clothing/wrists.dmi deleted file mode 100644 index f979fd1cf00..00000000000 Binary files a/icons/obj/clothing/wrists.dmi and /dev/null differ diff --git a/icons/obj/item/clothing/wrists/wrist.dmi b/icons/obj/item/clothing/wrists/wrist.dmi new file mode 100644 index 00000000000..e69c26ca498 Binary files /dev/null and b/icons/obj/item/clothing/wrists/wrist.dmi differ