one more time

ye

code/game/objects/items/miscellaneous.dm

@@ -47,7 +47,7 @@
 		if(istype(H.ears, /obj/item/radio/headset))
 			msg = "You hear something crackle in your ears for a moment before a voice speaks.  \"Please stand by for a message from Central Command.  Message as follows: <span class='bold'>Item request received. Your package is inbound, please stand back from the landing site.</span> Message ends.\""
 	to_chat(M, msg)
-	new /obj/effect/DPtarget(get_turf(src), pod)
+	new /obj/effect/abstract/DPtarget(get_turf(src), pod)
 
 /obj/item/caution
 	desc = "Caution! Wet Floor!"

code/modules/clothing/head/misc.dm

@@ -321,6 +321,39 @@
 	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" 
+	armor = list("melee" = 40, "bullet" = 30, "laser" = 30,"energy" = 10, "bomb" = 25, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 50)
+
+
 /obj/item/clothing/head/pharaoh
 	name = "pharaoh hat"
 	desc = "Walk like an Egyptian."

code/modules/clothing/shoes/miscellaneous.dm

@@ -397,6 +397,16 @@
 	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"
+
 /obj/item/clothing/shoes/winterboots/christmasbootsr
 	name = "red christmas boots"
 	desc = "A pair of fluffy red christmas boots!"

code/modules/mob/dead/new_player/sprite_accessories/undershirt.dm

@@ -310,4 +310,36 @@
 	name = "Tube Top"
 	icon_state = "tubetop"
 	has_color = TRUE
-	gender = FEMALE
+	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"

code/modules/vending/clothesmate.dm

@@ -117,7 +117,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,

modular_citadel/code/modules/client/loadout/head.dm

@@ -109,6 +109,33 @@
 	category = SLOT_HEAD
 	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")
+
 /datum/gear/pharaohmhat
 	name = "Pharaoh Hat"
 	category = SLOT_HEAD
@@ -128,4 +155,4 @@
 	name = "Improper Roman legionnaire helmet"
 	category = SLOT_HEAD
 	path = /obj/item/clothing/head/helmet/roman/legionnaire/fake
-	cost = 2
+	cost = 2

modular_citadel/code/modules/client/loadout/shoes.dm

@@ -93,12 +93,22 @@
 	category = SLOT_SHOES
 	path= /obj/item/clothing/shoes/winterboots/santaboots
 
-datum/gear/highheels
+/datum/gear/highheels
 	name = "High Heels"
 	category = SLOT_SHOES
 	path= /obj/item/clothing/shoes/highheels
 
-datum/gear/romansandals
+/datum/gear/romansandals
 	name = "Roman sandals"
 	category = SLOT_SHOES
-	path= /obj/item/clothing/shoes/roman
+	path= /obj/item/clothing/shoes/roman
+
+/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