diff --git a/code/modules/clothing/head/misc.dm b/code/modules/clothing/head/misc.dm index fffdee5833..4c6a0fa3b6 100644 --- a/code/modules/clothing/head/misc.dm +++ b/code/modules/clothing/head/misc.dm @@ -392,3 +392,33 @@ desc = "A green Christmas Hat! How festive!" icon_state = "christmashatg" item_state = "christmashatg" + +/obj/item/clothing/head/cowboyhat + name = "cowboy hat" + desc = "A standard brown cowboy hat, yeehaw." + icon_state = "cowboyhat" + item_state= "cowboyhat" + +/obj/item/clothing/head/cowboyhat/black + name = "black cowboy hat" + desc = "A a black cowboy hat, perfect for any outlaw" + icon_state = "cowboyhat_black" + item_state= "cowboyhat_black" + +/obj/item/clothing/head/cowboyhat/white + name = "white cowboy hat" + desc = "A white cowboy hat, perfect for your every day rancher" + icon_state = "cowboyhat_white" + item_state= "cowboyhat_white" + +/obj/item/clothing/head/cowboyhat/pink + name = "pink cowboy hat" + desc = "A pink cowboy? more like cowgirl hat, just don't be a buckle bunny." + icon_state = "cowboyhat_pink" + item_state= "cowboyhat_pink" + +/obj/item/clothing/head/cowboyhat/sec + name = "security cowboy hat" + desc = "A security cowboy hat, perfect for any true lawman" + icon_state = "cowboyhat_sec" + item_state= "cowboyhat_sec" \ No newline at end of file diff --git a/code/modules/clothing/shoes/miscellaneous.dm b/code/modules/clothing/shoes/miscellaneous.dm index c81584dbcc..c0e566cc0e 100644 --- a/code/modules/clothing/shoes/miscellaneous.dm +++ b/code/modules/clothing/shoes/miscellaneous.dm @@ -355,3 +355,13 @@ name = "blue leg wraps" desc = "Ankle coverings. Hang ten, brother." icon_state = "bluecuffs" + +/obj/item/clothing/shoes/cowboyboots + name = "cowboy boots" + desc = "A standard pair of brown cowboy boots." + icon_state = "cowboyboots" + +/obj/item/clothing/shoes/cowboyboots/black + name = "black cowboy boots" + desc = "A pair of black cowboy boots, pretty easy to scuff up." + icon_state = "cowboyboots_black" diff --git a/code/modules/mob/dead/new_player/sprite_accessories/undershirt.dm b/code/modules/mob/dead/new_player/sprite_accessories/undershirt.dm index fb40563ccf..58c64dc7d0 100644 --- a/code/modules/mob/dead/new_player/sprite_accessories/undershirt.dm +++ b/code/modules/mob/dead/new_player/sprite_accessories/undershirt.dm @@ -310,4 +310,40 @@ name = "Tube Top" icon_state = "tubetop" has_color = TRUE - gender = FEMALE \ No newline at end of file + gender = FEMALE + +/datum/sprite_accessory/underwear/top/cowboyshirt + name = "Cowboy Shirt Black" + icon_state = "cowboyshirt" + +/datum/sprite_accessory/underwear/top/cowboyshirt/s + name = "Cowboy Shirt Shortsleeved Black" + icon_state = "cowboyshirt_s" + +/datum/sprite_accessory/underwear/top/cowboyshirt/white + name = "Cowboy Shirt White" + icon_state = "cowboyshirt_white" + +/datum/sprite_accessory/underwear/top/cowboyshirt/white/s + name = "Cowboy Shirt Shortsleeved White" + icon_state = "cowboyshirt_whites" + +/datum/sprite_accessory/underwear/top/cowboyshirt/navy + name = "Cowboy Shirt Navy" + icon_state = "cowboyshirt_navy" + +/datum/sprite_accessory/underwear/top/cowboyshirt/navy/s + name = "Cowboy Shirt Shortsleeved Navy" + icon_state = "cowboyshirt_navys" + +/datum/sprite_accessory/underwear/top/cowboyshirt/red + name = "Cowboy Shirt Red" + icon_state = "cowboyshirt_red" + +/datum/sprite_accessory/underwear/top/cowboyshirt/red/s + name = "Cowboy Shirt Shortsleeved Red" + icon_state = "cowboyshirt_reds" + + + + diff --git a/code/modules/vending/clothesmate.dm b/code/modules/vending/clothesmate.dm index 6144f4c57a..6116936880 100644 --- a/code/modules/vending/clothesmate.dm +++ b/code/modules/vending/clothesmate.dm @@ -134,7 +134,13 @@ /obj/item/clothing/head/christmashatg = 3, /obj/item/clothing/shoes/winterboots/christmasbootsr = 3, /obj/item/clothing/shoes/winterboots/christmasbootsg = 3, - /obj/item/clothing/shoes/winterboots/santaboots = 3) + /obj/item/clothing/shoes/winterboots/santaboots = 3, + /obj/item/clothing/head/cowboyhat = 3, + /obj/item/clothing/head/cowboyhat/black = 3, + /obj/item/clothing/head/cowboyhat/white = 3, + /obj/item/clothing/head/cowboyhat/pink = 3, + /obj/item/clothing/shoes/cowboyboots = 3, + /obj/item/clothing/shoes/cowboyboots/black = 3) contraband = list(/obj/item/clothing/under/syndicate/tacticool = 3, /obj/item/clothing/under/syndicate/tacticool/skirt = 3, /obj/item/clothing/mask/balaclava = 3, diff --git a/icons/mob/feet.dmi b/icons/mob/feet.dmi index e768271757..bebfb7c2e0 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 3adedcffba..6bba2fc7fb 100644 Binary files a/icons/mob/head.dmi and b/icons/mob/head.dmi differ diff --git a/icons/mob/underwear.dmi b/icons/mob/underwear.dmi index e0789a1eeb..f0c2cde93d 100644 Binary files a/icons/mob/underwear.dmi and b/icons/mob/underwear.dmi differ diff --git a/icons/obj/clothing/hats.dmi b/icons/obj/clothing/hats.dmi index 4587d6e7b6..f94106dd55 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 b52c314296..3c8a1332a9 100644 Binary files a/icons/obj/clothing/shoes.dmi and b/icons/obj/clothing/shoes.dmi differ diff --git a/modular_citadel/code/modules/client/loadout/head.dm b/modular_citadel/code/modules/client/loadout/head.dm index 3e7eb39823..427a4ac61d 100644 --- a/modular_citadel/code/modules/client/loadout/head.dm +++ b/modular_citadel/code/modules/client/loadout/head.dm @@ -101,4 +101,34 @@ /datum/gear/santahatg name = "Green Santa Hat" category = SLOT_HEAD - path = /obj/item/clothing/head/christmashatg \ No newline at end of file + path = /obj/item/clothing/head/christmashatg + +/datum/gear/cowboyhat + name = "Cowboy Hat, Brown" + category = SLOT_HEAD + path = /obj/item/clothing/head/cowboyhat + +/datum/gear/cowboyhat/black + name = "Cowboy Hat, Black" + category = SLOT_HEAD + path = /obj/item/clothing/head/cowboyhat/black + +/datum/gear/cowboyhat/white + name = "Cowboy Hat, White" + category = SLOT_HEAD + path = /obj/item/clothing/head/cowboyhat/white + +/datum/gear/cowboyhat/pink + name = "Cowboy Hat, Pink" + category = SLOT_HEAD + path = /obj/item/clothing/head/cowboyhat/pink + +/datum/gear/cowboyhat/sec + name = "Cowboy Hat, Security" + category = SLOT_HEAD + path = /obj/item/clothing/head/cowboyhat/sec + restricted_desc = "Security" + restricted_roles = list("Warden","Detective","Security Officer","Head of Security") + + + diff --git a/modular_citadel/code/modules/client/loadout/shoes.dm b/modular_citadel/code/modules/client/loadout/shoes.dm index 7b3bee6638..3531e69cfd 100644 --- a/modular_citadel/code/modules/client/loadout/shoes.dm +++ b/modular_citadel/code/modules/client/loadout/shoes.dm @@ -71,4 +71,14 @@ /datum/gear/santaboots name = "Santa Boots" category = SLOT_SHOES - path= /obj/item/clothing/shoes/winterboots/santaboots \ No newline at end of file + path= /obj/item/clothing/shoes/winterboots/santaboots + +/datum/gear/cowboyboots + name = "Cowboy Boots, Brown" + category = SLOT_SHOES + path = /obj/item/clothing/shoes/cowboyboots + +/datum/gear/cowboyboots/black + name = "Cowboy Boots, Black" + category = SLOT_SHOES + path = /obj/item/clothing/shoes/cowboyboots/black \ No newline at end of file