Expanding Clothing Options

code/datums/components/crafting/recipes/primitive.dm

@@ -11,3 +11,27 @@
 	reqs = list(/obj/item/stack/material/cloth = 2)
 	time = 40
 	category = CAT_PRIMAL
+
+/*
+ * Clothing
+ */
+
+/datum/crafting_recipe/primitive_clothes
+	name = "primitive clothes"
+	result = /obj/item/clothing/under/primitive
+	reqs = list(
+		/obj/item/stack/material/fiber = 4,
+		/obj/item/stack/material/cloth = 6
+	)
+	time = 90
+	category = CAT_CLOTHING
+
+/datum/crafting_recipe/primitive_shoes
+	name = "primitive shoes"
+	result = /obj/item/clothing/shoes/primitive
+	reqs = list(
+		/obj/item/stack/material/fiber = 2,
+		/obj/item/stack/material/cloth = 3
+	)
+	time = 60
+	category = CAT_CLOTHING

code/datums/outfits/costumes/halloween.dm

@@ -52,7 +52,7 @@
 	name = OUTFIT_COSTUME("Cowboy")
 	uniform = /obj/item/clothing/under/pants{ starting_accessories=list(/obj/item/clothing/accessory/holster/hip) }
 	shoes = /obj/item/clothing/shoes/boots/cowboy
-	head = /obj/item/clothing/head/cowboy_hat
+	head = /obj/item/clothing/head/cowboy
 	gloves = /obj/item/clothing/gloves/fingerless
 	suit = /obj/item/clothing/accessory/poncho
 	r_hand = /obj/item/weapon/gun/projectile/revolver/capgun

code/datums/supplypacks/costumes_vr.dm

@@ -296,8 +296,10 @@
 			/obj/item/clothing/accessory/collar/spike,
 			/obj/item/clothing/gloves/fingerless,
 			/obj/item/clothing/gloves/botanic_leather,
-			/obj/item/clothing/head/cowboy_hat,
-			/obj/item/clothing/head/cowboy_hat/black
+			/obj/item/clothing/head/cowboy,
+			/obj/item/clothing/head/cowboy/bandit,
+			/obj/item/clothing/accessory/cowboy_vest/brown,
+			/obj/item/clothing/accessory/cowboy_vest/grey
 			)
 	cost = 50
 	containertype = /obj/structure/closet/crate

code/game/machinery/computer/arcade.dm

@@ -20,7 +20,7 @@
 							/obj/item/toy/cultsword									= 1,
 							/obj/item/toy/bouquet/fake								= 1,
 							/obj/item/clothing/accessory/badge/sheriff				= 2,
-							/obj/item/clothing/head/cowboy_hat/small				= 2,
+							/obj/item/clothing/head/cowboy/small				= 2,
 							/obj/item/toy/stickhorse								= 2
 							)
 	var/list/special_prizes = list() // Holds instanced objects, intended for admins to shove surprises inside or something.

code/game/machinery/computer/arcade_vr.dm

@@ -1,5 +1,5 @@
 /obj/machinery/computer/arcade
-	prizes = list(	/obj/item/weapon/storage/box/snappops					= 2,
+	prizes = list(	/obj/item/weapon/storage/box/snappops							= 2,
 							/obj/item/toy/blink										= 2,
 							/obj/item/clothing/under/syndicate/tacticool			= 2,
 							/obj/item/toy/sword										= 2,
@@ -15,7 +15,7 @@
 							/obj/item/toy/cultsword									= 1,
 							/obj/item/toy/bouquet/fake								= 1,
 							/obj/item/clothing/accessory/badge/sheriff				= 2,
-							/obj/item/clothing/head/cowboy_hat/small				= 2,
+							/obj/item/clothing/head/cowboy/small					= 2,
 							/obj/item/toy/stickhorse								= 2,
 							/obj/item/toy/rock										= 2,
 							/obj/item/toy/flash										= 2,

code/game/objects/structures/crates_lockers/closets/wardrobe.dm

@@ -378,8 +378,11 @@
 		/obj/item/clothing/under/pants/khaki,
 		/obj/item/clothing/mask/bandana/blue,
 		/obj/item/clothing/mask/bandana/blue,
-		/obj/item/clothing/accessory/hawaii,
-		/obj/item/clothing/accessory/hawaii/random)
+		/obj/item/clothing/accessory/hawaiian,
+		/obj/item/clothing/accessory/hawaiian/blue,
+		/obj/item/clothing/accessory/hawaiian/pink,
+		/obj/item/clothing/accessory/hawaiian/red,
+		/obj/item/clothing/accessory/hawaiian/yellow)
 
 
 /obj/structure/closet/wardrobe/tactical

code/modules/client/preference_setup/loadout/loadout_accessories.dm

@@ -190,19 +190,6 @@
 	display_name = "chaps, black"
 	path = /obj/item/clothing/accessory/chaps/black
 
-/datum/gear/accessory/hawaii
-	display_name = "hawaii shirt"
-	path = /obj/item/clothing/accessory/hawaii
-
-/datum/gear/accessory/hawaii/New()
-	..()
-	var/list/shirts = list()
-	shirts["blue hawaii shirt"] = /obj/item/clothing/accessory/hawaii
-	shirts["red hawaii shirt"] = /obj/item/clothing/accessory/hawaii/red
-	shirts["random colored hawaii shirt"] = /obj/item/clothing/accessory/hawaii/random
-	gear_tweaks += new/datum/gear_tweak/path(shirts)
-
-
 /datum/gear/accessory/sweater
 	display_name = "sweater selection"
 	path = /obj/item/clothing/accessory/sweater
@@ -284,3 +271,31 @@
 /datum/gear/accessory/asymovercoat
 	display_name = "orange asymmetrical overcoat"
 	path = /obj/item/clothing/accessory/asymovercoat
+
+/datum/gear/accessory/hawaiian_shirt
+	display_name = "hawaiian shirt selection"
+	path = /obj/item/clothing/accessory/hawaiian
+
+/datum/gear/accessory/hawaiian_shirt/New()
+	..()
+	var/list/hawaiian_shirts = list(
+	"Cyan Hawaiian shirt" = /obj/item/clothing/accessory/hawaiian,
+	"Blue Hawaiian shirt" = /obj/item/clothing/accessory/hawaiian/blue,
+	"Pink Hawaiian shirt" = /obj/item/clothing/accessory/hawaiian/pink,
+	"Red Hawaiian shirt" = /obj/item/clothing/accessory/hawaiian/red,
+	"Yellow Hawaiian shirt" = /obj/item/clothing/accessory/hawaiian/yellow
+	)
+	gear_tweaks += new/datum/gear_tweak/path(hawaiian_shirts)
+
+/datum/gear/accessory/cowboy_vest
+	display_name = "cowboy selection"
+	path = /obj/item/clothing/accessory/cowboy_vest
+
+/datum/gear/accessory/cowboy_vest/New()
+	..()
+	var/list/cowboy_vests = list(
+	"Ranger Vest" = /obj/item/clothing/accessory/cowboy_vest,
+	"Brown Vest" = /obj/item/clothing/accessory/cowboy_vest/brown,
+	"Grey Vest" = /obj/item/clothing/accessory/cowboy_vest/grey
+	)
+	gear_tweaks += new/datum/gear_tweak/path(cowboy_vests)

code/modules/client/preference_setup/loadout/loadout_head.dm

@@ -135,24 +135,60 @@
 	path = /obj/item/clothing/head/soft/solgov
 
 /datum/gear/head/cowboy
-	display_name = "cowboy, rodeo"
-	path = /obj/item/clothing/head/cowboy_hat
+	display_name = "cowboy"
+	path = /obj/item/clothing/head/cowboy
+
+/datum/gear/head/cowboy/rattan
+	display_name = "cowboy, rattan"
+	path = /obj/item/clothing/head/cowboy/rattan
+
+/datum/gear/head/cowboy/dark
+	display_name = "cowboy, dark"
+	path = /obj/item/clothing/head/cowboy/dark
+
+/datum/gear/head/cowboy/ranger
+	display_name = "cowboy, ranger"
+	path = /obj/item/clothing/head/cowboy/ranger
 
 /datum/gear/head/cowboy/black
 	display_name = "cowboy, black"
-	path = /obj/item/clothing/head/cowboy_hat/black
+	path = /obj/item/clothing/head/cowboy/black
+
+/datum/gear/head/cowboy/fancy
+	display_name = "cowboy, fancy"
+	path = /obj/item/clothing/head/cowboy/fancy
+
+/datum/gear/head/cowboy/rustler
+	display_name = "cowboy, rustler"
+	path = /obj/item/clothing/head/cowboy/rustler
+
+/datum/gear/head/cowboy/black
+	display_name = "cowboy, bandit"
+	path = /obj/item/clothing/head/cowboy/bandit
 
 /datum/gear/head/cowboy/wide
 	display_name = "cowboy, wide"
-	path = /obj/item/clothing/head/cowboy_hat/wide
-
-/datum/gear/head/fedora
-	display_name = "fedora, brown"
-	path = /obj/item/clothing/head/fedora/brown
+	path = /obj/item/clothing/head/cowboy/wide
 
 /datum/gear/head/fedora/grey
 	display_name = "fedora, grey"
-	path = /obj/item/clothing/head/fedora/grey
+	path = /obj/item/clothing/head/fedora
+
+/datum/gear/head/fedora/brown
+	display_name = "fedora, brown"
+	path = /obj/item/clothing/head/fedora/brown
+
+/datum/gear/head/fedora/white
+	display_name = "fedora, white"
+	path = /obj/item/clothing/head/fedora/white
+
+/datum/gear/head/fedora/beige
+	display_name = "fedora, beige"
+	path = /obj/item/clothing/head/fedora/beige
+
+/datum/gear/head/fedora/panama
+	display_name = "fedora, panama"
+	path = /obj/item/clothing/head/fedora/panama
 
 /datum/gear/head/hairflower
 	display_name = "hair flower pin (colorable)"

code/modules/client/preference_setup/loadout/loadout_shoes.dm

@@ -5,6 +5,14 @@
 	slot = slot_shoes
 	sort_category = "Shoes and Footwear"
 
+/datum/gear/shoes/tourist_1
+	display_name = "tourist, black"
+	path = /obj/item/clothing/shoes/tourist_1
+
+/datum/gear/shoes/tourist_2
+	display_name = "tourist, green"
+	path = /obj/item/clothing/shoes/tourist_2
+
 /datum/gear/shoes/jackboots
 	display_name = "jackboots"
 	path = /obj/item/clothing/shoes/boots/jackboots
@@ -126,13 +134,37 @@
 	path = /obj/item/clothing/shoes/boots/cowboy
 
 /datum/gear/shoes/cowboy/classic
-	display_name = "classic cowboy boots"
+	display_name = "cowboy boots, classic"
 	path = /obj/item/clothing/shoes/boots/cowboy/classic
 
+/datum/gear/shoes/cowboy/brown
+	display_name = "cowboy boots, brown"
+	path = /obj/item/clothing/shoes/boots/cowboy/brown
+
+/datum/gear/shoes/cowboy/black
+	display_name = "cowboy boots, black"
+	path = /obj/item/clothing/shoes/boots/cowboy/black
+
+/datum/gear/shoes/cowboy/white
+	display_name = "cowboy boots, white"
+	path = /obj/item/clothing/shoes/boots/cowboy/white
+
+/datum/gear/shoes/cowboy/fancy
+	display_name = "cowboy boots, fancy"
+	path = /obj/item/clothing/shoes/boots/cowboy/fancy
+
 /datum/gear/shoes/cowboy/snakeskin
-	display_name = "snakeskin cowboy boots"
+	display_name = "cowboy boots, snake skin"
 	path = /obj/item/clothing/shoes/boots/cowboy/snakeskin
 
+/datum/gear/shoes/cowboy/lizard
+	display_name = "cowboy boots, lizard skin"
+	path = /obj/item/clothing/shoes/boots/cowboy/lizard
+
+/datum/gear/shoes/cowboy/lizard/masterwork
+	display_name = "cowboy boots, lizard skin (masterwork)"
+	path = /obj/item/clothing/shoes/boots/cowboy/lizard/masterwork
+
 /datum/gear/shoes/jungle
 	display_name = "jungle boots"
 	path = /obj/item/clothing/shoes/boots/jungle

code/modules/client/preference_setup/loadout/loadout_uniform.dm

@@ -663,21 +663,43 @@
 	gear_tweaks += gear_tweak_free_color_choice
 
 /datum/gear/uniform/paramedunidark
-	display_name = "paramedic uniform - dark"
+	display_name = "paramedic uniform, dark"
 	path = /obj/item/clothing/under/rank/paramedunidark
 	allowed_roles = list("Medical Doctor","Chief Medical Officer","Paramedic")
 
 /datum/gear/uniform/parameduniskirtdark
-	display_name = "paramedic skirt - dark"
+	display_name = "paramedic skirt, dark"
 	path = /obj/item/clothing/under/rank/parameduniskirtdark
 	allowed_roles = list("Medical Doctor","Chief Medical Officer","Paramedic")
 
 /datum/gear/uniform/paramedunilight
-	display_name = "paramedic uniform - light"
+	display_name = "paramedic uniform, light"
 	path = /obj/item/clothing/under/rank/paramedunilight
 	allowed_roles = list("Medical Doctor","Chief Medical Officer","Paramedic")
 
 /datum/gear/uniform/parameduniskirtlight
-	display_name = "paramedic skirt - light"
+	display_name = "paramedic skirt, light"
 	path = /obj/item/clothing/under/rank/parameduniskirtlight
-	allowed_roles = list("Medical Doctor","Chief Medical Officer","Paramedic")
+	allowed_roles = list("Medical Doctor","Chief Medical Officer","Paramedic")
+
+/datum/gear/uniform/tourist_1
+	display_name = "tourist outfit, white"
+	path = /obj/item/clothing/under/tourist_1
+
+/datum/gear/uniform/tourist_2
+	display_name = "tourist outfit, blue"
+	path = /obj/item/clothing/under/tourist_2
+
+/datum/gear/uniform/cowboy_outfits
+	display_name = "cowboy outfit selection"
+	path = /obj/item/clothing/under/cowboy
+
+/datum/gear/uniform/cowboy_outfits/New()
+	..()
+	var/list/cowboy_outfits = list(
+	"Patterned Cowboy Outfit" = /obj/item/clothing/under/cowboy,
+	"Tan Cowboy Outfit" = /obj/item/clothing/under/cowboy/tan,
+	"Brown Cowboy Outfit" = /obj/item/clothing/under/cowboy/brown,
+	"Grey Cowboy Outfit" = /obj/item/clothing/under/cowboy/grey
+	)
+	gear_tweaks += new/datum/gear_tweak/path(cowboy_outfits)

code/modules/clothing/head/jobs.dm

@@ -133,9 +133,10 @@
 	flags_inv = null
 
 /obj/item/clothing/head/det
-	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."
-	icon_state = "detective"
+	name = "detective fedora"
+	desc = "A specially designed fedora that is woven with protective fibers. It also makes you look cool."
+	icon_state = "fedora_brown"
+	item_state_slots = list(slot_r_hand_str = "detective", slot_l_hand_str = "detective")
 	allowed = list(/obj/item/weapon/reagent_containers/food/snacks/candy_corn, /obj/item/weapon/pen)
 	armor = list(melee = 10, bullet = 10, laser = 15, energy = 10, bomb = 0, bio = 0, rad = 0)
 	siemens_coefficient = 0.9
@@ -143,9 +144,7 @@
 	show_examine = FALSE
 
 /obj/item/clothing/head/det/grey
-	icon_state = "detective2"
-	item_state_slots = list(slot_r_hand_str = "detective", slot_l_hand_str = "detective")
-	desc = "A grey fedora - either the cornerstone of a detective's style or a poor attempt at looking cool, depending on the person wearing it."
+	icon_state = "fedora_grey"
 
 /obj/item/clothing/head/beret/engineering
 	name = "engineering beret"

code/modules/clothing/head/misc.dm

@@ -96,13 +96,6 @@
 	desc = "A powdered wig."
 	icon_state = "pwig"
 
-/obj/item/clothing/head/that
-	name = "top-hat"
-	desc = "It's an amish looking hat."
-	icon_state = "tophat"
-	siemens_coefficient = 0.9
-	body_parts_covered = 0
-
 /obj/item/clothing/head/redcoat
 	name = "redcoat's hat"
 	icon_state = "redcoat"
@@ -234,84 +227,6 @@
 	icon_state = "bandana"
 	item_state_slots = list(slot_r_hand_str = "redbandana", slot_l_hand_str = "redbandana")
 
-/obj/item/clothing/head/bowler
-	name = "bowler-hat"
-	desc = "Gentleman, elite aboard!"
-	icon_state = "bowler"
-	item_state_slots = list(slot_r_hand_str = "tophat", slot_l_hand_str = "tophat")
-	body_parts_covered = 0
-
-//stylish bs12 hats
-
-/obj/item/clothing/head/bowlerhat
-	name = "bowler hat"
-	icon_state = "bowler_hat"
-	item_state_slots = list(slot_r_hand_str = "tophat", slot_l_hand_str = "tophat")
-	desc = "For the gentleman of distinction."
-	body_parts_covered = 0
-
-/obj/item/clothing/head/beaverhat
-	name = "beaver hat"
-	icon_state = "beaver_hat"
-	item_state_slots = list(slot_r_hand_str = "tophat", slot_l_hand_str = "tophat")
-	desc = "Soft felt makes this hat both comfortable and elegant."
-
-/obj/item/clothing/head/boaterhat
-	name = "boater hat"
-	icon_state = "boater_hat"
-	item_state_slots = list(slot_r_hand_str = "tophat", slot_l_hand_str = "tophat")
-	desc = "The ultimate in summer fashion."
-
-/obj/item/clothing/head/fedora
-	name = "fedora"
-	icon_state = "fedora"
-	item_state_slots = list(slot_r_hand_str = "detective", slot_l_hand_str = "detective")
-	desc = "A sharp, stylish hat."
-
-/obj/item/clothing/head/fedora/brown
-	name = "fedora"
-	desc = "A brown fedora - either the cornerstone of a reporter's style or a poor attempt at looking cool, depending on the person wearing it."
-	icon_state = "detective"
-	allowed = list(/obj/item/weapon/reagent_containers/food/snacks/candy_corn, /obj/item/weapon/pen)
-
-/obj/item/clothing/head/fedora/grey
-	icon_state = "detective2"
-	item_state_slots = list(slot_r_hand_str = "detective", slot_l_hand_str = "detective")
-	desc = "A grey fedora - either the cornerstone of a reporter's style or a poor attempt at looking cool, depending on the person wearing it."
-
-
-/obj/item/clothing/head/feathertrilby
-	name = "feather trilby"
-	icon_state = "feather_trilby"
-	item_state_slots = list(slot_r_hand_str = "detective", slot_l_hand_str = "detective")
-	desc = "A sharp, stylish hat with a feather."
-
-/obj/item/clothing/head/fez
-	name = "fez"
-	icon_state = "fez"
-	desc = "You should wear a fez. Fezzes are cool."
-
-/obj/item/clothing/head/cowboy_hat
-	name = "cowboy hat"
-	desc = "For those that have spurs that go jingle jangle jingle."
-	icon_state = "cowboyhat"
-	body_parts_covered = 0
-
-/obj/item/clothing/head/cowboy_hat/black
-	name = "black cowboy hat"
-	desc = "You can almost hear the old western music."
-	icon_state = "cowboy_black"
-
-/obj/item/clothing/head/cowboy_hat/wide
-	name = "wide-brimmed cowboy hat"
-	desc = "Because justice isn't going to dispense itself."
-	icon_state = "cowboy_wide"
-
-/obj/item/clothing/head/cowboy_hat/small
-	name = "small cowboy hat"
-	desc = "For the tiniest of cowboys."
-	icon_state = "cowboy_small"
-
 /obj/item/clothing/head/witchwig
 	name = "witch costume wig"
 	desc = "Eeeee~heheheheheheh!"
@@ -484,4 +399,129 @@
 /obj/item/clothing/head/beret/corp/xion
 	name = "\improper Xion beret"
 	desc = "An orange beret denoting employment with Xion Manufacturing. For personnel that are more inclined towards style than safety."
-	icon_state = "beret_orange"
+	icon_state = "beret_orange"
+
+//Stylish Hats
+
+/obj/item/clothing/head/bowler
+	name = "bowler hat"
+	desc = "Gentleman, elite aboard!"
+	icon_state = "bowler"
+	item_state_slots = list(slot_r_hand_str = "tophat", slot_l_hand_str = "tophat")
+	body_parts_covered = 0
+
+/obj/item/clothing/head/that
+	name = "top-hat"
+	desc = "It's an amish looking hat."
+	icon_state = "tophat"
+	siemens_coefficient = 0.9
+	body_parts_covered = 0
+
+/obj/item/clothing/head/beaverhat
+	name = "beaver hat"
+	desc = "Soft felt makes this hat both comfortable and elegant."
+	icon_state = "beaver_hat"
+	item_state_slots = list(slot_r_hand_str = "tophat", slot_l_hand_str = "tophat")
+	siemens_coefficient = 0.9
+	body_parts_covered = 0
+
+/obj/item/clothing/head/boaterhat
+	name = "boater hat"
+	desc = "The ultimate in summer fashion."
+	icon_state = "boater_hat"
+	item_state_slots = list(slot_r_hand_str = "tophat", slot_l_hand_str = "tophat")
+	body_parts_covered = 0
+
+/obj/item/clothing/head/fedora
+	name = "fedora"
+	icon_state = "fedora_grey"
+	desc = "A sharp, stylish hat that's grey in color."
+	item_state_slots = list(slot_r_hand_str = "detective", slot_l_hand_str = "detective")
+	body_parts_covered = 0
+
+/obj/item/clothing/head/fedora/brown
+	desc = "A brown fedora. Perfect for detectives or those trying to pilfer artifacts."
+	icon_state = "fedora_brown"
+	allowed = list(/obj/item/weapon/reagent_containers/food/snacks/candy_corn, /obj/item/weapon/pen)
+
+/obj/item/clothing/head/fedora/white
+	desc = "A white fedora, really cool hat if you're a mobster. A really lame hat if you're not."
+	icon_state = "fedora_white"
+
+/obj/item/clothing/head/fedora/beige
+	desc = "A beige fedora. Either the cornerstone of a reporter's style or a poor attempt at looking cool. Depends on the person wearing it."
+	icon_state = "fedora_beige"
+
+/obj/item/clothing/head/fedora/panama
+	desc = "A fancy, cream colored fedora. Columbian pure."
+	icon_state = "fedora_panama"
+
+/obj/item/clothing/head/trilby
+	name = "trilby"
+	icon_state = "trilby"
+	item_state_slots = list(slot_r_hand_str = "detective", slot_l_hand_str = "detective")
+	desc = "M'lady"
+
+/obj/item/clothing/head/trilby/feather
+	name = "feather trilby"
+	icon_state = "feather_trilby"
+	item_state_slots = list(slot_r_hand_str = "detective", slot_l_hand_str = "detective")
+	desc = "A sharp, stylish hat with a feather."
+
+/obj/item/clothing/head/fez
+	name = "fez"
+	icon_state = "fez"
+	desc = "You should wear a fez. Fezzes are cool."
+
+//Cowboy Hats
+
+/obj/item/clothing/head/cowboy
+	name = "cowboy hat"
+	desc = "For those that have spurs that go jingle jangle jingle."
+	icon_state = "cowboy_1"
+	body_parts_covered = 0
+
+/obj/item/clothing/head/cowboy/rattan
+	name = "rattan cowboy hat"
+	desc = "Made from the same straw harvested from the fields."
+	icon_state = "cowboy_2"
+
+/obj/item/clothing/head/cowboy/dark
+	name = "dark cowboy hat"
+	desc = "Protect yer head in this new frontier."
+	icon_state = "cowboy_3"
+
+/obj/item/clothing/head/cowboy/ranger
+	name = "ranger cowboy hat"
+	desc = "Feel the western vibe from this good ol' classic."
+	icon_state = "cowboy_4"
+
+/obj/item/clothing/head/cowboy/rustler
+	name = "rustler cowboy hat"
+	desc = "Rustle up some of that there cattle bucko."
+	icon_state = "cowboy_5"
+
+/obj/item/clothing/head/cowboy/black
+	name = "black cowboy hat"
+	desc = "Perfect for the budding tram robber."
+	icon_state = "cowboy_7"
+
+/obj/item/clothing/head/cowboy/fancy
+	name = "fancy cowboy hat"
+	desc = "Premium black leather had with a rattlesnake hatband to top the ensemble."
+	icon_state = "cowboy_8"
+
+/obj/item/clothing/head/cowboy/wide
+	name = "wide-brimmed cowboy hat"
+	desc = "Because justice isn't going to dispense itself."
+	icon_state = "cowboy_6"
+
+/obj/item/clothing/head/cowboy/bandit
+	name = "bandit cowboy hat"
+	desc = "You can almost hear the old western music."
+	icon_state = "cowboy_9"
+
+/obj/item/clothing/head/cowboy/small
+	name = "small cowboy hat"
+	desc = "For the tiniest of cowboys."
+	icon_state = "cowboy_small"

code/modules/clothing/shoes/boots.dm

@@ -19,10 +19,40 @@
 	icon_state = "cowboy_classic"
 
 /obj/item/clothing/shoes/boots/cowboy/snakeskin
-	name = "snakeskin cowboy boots"
+	name = "snake skin boots"
 	desc = "A pair of cowboy boots made from python skin."
 	icon_state = "cowboy_snakeskin"
 
+/obj/item/clothing/shoes/boots/cowboy/lizard
+	name = "lizard skin boots"
+	desc = "You can hear a faint hissing from inside the boots; you hope it is just a mournful ghost."
+	icon_state = "lizardboots_green"
+
+/obj/item/clothing/shoes/boots/cowboy/lizard/masterwork
+	name = "\improper Hugs-The-Feet lizard skin boots"
+	desc = "A pair of masterfully crafted lizard skin boots. Finally a good application for the station's most bothersome inhabitants."
+	icon_state = "lizardboots_blue"
+
+/obj/item/clothing/shoes/boots/cowboy/brown
+	name = "brown cowboy boots"
+	desc = "A small sticker lets you know they've been inspected for snakes, It is unclear how long ago the inspection took place..."
+	icon_state = "cowboy_brown"
+
+/obj/item/clothing/shoes/boots/cowboy/black
+	name = "black cowboy boots"
+	desc = "You get the feeling that these were red at one point."
+	icon_state = "cowboy_black"
+
+/obj/item/clothing/shoes/boots/cowboy/white
+	name = "white cowboy boots"
+	desc = "Perfect for those that like style while remaining rugged as ever."
+	icon_state = "cowboy_white"
+
+/obj/item/clothing/shoes/boots/cowboy/fancy
+	name = "fancy cowboy boots"
+	desc = "A gambler was 100% wearing these when he died."
+	icon_state = "cowboy_fancy"
+
 /obj/item/clothing/shoes/boots/jackboots
 	name = "jackboots"
 	desc = "Standard-issue Security combat boots for combat scenarios or combat situations. All combat, all the time."

code/modules/clothing/shoes/miscellaneous.dm

@@ -48,6 +48,33 @@
 
 	wizard_garb = 1
 
+/obj/item/clothing/shoes/flipflop
+	name = "flip flops"
+	desc = "A pair of foam flip flops. For those not afraid to show a little ankle."
+	icon_state = "thongsandal"
+	addblends = "thongsandal_a"
+
+/obj/item/clothing/shoes/cookflop
+	name = "grilling sandals"
+	desc = "All this talk of antags, greytiding, and griefing... I just wanna grill for god's sake!"
+	icon_state = "cookflops"
+	species_restricted = null
+	body_parts_covered = 0
+
+/obj/item/clothing/shoes/tourist_1
+	name = "tourist sandals"
+	desc = "Black sandals usually worn by tourists. Need I say more?"
+	icon_state = "tourist_1"
+	species_restricted = null
+	body_parts_covered = 0
+
+/obj/item/clothing/shoes/tourist_2
+	name = "tourist sandals"
+	desc = "Green sandals usually worn by tourists. Need I say more?"
+	icon_state = "tourist_2"
+	species_restricted = null
+	body_parts_covered = 0
+
 /obj/item/clothing/shoes/sandal/clogs
 	name = "plastic clogs"
 	desc = "A pair of plastic clog shoes."
@@ -137,12 +164,6 @@
 	slowdown = SHOES_SLOWDOWN+0.5
 	species_restricted = null
 
-/obj/item/clothing/shoes/flipflop
-	name = "flip flops"
-	desc = "A pair of foam flip flops. For those not afraid to show a little ankle."
-	icon_state = "thongsandal"
-	addblends = "thongsandal_a"
-
 /obj/item/clothing/shoes/athletic
 	name = "athletic shoes"
 	desc = "A pair of sleek atheletic shoes. Made by and for the sporty types."
@@ -204,4 +225,12 @@
 	bootcolor = "orange"
 
 /obj/item/clothing/shoes/boots/ranger/yellow
-	bootcolor = "yellow"
+	bootcolor = "yellow"
+
+/obj/item/clothing/shoes/primitive
+	name = "primitive shoes"
+	desc = "Some patched together rags. Better than being barefoot."
+	icon_state = "rag"
+	force = 0
+	drop_sound = 'sound/items/drop/clothing.ogg'
+	pickup_sound = 'sound/items/pickup/clothing.ogg'

code/modules/clothing/suits/miscellaneous.dm

@@ -3,6 +3,7 @@
  *		Lasertag
  *		Costume
  *		Misc
+ *		Department Jackets
  */
 
 // -S2-note- Needs categorizing and sorting.
@@ -10,6 +11,7 @@
 /*
  * Lasertag
  */
+
 /obj/item/clothing/suit/bluetag
 	name = "blue laser tag armour"
 	desc = "Blue Pride, Station Wide."
@@ -33,6 +35,7 @@
 /*
  * Costume
  */
+
 /obj/item/clothing/suit/pirate
 	name = "pirate coat"
 	desc = "Yarr."
@@ -227,6 +230,7 @@
 /*
  * Misc
  */
+
 /obj/item/clothing/suit/straight_jacket
 	name = "straight jacket"
 	desc = "A suit that completely restrains the wearer."
@@ -278,8 +282,9 @@
 	icon_state = "kamishimo"
 
 /*
- * coats
+ * Coats
  */
+
 /obj/item/clothing/suit/leathercoat
 	name = "leather coat"
 	desc = "A long, thick black leather coat."

code/modules/clothing/under/accessories/clothing.dm

@@ -1,3 +1,7 @@
+/*
+ * Formal
+ */
+
 /obj/item/clothing/accessory/vest
 	name = "black vest"
 	desc = "Slick black suit vest."
@@ -30,6 +34,59 @@
 	desc = "Lucky suit jacket."
 	icon_state = "checkered_jacket"
 
+/obj/item/clothing/accessory/jacket/gambler
+	name = "gambler suit jacket"
+	desc = "Chairman suit jacket."
+	icon_state = "gambler_jacket"
+
+/*
+ * Hawaiian
+ */
+
+/obj/item/clothing/accessory/hawaiian
+	name = "hawaiian shirt"
+	desc = "You probably need some welder googles to look at this."
+	icon_state = "hawaiian_cyan"
+	armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 0, rad = 0)
+	slot_flags = SLOT_OCLOTHING | SLOT_TIE
+	body_parts_covered = UPPER_TORSO|LOWER_TORSO
+	siemens_coefficient = 0.9
+	w_class = ITEMSIZE_NORMAL
+	slot = ACCESSORY_SLOT_OVER
+
+/obj/item/clothing/accessory/hawaiian/blue
+	name = "blue hawaiian shirt"
+	icon_state = "hawaiian_blue"
+
+/obj/item/clothing/accessory/hawaiian/pink
+	name = "pink hawaiian shirt"
+	icon_state = "hawaiian_pink"
+
+/obj/item/clothing/accessory/hawaiian/red
+	name = "red hawaiian shirt"
+	icon_state = "hawaiian_red"
+
+/obj/item/clothing/accessory/hawaiian/yellow
+	name = "yellow hawaiian shirt"
+	icon_state = "hawaiian_yellow"
+
+/obj/item/clothing/accessory/hawaiian_random
+	name = "random hawaiian shirt"
+	desc = "A random set of hawaiian shirts for style."
+
+/obj/item/clothing/accessory/hawaiian_random/New()
+	return pick(
+			prob(2);/obj/item/clothing/accessory/hawaiian,
+			prob(2);/obj/item/clothing/accessory/hawaiian/blue,
+			prob(2);/obj/item/clothing/accessory/hawaiian/pink,
+			prob(2);/obj/item/clothing/accessory/hawaiian/red,
+			prob(2);/obj/item/clothing/accessory/hawaiian/yellow
+			)
+
+/*
+ * Chaps
+ */
+
 /obj/item/clothing/accessory/chaps
 	name = "brown chaps"
 	desc = "A pair of loose, brown leather chaps."
@@ -43,6 +100,7 @@
 /*
  * Poncho
  */
+
 /obj/item/clothing/accessory/poncho
 	name = "poncho"
 	desc = "A simple, comfortable poncho."
@@ -140,6 +198,7 @@
 /*
  * Cloak
  */
+
 /obj/item/clothing/accessory/poncho/roles/cloak
 	name = "quartermaster's cloak"
 	desc = "An elaborate brown and gold cloak."
@@ -244,28 +303,6 @@
 	icon_state = "colorcloak"
 	item_state = "colorcloak"
 
-/obj/item/clothing/accessory/hawaii
-	name = "flower-pattern shirt"
-	desc = "You probably need some welder googles to look at this."
-	icon_state = "hawaii"
-	armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 0, rad = 0)
-	slot_flags = SLOT_OCLOTHING | SLOT_TIE
-	body_parts_covered = UPPER_TORSO|LOWER_TORSO
-	siemens_coefficient = 0.9
-	w_class = ITEMSIZE_NORMAL
-	slot = ACCESSORY_SLOT_OVER
-
-/obj/item/clothing/accessory/hawaii/red
-	icon_state = "hawaii2"
-
-/obj/item/clothing/accessory/hawaii/random
-	name = "flower-pattern shirt"
-
-/obj/item/clothing/accessory/hawaii/random/New()
-	if(prob(50))
-		icon_state = "hawaii2"
-	color = color_rotation(rand(-11,12)*15)
-
 /obj/item/clothing/accessory/wcoat
 	name = "waistcoat"
 	desc = "For some classy, murderous fun."
@@ -301,23 +338,34 @@
 	icon_state = "elegant_waistcoat"
 	item_state = "elegant_waistcoat"
 
+/*
+ * Sweatervests
+ */
+
 /obj/item/clothing/accessory/wcoat/swvest
-	name = "black sweatervest"
+	name = "black sweater vest"
 	desc = "A sleeveless sweater. Wear this if you don't want your arms to be warm, or if you're a nerd."
 	icon_state = "sweatervest"
 	item_state = "sweatervest"
 
 /obj/item/clothing/accessory/wcoat/swvest/blue
-	name = "blue sweatervest"
+	name = "blue sweater vest"
 	icon_state = "sweatervest_blue"
 	item_state = "sweatervest_blue"
 
 /obj/item/clothing/accessory/wcoat/swvest/red
-	name = "red sweatervest"
+	name = "red sweater vest"
 	icon_state = "sweatervest_red"
 	item_state = "sweatervest_red"
 
-//Sweaters.
+/obj/item/clothing/accessory/wcoat/swvest/green
+	name = "green sweater vest"
+	icon_state = "sweatervest_green"
+	item_state = "sweatervest_green"
+
+/*
+ * Sweaters
+ */
 
 /obj/item/clothing/accessory/sweater
 	name = "sweater"
@@ -385,9 +433,9 @@
 	desc = "A comfortable turtleneck in a dark red."
 	icon_state = "turtleneck_red"
 
-//***
-// End of sweaters
-//***
+/*
+ * Misc
+ */
 
 /obj/item/clothing/accessory/cowledvest
 	name = "cowled vest"
@@ -413,3 +461,20 @@
 	name = "orange asymmetrical overcoat"
 	desc = "An asymmetrical orange overcoat in a 2560's fashion."
 	icon_state = "asymovercoat"
+
+/*
+ * Cowboy Vests
+ */
+
+/obj/item/clothing/accessory/cowboy_vest
+	name = "ranger cowboy vest"
+	desc = "A rugged looking vest made from leather. For those that tame the wilds."
+	icon_state = "cowboyvest_ranger"
+
+/obj/item/clothing/accessory/cowboy_vest/brown
+	name = "brown cowboy vest"
+	icon_state = "cowboyvest_brown"
+
+/obj/item/clothing/accessory/cowboy_vest/grey
+	name = "grey cowboy vest"
+	icon_state = "cowboyvest_grey"

code/modules/clothing/under/miscellaneous.dm

@@ -743,6 +743,13 @@ Uniforms and such
 	name = "checkered skirt"
 	icon_state = "checkered_suit_skirt"
 
+/obj/item/clothing/under/suit_jacket/gambler
+	name = "gambling suit"
+	desc = "The suit of a gambler. Lady luck be with you."
+	icon_state = "gambler_suit"
+	item_state_slots = list(slot_r_hand_str = "lawyer_black", slot_l_hand_str = "lawyer_black")
+	starting_accessories = list(/obj/item/clothing/accessory/tie/black, /obj/item/clothing/accessory/jacket/gambler)
+
 /obj/item/clothing/under/suit_jacket/tan
 	name = "tan suit"
 	desc = "A tan suit. Smart, but casual."
@@ -754,13 +761,6 @@ Uniforms and such
 	name = "tan skirt"
 	icon_state = "tan_suit_skirt"
 
-/obj/item/clothing/under/serviceoveralls
-	name = "workman outfit"
-	desc = "The very image of a working man. Not that you're probably doing work."
-	icon_state = "mechanic"
-	item_state_slots = list(slot_r_hand_str = "cargo", slot_l_hand_str = "cargo")
-	rolled_sleeves = 0
-
 /obj/item/clothing/under/cheongsam
 	name = "white cheongsam"
 	desc = "It is a white cheongsam dress."
@@ -1026,12 +1026,6 @@ Uniforms and such
 	icon_state = "saare"
 	worn_state = "saare"
 
-/obj/item/clothing/under/frontier
-	name = "frontier clothes"
-	desc = "A rugged flannel shirt and denim overalls. A popular style among frontier colonists."
-	icon_state = "frontier"
-	worn_state = "frontier"
-
 /obj/item/clothing/under/focal
 	name = "\improper Focal Point jumpsuit"
 	desc = "A jumpsuit belonging to Focal Point Energistics, an engineering megacorporation."
@@ -1136,4 +1130,83 @@ Uniforms and such
 	unicolor = "orange"
 
 /obj/item/clothing/under/color/ranger/yellow
-	unicolor = "yellow"
+	unicolor = "yellow"
+
+/obj/item/clothing/under/boater
+	name = "boater outfit"
+	desc = "A classic outfit for those with a nautical inclination."
+	icon_state = "boater"
+	worn_state = "boater"
+
+/obj/item/clothing/under/tourist_1
+	name = "summer outfit"
+	desc = "The perfect outfit to wear out of town."
+	icon_state = "tourist_1"
+	worn_state = "tourist_1"
+
+/obj/item/clothing/under/tourist_2
+	name = "summer outfit"
+	desc = "The perfect outfit to wear out of town."
+	icon_state = "tourist_2"
+	worn_state = "tourist_2"
+
+/obj/item/clothing/under/relaxwear_1
+	name = "casual outfit"
+	desc = "Something casual to wear out on the town. Pairs well with the holiday season."
+	icon_state = "relaxwear_1"
+	worn_state = "relaxwear_1"
+	starting_accessories = list(/obj/item/clothing/accessory/wcoat/swvest/red)
+
+/obj/item/clothing/under/relaxwear_2
+	name = "relaxing outfit"
+	desc = "A comfy looking set of clothes to relax in, even if the style is a bit dated."
+	icon_state = "relaxwear_2"
+	worn_state = "relaxwear_2"
+	starting_accessories = list(/obj/item/clothing/accessory/wcoat/swvest/green)
+
+/obj/item/clothing/under/serviceoveralls
+	name = "workman outfit"
+	desc = "The very image of a working man. Not that you're probably doing work."
+	icon_state = "mechanic"
+	item_state_slots = list(slot_r_hand_str = "cargo", slot_l_hand_str = "cargo")
+	rolled_sleeves = 0
+
+/obj/item/clothing/under/frontier
+	name = "frontier clothes"
+	desc = "A rugged flannel shirt and denim overalls. A popular style among frontier colonists."
+	icon_state = "frontier"
+	worn_state = "frontier"
+
+/obj/item/clothing/under/rustler
+	name = "rustler outfit"
+	desc = "A rugged outfit for rustling cattle out on the frontier."
+	icon_state = "rustler"
+	worn_state = "rustler"
+
+/obj/item/clothing/under/cowboy
+	name = "cowboy clothes"
+	desc = "Some rugged clothes for hard labor out on the farm."
+	icon_state = "cowboy"
+	worn_state = "cowboy"
+
+/obj/item/clothing/under/cowboy/tan
+	name = "tan cowboy clothes"
+	icon_state = "cowboy_tan"
+	worn_state = "cowboy_tan"
+
+/obj/item/clothing/under/cowboy/brown
+	name = "brown cowboy clothes"
+	icon_state = "cowboy_brown"
+	worn_state = "cowboy_brown"
+
+/obj/item/clothing/under/cowboy/grey
+	name = "grey cowboy clothes"
+	icon_state = "cowboy_grey"
+	worn_state = "cowboy_grey"
+
+/obj/item/clothing/under/primitive
+	name = "primitive clothes"
+	desc = "Some patched together rags. Better than being naked."
+	force = 0
+	icon_state = "rag"
+	worn_state = "rag"

code/modules/economy/vending_machines.dm

@@ -1191,6 +1191,7 @@
 	products = list(
 		/obj/item/clothing/under/rank/chef = 5,
 		/obj/item/clothing/shoes/black = 5,
+		/obj/item/clothing/shoes/cookflop = 2,
 		/obj/item/clothing/suit/storage/apron/white = 5,
 		/obj/item/clothing/suit/chef = 5,
 		/obj/item/clothing/suit/chef/classic = 5,