diff --git a/code/modules/client/preference_setup/loadout/items/head.dm b/code/modules/client/preference_setup/loadout/items/head.dm index 607e61d02d7..877de5d72cc 100644 --- a/code/modules/client/preference_setup/loadout/items/head.dm +++ b/code/modules/client/preference_setup/loadout/items/head.dm @@ -256,6 +256,7 @@ hats["hat, beaver"] = /obj/item/clothing/head/beaverhat hats["hat, sombrero"] = /obj/item/clothing/head/sombrero hats["hat, bear pelt"] = /obj/item/clothing/head/bearpelt + hats["hat, woolen"] = /obj/item/clothing/head/wool gear_tweaks += new /datum/gear_tweak/path(hats) /datum/gear/head/hats_colourable @@ -269,7 +270,7 @@ var/list/hats_colourable = list() hats_colourable["hat, flatcap"] = /obj/item/clothing/head/flatcap/colourable hats_colourable["hat, feather trilby"] = /obj/item/clothing/head/feathertrilby - hats_colourable["hat, woolen"] = /obj/item/clothing/head/wool + hats_colourable["hat, woolen"] = /obj/item/clothing/head/wool/colorable hats_colourable["hat, fedora"] = /obj/item/clothing/head/fedora hats_colourable["hat, top hat"] = /obj/item/clothing/head/top_hat hats_colourable["hat, cowboy"] = /obj/item/clothing/head/cowboy diff --git a/code/modules/clothing/head/woolen_hats.dm b/code/modules/clothing/head/woolen_hats.dm index b0c537862bf..8d41a8f417b 100644 --- a/code/modules/clothing/head/woolen_hats.dm +++ b/code/modules/clothing/head/woolen_hats.dm @@ -6,6 +6,11 @@ item_state = "hat" contained_sprite = TRUE +/obj/item/clothing/head/wool/colorable + icon_state = "hat_colorable" + item_state = "hat_colorable" + has_accents = TRUE + /obj/item/clothing/head/wool/idris name = "idris woolen hat" desc = "A warm woolen hat in Idris Incorporated colors. Have an Idris (and warm) day!" diff --git a/html/changelogs/ElorgRHG-woolen-hat-resprite.yml b/html/changelogs/ElorgRHG-woolen-hat-resprite.yml new file mode 100644 index 00000000000..8b33c114c0f --- /dev/null +++ b/html/changelogs/ElorgRHG-woolen-hat-resprite.yml @@ -0,0 +1,15 @@ +# Your name. +author: ElorgRHG + +# 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: "Resprited woolen hats." + - imageadd: "The colorable woolen hat now has an accent color." + - rscadd: "An uncolorable, generic woolen hat has been added to the loadout." diff --git a/icons/obj/item/clothing/head/wool_hats.dmi b/icons/obj/item/clothing/head/wool_hats.dmi index 1aaf40ecb12..d8185b186d9 100644 Binary files a/icons/obj/item/clothing/head/wool_hats.dmi and b/icons/obj/item/clothing/head/wool_hats.dmi differ