A load of Teshari stuff: For Real This time

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

@@ -83,31 +83,46 @@
 	..()
 	gear_tweaks = list(gear_tweak_free_color_choice)
 
-/datum/gear/uniform/teshari
-	display_name = "smock, grey (Teshari)"
-	path = /obj/item/clothing/under/seromi
+/datum/gear/uniform/smock
+	display_name = "smock selection (Teshari)"
+	path = /obj/item/clothing/under/seromi/smock
 	whitelisted = "Teshari"
 	sort_category = "Xenowear"
 
-/datum/gear/uniform/teshari/jumpsuit
-	display_name = "smock, yellow (Teshari)"
-	path = /obj/item/clothing/under/seromi/yellow
+/datum/gear/uniform/smock/New()
+	..()
+	var/list/smocks = list()
+	for(var/smock in typesof(/obj/item/clothing/under/seromi/smock))
+		var/obj/item/clothing/under/seromi/smock/smock_type = smock
+		smocks[initial(smock_type.name)] = smock_type
+	gear_tweaks += new/datum/gear_tweak/path(sortAssoc(smocks))
 
-/datum/gear/uniform/teshari/jumpsuit/red
-	display_name = "smock, red (Teshari)"
-	path = /obj/item/clothing/under/seromi/red
+/datum/gear/uniform/undercoat
+	display_name = "undercoat selection (Teshari)"
+	path = /obj/item/clothing/under/seromi/undercoat
+	whitelisted = "Teshari"
+	sort_category = "Xenowear"
 
-/datum/gear/uniform/teshari/jumpsuit/white
-	display_name = "smock, white (Teshari)"
-	path = /obj/item/clothing/under/seromi/white
+/datum/gear/uniform/undercoat/New()
+	..()
+	var/list/undercoats = list()
+	for(var/undercoat in typesof(/obj/item/clothing/under/seromi/undercoat))
+		var/obj/item/clothing/under/seromi/undercoat/undercoat_type = undercoat
+		undercoats[initial(undercoat_type.name)] = undercoat_type
+	gear_tweaks += new/datum/gear_tweak/path(sortAssoc(undercoats))
 
-/datum/gear/uniform/teshari/jumpsuit/medical
-	display_name = "smock, Medical (Teshari)"
-	path = /obj/item/clothing/under/seromi/medical
+/datum/gear/suit/cloak
+	path = /obj/item/clothing/suit/storage/seromi/cloak
+	whitelisted = "Teshari"
+	sort_category = "Xenowear"
 
-/datum/gear/uniform/teshari/jumpsuit/rainbow
-	display_name = "smock, rainbow (Teshari)"
-	path = /obj/item/clothing/under/seromi/rainbow
+/datum/gear/suit/cloak/New()
+	..()
+	var/list/cloaks = list()
+	for(var/cloak in typesof(/obj/item/clothing/suit/storage/seromi/cloak))
+		var/obj/item/clothing/suit/storage/seromi/cloak/cloak_type = cloak
+		cloaks[initial(cloak_type.name)] = cloak_type
+	gear_tweaks += new/datum/gear_tweak/path(sortAssoc(cloaks))
 
 /datum/gear/mask/ipc_monitor
 	display_name = "display monitor (Full Body Prosthetic)"

code/modules/clothing/suits/xenos/seromi.dm

@@ -0,0 +1,134 @@
+/obj/item/clothing/suit/storage/seromi/cloak
+	name = "black and orange cloak "
+	desc = "It drapes over a Teshari's shoulders and closes at the neck with pockets convienently placed inside."
+	icon = 'icons/mob/species/seromi/teshari_cloak.dmi'
+	icon_override = 'icons/mob/species/seromi/teshari_cloak.dmi'
+	icon_state = "tesh_cloak_bo"
+	item_state = "tesh_cloak_bo"
+	species_restricted = list("Teshari")
+	body_parts_covered = UPPER_TORSO|ARMS
+
+/obj/item/clothing/suit/storage/seromi/cloak/black_orange
+	name = "black and orange cloak"
+	icon_state = "tesh_cloak_bo"
+	item_state = "tesh_cloak_bo"
+
+/obj/item/clothing/suit/storage/seromi/cloak/black_grey
+	name = "black and grey cloak"
+	icon_state = "tesh_cloak_bg"
+	item_state = "tesh_cloak_bg"
+
+/obj/item/clothing/suit/storage/seromi/cloak/black_midgrey
+	name = "black and medium grey cloak"
+	icon_state = "tesh_cloak_bmg"
+	item_state = "tesh_cloak_bmg"
+
+/obj/item/clothing/suit/storage/seromi/cloak/black_lightgrey
+	name = "black and light grey cloak"
+	icon_state = "tesh_cloak_blg"
+	item_state = "tesh_cloak_blg"
+
+/obj/item/clothing/suit/storage/seromi/cloak/black_white
+	name = "black and white cloak"
+	icon_state = "tesh_cloak_bw"
+	item_state = "tesh_cloak_bw"
+
+/obj/item/clothing/suit/storage/seromi/cloak/black_red
+	name = "black and red cloak"
+	icon_state = "tesh_cloak_br"
+	item_state = "tesh_cloak_br"
+
+/obj/item/clothing/suit/storage/seromi/cloak/black
+	name = "black cloak"
+	icon_state = "tesh_cloak_bn"
+	item_state = "tesh_cloak_bn"
+
+/obj/item/clothing/suit/storage/seromi/cloak/black_yellow
+	name = "black and yellow cloak"
+	icon_state = "tesh_cloak_by"
+	item_state = "tesh_cloak_by"
+
+/obj/item/clothing/suit/storage/seromi/cloak/black_green
+	name = "black and Green cloak"
+	icon_state = "tesh_cloak_bgr"
+	item_state = "tesh_cloak_bgr"
+
+/obj/item/clothing/suit/storage/seromi/cloak/black_blue
+	name = "black and blue cloak"
+	icon_state = "tesh_cloak_bbl"
+	item_state = "tesh_cloak_bbl"
+
+/obj/item/clothing/suit/storage/seromi/cloak/black_purple
+	name = "black and purple cloak"
+	icon_state = "tesh_cloak_bp"
+	item_state = "tesh_cloak_bp"
+
+/obj/item/clothing/suit/storage/seromi/cloak/black_pink
+	name = "black and pink cloak"
+	icon_state = "tesh_cloak_bpi"
+	item_state = "tesh_cloak_bpi"
+
+/obj/item/clothing/suit/storage/seromi/cloak/black_brown
+	name = "black and brown cloak"
+	icon_state = "tesh_cloak_bbr"
+	item_state = "tesh_cloak_bbr"
+
+/obj/item/clothing/suit/storage/seromi/cloak/orange_grey
+	name = "orange and grey cloak"
+	icon_state = "tesh_cloak_og"
+	item_state = "tesh_cloak_og"
+
+/obj/item/clothing/suit/storage/seromi/cloak/rainbow
+	name = "rainbow cloak"
+	icon_state = "tesh_cloak_rainbow"
+	item_state = "tesh_cloak_rainbow"
+
+/obj/item/clothing/suit/storage/seromi/cloak/lightgrey_grey
+	name = "light grey and grey cloak"
+	icon_state = "tesh_cloak_lgg"
+	item_state = "tesh_cloak_lgg"
+
+/obj/item/clothing/suit/storage/seromi/cloak/white_grey
+	name = "white and grey cloak"
+	icon_state = "tesh_cloak_wg"
+	item_state = "tesh_cloak_wg"
+
+/obj/item/clothing/suit/storage/seromi/cloak/red_grey
+	name = "red and grey cloak"
+	icon_state = "tesh_cloak_rg"
+	item_state = "tesh_cloak_rg"
+
+/obj/item/clothing/suit/storage/seromi/cloak/orange
+	name = "orange cloak"
+	icon_state = "tesh_cloak_on"
+	item_state = "tesh_cloak_on"
+
+/obj/item/clothing/suit/storage/seromi/cloak/yellow_grey
+	name = "yellow and grey cloak"
+	icon_state = "tesh_cloak_yg"
+	item_state = "tesh_cloak_yg"
+
+/obj/item/clothing/suit/storage/seromi/cloak/green_grey
+	name = "green and grey cloak"
+	icon_state = "tesh_cloak_gg"
+	item_state = "tesh_cloak_gg"
+
+/obj/item/clothing/suit/storage/seromi/cloak/blue_grey
+	name = "blue and grey cloak"
+	icon_state = "tesh_cloak_blg"
+	item_state = "tesh_cloak_blg"
+
+/obj/item/clothing/suit/storage/seromi/cloak/purple_grey
+	name = "purple and grey cloak"
+	icon_state = "tesh_cloak_pg"
+	item_state = "tesh_cloak_pg"
+
+/obj/item/clothing/suit/storage/seromi/cloak/pink_grey
+	name = "black and orange cloak"
+	icon_state = "tesh_cloak_pig"
+	item_state = "tesh_cloak_pig"
+
+/obj/item/clothing/suit/storage/seromi/cloak/brown_grey
+	name = "purple and grey cloak"
+	icon_state = "tesh_cloak_brg"
+	item_state = "tesh_cloak_brg"

code/modules/clothing/under/xenos/seromi.dm

@@ -1,27 +1,167 @@
 /obj/item/clothing/under/seromi
-	name = "small grey smock"
-	desc = "It looks fitted to nonhuman proportions."
 	icon = 'icons/obj/clothing/species/seromi/uniform.dmi'
 	icon_state = "seromi_grey"
 	species_restricted = list("Teshari")
+
+/obj/item/clothing/under/seromi/smock
+	name = "small grey smock"
+	desc = "It looks fitted to nonhuman proportions."
+	icon_state = "seromi_grey"
 	body_parts_covered = 0 // It's a thin piece of cloth with a neck hole.
 
-/obj/item/clothing/under/seromi/white
+/obj/item/clothing/under/seromi/smock/white
 	name = "small white smock"
 	icon_state = "seromi_white"
 
-/obj/item/clothing/under/seromi/red
+/obj/item/clothing/under/seromi/smock/red
 	name = "small Security smock"
 	icon_state = "seromi_red"
 
-/obj/item/clothing/under/seromi/yellow
+/obj/item/clothing/under/seromi/smock/yellow
 	name = "small Engineering smock"
 	icon_state = "seromi_yellow"
 
-/obj/item/clothing/under/seromi/medical
+/obj/item/clothing/under/seromi/smock/medical
 	name = "small Medical uniform"
 	icon_state = "seromi_medical"
-	
-/obj/item/clothing/under/seromi/rainbow
+
+/obj/item/clothing/under/seromi/smock/science
+	name = "small Research uniform"
+	icon_state = "teshari_science"
+
+/obj/item/clothing/under/seromi/smock/rainbow
 	name = "small rainbow smock"
-	icon_state = "seromi_rainbow"
+	icon_state = "seromi_rainbow"
+
+/obj/item/clothing/under/seromi/undercoat
+	desc =  "A Teshari traditional garb, with a modern twist! Made of micro and nanofibres to make it light and billowy, perfect for going fast and stylishly!"
+	icon = 'icons/mob/species/seromi/teshari_uniform.dmi'
+	icon_override = 'icons/mob/species/seromi/teshari_uniform.dmi'
+	icon_state = "tesh_uniform_bo"
+	item_state = "tesh_uniform_bo"
+	body_parts_covered = UPPER_TORSO|LOWER_TORSO
+
+/obj/item/clothing/under/seromi/undercoat/black_orange
+	name = "black and orange undercoat"
+	icon_state = "tesh_uniform_bo"
+	item_state = "tesh_uniform_bo"
+
+/obj/item/clothing/under/seromi/undercoat/black_grey
+	name = "black and grey undercoat"
+	icon_state = "tesh_uniform_bg"
+	item_state = "tesh_uniform_bg"
+
+/obj/item/clothing/under/seromi/undercoat/black_midgrey
+	name = "black and medium grey undercoat"
+	icon_state = "tesh_uniform_bmg"
+	item_state = "tesh_uniform_bmg"
+
+/obj/item/clothing/under/seromi/undercoat/black_lightgrey
+	name = "black and light grey undercoat"
+	icon_state = "tesh_uniform_blg"
+	item_state = "tesh_uniform_blg"
+
+/obj/item/clothing/under/seromi/undercoat/black_white
+	name = "black and white undercoat"
+	icon_state = "tesh_uniform_bw"
+	item_state = "tesh_uniform_bw"
+
+/obj/item/clothing/under/seromi/undercoat/black_red
+	name = "black and red undercoat"
+	icon_state = "tesh_uniform_br"
+	item_state = "tesh_uniform_br"
+
+/obj/item/clothing/under/seromi/undercoat/black
+	name = "black undercoat"
+	icon_state = "tesh_uniform_bn"
+	item_state = "tesh_uniform_bn"
+
+/obj/item/clothing/under/seromi/undercoat/black_yellow
+	name = "black and yellow undercoat"
+	icon_state = "tesh_uniform_by"
+	item_state = "tesh_uniform_by"
+
+/obj/item/clothing/under/seromi/undercoat/black_green
+	name = "black and Green undercoat"
+	icon_state = "tesh_uniform_bgr"
+	item_state = "tesh_uniform_bgr"
+
+/obj/item/clothing/under/seromi/undercoat/black_blue
+	name = "black and blue undercoat"
+	icon_state = "tesh_uniform_bbl"
+	item_state = "tesh_uniform_bbl"
+
+/obj/item/clothing/under/seromi/undercoat/black_purple
+	name = "black and purple undercoat"
+	icon_state = "tesh_uniform_bp"
+	item_state = "tesh_uniform_bp"
+
+/obj/item/clothing/under/seromi/undercoat/black_pink
+	name = "black and pink undercoat"
+	icon_state = "tesh_uniform_bpi"
+	item_state = "tesh_uniform_bpi"
+
+/obj/item/clothing/under/seromi/undercoat/black_brown
+	name = "black and brown undercoat"
+	icon_state = "tesh_uniform_bbr"
+	item_state = "tesh_uniform_bbr"
+
+/obj/item/clothing/under/seromi/undercoat/orange_grey
+	name = "orange and grey undercoat"
+	icon_state = "tesh_uniform_og"
+	item_state = "tesh_uniform_og"
+
+/obj/item/clothing/under/seromi/undercoat/rainbow
+	name = "rainbow undercoat"
+	icon_state = "tesh_uniform_rainbow"
+	item_state = "tesh_uniform_rainbow"
+
+/obj/item/clothing/under/seromi/undercoat/lightgrey_grey
+	name = "light grey and grey undercoat"
+	icon_state = "tesh_uniform_lgg"
+	item_state = "tesh_uniform_lgg"
+
+/obj/item/clothing/under/seromi/undercoat/white_grey
+	name = "white and grey undercoat"
+	icon_state = "tesh_uniform_wg"
+	item_state = "tesh_uniform_wg"
+
+/obj/item/clothing/under/seromi/undercoat/red_grey
+	name = "red and grey undercoat"
+	icon_state = "tesh_uniform_rg"
+	item_state = "tesh_uniform_rg"
+
+/obj/item/clothing/under/seromi/undercoat/orange
+	name = "orange undercoat"
+	icon_state = "tesh_uniform_on"
+	item_state = "tesh_uniform_on"
+
+/obj/item/clothing/under/seromi/undercoat/yellow_grey
+	name = "yellow and grey undercoat"
+	icon_state = "tesh_uniform_yg"
+	item_state = "tesh_uniform_yg"
+
+/obj/item/clothing/under/seromi/undercoat/green_grey
+	name = "green and grey undercoat"
+	icon_state = "tesh_uniform_gg"
+	item_state = "tesh_uniform_gg"
+
+/obj/item/clothing/under/seromi/undercoat/blue_grey
+	name = "blue and grey undercoat"
+	icon_state = "tesh_uniform_blg"
+	item_state = "tesh_uniform_blg"
+
+/obj/item/clothing/under/seromi/undercoat/purple_grey
+	name = "purple and grey undercoat"
+	icon_state = "tesh_uniform_pg"
+	item_state = "tesh_uniform_pg"
+
+/obj/item/clothing/under/seromi/undercoat/pink_grey
+	name = "black and orange undercoat"
+	icon_state = "tesh_uniform_pig"
+	item_state = "tesh_uniform_pig"
+
+/obj/item/clothing/under/seromi/undercoat/brown_grey
+	name = "purple and grey undercoat"
+	icon_state = "tesh_uniform_brg"
+	item_state = "tesh_uniform_brg"

polaris.dme

@@ -1290,6 +1290,7 @@
 #include "code\modules\clothing\suits\toggles.dm"
 #include "code\modules\clothing\suits\utility.dm"
 #include "code\modules\clothing\suits\wiz_robe.dm"
+#include "code\modules\clothing\suits\xenos\seromi.dm"
 #include "code\modules\clothing\under\color.dm"
 #include "code\modules\clothing\under\miscellaneous.dm"
 #include "code\modules\clothing\under\pants.dm"