diff --git a/code/modules/client/preference_setup/loadout/loadout_head.dm b/code/modules/client/preference_setup/loadout/loadout_head.dm index f62a649bb94..4b3ec3427a1 100644 --- a/code/modules/client/preference_setup/loadout/loadout_head.dm +++ b/code/modules/client/preference_setup/loadout/loadout_head.dm @@ -210,6 +210,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/colourable gear_tweaks += new /datum/gear_tweak/path(hats_colourable) /datum/gear/head/hijab diff --git a/code/modules/clothing/head/misc.dm b/code/modules/clothing/head/misc.dm index 9cfe712d45b..0b217c57498 100644 --- a/code/modules/clothing/head/misc.dm +++ b/code/modules/clothing/head/misc.dm @@ -222,9 +222,18 @@ /obj/item/clothing/head/feathertrilby name = "feather trilby" + icon = 'icons/contained_items/clothing/headwear/feather_trilby.dmi' icon_state = "feather_trilby" + item_state = "feather_trilby" + contained_sprite = TRUE desc = "A sharp, stylish hat with a feather." +/obj/item/clothing/head/feathertrilby/colourable + icon_state = "feather_trilby_grayscale" + item_state = "feather_trilby_grayscale" + build_from_parts = TRUE + worn_overlay = "feather" + /obj/item/clothing/head/fez name = "fez" desc = "You should wear a fez. Fezzes are cool." diff --git a/html/changelogs/feartheblackout-featherdreams.yml b/html/changelogs/feartheblackout-featherdreams.yml new file mode 100644 index 00000000000..c9c9c94c68f --- /dev/null +++ b/html/changelogs/feartheblackout-featherdreams.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: FearTheBlackout + +# 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: + - rscadd: "Adds a colorable feather trilby to the loadout." diff --git a/icons/contained_items/clothing/headwear/feather_trilby.dmi b/icons/contained_items/clothing/headwear/feather_trilby.dmi new file mode 100644 index 00000000000..6a06a03a539 Binary files /dev/null and b/icons/contained_items/clothing/headwear/feather_trilby.dmi differ diff --git a/icons/mob/head.dmi b/icons/mob/head.dmi index 4a5e6a35f35..a32f057c31b 100644 Binary files a/icons/mob/head.dmi and b/icons/mob/head.dmi differ diff --git a/icons/obj/clothing/hats.dmi b/icons/obj/clothing/hats.dmi index 0aafa4cf243..e33968a8db2 100644 Binary files a/icons/obj/clothing/hats.dmi and b/icons/obj/clothing/hats.dmi differ