diff --git a/code/modules/client/preference/loadout/loadout_accessories.dm b/code/modules/client/preference/loadout/loadout_accessories.dm index b86d5c44ed1..c591295d940 100644 --- a/code/modules/client/preference/loadout/loadout_accessories.dm +++ b/code/modules/client/preference/loadout/loadout_accessories.dm @@ -93,3 +93,49 @@ display_name = "stethoscope" path = /obj/item/clothing/accessory/stethoscope allowed_roles = list("Chief Medical Officer", "Medical Doctor", "Paramedic", "Brig Physician") + +/datum/gear/accessory/cowboyshirt + display_name = "cowboy shirt, black" + path = /obj/item/clothing/accessory/cowboyshirt + +/datum/gear/accessory/cowboyshirt/short_sleeved + display_name = "cowboy shirt, short sleeved black" + 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/white/short_sleeved + display_name = "cowboy shirt, short sleeved white" + 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/pink/short_sleeved + display_name = "cowboy shirt, short sleeved pink" + 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/red/short_sleeved + display_name = "cowboy shirt, short sleeved red" + 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/navy/short_sleeved + display_name = "cowboy shirt, short sleeved navy" + 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 2abfd08f8ce..1b1978f7d71 100644 --- a/code/modules/client/preference/loadout/loadout_hat.dm +++ b/code/modules/client/preference/loadout/loadout_hat.dm @@ -94,9 +94,25 @@ 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/tan + display_name = "cowboy hat, tan" + path = /obj/item/clothing/head/cowboyhat/tan + +/datum/gear/hat/cowboyhat/black + display_name = "cowboy hat, black" + path = /obj/item/clothing/head/cowboyhat/black + +/datum/gear/hat/cowboyhat/white + display_name = "cowboy hat, white" + path = /obj/item/clothing/head/cowboyhat/white + +/datum/gear/hat/cowboyhat/pink + display_name = "cowboy hat, pink" + path = /obj/item/clothing/head/cowboyhat/pink + /datum/gear/hat/pr_beret display_name = "beret, purple" path = /obj/item/clothing/head/beret/purple_normal diff --git a/code/modules/client/preference/loadout/loadout_shoes.dm b/code/modules/client/preference/loadout/loadout_shoes.dm index ead7257bba1..89ccd952065 100644 --- a/code/modules/client/preference/loadout/loadout_shoes.dm +++ b/code/modules/client/preference/loadout/loadout_shoes.dm @@ -24,3 +24,23 @@ display_name = "dress shoes" cost = 5 path = /obj/item/clothing/shoes/centcom + +/datum/gear/shoes/cowboyboots + display_name = "cowboy boots, dark brown" + cost = 1 + path = /obj/item/clothing/shoes/cowboyboots + +/datum/gear/shoes/cowboyboots_black + display_name = "cowboy boots, black" + cost = 1 + path = /obj/item/clothing/shoes/cowboyboots/black + +/datum/gear/shoes/cowboyboots/white + display_name = "cowboy boots, white" + cost = 1 + path = /obj/item/clothing/shoes/cowboyboots/white + +/datum/gear/shoes/cowboyboots/pink + display_name = "cowboy boots, pink" + cost = 1 + path = /obj/item/clothing/shoes/cowboyboots/pink diff --git a/code/modules/clothing/head/misc.dm b/code/modules/clothing/head/misc.dm index 319c0fd5fce..a3d68c8dd32 100644 --- a/code/modules/clothing/head/misc.dm +++ b/code/modules/clothing/head/misc.dm @@ -185,9 +185,33 @@ /obj/item/clothing/head/cowboyhat name = "cowboy hat" icon_state = "cowboyhat" - item_state = "fedora" + 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" + item_state = "cowboyhat_black" + desc = "This station aint big enough for the two ah' us." + +/obj/item/clothing/head/cowboyhat/white + name = "white cowboy hat" + icon_state = "cowboyhat_white" + item_state = "cowboyhat_white" + desc = "Authentic Marshall hair case. Now ya can protect this here homestead. Navy Model not included." + +/obj/item/clothing/head/cowboyhat/pink + name = "cowgirl hat" + icon_state = "cowboyhat_pink" + item_state = "cowboyhat_pink" + desc = "For those buckle bunnies wanta' become a real buckaroo." + /obj/item/clothing/head/fedora name = "fedora" icon_state = "fedora" diff --git a/code/modules/clothing/shoes/miscellaneous.dm b/code/modules/clothing/shoes/miscellaneous.dm index 09ec70e6729..923a8b4e5ab 100644 --- a/code/modules/clothing/shoes/miscellaneous.dm +++ b/code/modules/clothing/shoes/miscellaneous.dm @@ -232,3 +232,27 @@ desc = "These boots were made for dancing." icon_state = "bsing" put_on_delay = 50 + +/obj/item/clothing/shoes/cowboyboots + name = "cowboy boots" + desc = "A pair a' dark brown boots." + icon_state = "cowboyboots" + item_color = "cowboyboots" + +/obj/item/clothing/shoes/cowboyboots/black + name = "black cowboy boots" + desc = "A pair a' black rustlers' boots" + icon_state = "cowboyboots_black" + item_color = "cowboyboots_black" + +/obj/item/clothing/shoes/cowboyboots/white + name = "white cowboy boots" + desc = "For the rancher in us all." + icon_state = "cowboyboots_white" + item_color = "cowboyboots_white" + +/obj/item/clothing/shoes/cowboyboots/pink + name = "pink cowgirl boots" + desc = "For a Rustlin' tustlin' cowgirl." + icon_state = "cowboyboots_pink" + item_color = "cowboyboots_pink" \ No newline at end of file diff --git a/code/modules/clothing/under/accessories/accessory.dm b/code/modules/clothing/under/accessories/accessory.dm index 2e79b68a11a..4f844b8be78 100644 --- a/code/modules/clothing/under/accessories/accessory.dm +++ b/code/modules/clothing/under/accessories/accessory.dm @@ -377,6 +377,117 @@ icon_state = "stripedbluescarf" item_color = "stripedbluescarf" +//Cowboy Shirts +/obj/item/clothing/accessory/cowboyshirt + name = "black cowboy shirt" + desc = "For a real western look." + icon_state = "cowboyshirt" + item_state = "cowboyshirt" + item_color = "cowboyshirt" + species_fit = list("Vox") + sprite_sheets = list( + "Vox" = 'icons/mob/species/vox/suit.dmi' + ) + +/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" + item_state = "cowboyshirt_s" + item_color = "cowboyshirt_s" + species_fit = list("Vox") + sprite_sheets = list( + "Vox" = 'icons/mob/species/vox/suit.dmi' + ) + +/obj/item/clothing/accessory/cowboyshirt/white + name = "white cowboy shirt" + desc = "For the rancher in us all." + icon_state = "cowboyshirt_white" + item_state = "cowboyshirt_white" + item_color = "cowboyshirt_white" + species_fit = list("Vox") + sprite_sheets = list( + "Vox" = 'icons/mob/species/vox/suit.dmi' + ) + +/obj/item/clothing/accessory/cowboyshirt/white/short_sleeved + name = "short sleeved white cowboy shirt" + desc = "Best for midday cattle tending." + icon_state = "cowboyshirt_whites" + item_state = "cowboyshirt_whites" + item_color = "cowboyshirt_whites" + species_fit = list("Vox") + sprite_sheets = list( + "Vox" = 'icons/mob/species/vox/suit.dmi' + ) + +/obj/item/clothing/accessory/cowboyshirt/pink + name = "pink cowboy shirt" + desc = "For only the manliest of men, or girliest of girls." + icon_state = "cowboyshirt_pink" + item_state = "cowboyshirt_pink" + item_color = "cowboyshirt_pink" + species_fit = list("Vox") + sprite_sheets = list( + "Vox" = 'icons/mob/species/vox/suit.dmi' + ) + +/obj/item/clothing/accessory/cowboyshirt/pink/short_sleeved + name = "short sleeved pink cowboy shirt" + desc = "For a real buckle bunny." + icon_state = "cowboyshirt_pinks" + item_state = "cowboyshirt_pinks" + item_color = "cowboyshirt_pinks" + species_fit = list("Vox") + sprite_sheets = list( + "Vox" = 'icons/mob/species/vox/suit.dmi' + ) + +/obj/item/clothing/accessory/cowboyshirt/navy + name = "navy cowboy shirt" + desc = "Now yer a real cowboy." + icon_state = "cowboyshirt_navy" + item_state = "cowboyshirt_navy" + item_color = "cowboyshirt_navy" + species_fit = list("Vox") + sprite_sheets = list( + "Vox" = 'icons/mob/species/vox/suit.dmi' + ) + +/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" + item_state = "cowboyshirt_navys" + item_color = "cowboyshirt_navys" + species_fit = list("Vox") + sprite_sheets = list( + "Vox" = 'icons/mob/species/vox/suit.dmi' + ) + +/obj/item/clothing/accessory/cowboyshirt/red + name = "red cowboy shirt" + desc = "It's high noon." + icon_state = "cowboyshirt_red" + item_state = "cowboyshirt_red" + item_color = "cowboyshirt_red" + species_fit = list("Vox") + sprite_sheets = list( + "Vox" = 'icons/mob/species/vox/suit.dmi' + ) + +/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" + item_state = "cowboyshirt_reds" + item_color = "cowboyshirt_reds" + species_fit = list("Vox") + sprite_sheets = list( + "Vox" = 'icons/mob/species/vox/suit.dmi' + ) + /obj/item/clothing/accessory/petcollar name = "pet collar" desc = "The latest fashion accessory for your favorite pets!" diff --git a/icons/mob/feet.dmi b/icons/mob/feet.dmi index 659c3d2e9d2..2dd84b4117c 100644 Binary files a/icons/mob/feet.dmi and b/icons/mob/feet.dmi differ diff --git a/icons/mob/head.dmi b/icons/mob/head.dmi index acfaf83a92c..6d5819f338b 100644 Binary files a/icons/mob/head.dmi and b/icons/mob/head.dmi differ diff --git a/icons/mob/species/vox/shoes.dmi b/icons/mob/species/vox/shoes.dmi index 83d6b9870ce..45f664c715a 100644 Binary files a/icons/mob/species/vox/shoes.dmi and b/icons/mob/species/vox/shoes.dmi differ diff --git a/icons/mob/species/vox/suit.dmi b/icons/mob/species/vox/suit.dmi index 4584f489ca6..b0e9f61d7bf 100644 Binary files a/icons/mob/species/vox/suit.dmi and b/icons/mob/species/vox/suit.dmi differ diff --git a/icons/mob/ties.dmi b/icons/mob/ties.dmi index e557ed1c87e..891f725aa07 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 0aece3ac8ac..b82450ab87a 100644 Binary files a/icons/obj/clothing/hats.dmi and b/icons/obj/clothing/hats.dmi differ diff --git a/icons/obj/clothing/shoes.dmi b/icons/obj/clothing/shoes.dmi index b92c02e7166..3631097a2ba 100644 Binary files a/icons/obj/clothing/shoes.dmi and b/icons/obj/clothing/shoes.dmi differ diff --git a/icons/obj/clothing/ties.dmi b/icons/obj/clothing/ties.dmi index cc83ea5d9ec..a894b1b2465 100644 Binary files a/icons/obj/clothing/ties.dmi and b/icons/obj/clothing/ties.dmi differ