diff --git a/code/modules/client/preference_setup/loadout/loadout_head.dm b/code/modules/client/preference_setup/loadout/loadout_head.dm index 8f75dbe1b9e..aac83864803 100644 --- a/code/modules/client/preference_setup/loadout/loadout_head.dm +++ b/code/modules/client/preference_setup/loadout/loadout_head.dm @@ -194,7 +194,8 @@ hats["hat, fez"] = /obj/item/clothing/head/fez hats["hat, tophat"] = /obj/item/clothing/head/that hats["hat, feather trilby"] = /obj/item/clothing/head/feathertrilby - hats["hat, black fedora"] = /obj/item/clothing/head/fedora + hats["hat, striped black fedora"] = /obj/item/clothing/head/fedora + hats["hat, black fedora"] = /obj/item/clothing/head/fedora/black hats["hat, brown fedora"] = /obj/item/clothing/head/fedora/brown hats["hat, dark brown fedora"] = /obj/item/clothing/head/fedora/brown/dark hats["hat, grey fedora"] = /obj/item/clothing/head/fedora/grey diff --git a/code/modules/clothing/head/misc.dm b/code/modules/clothing/head/misc.dm index 8aaa19d4acf..457d96e6365 100644 --- a/code/modules/clothing/head/misc.dm +++ b/code/modules/clothing/head/misc.dm @@ -221,11 +221,6 @@ icon_state = "boater_hat" desc = "The ultimate in summer fashion." -/obj/item/clothing/head/fedora - name = "fedora" - icon_state = "fedora" - desc = "A sharp, stylish hat." - /obj/item/clothing/head/feathertrilby name = "feather trilby" icon_state = "feather_trilby" @@ -396,6 +391,15 @@ . = ..() color = get_random_colour(lower = 150) +/obj/item/clothing/head/fedora + name = "fedora" + icon_state = "fedora" + desc = "A sharp, stylish hat." + +/obj/item/clothing/head/fedora/black + name = "black fedora" + icon_state = "black_fedora" + /obj/item/clothing/head/fedora/brown name = "fedora" desc = "A brown fedora - either the cornerstone of a detective's style or a poor attempt at looking cool, depending on the person wearing it." diff --git a/html/changelogs/Ferner-201108-spriting_blackfedora.yml b/html/changelogs/Ferner-201108-spriting_blackfedora.yml new file mode 100644 index 00000000000..649fe48d59c --- /dev/null +++ b/html/changelogs/Ferner-201108-spriting_blackfedora.yml @@ -0,0 +1,4 @@ +author: Ferner, Valwyn +delete-after: True +changes: + - rscadd: "Added a black, unstriped fedora to the loadout. Spritework by Valwyn." \ No newline at end of file diff --git a/icons/mob/head.dmi b/icons/mob/head.dmi index 41e5d60d69d..a801684bcb0 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 bae988fa60a..79b7e6aad0c 100644 Binary files a/icons/obj/clothing/hats.dmi and b/icons/obj/clothing/hats.dmi differ