diff --git a/code/modules/client/preference_setup/loadout/loadout_head.dm b/code/modules/client/preference_setup/loadout/loadout_head.dm index eea1f0cdd75..866dc8c931d 100644 --- a/code/modules/client/preference_setup/loadout/loadout_head.dm +++ b/code/modules/client/preference_setup/loadout/loadout_head.dm @@ -200,6 +200,18 @@ hats["hat, flatcap"] = /obj/item/clothing/head/flatcap gear_tweaks += new /datum/gear_tweak/path(hats) +/datum/gear/head/hats_colourable + display_name = "hat selection (colourable)" + description = "A selection of hats." + path = /obj/item/clothing/head/flatcap/colourable + flags = GEAR_HAS_NAME_SELECTION | GEAR_HAS_DESC_SELECTION | GEAR_HAS_COLOR_SELECTION + +/datum/gear/head/hats_colourable/New() + ..() + var/list/hats_colourable = list() + hats_colourable["hat, flatcap"] = /obj/item/clothing/head/flatcap/colourable + gear_tweaks += new /datum/gear_tweak/path(hats_colourable) + /datum/gear/head/hijab display_name = "hijab selection" path = /obj/item/clothing/head/hijab diff --git a/code/modules/clothing/head/misc.dm b/code/modules/clothing/head/misc.dm index 62679cc2a19..8a4b22f68fd 100644 --- a/code/modules/clothing/head/misc.dm +++ b/code/modules/clothing/head/misc.dm @@ -178,9 +178,16 @@ /obj/item/clothing/head/flatcap name = "flat cap" desc = "A working man's hat." + icon = 'icons/contained_items/clothing/hats/flat_cap.dmi' icon_state = "flat_cap" + item_state = "flat_cap" + contained_sprite = TRUE siemens_coefficient = 0.9 +/obj/item/clothing/head/flatcap/colourable + icon_state = "flat_cap_greyscale" + item_state = "flat_cap_greyscale" + /obj/item/clothing/head/pirate name = "pirate hat" desc = "Yarr." diff --git a/html/changelogs/flatcap_tweaks.yml b/html/changelogs/flatcap_tweaks.yml new file mode 100644 index 00000000000..23ae29d211e --- /dev/null +++ b/html/changelogs/flatcap_tweaks.yml @@ -0,0 +1,6 @@ +author: SleepyGemmy + +delete-after: True + +changes: + - imageadd: "Tweaks the flat cap sprite. Adds a new colourable flat cap." \ No newline at end of file diff --git a/icons/CONTAINED_ITEMS_README.txt b/icons/CONTAINED_ITEMS_README.txt new file mode 100644 index 00000000000..fb1984c010f --- /dev/null +++ b/icons/CONTAINED_ITEMS_README.txt @@ -0,0 +1 @@ +Please use the "contained_items" folder for any future contained item sprites. \ No newline at end of file diff --git a/icons/contained_items/clothing/hats/flat_cap.dmi b/icons/contained_items/clothing/hats/flat_cap.dmi new file mode 100644 index 00000000000..cd3f5cc7007 Binary files /dev/null and b/icons/contained_items/clothing/hats/flat_cap.dmi differ diff --git a/icons/contained_items/custom_items/README.txt b/icons/contained_items/custom_items/README.txt new file mode 100644 index 00000000000..662ff37de04 --- /dev/null +++ b/icons/contained_items/custom_items/README.txt @@ -0,0 +1 @@ +Folder intended for storing contained custom item sprites. \ No newline at end of file diff --git a/icons/mob/head.dmi b/icons/mob/head.dmi index b7dcbaa7ff6..4a5e6a35f35 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 27119cf0554..0aafa4cf243 100644 Binary files a/icons/obj/clothing/hats.dmi and b/icons/obj/clothing/hats.dmi differ