diff --git a/code/modules/client/preference_setup/loadout/loadout_head.dm b/code/modules/client/preference_setup/loadout/loadout_head.dm index 7f40f1d34de..5a099e49746 100644 --- a/code/modules/client/preference_setup/loadout/loadout_head.dm +++ b/code/modules/client/preference_setup/loadout/loadout_head.dm @@ -107,11 +107,28 @@ /datum/gear/head/cowboy/New() ..() - var/list/hats = list() - for(var/hat in typesof(/obj/item/clothing/head/cowboy_hat)) - var/obj/item/clothing/head/hat_type = hat - hats[initial(hat_type.name)] = hat_type - gear_tweaks += new/datum/gear_tweak/path(sortAssoc(hats)) + var/list/hats = list( + "cowboy hat" = /obj/item/clothing/head/cowboy_hat, + "cowboy hat, black" = /obj/item/clothing/head/cowboy_hat/black, + "cowboy hat, wide" = /obj/item/clothing/head/cowboy_hat/wide, + "cowboy hat, small" = /obj/item/clothing/head/cowboy_hat/small, + ) + gear_tweaks += new/datum/gear_tweak/path(hats) + +/datum/gear/head/cowboy_colorable + display_name = "cowboy hat (colorable)" + + description = "Draw. In any color of the rainbow." + path = /obj/item/clothing/head/cowboy_hat/white + +/datum/gear/head/cowboy_colorable/New() + ..() + var/list/whitehats = list( + "cowboy hat" = /obj/item/clothing/head/cowboy_hat/white, + "cowboy hat, wide" = /obj/item/clothing/head/cowboy_hat/white_wide, + ) + gear_tweaks += new/datum/gear_tweak/path(whitehats) + gear_tweaks += gear_tweak_free_color_choice /datum/gear/head/fedora display_name = "fedora, brown" diff --git a/code/modules/clothing/head/misc.dm b/code/modules/clothing/head/misc.dm index 350c98fda59..983af47b4e9 100644 --- a/code/modules/clothing/head/misc.dm +++ b/code/modules/clothing/head/misc.dm @@ -226,6 +226,14 @@ desc = "Because justice isn't going to dispense itself." icon_state = "cowboy_wide" +/obj/item/clothing/head/cowboy_hat/white + icon_state = "cowboy_white" + +/obj/item/clothing/head/cowboy_hat/white_wide + name = "wide-brimmed cowboy hat" + desc = "Because justice isn't going to dispense itself." + icon_state = "cowboy_white_wide" + /obj/item/clothing/head/cowboy_hat/small name = "small cowboy hat" desc = "For the tiniest of cowboys." diff --git a/icons/mob/head.dmi b/icons/mob/head.dmi index 60d6498b760..945b7d5ca3b 100644 Binary files a/icons/mob/head.dmi and b/icons/mob/head.dmi differ diff --git a/icons/mob/species/unathi/mask.dmi b/icons/mob/species/unathi/mask.dmi index 232bc45e60b..f636b4c1902 100644 Binary files a/icons/mob/species/unathi/mask.dmi and b/icons/mob/species/unathi/mask.dmi differ diff --git a/icons/mob/ties.dmi b/icons/mob/ties.dmi index 0b2bb572f6b..b62277ec280 100644 Binary files a/icons/mob/ties.dmi and b/icons/mob/ties.dmi differ diff --git a/icons/obj/clothing/hats.dmi b/icons/obj/clothing/hats.dmi index 79f58709dd9..2fbdf7460a7 100644 Binary files a/icons/obj/clothing/hats.dmi and b/icons/obj/clothing/hats.dmi differ