Expanding Clothing Options (#11466)

* Base Commit

* Second Commit

* Third Commit

* Fourth Commit

* Fifth Commit

* Sixth Commit

* Seventh Commit

* Final (?) Commit

* Small Fix

* Small Fix

* Merge Fix

* Small Fix

* Additional Goods

* Small Fix

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)