Polaris Merge Sync

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

@@ -153,4 +153,12 @@
 
 /datum/gear/shoes/dress/white
 	display_name = "shoes, dress white"
-	path = 	/obj/item/clothing/shoes/dress/white
+	path = 	/obj/item/clothing/shoes/dress/white
+
+/datum/gear/shoes/heels
+	display_name = "high heels"
+	path = /obj/item/clothing/shoes/heels
+
+/datum/gear/shoes/heels/New()
+	..()
+	gear_tweaks = list(gear_tweak_free_color_choice)

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

@@ -348,3 +348,14 @@
 		services[initial(service.name)] = service
 	gear_tweaks += new/datum/gear_tweak/path(sortAssoc(services))
 
+/datum/gear/suit/miscellaneous/kimono
+	display_name = "kimono"
+	path = /obj/item/clothing/suit/kimono
+
+/datum/gear/suit/miscellaneous/kimono/New()
+	..()
+	gear_tweaks = list(gear_tweak_free_color_choice)
+
+/datum/gear/suit/miscellaneous/redandblackjacket
+	display_name = "red and black jacket"
+	path = /obj/item/clothing/suit/storage/toggle/redandblackjacket

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

@@ -273,11 +273,11 @@
 
 /datum/gear/uniform/sundress
 	display_name = "sundress"
-	path = /obj/item/clothing/under/sundress
+	path = /obj/item/clothing/under/dress/sundress
 
 /datum/gear/uniform/sundress/white
 	display_name = "sundress, white"
-	path = /obj/item/clothing/under/sundress_white
+	path = /obj/item/clothing/under/dress/sundress/white
 
 /datum/gear/uniform/dress_fire
 	display_name = "flame dress"
@@ -444,4 +444,12 @@
 
 /datum/gear/uniform/brandsuit/hephaestus
 	display_name = "jumpsuit, hephaestus"
-	path = 	/obj/item/clothing/under/hephaestus
+	path = 	/obj/item/clothing/under/hephaestus
+
+/datum/gear/uniform/yoga
+	display_name = "yoga pants"
+	path = /obj/item/clothing/under/pants/yoga
+
+/datum/gear/uniform/yoga/New()
+	..()
+	gear_tweaks = list(gear_tweak_free_color_choice)