diff --git a/code/modules/client/preference/loadout/loadout_accessories.dm b/code/modules/client/preference/loadout/loadout_accessories.dm index 1c7ad2f88e8..c591295d940 100644 --- a/code/modules/client/preference/loadout/loadout_accessories.dm +++ b/code/modules/client/preference/loadout/loadout_accessories.dm @@ -98,41 +98,41 @@ display_name = "cowboy shirt, black" path = /obj/item/clothing/accessory/cowboyshirt -/datum/gear/accessory/cowboyshirt/s +/datum/gear/accessory/cowboyshirt/short_sleeved display_name = "cowboy shirt, short sleeved black" - path = /obj/item/clothing/accessory/cowboyshirt/s + path = /obj/item/clothing/accessory/cowboyshirt/short_sleeved /datum/gear/accessory/cowboyshirt/white display_name = "cowboy shirt, white" path = /obj/item/clothing/accessory/cowboyshirt/white -/datum/gear/accessory/cowboyshirt/whites +/datum/gear/accessory/cowboyshirt/white/short_sleeved display_name = "cowboy shirt, short sleeved white" - path = /obj/item/clothing/accessory/cowboyshirt/whites + path = /obj/item/clothing/accessory/cowboyshirt/white/short_sleeved /datum/gear/accessory/cowboyshirt/pink display_name = "cowboy shirt, pink" path = /obj/item/clothing/accessory/cowboyshirt/pink -/datum/gear/accessory/cowboyshirt/pinks +/datum/gear/accessory/cowboyshirt/pink/short_sleeved display_name = "cowboy shirt, short sleeved pink" - path = /obj/item/clothing/accessory/cowboyshirt/pinks + path = /obj/item/clothing/accessory/cowboyshirt/pink/short_sleeved /datum/gear/accessory/cowboyshirt/red display_name = "cowboy shirt, red" path = /obj/item/clothing/accessory/cowboyshirt/red -/datum/gear/accessory/cowboyshirt/reds +/datum/gear/accessory/cowboyshirt/red/short_sleeved display_name = "cowboy shirt, short sleeved red" - path = /obj/item/clothing/accessory/cowboyshirt/reds + path = /obj/item/clothing/accessory/cowboyshirt/red/short_sleeved /datum/gear/accessory/cowboyshirt/navy display_name = "cowboy shirt, navy" path = /obj/item/clothing/accessory/cowboyshirt/navy -/datum/gear/accessory/cowboyshirt/navys +/datum/gear/accessory/cowboyshirt/navy/short_sleeved display_name = "cowboy shirt, short sleeved navy" - path = /obj/item/clothing/accessory/cowboyshirt/navys + path = /obj/item/clothing/accessory/cowboyshirt/navy/short_sleeved diff --git a/code/modules/client/preference/loadout/loadout_hat.dm b/code/modules/client/preference/loadout/loadout_hat.dm index 4657893bec7..1b1978f7d71 100644 --- a/code/modules/client/preference/loadout/loadout_hat.dm +++ b/code/modules/client/preference/loadout/loadout_hat.dm @@ -94,12 +94,12 @@ path = /obj/item/clothing/head/soft/yellow /datum/gear/hat/cowboyhat - display_name = "cowboy hat" + display_name = "cowboy hat, brown" path = /obj/item/clothing/head/cowboyhat -/datum/gear/hat/cowboyhat/brown - display_name = "cowboy hat, dark brown" - path = /obj/item/clothing/head/cowboyhat/darkbrown +/datum/gear/hat/cowboyhat/tan + display_name = "cowboy hat, tan" + path = /obj/item/clothing/head/cowboyhat/tan /datum/gear/hat/cowboyhat/black display_name = "cowboy hat, black" diff --git a/code/modules/clothing/head/misc.dm b/code/modules/clothing/head/misc.dm index e8b6ab50d92..a3d68c8dd32 100644 --- a/code/modules/clothing/head/misc.dm +++ b/code/modules/clothing/head/misc.dm @@ -185,15 +185,15 @@ /obj/item/clothing/head/cowboyhat name = "cowboy hat" icon_state = "cowboyhat" - item_state = "fedora" - desc = "There's a new sheriff in town. Pass the whiskey." - -/obj/item/clothing/head/cowboyhat/darkbrown - name = "dark brown cowboy hat" - icon_state = "cowboyhat_darkbrown" - item_state = "cowboyhat_darlbrown" + item_state = "cowboyhat" desc = "For the Rancher in us all." +/obj/item/clothing/head/cowboyhat/tan + name = "tan cowboy hat" + icon_state = "cowboyhat_tan" + item_state = "cowboyhat_tan" + desc = "There's a new sheriff in town. Pass the whiskey." + /obj/item/clothing/head/cowboyhat/black name = "black cowboy hat" icon_state = "cowboyhat_black" diff --git a/code/modules/clothing/under/accessories/accessory.dm b/code/modules/clothing/under/accessories/accessory.dm index fb82f20b8fc..58eea74a2cb 100644 --- a/code/modules/clothing/under/accessories/accessory.dm +++ b/code/modules/clothing/under/accessories/accessory.dm @@ -389,7 +389,7 @@ "Vox" = 'icons/mob/species/vox/suit.dmi' ) -/obj/item/clothing/accessory/cowboyshirt/s +/obj/item/clothing/accessory/cowboyshirt/short_sleeved name = "shortsleeved black cowboy shirt" desc = "For when it's a hot day in the west." icon_state = "cowboyshirt_s" @@ -411,7 +411,7 @@ "Vox" = 'icons/mob/species/vox/suit.dmi' ) -/obj/item/clothing/accessory/cowboyshirt/whites +/obj/item/clothing/accessory/cowboyshirt/white/short_sleeved name = "short sleeved white cowboy shirt" desc = "Best for midday cattle tending." icon_state = "cowboyshirt_whites" @@ -433,7 +433,7 @@ "Vox" = 'icons/mob/species/vox/suit.dmi' ) -/obj/item/clothing/accessory/cowboyshirt/pinks +/obj/item/clothing/accessory/cowboyshirt/pink/short_sleeved name = "short sleeved pink cowboy shirt" desc = "For a real buckle bunny." icon_state = "cowboyshirt_pinks" @@ -455,7 +455,7 @@ "Vox" = 'icons/mob/species/vox/suit.dmi' ) -/obj/item/clothing/accessory/cowboyshirt/navys +/obj/item/clothing/accessory/cowboyshirt/navy/short_sleeved name = "short sleeved navy cowboy shirt" desc = "Sometimes ya need to roll up your sleeves." icon_state = "cowboyshirt_navys" @@ -477,7 +477,7 @@ "Vox" = 'icons/mob/species/vox/suit.dmi' ) -/obj/item/clothing/accessory/cowboyshirt/reds +/obj/item/clothing/accessory/cowboyshirt/red/short_sleeved name = "short sleeved red cowboy shirt" desc = "Life on the open range is quite dangeorus, you never know what to expect." icon_state = "cowboyshirt_reds" diff --git a/icons/mob/head.dmi b/icons/mob/head.dmi index 3f37086edb0..6d5819f338b 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 d1b9bb901fc..b82450ab87a 100644 Binary files a/icons/obj/clothing/hats.dmi and b/icons/obj/clothing/hats.dmi differ