Yet Another Clothing PR (#8064)

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

@@ -54,6 +54,14 @@
 	display_name = "beret, purple"
 	path = /obj/item/clothing/head/beret/purple
 
+/datum/gear/head/beret/color
+	display_name = "beret (colorable)"
+	path = /obj/item/clothing/head/beret/misc
+
+/datum/gear/head/beret/color/New()
+	..()
+	gear_tweaks += gear_tweak_free_color_choice
+
 /datum/gear/head/beret/sec
 	display_name = "beret, security"
 	path = /obj/item/clothing/head/beret/sec
@@ -228,6 +236,9 @@
 	..()
 	gear_tweaks += gear_tweak_free_color_choice
 
+/datum/gear/head/nonla
+	display_name = "non la hat"
+	path = /obj/item/clothing/head/nonla
 
 /datum/gear/head/iacberet
 	display_name = "IAC Beret"

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

@@ -247,10 +247,18 @@
 	coat["dominia great coat, alternative black"] = /obj/item/clothing/suit/storage/toggle/dominia/black/alt
 	gear_tweaks += new/datum/gear_tweak/path(coat)
 
-/datum/gear/suit/legion_jacket
-	display_name = "Tau Ceti Foreign Legion jacket"
+/datum/gear/suit/tcfl
+	display_name = "Tau Ceti Foreign Legion jacket selection"
+	description = "A selection of fine, surplus jackets of the Foreign Legion."
 	path = /obj/item/clothing/suit/storage/legion
 
+/datum/gear/suit/tcfl/New()
+	..()
+	var/tcfljac = list()
+	tcfljac ["tcfl jacket"] = /obj/item/clothing/suit/storage/legion
+	tcfljac ["tcfl jacket, flight"] = /obj/item/clothing/suit/storage/toggle/leather_jacket/flight/legion
+	gear_tweaks += new/datum/gear_tweak/path(tcfljac)
+
 /datum/gear/suit/dep_jacket
 	display_name = "department jackets selection"
 	description = "A selection of department jackets."

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

@@ -8,7 +8,7 @@
 /datum/gear/uniform/kilt
 	display_name = "kilt"
 	path = /obj/item/clothing/under/kilt
-	
+
 /datum/gear/uniform/formalblouse
     display_name = "formal blouse"
     path = /obj/item/clothing/under/formalblouse
@@ -65,6 +65,7 @@
 	..()
 	var/skirts = list()
 	skirts["casual skirt"] = /obj/item/clothing/under/skirt/casual
+	skirts["casual skirt, alt"] = /obj/item/clothing/under/skirt/casual/alt
 	skirts["long skirt"] = /obj/item/clothing/under/skirt/long
 	skirts["pencil skirt"] = /obj/item/clothing/under/skirt/pencil
 	skirts["swept skirt"] = /obj/item/clothing/under/skirt/swept
@@ -213,6 +214,18 @@
 	pants["khaki shorts shorts"] = /obj/item/clothing/under/shorts/khaki/female
 	gear_tweaks += new/datum/gear_tweak/path(pants)
 
+/datum/gear/uniform/colorpants
+	display_name = "pants (recolorable)"
+	path = /obj/item/clothing/under/pants/dress
+
+/datum/gear/uniform/colorpants/New()
+	..()
+	var/colorpants = list()
+	colorpants["dress pants"] = /obj/item/clothing/under/pants/dress
+	colorpants["striped pants"] = /obj/item/clothing/under/pants/striped
+	gear_tweaks += new/datum/gear_tweak/path(colorpants)
+	gear_tweaks += list(gear_tweak_free_color_choice)
+
 /datum/gear/uniform/turtleneck
 	display_name = "tacticool turtleneck"
 	path = /obj/item/clothing/under/syndicate/tacticool

code/modules/clothing/head/jobs.dm

@@ -138,6 +138,12 @@
 	desc = "A white beret adorned with the crest of an ERT detachment. Worn by commanders of Nanotrasen response teams."
 	icon_state = "centcomcaptain"
 
+/obj/item/clothing/head/beret/misc
+	name = "beret"
+	desc = "A colorful beret, treasured by artists and the French."
+	icon_state = "miscberet"
+	item_state = "miscberet"
+
 //Medical
 /obj/item/clothing/head/surgery
 	name = "surgical cap"

code/modules/clothing/head/misc.dm

@@ -683,4 +683,10 @@
 	icon_state = "helmet_tac_sol"
 	item_state = "helmet_tac_sol"
 	armor = list(melee = 60, bullet = 60, laser = 60, energy = 40, bomb = 40, bio = 0, rad = 0)
-	contained_sprite = 1
+	contained_sprite = 1
+
+/obj/item/clothing/head/nonla
+	name = "non la"
+	desc = "A conical straw hat enjoyed particularly by residents of New Hai Phong, to protect the head from sweltering suns and heavy rains."
+	icon_state = "nonla"
+	item_state = "nonla"

code/modules/clothing/suits/miscellaneous.dm

@@ -300,11 +300,16 @@
 
 /obj/item/clothing/suit/storage/toggle/leather_jacket/flight/legion
 	name = "tcfl flight jacket"
-	desc = "A Tau Ceti Foreign Legion pilot's jacket made from a silky, shiny nanonylon material and lined with tough, protective synthfabrics."
+	desc = "A Tau Ceti Foreign Legion pilot's jacket. This is the more common, less durable variety, which typically finds itself percolating amongst all ranks of the TCFL."
 	icon_state = "lflight"
 	item_state = "lflight"
 	icon_open = "lflight_open"
 	icon_closed = "lflight"
+	armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 10, rad = 0)
+	siemens_coefficient = 0.75
+
+/obj/item/clothing/suit/storage/toggle/leather_jacket/flight/legion/alt
+	desc = "A Tau Ceti Foreign Legion pilot's jacket made from a silky, shiny nanonylon material and lined with tough, protective synthfabrics."
 	armor = list(melee = 40, bullet = 10, laser = 20, energy = 10, bomb = 30, bio = 0, rad = 0)
 	siemens_coefficient = 0.35
 

code/modules/clothing/under/shorts.dm

@@ -206,3 +206,15 @@
 	desc = "Dark denim jeans carefully distressed to perfection. They're not as rugged as they look."
 	icon_state = "designer_jeans"
 	item_state = "designer_jeans"
+
+/obj/item/clothing/under/pants/dress
+	name = "dress pants"
+	desc = "A pair of suit trousers. The rest of the outfit can't have gone far."
+	icon_state = "dresspants"
+	item_state = "dresspants"
+
+/obj/item/clothing/under/pants/striped
+	name = "striped pants"
+	desc = "A pair of striped pants. Typically seen among privateers."
+	icon_state = "stripedpants"
+	item_state = "stripedpants"

code/modules/clothing/under/skirts.dm

@@ -21,6 +21,10 @@
 	icon_state = "skirt_casual"
 	worn_state = "skirt_casual"
 
+/obj/item/clothing/under/skirt/casual/alt
+	icon_state = "skirt_casual_alt"
+	worn_state = "skirt_casual_alt"
+
 /obj/item/clothing/under/skirt/long
 	name = "long skirt"
 	desc = "A long, modest skirt."