diff --git a/code/modules/client/preference_setup/loadout/loadout_xeno.dm b/code/modules/client/preference_setup/loadout/loadout_xeno.dm
index 317eae6d7b..1bef387bdd 100644
--- a/code/modules/client/preference_setup/loadout/loadout_xeno.dm
+++ b/code/modules/client/preference_setup/loadout/loadout_xeno.dm
@@ -270,222 +270,86 @@
 	path = /obj/item/clothing/suit/storage/seromi/cloak/jobs/ce
 	allowed_roles = list("Chief Engineer")
 
-/datum/gear/suit/dept/cloak/ce/New() //VS EDIT
-	..()
-	var/list/cloaks = list()
-	for(var/cloak in typesof(path))
-		var/obj/item/clothing/suit/storage/seromi/cloak/jobs/cloak_type = cloak
-		cloaks[initial(cloak_type.name)] = cloak_type
-	gear_tweaks += new/datum/gear_tweak/path(sortAssoc(cloaks))
-
 /datum/gear/suit/dept/cloak/qm
 	display_name = "quartermaster cloak (Teshari)"
 	path = /obj/item/clothing/suit/storage/seromi/cloak/jobs/qm
 	allowed_roles = list("Quartermaster")
 
-/datum/gear/suit/dept/cloak/qm/New() //VS EDIT
-	..()
-	var/list/cloaks = list()
-	for(var/cloak in typesof(path))
-		var/obj/item/clothing/suit/storage/seromi/cloak/jobs/cloak_type = cloak
-		cloaks[initial(cloak_type.name)] = cloak_type
-	gear_tweaks += new/datum/gear_tweak/path(sortAssoc(cloaks))
-
 /datum/gear/suit/dept/cloak/command
 	display_name = "command cloak (Teshari)"
 	path = /obj/item/clothing/suit/storage/seromi/cloak/jobs/command
 	allowed_roles = list("Site Manager","Head of Personnel","Head of Security","Chief Engineer","Chief Medical Officer","Research Director")
 
-/datum/gear/suit/dept/cloak/command/New() //VS EDIT
-	..()
-	var/list/cloaks = list()
-	for(var/cloak in typesof(path))
-		var/obj/item/clothing/suit/storage/seromi/cloak/jobs/cloak_type = cloak
-		cloaks[initial(cloak_type.name)] = cloak_type
-	gear_tweaks += new/datum/gear_tweak/path(sortAssoc(cloaks))
-
 /datum/gear/suit/dept/cloak/cmo
 	display_name = "chief medical officer cloak (Teshari)"
 	path = /obj/item/clothing/suit/storage/seromi/cloak/jobs/cmo
 	allowed_roles = list("Chief Medical Officer")
 
-/datum/gear/suit/dept/cloak/cmo/New() //VS EDIT
-	..()
-	var/list/cloaks = list()
-	for(var/cloak in typesof(path))
-		var/obj/item/clothing/suit/storage/seromi/cloak/jobs/cloak_type = cloak
-		cloaks[initial(cloak_type.name)] = cloak_type
-	gear_tweaks += new/datum/gear_tweak/path(sortAssoc(cloaks))
-
 /datum/gear/suit/dept/cloak/cargo
 	display_name = "cargo cloak (Teshari)"
 	path = /obj/item/clothing/suit/storage/seromi/cloak/jobs/cargo
 	allowed_roles = list("Cargo Technician","Quartermaster","Shaft Miner")
 
-/datum/gear/suit/dept/cloak/cargo/New() //VS EDIT
-	..()
-	var/list/cloaks = list()
-	for(var/cloak in typesof(path))
-		var/obj/item/clothing/suit/storage/seromi/cloak/jobs/cloak_type = cloak
-		cloaks[initial(cloak_type.name)] = cloak_type
-	gear_tweaks += new/datum/gear_tweak/path(sortAssoc(cloaks))
-
 /datum/gear/suit/dept/cloak/mining
 	display_name = "mining cloak (Teshari)"
 	path = /obj/item/clothing/suit/storage/seromi/cloak/jobs/mining
 	allowed_roles = list("Quartermaster","Shaft Miner")
 
-/datum/gear/suit/dept/cloak/mining/New() //VS EDIT
-	..()
-	var/list/cloaks = list()
-	for(var/cloak in typesof(path))
-		var/obj/item/clothing/suit/storage/seromi/cloak/jobs/cloak_type = cloak
-		cloaks[initial(cloak_type.name)] = cloak_type
-	gear_tweaks += new/datum/gear_tweak/path(sortAssoc(cloaks))
-
 /datum/gear/suit/dept/cloak/security
 	display_name = "security cloak (Teshari)"
 	path = /obj/item/clothing/suit/storage/seromi/cloak/jobs/sec
 	allowed_roles = list("Head of Security","Detective","Warden","Security Officer",)
 
-/datum/gear/suit/dept/cloak/security/New() //VS EDIT
-	..()
-	var/list/cloaks = list()
-	for(var/cloak in typesof(path))
-		var/obj/item/clothing/suit/storage/seromi/cloak/jobs/cloak_type = cloak
-		cloaks[initial(cloak_type.name)] = cloak_type
-	gear_tweaks += new/datum/gear_tweak/path(sortAssoc(cloaks))
-
 /datum/gear/suit/dept/cloak/service
 	display_name = "service cloak (Teshari)"
 	path = /obj/item/clothing/suit/storage/seromi/cloak/jobs/service
 	allowed_roles = list("Head of Personnel","Bartender","Botanist","Janitor","Chef","Librarian")
 
-/datum/gear/suit/dept/cloak/service/New() //VS EDIT
-	..()
-	var/list/cloaks = list()
-	for(var/cloak in typesof(path))
-		var/obj/item/clothing/suit/storage/seromi/cloak/jobs/cloak_type = cloak
-		cloaks[initial(cloak_type.name)] = cloak_type
-	gear_tweaks += new/datum/gear_tweak/path(sortAssoc(cloaks))
-
 /datum/gear/suit/dept/cloak/engineer
 	display_name = "engineering cloak (Teshari)"
 	path = /obj/item/clothing/suit/storage/seromi/cloak/jobs/eningeer
 	allowed_roles = list("Chief Engineer","Station Engineer")
 
-/datum/gear/suit/dept/cloak/engineer/New() //VS EDIT
-	..()
-	var/list/cloaks = list()
-	for(var/cloak in typesof(path))
-		var/obj/item/clothing/suit/storage/seromi/cloak/jobs/cloak_type = cloak
-		cloaks[initial(cloak_type.name)] = cloak_type
-	gear_tweaks += new/datum/gear_tweak/path(sortAssoc(cloaks))
-
 /datum/gear/suit/dept/cloak/atmos
 	display_name = "atmospherics cloak (Teshari)"
 	path = /obj/item/clothing/suit/storage/seromi/cloak/jobs/atmos
 	allowed_roles = list("Chief Engineer","Atmospheric Technician")
 
-/datum/gear/suit/dept/cloak/atmos/New() //VS EDIT
-	..()
-	var/list/cloaks = list()
-	for(var/cloak in typesof(path))
-		var/obj/item/clothing/suit/storage/seromi/cloak/jobs/cloak_type = cloak
-		cloaks[initial(cloak_type.name)] = cloak_type
-	gear_tweaks += new/datum/gear_tweak/path(sortAssoc(cloaks))
-
 /datum/gear/suit/dept/cloak/research
 	display_name = "scientist cloak (Teshari)"
 	path = /obj/item/clothing/suit/storage/seromi/cloak/jobs/sci
 	allowed_roles = list("Research Director","Scientist", "Roboticist", "Xenobiologist")
 
-/datum/gear/suit/dept/cloak/research/New() //VS EDIT
-	..()
-	var/list/cloaks = list()
-	for(var/cloak in typesof(path))
-		var/obj/item/clothing/suit/storage/seromi/cloak/jobs/cloak_type = cloak
-		cloaks[initial(cloak_type.name)] = cloak_type
-	gear_tweaks += new/datum/gear_tweak/path(sortAssoc(cloaks))
-
 /datum/gear/suit/dept/cloak/robo
 	display_name = "roboticist cloak (Teshari)"
 	path = /obj/item/clothing/suit/storage/seromi/cloak/jobs/robo
 	allowed_roles = list("Roboticist")
 
-/datum/gear/suit/dept/cloak/robo/New() //VS EDIT
-	..()
-	var/list/cloaks = list()
-	for(var/cloak in typesof(path))
-		var/obj/item/clothing/suit/storage/seromi/cloak/jobs/cloak_type = cloak
-		cloaks[initial(cloak_type.name)] = cloak_type
-	gear_tweaks += new/datum/gear_tweak/path(sortAssoc(cloaks))
-
 /datum/gear/suit/dept/cloak/medical
 	display_name = "medical cloak (Teshari)"
 	path = /obj/item/clothing/suit/storage/seromi/cloak/jobs/medical
 	allowed_roles = list("Medical Doctor","Chief Medical Officer","Chemist","Paramedic","Geneticist", "Psychiatrist")
 
-/datum/gear/suit/dept/cloak/medical/New() //VS EDIT
-	..()
-	var/list/cloaks = list()
-	for(var/cloak in typesof(path))
-		var/obj/item/clothing/suit/storage/seromi/cloak/jobs/cloak_type = cloak
-		cloaks[initial(cloak_type.name)] = cloak_type
-	gear_tweaks += new/datum/gear_tweak/path(sortAssoc(cloaks))
-
 /datum/gear/suit/dept/cloak/chemistry
 	display_name = "chemist cloak (Teshari)"
 	path = /obj/item/clothing/suit/storage/seromi/cloak/jobs/chemistry
 	allowed_roles = list("Chemist")
 
-/datum/gear/suit/dept/cloak/chemistry/New() //VS EDIT
-	..()
-	var/list/cloaks = list()
-	for(var/cloak in typesof(path))
-		var/obj/item/clothing/suit/storage/seromi/cloak/jobs/cloak_type = cloak
-		cloaks[initial(cloak_type.name)] = cloak_type
-	gear_tweaks += new/datum/gear_tweak/path(sortAssoc(cloaks))
-
 /datum/gear/suit/dept/cloak/virology
 	display_name = "virologist cloak (Teshari)"
 	path = /obj/item/clothing/suit/storage/seromi/cloak/jobs/viro
 	allowed_roles = list("Medical Doctor")
 
-/datum/gear/suit/dept/cloak/virology/New() //VS EDIT
-	..()
-	var/list/cloaks = list()
-	for(var/cloak in typesof(path))
-		var/obj/item/clothing/suit/storage/seromi/cloak/jobs/cloak_type = cloak
-		cloaks[initial(cloak_type.name)] = cloak_type
-	gear_tweaks += new/datum/gear_tweak/path(sortAssoc(cloaks))
-
 /datum/gear/suit/dept/cloak/paramedic
 	display_name = "paramedic cloak (Teshari)"
 	path = /obj/item/clothing/suit/storage/seromi/cloak/jobs/para
 	allowed_roles = list("Paramedic")
 
-/datum/gear/suit/dept/cloak/paramedic/New() //VS EDIT
-	..()
-	var/list/cloaks = list()
-	for(var/cloak in typesof(path))
-		var/obj/item/clothing/suit/storage/seromi/cloak/jobs/cloak_type = cloak
-		cloaks[initial(cloak_type.name)] = cloak_type
-	gear_tweaks += new/datum/gear_tweak/path(sortAssoc(cloaks))
-
 /datum/gear/suit/dept/cloak/iaa
 	display_name = "internal affairs cloak (Teshari)"
 	path = /obj/item/clothing/suit/storage/seromi/cloak/jobs/iaa
 	allowed_roles = list("Internal Affairs Agent")
 
-/datum/gear/suit/dept/cloak/iaa/New() //VS EDIT
-	..()
-	var/list/cloaks = list()
-	for(var/cloak in typesof(path))
-		var/obj/item/clothing/suit/storage/seromi/cloak/jobs/cloak_type = cloak
-		cloaks[initial(cloak_type.name)] = cloak_type
-	gear_tweaks += new/datum/gear_tweak/path(sortAssoc(cloaks))
-
 /datum/gear/uniform/smockcolor
 	display_name = "smock, recolorable (Teshari)"
 	path = /obj/item/clothing/under/seromi/smock/white
@@ -560,11 +424,16 @@
 	display_name = "toe-less jackboots"
 	path = /obj/item/clothing/shoes/boots/jackboots/toeless
 
-
 /datum/gear/shoes/toelessknee
 	display_name = "toe-less jackboots, knee-length"
 	path = /obj/item/clothing/shoes/boots/jackboots/toeless/knee
 
 /datum/gear/shoes/toelessthigh
 	display_name = "toe-less jackboots, thigh-length"
-	path = /obj/item/clothing/shoes/boots/jackboots/toeless/thigh
\ No newline at end of file
+	path = /obj/item/clothing/shoes/boots/jackboots/toeless/thigh
+
+/datum/gear/eyes/aerogelgoggles
+	display_name = "airtight orange goggles (Teshari)"
+	path = /obj/item/clothing/glasses/aerogelgoggles
+	whitelisted = SPECIES_TESHARI
+	sort_category = "Xenowear"
diff --git a/code/modules/client/preference_setup/loadout/loadout_xeno_vr.dm b/code/modules/client/preference_setup/loadout/loadout_xeno_vr.dm
index 2efe9866a3..a89b9745b1 100644
--- a/code/modules/client/preference_setup/loadout/loadout_xeno_vr.dm
+++ b/code/modules/client/preference_setup/loadout/loadout_xeno_vr.dm
@@ -97,57 +97,349 @@
 	path = /obj/item/clothing/suit/taur_dress/white
 	sort_category = "Xenowear"
 
-/datum/gear/suit/cloak_cit
-	display_name = "cloak selection (Teshari) (CitRP)"
-	path = /obj/item/clothing/suit/storage/teshari/cloak_cit/standard
+//Net new alternate job undercoats.
+/datum/gear/suit/dept/undercoat/cap
+	display_name = "facility director undercoat (Teshari)"
+	path = /obj/item/clothing/under/seromi/undercoat/jobs/cap_vr
+	allowed_roles = list("Site Manager")
+
+/datum/gear/suit/dept/undercoat/psych
+	display_name = "psychiatrist undercoat (Teshari)"
+	path = /obj/item/clothing/under/seromi/undercoat/jobs/psych_vr
+	allowed_roles = list("Psychiatrist")
+
+/datum/gear/suit/dept/undercoat/rd
+	display_name = "research director undercoat (Teshari)"
+	path = /obj/item/clothing/under/seromi/undercoat/jobs/rd_vr
+	allowed_roles = list("Research Director")
+
+/datum/gear/suit/dept/undercoat/hos
+	display_name = "head of security undercoat (Teshari)"
+	path = /obj/item/clothing/under/seromi/undercoat/jobs/hos_vr
+	allowed_roles = list("Head of Security")
+
+/datum/gear/suit/dept/undercoat/hop
+	display_name = "head of personnel undercoat (Teshari)"
+	path = /obj/item/clothing/under/seromi/undercoat/jobs/hop_vr
+	allowed_roles = list("Head of Personnel")
+
+//Added to allow selection of alternate job undercoats.
+./datum/gear/uniform/dept/undercoat/ce/New()
+	..()
+	var/list/undercoats = list()
+	for(var/undercoat in typesof(path))
+		var/obj/item/clothing/under/seromi/undercoat/standard/undercoat_type = undercoat
+		undercoats[initial(undercoat_type.name)] = undercoat_type
+	gear_tweaks += new/datum/gear_tweak/path(sortAssoc(undercoats))
+
+/datum/gear/uniform/dept/undercoat/qm/New()
+	..()
+	var/list/undercoats = list()
+	for(var/undercoat in typesof(path))
+		var/obj/item/clothing/under/seromi/undercoat/standard/undercoat_type = undercoat
+		undercoats[initial(undercoat_type.name)] = undercoat_type
+	gear_tweaks += new/datum/gear_tweak/path(sortAssoc(undercoats))
+
+/datum/gear/uniform/dept/undercoat/cmo/New()
+	..()
+	var/list/undercoats = list()
+	for(var/undercoat in typesof(path))
+		var/obj/item/clothing/under/seromi/undercoat/standard/undercoat_type = undercoat
+		undercoats[initial(undercoat_type.name)] = undercoat_type
+	gear_tweaks += new/datum/gear_tweak/path(sortAssoc(undercoats))
+
+/datum/gear/uniform/dept/undercoat/cargo/New()
+	..()
+	var/list/undercoats = list()
+	for(var/undercoat in typesof(path))
+		var/obj/item/clothing/under/seromi/undercoat/standard/undercoat_type = undercoat
+		undercoats[initial(undercoat_type.name)] = undercoat_type
+	gear_tweaks += new/datum/gear_tweak/path(sortAssoc(undercoats))
+
+/datum/gear/uniform/dept/undercoat/mining/New()
+	..()
+	var/list/undercoats = list()
+	for(var/undercoat in typesof(path))
+		var/obj/item/clothing/under/seromi/undercoat/standard/undercoat_type = undercoat
+		undercoats[initial(undercoat_type.name)] = undercoat_type
+	gear_tweaks += new/datum/gear_tweak/path(sortAssoc(undercoats))
+
+/datum/gear/uniform/dept/undercoat/security/New()
+	..()
+	var/list/undercoats = list()
+	for(var/undercoat in typesof(path))
+		var/obj/item/clothing/under/seromi/undercoat/standard/undercoat_type = undercoat
+		undercoats[initial(undercoat_type.name)] = undercoat_type
+	gear_tweaks += new/datum/gear_tweak/path(sortAssoc(undercoats))
+
+/datum/gear/uniform/dept/undercoat/service/New()
+	..()
+	var/list/undercoats = list()
+	for(var/undercoat in typesof(path))
+		var/obj/item/clothing/under/seromi/undercoat/standard/undercoat_type = undercoat
+		undercoats[initial(undercoat_type.name)] = undercoat_type
+	gear_tweaks += new/datum/gear_tweak/path(sortAssoc(undercoats))
+
+/datum/gear/uniform/dept/undercoat/engineer/New()
+	..()
+	var/list/undercoats = list()
+	for(var/undercoat in typesof(path))
+		var/obj/item/clothing/under/seromi/undercoat/standard/undercoat_type = undercoat
+		undercoats[initial(undercoat_type.name)] = undercoat_type
+	gear_tweaks += new/datum/gear_tweak/path(sortAssoc(undercoats))
+
+/datum/gear/uniform/dept/undercoat/atmos/New()
+	..()
+	var/list/undercoats = list()
+	for(var/undercoat in typesof(path))
+		var/obj/item/clothing/under/seromi/undercoat/standard/undercoat_type = undercoat
+		undercoats[initial(undercoat_type.name)] = undercoat_type
+	gear_tweaks += new/datum/gear_tweak/path(sortAssoc(undercoats))
+
+/datum/gear/uniform/dept/undercoat/research/New()
+	..()
+	var/list/undercoats = list()
+	for(var/undercoat in typesof(path))
+		var/obj/item/clothing/under/seromi/undercoat/standard/undercoat_type = undercoat
+		undercoats[initial(undercoat_type.name)] = undercoat_type
+	gear_tweaks += new/datum/gear_tweak/path(sortAssoc(undercoats))
+
+/datum/gear/uniform/dept/undercoat/robo/New()
+	..()
+	var/list/undercoats = list()
+	for(var/undercoat in typesof(path))
+		var/obj/item/clothing/under/seromi/undercoat/standard/undercoat_type = undercoat
+		undercoats[initial(undercoat_type.name)] = undercoat_type
+	gear_tweaks += new/datum/gear_tweak/path(sortAssoc(undercoats))
+
+/datum/gear/uniform/dept/undercoat/medical/New()
+	..()
+	var/list/undercoats = list()
+	for(var/undercoat in typesof(path))
+		var/obj/item/clothing/under/seromi/undercoat/standard/undercoat_type = undercoat
+		undercoats[initial(undercoat_type.name)] = undercoat_type
+	gear_tweaks += new/datum/gear_tweak/path(sortAssoc(undercoats))
+
+/datum/gear/uniform/dept/undercoat/chemistry/New()
+	..()
+	var/list/undercoats = list()
+	for(var/undercoat in typesof(path))
+		var/obj/item/clothing/under/seromi/undercoat/standard/undercoat_type = undercoat
+		undercoats[initial(undercoat_type.name)] = undercoat_type
+	gear_tweaks += new/datum/gear_tweak/path(sortAssoc(undercoats))
+
+/datum/gear/uniform/dept/undercoat/virology/New()
+	..()
+	var/list/undercoats = list()
+	for(var/undercoat in typesof(path))
+		var/obj/item/clothing/under/seromi/undercoat/standard/undercoat_type = undercoat
+		undercoats[initial(undercoat_type.name)] = undercoat_type
+	gear_tweaks += new/datum/gear_tweak/path(sortAssoc(undercoats))
+
+/datum/gear/uniform/dept/undercoat/paramedic/New()
+	..()
+	var/list/undercoats = list()
+	for(var/undercoat in typesof(path))
+		var/obj/item/clothing/under/seromi/undercoat/standard/undercoat_type = undercoat
+		undercoats[initial(undercoat_type.name)] = undercoat_type
+	gear_tweaks += new/datum/gear_tweak/path(sortAssoc(undercoats))
+
+/datum/gear/uniform/dept/undercoat/iaa/New()
+	..()
+	var/list/undercoats = list()
+	for(var/undercoat in typesof(path))
+		var/obj/item/clothing/under/seromi/undercoat/standard/undercoat_type = undercoat
+		undercoats[initial(undercoat_type.name)] = undercoat_type
+	gear_tweaks += new/datum/gear_tweak/path(sortAssoc(undercoats))
+
+//Net new alternate cloak sprites.
+/datum/gear/suit/cloak_vr
+	display_name = "cloak selection (Teshari) (VR)"
+	path = /obj/item/clothing/suit/storage/teshari/cloak_vr/standard
 	whitelisted = SPECIES_TESHARI
 	sort_category = "Xenowear"
 
-//CitRP port. Their cloaks have new icons.
-/datum/gear/suit/cloak_cit/New()
+/datum/gear/suit/cloak_vr/New()
 	..()
 	var/list/cloaks = list()
-	for(var/cloak in typesof(/obj/item/clothing/suit/storage/teshari/cloak_cit/standard))
-		var/obj/item/clothing/suit/storage/teshari/cloak_cit/standard/cloak_type = cloak
+	for(var/cloak in typesof(/obj/item/clothing/suit/storage/teshari/cloak_vr/standard))
+		var/obj/item/clothing/suit/storage/teshari/cloak_vr/standard/cloak_type = cloak
 		cloaks[initial(cloak_type.name)] = cloak_type
 	gear_tweaks += new/datum/gear_tweak/path(sortAssoc(cloaks))
 
-/datum/gear/suit/cloak_cit_color
-	display_name = "cloak, recolorable (Teshari) (CitRP)"
-	path = /obj/item/clothing/suit/storage/teshari/cloak_cit/standard/white
+/datum/gear/suit/cloak_vr_color
+	display_name = "cloak, recolorable (Teshari) (VR)"
+	path = /obj/item/clothing/suit/storage/teshari/cloak_vr/standard/white
 	whitelisted = SPECIES_TESHARI
 	sort_category = "Xenowear"
 
-/datum/gear/suit/cloak_cit_color/New()
+/datum/gear/suit/cloak_vr_color/New()
 	..()
 	gear_tweaks += gear_tweak_free_color_choice
 
-//Net new CitRP job cloaks
+//Net new alternate job cloaks
 /datum/gear/suit/dept/cloak/cap
 	display_name = "facility director cloak (Teshari)"
-	path = /obj/item/clothing/suit/storage/seromi/cloak/jobs/cap
+	path = /obj/item/clothing/suit/storage/seromi/cloak/jobs/cap_vr
 	allowed_roles = list("Site Manager")
 
 /datum/gear/suit/dept/cloak/psych
 	display_name = "psychiatrist cloak (Teshari)"
-	path = /obj/item/clothing/suit/storage/seromi/cloak/jobs/psych
+	path = /obj/item/clothing/suit/storage/seromi/cloak/jobs/psych_vr
 	allowed_roles = list("Psychiatrist")
 
 /datum/gear/suit/dept/cloak/rd
 	display_name = "research director cloak (Teshari)"
-	path = /obj/item/clothing/suit/storage/seromi/cloak/jobs/rd
+	path = /obj/item/clothing/suit/storage/seromi/cloak/jobs/rd_vr
 	allowed_roles = list("Research Director")
 
 /datum/gear/suit/dept/cloak/hos
 	display_name = "head of security cloak (Teshari)"
-	path = /obj/item/clothing/suit/storage/seromi/cloak/jobs/hos
+	path = /obj/item/clothing/suit/storage/seromi/cloak/jobs/hos_vr
 	allowed_roles = list("Head of Security")
 
 /datum/gear/suit/dept/cloak/hop
 	display_name = "head of personnel cloak (Teshari)"
-	path = /obj/item/clothing/suit/storage/seromi/cloak/jobs/hop
+	path = /obj/item/clothing/suit/storage/seromi/cloak/jobs/hop_vr
 	allowed_roles = list("Head of Personnel")
 
+//Added to allow selection of alternate job cloaks.
+/datum/gear/suit/dept/cloak/ce/New()
+	..()
+	var/list/cloaks = list()
+	for(var/cloak in typesof(path))
+		var/obj/item/clothing/suit/storage/seromi/cloak/jobs/cloak_type = cloak
+		cloaks[initial(cloak_type.name)] = cloak_type
+	gear_tweaks += new/datum/gear_tweak/path(sortAssoc(cloaks))
+
+/datum/gear/suit/dept/cloak/qm/New()
+	..()
+	var/list/cloaks = list()
+	for(var/cloak in typesof(path))
+		var/obj/item/clothing/suit/storage/seromi/cloak/jobs/cloak_type = cloak
+		cloaks[initial(cloak_type.name)] = cloak_type
+	gear_tweaks += new/datum/gear_tweak/path(sortAssoc(cloaks))
+
+/datum/gear/suit/dept/cloak/command/New()
+	..()
+	var/list/cloaks = list()
+	for(var/cloak in typesof(path))
+		var/obj/item/clothing/suit/storage/seromi/cloak/jobs/cloak_type = cloak
+		cloaks[initial(cloak_type.name)] = cloak_type
+	gear_tweaks += new/datum/gear_tweak/path(sortAssoc(cloaks))
+
+/datum/gear/suit/dept/cloak/cmo/New()
+	..()
+	var/list/cloaks = list()
+	for(var/cloak in typesof(path))
+		var/obj/item/clothing/suit/storage/seromi/cloak/jobs/cloak_type = cloak
+		cloaks[initial(cloak_type.name)] = cloak_type
+	gear_tweaks += new/datum/gear_tweak/path(sortAssoc(cloaks))
+
+/datum/gear/suit/dept/cloak/cargo/New()
+	..()
+	var/list/cloaks = list()
+	for(var/cloak in typesof(path))
+		var/obj/item/clothing/suit/storage/seromi/cloak/jobs/cloak_type = cloak
+		cloaks[initial(cloak_type.name)] = cloak_type
+	gear_tweaks += new/datum/gear_tweak/path(sortAssoc(cloaks))
+
+/datum/gear/suit/dept/cloak/mining/New()
+	..()
+	var/list/cloaks = list()
+	for(var/cloak in typesof(path))
+		var/obj/item/clothing/suit/storage/seromi/cloak/jobs/cloak_type = cloak
+		cloaks[initial(cloak_type.name)] = cloak_type
+	gear_tweaks += new/datum/gear_tweak/path(sortAssoc(cloaks))
+
+/datum/gear/suit/dept/cloak/security/New()
+	..()
+	var/list/cloaks = list()
+	for(var/cloak in typesof(path))
+		var/obj/item/clothing/suit/storage/seromi/cloak/jobs/cloak_type = cloak
+		cloaks[initial(cloak_type.name)] = cloak_type
+	gear_tweaks += new/datum/gear_tweak/path(sortAssoc(cloaks))
+
+/datum/gear/suit/dept/cloak/service/New()
+	..()
+	var/list/cloaks = list()
+	for(var/cloak in typesof(path))
+		var/obj/item/clothing/suit/storage/seromi/cloak/jobs/cloak_type = cloak
+		cloaks[initial(cloak_type.name)] = cloak_type
+	gear_tweaks += new/datum/gear_tweak/path(sortAssoc(cloaks))
+
+/datum/gear/suit/dept/cloak/engineer/New()
+	..()
+	var/list/cloaks = list()
+	for(var/cloak in typesof(path))
+		var/obj/item/clothing/suit/storage/seromi/cloak/jobs/cloak_type = cloak
+		cloaks[initial(cloak_type.name)] = cloak_type
+	gear_tweaks += new/datum/gear_tweak/path(sortAssoc(cloaks))
+
+/datum/gear/suit/dept/cloak/atmos/New()
+	..()
+	var/list/cloaks = list()
+	for(var/cloak in typesof(path))
+		var/obj/item/clothing/suit/storage/seromi/cloak/jobs/cloak_type = cloak
+		cloaks[initial(cloak_type.name)] = cloak_type
+	gear_tweaks += new/datum/gear_tweak/path(sortAssoc(cloaks))
+
+/datum/gear/suit/dept/cloak/research/New()
+	..()
+	var/list/cloaks = list()
+	for(var/cloak in typesof(path))
+		var/obj/item/clothing/suit/storage/seromi/cloak/jobs/cloak_type = cloak
+		cloaks[initial(cloak_type.name)] = cloak_type
+	gear_tweaks += new/datum/gear_tweak/path(sortAssoc(cloaks))
+
+/datum/gear/suit/dept/cloak/robo/New()
+	..()
+	var/list/cloaks = list()
+	for(var/cloak in typesof(path))
+		var/obj/item/clothing/suit/storage/seromi/cloak/jobs/cloak_type = cloak
+		cloaks[initial(cloak_type.name)] = cloak_type
+	gear_tweaks += new/datum/gear_tweak/path(sortAssoc(cloaks))
+
+/datum/gear/suit/dept/cloak/medical/New()
+	..()
+	var/list/cloaks = list()
+	for(var/cloak in typesof(path))
+		var/obj/item/clothing/suit/storage/seromi/cloak/jobs/cloak_type = cloak
+		cloaks[initial(cloak_type.name)] = cloak_type
+	gear_tweaks += new/datum/gear_tweak/path(sortAssoc(cloaks))
+
+/datum/gear/suit/dept/cloak/chemistry/New()
+	..()
+	var/list/cloaks = list()
+	for(var/cloak in typesof(path))
+		var/obj/item/clothing/suit/storage/seromi/cloak/jobs/cloak_type = cloak
+		cloaks[initial(cloak_type.name)] = cloak_type
+	gear_tweaks += new/datum/gear_tweak/path(sortAssoc(cloaks))
+
+/datum/gear/suit/dept/cloak/virology/New()
+	..()
+	var/list/cloaks = list()
+	for(var/cloak in typesof(path))
+		var/obj/item/clothing/suit/storage/seromi/cloak/jobs/cloak_type = cloak
+		cloaks[initial(cloak_type.name)] = cloak_type
+	gear_tweaks += new/datum/gear_tweak/path(sortAssoc(cloaks))
+
+/datum/gear/suit/dept/cloak/paramedic/New()
+	..()
+	var/list/cloaks = list()
+	for(var/cloak in typesof(path))
+		var/obj/item/clothing/suit/storage/seromi/cloak/jobs/cloak_type = cloak
+		cloaks[initial(cloak_type.name)] = cloak_type
+	gear_tweaks += new/datum/gear_tweak/path(sortAssoc(cloaks))
+
+/datum/gear/suit/dept/cloak/iaa/New()
+	..()
+	var/list/cloaks = list()
+	for(var/cloak in typesof(path))
+		var/obj/item/clothing/suit/storage/seromi/cloak/jobs/cloak_type = cloak
+		cloaks[initial(cloak_type.name)] = cloak_type
+	gear_tweaks += new/datum/gear_tweak/path(sortAssoc(cloaks))
+
 //Added from CHOMP
 /datum/gear/suit/cloak_hood
 	display_name = "hooded cloak selection (Teshari)"
@@ -186,9 +478,3 @@
 /datum/gear/suit/beltcloak_color/New()
 	..()
 	gear_tweaks += gear_tweak_free_color_choice
-
-/datum/gear/eyes/aerogelgoggles
-	display_name = "airtight orange goggles (Teshari)"
-	path = /obj/item/clothing/glasses/aerogelgoggles
-	whitelisted = SPECIES_TESHARI
-	sort_category = "Xenowear"
diff --git a/code/modules/clothing/suits/aliens/seromi_cit.dm b/code/modules/clothing/suits/aliens/seromi_cit.dm
deleted file mode 100644
index 7cc9004da3..0000000000
--- a/code/modules/clothing/suits/aliens/seromi_cit.dm
+++ /dev/null
@@ -1,275 +0,0 @@
-// Standard Cloaks
-/obj/item/clothing/suit/storage/teshari/cloak_cit
-	name = "black cloak (CitRP)"
-	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_cit.dmi'
-	icon_override = 'icons/mob/species/seromi/teshari_cloak_cit.dmi'
-	icon_state = "tesh_cloak_bn"
-	item_state = "tesh_cloak_bn"
-	species_restricted = list(SPECIES_TESHARI)
-	body_parts_covered = UPPER_TORSO|ARMS
-
-/obj/item/clothing/suit/storage/teshari/cloak_cit/standard/black_red
-	name = "black and red cloak (CitRP)"
-	icon_state = "tesh_cloak_br"
-	item_state = "tesh_cloak_br"
-
-/obj/item/clothing/suit/storage/teshari/cloak_cit/standard/black_orange
-	name = "black and orange cloak (CitRP)"
-	icon_state = "tesh_cloak_bo"
-	item_state = "tesh_cloak_bo"
-
-/obj/item/clothing/suit/storage/teshari/cloak_cit/standard/black_yellow
-	name = "black and yellow cloak (CitRP)"
-	icon_state = "tesh_cloak_by"
-	item_state = "tesh_cloak_by"
-
-/obj/item/clothing/suit/storage/teshari/cloak_cit/standard/black_green
-	name = "black and green cloak (CitRP)"
-	icon_state = "tesh_cloak_bgr"
-	item_state = "tesh_cloak_bgr"
-
-/obj/item/clothing/suit/storage/teshari/cloak_cit/standard/black_blue
-	name = "black and blue cloak (CitRP)"
-	icon_state = "tesh_cloak_bbl"
-	item_state = "tesh_cloak_bbl"
-
-/obj/item/clothing/suit/storage/teshari/cloak_cit/standard/black_purple
-	name = "black and purple cloak (CitRP)"
-	icon_state = "tesh_cloak_bp"
-	item_state = "tesh_cloak_bp"
-
-/obj/item/clothing/suit/storage/teshari/cloak_cit/standard/black_pink
-	name = "black and pink cloak (CitRP)"
-	icon_state = "tesh_cloak_bpi"
-	item_state = "tesh_cloak_bpi"
-
-/obj/item/clothing/suit/storage/teshari/cloak_cit/standard/black_brown
-	name = "black and brown cloak (CitRP)"
-	icon_state = "tesh_cloak_bbr"
-	item_state = "tesh_cloak_bbr"
-
-/obj/item/clothing/suit/storage/teshari/cloak_cit/standard/black_grey
-	name = "black and grey cloak (CitRP)"
-	icon_state = "tesh_cloak_bg"
-	item_state = "tesh_cloak_bg"
-
-/obj/item/clothing/suit/storage/teshari/cloak_cit/standard/black_white
-	name = "black and white cloak (CitRP)"
-	icon_state = "tesh_cloak_bw"
-	item_state = "tesh_cloak_bw"
-
-/obj/item/clothing/suit/storage/teshari/cloak_cit/standard/white
-	name = "white cloak (CitRP)"
-	icon_state = "tesh_cloak_wn"
-	item_state = "tesh_cloak_wn"
-
-/obj/item/clothing/suit/storage/teshari/cloak_cit/standard/white_grey
-	name = "white and grey cloak (CitRP)"
-	icon_state = "tesh_cloak_wg"
-	item_state = "tesh_cloak_wg"
-
-/obj/item/clothing/suit/storage/teshari/cloak_cit/standard/red_grey
-	name = "red and grey cloak (CitRP)"
-	icon_state = "tesh_cloak_rg"
-	item_state = "tesh_cloak_rg"
-
-/obj/item/clothing/suit/storage/teshari/cloak_cit/standard/orange_grey
-	name = "orange and grey cloak (CitRP)"
-	icon_state = "tesh_cloak_og"
-	item_state = "tesh_cloak_og"
-
-/obj/item/clothing/suit/storage/teshari/cloak_cit/standard/yellow_grey
-	name = "yellow and grey cloak (CitRP)"
-	icon_state = "tesh_cloak_yg"
-	item_state = "tesh_cloak_yg"
-
-/obj/item/clothing/suit/storage/teshari/cloak_cit/standard/green_grey
-	name = "green and grey cloak (CitRP)"
-	icon_state = "tesh_cloak_gg"
-	item_state = "tesh_cloak_gg"
-
-/obj/item/clothing/suit/storage/teshari/cloak_cit/standard/blue_grey
-	name = "blue and grey cloak (CitRP)"
-	icon_state = "tesh_cloak_blug"
-	item_state = "tesh_cloak_blug"
-
-/obj/item/clothing/suit/storage/teshari/cloak_cit/standard/purple_grey
-	name = "purple and grey cloak (CitRP)"
-	icon_state = "tesh_cloak_pg"
-	item_state = "tesh_cloak_pg"
-
-/obj/item/clothing/suit/storage/teshari/cloak_cit/standard/pink_grey
-	name = "pink and grey cloak (CitRP)"
-	icon_state = "tesh_cloak_pig"
-	item_state = "tesh_cloak_pig"
-
-/obj/item/clothing/suit/storage/teshari/cloak_cit/standard/brown_grey
-	name = "brown and grey cloak (CitRP)"
-	icon_state = "tesh_cloak_brg"
-	item_state = "tesh_cloak_brg"
-
-/obj/item/clothing/suit/storage/teshari/cloak_cit/standard/rainbow
-	name = "rainbow cloak (CitRP)"
-	icon_state = "tesh_cloak_rainbow"
-	item_state = "tesh_cloak_rainbow"
-
-/obj/item/clothing/suit/storage/teshari/cloak_cit/standard/orange
-	name = "orange cloak (CitRP)"
-	icon_state = "tesh_cloak_on"
-	item_state = "tesh_cloak_on"
-
-//CitRP Job Cloaks - subpathed for ease of access in loadouts
-/obj/item/clothing/suit/storage/seromi/cloak/jobs/cap
-	name = "facility director cloak (CitRP)"
-	desc = "A soft Teshari cloak made for the Facility Director"
-	icon_state = "tesh_cloak_cap"
-	item_state = "tesh_cloak_cap"
-	icon = 'icons/mob/species/seromi/deptcloak_cit.dmi'
-	icon_override = 'icons/mob/species/seromi/deptcloak_cit.dmi'
-
-//Cargo
-
-/obj/item/clothing/suit/storage/seromi/cloak/jobs/qm/citrp
-	name = "quartermaster cloak (CitRP)"
-	desc = "A soft Teshari cloak made for the Quartermaster"
-	icon = 'icons/mob/species/seromi/deptcloak_cit.dmi'
-	icon_override = 'icons/mob/species/seromi/deptcloak_cit.dmi'
-
-/obj/item/clothing/suit/storage/seromi/cloak/jobs/cargo/citrp
-	name = "cargo cloak (CitRP)"
-	desc = "A soft Teshari cloak made for the Cargo department"
-	icon = 'icons/mob/species/seromi/deptcloak_cit.dmi'
-	icon_override = 'icons/mob/species/seromi/deptcloak_cit.dmi'
-
-/obj/item/clothing/suit/storage/seromi/cloak/jobs/mining/citrp
-	name = "mining cloak (CitRP)"
-	desc = "A soft Teshari cloak made for Mining"
-	icon = 'icons/mob/species/seromi/deptcloak_cit.dmi'
-	icon_override = 'icons/mob/species/seromi/deptcloak_cit.dmi'
-
-/obj/item/clothing/suit/storage/seromi/cloak/jobs/command/citrp
-	name = "command cloak (CitRP)"
-	desc = "A soft Teshari cloak made for the Command department"
-	icon = 'icons/mob/species/seromi/deptcloak_cit.dmi'
-	icon_override = 'icons/mob/species/seromi/deptcloak_cit.dmi'
-
-//Engineering
-
-/obj/item/clothing/suit/storage/seromi/cloak/jobs/ce/citrp
-	name = "chief engineer cloak (CitRP)"
-	desc = "A soft Teshari cloak made the Chief Engineer"
-	icon = 'icons/mob/species/seromi/deptcloak_cit.dmi'
-	icon_override = 'icons/mob/species/seromi/deptcloak_cit.dmi'
-
-/obj/item/clothing/suit/storage/seromi/cloak/jobs/eningeer/citrp
-	name = "engineering cloak (CitRP)"
-	desc = "A soft Teshari cloak made for the Engineering department"
-	icon = 'icons/mob/species/seromi/deptcloak_cit.dmi'
-	icon_override = 'icons/mob/species/seromi/deptcloak_cit.dmi'
-
-/obj/item/clothing/suit/storage/seromi/cloak/jobs/atmos/citrp
-	name = "atmospherics cloak (CitRP)"
-	desc = "A soft Teshari cloak made for the Atmospheric Technician"
-	icon = 'icons/mob/species/seromi/deptcloak_cit.dmi'
-	icon_override = 'icons/mob/species/seromi/deptcloak_cit.dmi'
-
-//Medical
-
-/obj/item/clothing/suit/storage/seromi/cloak/jobs/cmo/citrp
-	name = "chief medical officer cloak (CitRP)"
-	desc = "A soft Teshari cloak made the Cheif Medical Officer"
-	icon = 'icons/mob/species/seromi/deptcloak_cit.dmi'
-	icon_override = 'icons/mob/species/seromi/deptcloak_cit.dmi'
-
-/obj/item/clothing/suit/storage/seromi/cloak/jobs/medical/citrp
-	name = "medical cloak (CitRP)"
-	desc = "A soft Teshari cloak made for the Medical department"
-	icon = 'icons/mob/species/seromi/deptcloak_cit.dmi'
-	icon_override = 'icons/mob/species/seromi/deptcloak_cit.dmi'
-
-/obj/item/clothing/suit/storage/seromi/cloak/jobs/chemistry/citrp
-	name = "chemist cloak (CitRP)"
-	desc = "A soft Teshari cloak made for the Chemist"
-	icon = 'icons/mob/species/seromi/deptcloak_cit.dmi'
-	icon_override = 'icons/mob/species/seromi/deptcloak_cit.dmi'
-
-/obj/item/clothing/suit/storage/seromi/cloak/jobs/viro/citrp
-	name = "virologist cloak (CitRP)"
-	desc = "A soft Teshari cloak made for the Virologist"
-	icon = 'icons/mob/species/seromi/deptcloak_cit.dmi'
-	icon_override = 'icons/mob/species/seromi/deptcloak_cit.dmi'
-
-/obj/item/clothing/suit/storage/seromi/cloak/jobs/para/citrp
-	name = "paramedic cloak (CitRP)"
-	desc = "A soft Teshari cloak made for the Paramedic"
-	icon = 'icons/mob/species/seromi/deptcloak_cit.dmi'
-	icon_override = 'icons/mob/species/seromi/deptcloak_cit.dmi'
-
-/obj/item/clothing/suit/storage/seromi/cloak/jobs/psych
-	name = "psychiatrist cloak (CitRP)"
-	desc = "A soft Teshari cloak made for the Psychiatrist"
-	icon_state = "tesh_cloak_psych"
-	item_state = "tesh_cloak_psych"
-	icon = 'icons/mob/species/seromi/deptcloak_cit.dmi'
-	icon_override = 'icons/mob/species/seromi/deptcloak_cit.dmi'
-
-//Science
-
-/obj/item/clothing/suit/storage/seromi/cloak/jobs/rd
-	name = "research director cloak (CitRP)"
-	desc = "A soft Teshari cloak made for the Research Director"
-	icon_state = "tesh_cloak_rd"
-	item_state = "tesh_cloak_rd"
-	icon = 'icons/mob/species/seromi/deptcloak_cit.dmi'
-	icon_override = 'icons/mob/species/seromi/deptcloak_cit.dmi'
-
-/obj/item/clothing/suit/storage/seromi/cloak/jobs/sci/citrp
-	name = "scientist cloak (CitRP)"
-	desc = "A soft Teshari cloak made for the Science department"
-	icon = 'icons/mob/species/seromi/deptcloak_cit.dmi'
-	icon_override = 'icons/mob/species/seromi/deptcloak_cit.dmi'
-
-/obj/item/clothing/suit/storage/seromi/cloak/jobs/robo/citrp
-	name = "roboticist cloak (CitRP)"
-	desc = "A soft Teshari cloak made for the Roboticist"
-	icon = 'icons/mob/species/seromi/deptcloak_cit.dmi'
-	icon_override = 'icons/mob/species/seromi/deptcloak_cit.dmi'
-
-//Security
-
-/obj/item/clothing/suit/storage/seromi/cloak/jobs/hos
-	name = "head of security cloak (CitRP)"
-	desc = "A soft Teshari cloak made for the Head of Security"
-	icon_state = "tesh_cloak_hos"
-	item_state = "tesh_cloak_hos"
-	icon = 'icons/mob/species/seromi/deptcloak_cit.dmi'
-	icon_override = 'icons/mob/species/seromi/deptcloak_cit.dmi'
-
-/obj/item/clothing/suit/storage/seromi/cloak/jobs/sec/citrp
-	name = "security cloak (CitRP)"
-	desc = "A soft Teshari cloak made for the Security department"
-	icon = 'icons/mob/species/seromi/deptcloak_cit.dmi'
-	icon_override = 'icons/mob/species/seromi/deptcloak_cit.dmi'
-
-/obj/item/clothing/suit/storage/seromi/cloak/jobs/iaa/citrp
-	name = "internal affairs cloak (CitRP)"
-	desc = "A soft Teshari cloak made for the Internal Affairs Agent"
-	icon = 'icons/mob/species/seromi/deptcloak_cit.dmi'
-	icon_override = 'icons/mob/species/seromi/deptcloak_cit.dmi'
-
-//Service
-
-/obj/item/clothing/suit/storage/seromi/cloak/jobs/hop
-	name = "head of personnel cloak (CitRP)"
-	desc = "A soft Teshari cloak made for the Head of Personnel"
-	icon_state = "tesh_cloak_hop"
-	item_state = "tesh_cloak_hop"
-	icon = 'icons/mob/species/seromi/deptcloak_cit.dmi'
-	icon_override = 'icons/mob/species/seromi/deptcloak_cit.dmi'
-
-/obj/item/clothing/suit/storage/seromi/cloak/jobs/service/citrp
-	name = "service cloak (CitRP)"
-	desc = "A soft Teshari cloak made for the Service department"
-	icon = 'icons/mob/species/seromi/deptcloak_cit.dmi'
-	icon_override = 'icons/mob/species/seromi/deptcloak_cit.dmi'
diff --git a/code/modules/clothing/suits/aliens/seromi_ch.dm b/code/modules/clothing/suits/aliens/seromi_vr.dm
similarity index 64%
rename from code/modules/clothing/suits/aliens/seromi_ch.dm
rename to code/modules/clothing/suits/aliens/seromi_vr.dm
index dd8c966a4b..62351bf13b 100644
--- a/code/modules/clothing/suits/aliens/seromi_ch.dm
+++ b/code/modules/clothing/suits/aliens/seromi_vr.dm
@@ -3,22 +3,22 @@
 	name = "dark aesthetic cloak"
 	icon_state = "tesh_cloak_dretrowave"
 	item_state = "tesh_cloak_dretrowave"
-	icon = 'icons/mob/species/seromi/teshari_cloak_ch.dmi'
-	icon_override = 'icons/mob/species/seromi/teshari_cloak_ch.dmi'
+	icon = 'icons/mob/species/seromi/teshari_cloak_vr.dmi'
+	icon_override = 'icons/mob/species/seromi/teshari_cloak_vr.dmi'
 
 /obj/item/clothing/suit/storage/seromi/cloak/standard/black_glow
 	name = "black and glowing cloak"
 	icon_state = "tesh_cloak_bglowing"
 	item_state = "tesh_cloak_bglowing"
-	icon = 'icons/mob/species/seromi/teshari_cloak_ch.dmi'
-	icon_override = 'icons/mob/species/seromi/teshari_cloak_ch.dmi'
+	icon = 'icons/mob/species/seromi/teshari_cloak_vr.dmi'
+	icon_override = 'icons/mob/species/seromi/teshari_cloak_vr.dmi'
 
 //Hooded teshari cloaks
 /obj/item/clothing/suit/storage/hooded/teshari
 	name = "Hooded Teshari Cloak"
 	desc = "A soft teshari cloak with an added hood."
-	icon_override = 'icons/mob/species/seromi/teshari_hood_ch.dmi'
-	icon = 'icons/mob/species/seromi/teshari_hood_ch.dmi'
+	icon_override = 'icons/mob/species/seromi/teshari_hood_vr.dmi'
+	icon = 'icons/mob/species/seromi/teshari_hood_vr.dmi'
 	icon_state = "tesh_hcloak_bo"
 	item_state_slots = list(slot_r_hand_str = "tesh_hcloak_bo", slot_l_hand_str = "tesh_hcloak_bo")
 	body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS
@@ -31,8 +31,8 @@
 /obj/item/clothing/head/tesh_hood
 	name = "Cloak Hood"
 	desc = "A hood attached to a teshari cloak."
-	icon_override = 'icons/mob/species/seromi/teshari_hood_ch.dmi'
-	icon = 'icons/mob/species/seromi/teshari_hood_ch.dmi'
+	icon_override = 'icons/mob/species/seromi/teshari_hood_vr.dmi'
+	icon = 'icons/mob/species/seromi/teshari_hood_vr.dmi'
 	icon_state = "tesh_hood_bo"
 	item_state_slots = list(slot_r_hand_str = "tesh_hood_bo", slot_l_hand_str = "tesh_hood_bo")
 	flags_inv = BLOCKHAIR
@@ -318,8 +318,8 @@
 /obj/item/clothing/suit/storage/seromi/beltcloak
 	name = "belted cloak"
 	desc = "A more ridged and stylized Teshari cloak."
-	icon = 'icons/mob/species/seromi/teshari_cloak_ch.dmi'
-	icon_override = 'icons/mob/species/seromi/teshari_cloak_ch.dmi'
+	icon = 'icons/mob/species/seromi/teshari_cloak_vr.dmi'
+	icon_override = 'icons/mob/species/seromi/teshari_cloak_vr.dmi'
 	icon_state = "tesh_beltcloak_bo"
 	item_state = "tesh_beltcloak_bo"
 	species_restricted = list(SPECIES_TESHARI)
@@ -452,8 +452,8 @@
 
 //Belted job cloaks
 /obj/item/clothing/suit/storage/seromi/beltcloak/jobs
-	icon = 'icons/mob/species/seromi/teshari_cloak_ch.dmi'
-	icon_override = 'icons/mob/species/seromi/teshari_cloak_ch.dmi'
+	icon = 'icons/mob/species/seromi/teshari_cloak_vr.dmi'
+	icon_override = 'icons/mob/species/seromi/teshari_cloak_vr.dmi'
 
 /obj/item/clothing/suit/storage/seromi/beltcloak/jobs/cargo
 	name = "cargo belted cloak"
@@ -506,8 +506,8 @@
 /obj/item/clothing/suit/storage/seromi/beltcloak/jobs/chemistry
 	name = "chemist belted cloak"
 	desc = "A soft Teshari cloak made for the Chemist"
-	icon_state = "tesh_beltcloak_chem"
-	item_state = "tesh_beltcloak_chem"
+	icon_state = "tesh_beltcloak_vrem"
+	item_state = "tesh_beltcloak_vrem"
 
 /obj/item/clothing/suit/storage/seromi/beltcloak/jobs/viro
 	name = "virologist belted cloak"
@@ -574,3 +574,279 @@
 	desc = "A soft Teshari cloak made for the Janitor"
 	icon_state = "tesh_beltcloak_jani"
 	item_state = "tesh_beltcloak_jani"
+
+//Alternate standard & job cloaks.
+/obj/item/clothing/suit/storage/teshari/cloak_vr
+	name = "black cloak (VR)"
+	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_vr.dmi'
+	icon_override = 'icons/mob/species/seromi/teshari_cloak_vr.dmi'
+	icon_state = "tesh_cloak_bn"
+	item_state = "tesh_cloak_bn"
+	species_restricted = list(SPECIES_TESHARI)
+	body_parts_covered = UPPER_TORSO|ARMS
+
+/obj/item/clothing/suit/storage/teshari/cloak_vr/standard/black_red
+	name = "black and red cloak (VR)"
+	icon_state = "tesh_cloak_br"
+	item_state = "tesh_cloak_br"
+
+/obj/item/clothing/suit/storage/teshari/cloak_vr/standard/black_orange
+	name = "black and orange cloak (VR)"
+	icon_state = "tesh_cloak_bo"
+	item_state = "tesh_cloak_bo"
+
+/obj/item/clothing/suit/storage/teshari/cloak_vr/standard/black_yellow
+	name = "black and yellow cloak (VR)"
+	icon_state = "tesh_cloak_by"
+	item_state = "tesh_cloak_by"
+
+/obj/item/clothing/suit/storage/teshari/cloak_vr/standard/black_green
+	name = "black and green cloak (VR)"
+	icon_state = "tesh_cloak_bgr"
+	item_state = "tesh_cloak_bgr"
+
+/obj/item/clothing/suit/storage/teshari/cloak_vr/standard/black_blue
+	name = "black and blue cloak (VR)"
+	icon_state = "tesh_cloak_bbl"
+	item_state = "tesh_cloak_bbl"
+
+/obj/item/clothing/suit/storage/teshari/cloak_vr/standard/black_purple
+	name = "black and purple cloak (VR)"
+	icon_state = "tesh_cloak_bp"
+	item_state = "tesh_cloak_bp"
+
+/obj/item/clothing/suit/storage/teshari/cloak_vr/standard/black_pink
+	name = "black and pink cloak (VR)"
+	icon_state = "tesh_cloak_bpi"
+	item_state = "tesh_cloak_bpi"
+
+/obj/item/clothing/suit/storage/teshari/cloak_vr/standard/black_brown
+	name = "black and brown cloak (VR)"
+	icon_state = "tesh_cloak_bbr"
+	item_state = "tesh_cloak_bbr"
+
+/obj/item/clothing/suit/storage/teshari/cloak_vr/standard/black_grey
+	name = "black and grey cloak (VR)"
+	icon_state = "tesh_cloak_bg"
+	item_state = "tesh_cloak_bg"
+
+/obj/item/clothing/suit/storage/teshari/cloak_vr/standard/black_white
+	name = "black and white cloak (VR)"
+	icon_state = "tesh_cloak_bw"
+	item_state = "tesh_cloak_bw"
+
+/obj/item/clothing/suit/storage/teshari/cloak_vr/standard/white
+	name = "white cloak (VR)"
+	icon_state = "tesh_cloak_wn"
+	item_state = "tesh_cloak_wn"
+
+/obj/item/clothing/suit/storage/teshari/cloak_vr/standard/white_grey
+	name = "white and grey cloak (VR)"
+	icon_state = "tesh_cloak_wg"
+	item_state = "tesh_cloak_wg"
+
+/obj/item/clothing/suit/storage/teshari/cloak_vr/standard/red_grey
+	name = "red and grey cloak (VR)"
+	icon_state = "tesh_cloak_rg"
+	item_state = "tesh_cloak_rg"
+
+/obj/item/clothing/suit/storage/teshari/cloak_vr/standard/orange_grey
+	name = "orange and grey cloak (VR)"
+	icon_state = "tesh_cloak_og"
+	item_state = "tesh_cloak_og"
+
+/obj/item/clothing/suit/storage/teshari/cloak_vr/standard/yellow_grey
+	name = "yellow and grey cloak (VR)"
+	icon_state = "tesh_cloak_yg"
+	item_state = "tesh_cloak_yg"
+
+/obj/item/clothing/suit/storage/teshari/cloak_vr/standard/green_grey
+	name = "green and grey cloak (VR)"
+	icon_state = "tesh_cloak_gg"
+	item_state = "tesh_cloak_gg"
+
+/obj/item/clothing/suit/storage/teshari/cloak_vr/standard/blue_grey
+	name = "blue and grey cloak (VR)"
+	icon_state = "tesh_cloak_blug"
+	item_state = "tesh_cloak_blug"
+
+/obj/item/clothing/suit/storage/teshari/cloak_vr/standard/purple_grey
+	name = "purple and grey cloak (VR)"
+	icon_state = "tesh_cloak_pg"
+	item_state = "tesh_cloak_pg"
+
+/obj/item/clothing/suit/storage/teshari/cloak_vr/standard/pink_grey
+	name = "pink and grey cloak (VR)"
+	icon_state = "tesh_cloak_pig"
+	item_state = "tesh_cloak_pig"
+
+/obj/item/clothing/suit/storage/teshari/cloak_vr/standard/brown_grey
+	name = "brown and grey cloak (VR)"
+	icon_state = "tesh_cloak_brg"
+	item_state = "tesh_cloak_brg"
+
+/obj/item/clothing/suit/storage/teshari/cloak_vr/standard/rainbow
+	name = "rainbow cloak (VR)"
+	icon_state = "tesh_cloak_rainbow"
+	item_state = "tesh_cloak_rainbow"
+
+/obj/item/clothing/suit/storage/teshari/cloak_vr/standard/orange
+	name = "orange cloak (VR)"
+	icon_state = "tesh_cloak_on"
+	item_state = "tesh_cloak_on"
+
+//Alternate Job Cloaks - subpathed for ease of access in loadouts. Net new get a unique _vr path.
+/obj/item/clothing/suit/storage/seromi/cloak/jobs/cap_vr
+	name = "facility director cloak (VR)"
+	desc = "A soft Teshari cloak made for the Facility Director"
+	icon_state = "tesh_cloak_cap"
+	item_state = "tesh_cloak_cap"
+	icon = 'icons/mob/species/seromi/deptcloak_vr.dmi'
+	icon_override = 'icons/mob/species/seromi/deptcloak_vr.dmi'
+
+//Cargo
+
+/obj/item/clothing/suit/storage/seromi/cloak/jobs/qm/VR
+	name = "quartermaster cloak (VR)"
+	desc = "A soft Teshari cloak made for the Quartermaster"
+	icon = 'icons/mob/species/seromi/deptcloak_vr.dmi'
+	icon_override = 'icons/mob/species/seromi/deptcloak_vr.dmi'
+
+/obj/item/clothing/suit/storage/seromi/cloak/jobs/cargo/VR
+	name = "cargo cloak (VR)"
+	desc = "A soft Teshari cloak made for the Cargo department"
+	icon = 'icons/mob/species/seromi/deptcloak_vr.dmi'
+	icon_override = 'icons/mob/species/seromi/deptcloak_vr.dmi'
+
+/obj/item/clothing/suit/storage/seromi/cloak/jobs/mining/VR
+	name = "mining cloak (VR)"
+	desc = "A soft Teshari cloak made for Mining"
+	icon = 'icons/mob/species/seromi/deptcloak_vr.dmi'
+	icon_override = 'icons/mob/species/seromi/deptcloak_vr.dmi'
+
+/obj/item/clothing/suit/storage/seromi/cloak/jobs/command/VR
+	name = "command cloak (VR)"
+	desc = "A soft Teshari cloak made for the Command department"
+	icon = 'icons/mob/species/seromi/deptcloak_vr.dmi'
+	icon_override = 'icons/mob/species/seromi/deptcloak_vr.dmi'
+
+//Engineering
+
+/obj/item/clothing/suit/storage/seromi/cloak/jobs/ce/VR
+	name = "chief engineer cloak (VR)"
+	desc = "A soft Teshari cloak made the Chief Engineer"
+	icon = 'icons/mob/species/seromi/deptcloak_vr.dmi'
+	icon_override = 'icons/mob/species/seromi/deptcloak_vr.dmi'
+
+/obj/item/clothing/suit/storage/seromi/cloak/jobs/eningeer/VR
+	name = "engineering cloak (VR)"
+	desc = "A soft Teshari cloak made for the Engineering department"
+	icon = 'icons/mob/species/seromi/deptcloak_vr.dmi'
+	icon_override = 'icons/mob/species/seromi/deptcloak_vr.dmi'
+
+/obj/item/clothing/suit/storage/seromi/cloak/jobs/atmos/VR
+	name = "atmospherics cloak (VR)"
+	desc = "A soft Teshari cloak made for the Atmospheric Technician"
+	icon = 'icons/mob/species/seromi/deptcloak_vr.dmi'
+	icon_override = 'icons/mob/species/seromi/deptcloak_vr.dmi'
+
+//Medical
+
+/obj/item/clothing/suit/storage/seromi/cloak/jobs/cmo/VR
+	name = "chief medical officer cloak (VR)"
+	desc = "A soft Teshari cloak made the Cheif Medical Officer"
+	icon = 'icons/mob/species/seromi/deptcloak_vr.dmi'
+	icon_override = 'icons/mob/species/seromi/deptcloak_vr.dmi'
+
+/obj/item/clothing/suit/storage/seromi/cloak/jobs/medical/VR
+	name = "medical cloak (VR)"
+	desc = "A soft Teshari cloak made for the Medical department"
+	icon = 'icons/mob/species/seromi/deptcloak_vr.dmi'
+	icon_override = 'icons/mob/species/seromi/deptcloak_vr.dmi'
+
+/obj/item/clothing/suit/storage/seromi/cloak/jobs/chemistry/VR
+	name = "chemist cloak (VR)"
+	desc = "A soft Teshari cloak made for the Chemist"
+	icon = 'icons/mob/species/seromi/deptcloak_vr.dmi'
+	icon_override = 'icons/mob/species/seromi/deptcloak_vr.dmi'
+
+/obj/item/clothing/suit/storage/seromi/cloak/jobs/viro/VR
+	name = "virologist cloak (VR)"
+	desc = "A soft Teshari cloak made for the Virologist"
+	icon = 'icons/mob/species/seromi/deptcloak_vr.dmi'
+	icon_override = 'icons/mob/species/seromi/deptcloak_vr.dmi'
+
+/obj/item/clothing/suit/storage/seromi/cloak/jobs/para/VR
+	name = "paramedic cloak (VR)"
+	desc = "A soft Teshari cloak made for the Paramedic"
+	icon = 'icons/mob/species/seromi/deptcloak_vr.dmi'
+	icon_override = 'icons/mob/species/seromi/deptcloak_vr.dmi'
+
+/obj/item/clothing/suit/storage/seromi/cloak/jobs/psych_vr
+	name = "psychiatrist cloak (VR)"
+	desc = "A soft Teshari cloak made for the Psychiatrist"
+	icon_state = "tesh_cloak_psych"
+	item_state = "tesh_cloak_psych"
+	icon = 'icons/mob/species/seromi/deptcloak_vr.dmi'
+	icon_override = 'icons/mob/species/seromi/deptcloak_vr.dmi'
+
+//Science
+
+/obj/item/clothing/suit/storage/seromi/cloak/jobs/rd_vr
+	name = "research director cloak (VR)"
+	desc = "A soft Teshari cloak made for the Research Director"
+	icon_state = "tesh_cloak_rd"
+	item_state = "tesh_cloak_rd"
+	icon = 'icons/mob/species/seromi/deptcloak_vr.dmi'
+	icon_override = 'icons/mob/species/seromi/deptcloak_vr.dmi'
+
+/obj/item/clothing/suit/storage/seromi/cloak/jobs/sci/VR
+	name = "scientist cloak (VR)"
+	desc = "A soft Teshari cloak made for the Science department"
+	icon = 'icons/mob/species/seromi/deptcloak_vr.dmi'
+	icon_override = 'icons/mob/species/seromi/deptcloak_vr.dmi'
+
+/obj/item/clothing/suit/storage/seromi/cloak/jobs/robo/VR
+	name = "roboticist cloak (VR)"
+	desc = "A soft Teshari cloak made for the Roboticist"
+	icon = 'icons/mob/species/seromi/deptcloak_vr.dmi'
+	icon_override = 'icons/mob/species/seromi/deptcloak_vr.dmi'
+
+//Security
+
+/obj/item/clothing/suit/storage/seromi/cloak/jobs/hos_vr
+	name = "head of security cloak (VR)"
+	desc = "A soft Teshari cloak made for the Head of Security"
+	icon_state = "tesh_cloak_hos"
+	item_state = "tesh_cloak_hos"
+	icon = 'icons/mob/species/seromi/deptcloak_vr.dmi'
+	icon_override = 'icons/mob/species/seromi/deptcloak_vr.dmi'
+
+/obj/item/clothing/suit/storage/seromi/cloak/jobs/sec/VR
+	name = "security cloak (VR)"
+	desc = "A soft Teshari cloak made for the Security department"
+	icon = 'icons/mob/species/seromi/deptcloak_vr.dmi'
+	icon_override = 'icons/mob/species/seromi/deptcloak_vr.dmi'
+
+/obj/item/clothing/suit/storage/seromi/cloak/jobs/iaa/VR
+	name = "internal affairs cloak (VR)"
+	desc = "A soft Teshari cloak made for the Internal Affairs Agent"
+	icon = 'icons/mob/species/seromi/deptcloak_vr.dmi'
+	icon_override = 'icons/mob/species/seromi/deptcloak_vr.dmi'
+
+//Service
+
+/obj/item/clothing/suit/storage/seromi/cloak/jobs/hop_vr
+	name = "head of personnel cloak (VR)"
+	desc = "A soft Teshari cloak made for the Head of Personnel"
+	icon_state = "tesh_cloak_hop"
+	item_state = "tesh_cloak_hop"
+	icon = 'icons/mob/species/seromi/deptcloak_vr.dmi'
+	icon_override = 'icons/mob/species/seromi/deptcloak_vr.dmi'
+
+/obj/item/clothing/suit/storage/seromi/cloak/jobs/service/VR
+	name = "service cloak (VR)"
+	desc = "A soft Teshari cloak made for the Service department"
+	icon = 'icons/mob/species/seromi/deptcloak_vr.dmi'
+	icon_override = 'icons/mob/species/seromi/deptcloak_vr.dmi'
diff --git a/code/modules/clothing/under/accessories/accessory_vr.dm b/code/modules/clothing/under/accessories/accessory_vr.dm
index 1669717cc0..c57656f80c 100644
--- a/code/modules/clothing/under/accessories/accessory_vr.dm
+++ b/code/modules/clothing/under/accessories/accessory_vr.dm
@@ -12,12 +12,12 @@
 	item_state = "choker_cst"
 	overlay_state = "choker_cst"
 	var/customized = 0
-	var/icon_previous_override //yw addition
+	var/icon_previous_override
 	sprite_sheets = list(
 		SPECIES_TESHARI = 'icons/mob/species/seromi/ties_vr.dmi'
 		)
 
-//ywedit start. forces different sprite sheet on equip
+//Forces different sprite sheet on equip
 /obj/item/clothing/accessory/choker/New()
 	..()
 	icon_previous_override = icon_override
@@ -28,9 +28,8 @@
 
 /obj/item/clothing/accessory/choker/proc/setUniqueSpeciesSprite()
 	var/mob/living/carbon/human/H = loc
-	if(!istype(H))
-		if(istype(has_suit) && ishuman(has_suit.loc))
-			H = has_suit.loc
+	if(!istype(H) && istype(has_suit) && ishuman(has_suit.loc))
+		H = has_suit.loc
 	if(sprite_sheets && istype(H) && H.species.get_bodytype(H) && (H.species.get_bodytype(H) in sprite_sheets))
 		icon_override = sprite_sheets[H.species.get_bodytype(H)]
 		update_clothing_icon()
@@ -44,7 +43,6 @@
 
 /obj/item/clothing/accessory/choker/dropped()
 	icon_override = icon_previous_override
-//ywedit end
 
 /obj/item/clothing/accessory/choker/attack_self(mob/user as mob)
 	if(!customized)
@@ -64,12 +62,12 @@
 	icon_override = 'icons/mob/ties_vr.dmi'
 	icon_state = "collar_blk"
 	var/writtenon = 0
-	var/icon_previous_override //yw addition
+	var/icon_previous_override
 	sprite_sheets = list(
 		SPECIES_TESHARI = 'icons/mob/species/seromi/ties_vr.dmi'
 		)
 
-//ywedit start. forces different sprite sheet on equip
+//Forces different sprite sheet on equip
 /obj/item/clothing/accessory/collar/New()
 	..()
 	icon_previous_override = icon_override
@@ -80,9 +78,8 @@
 
 /obj/item/clothing/accessory/collar/proc/setUniqueSpeciesSprite()
 	var/mob/living/carbon/human/H = loc
-	if(!istype(H))
-		if(istype(has_suit) && ishuman(has_suit.loc))
-			H = has_suit.loc
+	if(!istype(H) && istype(has_suit) && ishuman(has_suit.loc))
+		H = has_suit.loc
 	if(sprite_sheets && istype(H) && H.species.get_bodytype(H) && (H.species.get_bodytype(H) in sprite_sheets))
 		icon_override = sprite_sheets[H.species.get_bodytype(H)]
 		update_clothing_icon()
@@ -96,7 +93,6 @@
 
 /obj/item/clothing/accessory/collar/dropped()
 	icon_override = icon_previous_override
-//ywedit end
 
 /obj/item/clothing/accessory/collar/silver
 	name = "Silver tag collar"
diff --git a/code/modules/clothing/under/xenos/seromi_vr.dm b/code/modules/clothing/under/xenos/seromi_vr.dm
new file mode 100644
index 0000000000..5ca2ffc2b8
--- /dev/null
+++ b/code/modules/clothing/under/xenos/seromi_vr.dm
@@ -0,0 +1,169 @@
+//Alternate job undercoat sprites. If it isn't a /vr subpath it's net new
+
+/obj/item/clothing/under/seromi/undercoat/jobs/cargo/vr
+	name = "cargo undercoat"
+	desc = "A traditional Teshari garb made for the Cargo department"
+	icon_state = "tesh_uniform_car"
+	item_state = "tesh_uniform_car"
+	icon = 'icons/mob/species/seromi/deptjacket_vr.dmi'
+	icon_override = 'icons/mob/species/seromi/deptjacket_vr.dmi'
+
+/obj/item/clothing/under/seromi/undercoat/jobs/mining/vr
+	name = "mining undercoat"
+	desc = "A traditional Teshari garb made for Mining"
+	icon_state = "tesh_uniform_mine"
+	item_state = "tesh_uniform_mine"
+	icon = 'icons/mob/species/seromi/deptjacket_vr.dmi'
+	icon_override = 'icons/mob/species/seromi/deptjacket_vr.dmi'
+
+/obj/item/clothing/under/seromi/undercoat/jobs/cap_vr
+	name = "facility director undercoat"
+	desc = "A traditional Teshari garb made for the Facility Director"
+	icon_state = "tesh_uniform_cap"
+	item_state = "tesh_uniform_cap"
+	icon = 'icons/mob/species/seromi/deptjacket_vr.dmi'
+	icon_override = 'icons/mob/species/seromi/deptjacket_vr.dmi'
+
+/obj/item/clothing/under/seromi/undercoat/jobs/hop_vr
+	name = "head of personnel undercoat"
+	desc = "A traditional Teshari garb made for the Head of Personnel"
+	icon_state = "tesh_uniform_hop"
+	item_state = "tesh_uniform_hop"
+	icon = 'icons/mob/species/seromi/deptjacket_vr.dmi'
+	icon_override = 'icons/mob/species/seromi/deptjacket_vr.dmi'
+
+/obj/item/clothing/under/seromi/undercoat/jobs/ce/vr
+	name = "cheif engineer undercoat"
+	desc = "A traditional Teshari garb made for the Chief Engineer"
+	icon_state = "tesh_uniform_ce"
+	item_state = "tesh_uniform_ce"
+	icon = 'icons/mob/species/seromi/deptjacket_vr.dmi'
+	icon_override = 'icons/mob/species/seromi/deptjacket_vr.dmi'
+
+/obj/item/clothing/under/seromi/undercoat/jobs/engineer/vr
+	name = "engineering undercoat"
+	desc = "A traditional Teshari garb made for the Engineering department"
+	icon_state = "tesh_uniform_engie"
+	item_state = "tesh_uniform_engie"
+	icon = 'icons/mob/species/seromi/deptjacket_vr.dmi'
+	icon_override = 'icons/mob/species/seromi/deptjacket_vr.dmi'
+
+/obj/item/clothing/under/seromi/undercoat/jobs/atmos/vr
+	name = "atmospherics undercoat"
+	desc = "A traditional Teshari garb made for the Atmospheric Technician"
+	icon_state = "tesh_uniform_atmos"
+	item_state = "tesh_uniform_atmos"
+	icon = 'icons/mob/species/seromi/deptjacket_vr.dmi'
+	icon_override = 'icons/mob/species/seromi/deptjacket_vr.dmi'
+
+/obj/item/clothing/under/seromi/undercoat/jobs/cmo/vr
+	name = "chief medical officer undercoat"
+	desc = "A traditional Teshari garb made for the Cheif Medical Officer"
+	icon_state = "tesh_uniform_cmo"
+	item_state = "tesh_uniform_cmo"
+	icon = 'icons/mob/species/seromi/deptjacket_vr.dmi'
+	icon_override = 'icons/mob/species/seromi/deptjacket_vr.dmi'
+
+/obj/item/clothing/under/seromi/undercoat/jobs/medical/vr
+	name = "medical undercoat"
+	desc = "A traditional Teshari garb made for the Medical department"
+	icon_state = "tesh_uniform_doc"
+	item_state = "tesh_uniform_doc"
+	icon = 'icons/mob/species/seromi/deptjacket_vr.dmi'
+	icon_override = 'icons/mob/species/seromi/deptjacket_vr.dmi'
+
+/obj/item/clothing/under/seromi/undercoat/jobs/chemistry/vr
+	name = "chemist undercoat"
+	desc = "A traditional Teshari garb made for the Chemist"
+	icon_state = "tesh_uniform_chem"
+	item_state = "tesh_uniform_chem"
+	icon = 'icons/mob/species/seromi/deptjacket_vr.dmi'
+	icon_override = 'icons/mob/species/seromi/deptjacket_vr.dmi'
+
+/obj/item/clothing/under/seromi/undercoat/jobs/viro/vr
+	name = "virologist undercoat"
+	desc = "A traditional Teshari garb made for the Virologist"
+	icon_state = "tesh_uniform_viro"
+	item_state = "tesh_uniform_viro"
+	icon = 'icons/mob/species/seromi/deptjacket_vr.dmi'
+	icon_override = 'icons/mob/species/seromi/deptjacket_vr.dmi'
+
+/obj/item/clothing/under/seromi/undercoat/jobs/para/vr
+	name = "paramedic undercoat"
+	desc = "A traditional Teshari garb made for the Paramedic"
+	icon_state = "tesh_uniform_para"
+	item_state = "tesh_uniform_para"
+	icon = 'icons/mob/species/seromi/deptjacket_vr.dmi'
+	icon_override = 'icons/mob/species/seromi/deptjacket_vr.dmi'
+
+/obj/item/clothing/under/seromi/undercoat/jobs/psych_vr
+	name = "psychiatrist undercoat"
+	desc = "A traditional Teshari garb made for the Psychiatrist"
+	icon_state = "tesh_uniform_psych"
+	item_state = "tesh_uniform_psych"
+	icon = 'icons/mob/species/seromi/deptjacket_vr.dmi'
+	icon_override = 'icons/mob/species/seromi/deptjacket_vr.dmi'
+
+/obj/item/clothing/under/seromi/undercoat/jobs/rd_vr
+	name = "research director undercoat"
+	desc = "A traditional Teshari garb made for the Research Director"
+	icon_state = "tesh_uniform_rd"
+	item_state = "tesh_uniform_rd"
+	icon = 'icons/mob/species/seromi/deptjacket_vr.dmi'
+	icon_override = 'icons/mob/species/seromi/deptjacket_vr.dmi'
+
+/obj/item/clothing/under/seromi/undercoat/jobs/sci/vr
+	name = "scientist undercoat"
+	desc = "A traditional Teshari garb made for the Science department"
+	icon_state = "tesh_uniform_sci"
+	item_state = "tesh_uniform_sci"
+	icon = 'icons/mob/species/seromi/deptjacket_vr.dmi'
+	icon_override = 'icons/mob/species/seromi/deptjacket_vr.dmi'
+
+/obj/item/clothing/under/seromi/undercoat/jobs/robo/vr
+	name = "roboticist undercoat"
+	desc = "A traditional Teshari garb made for the Roboticist"
+	icon_state = "tesh_uniform_robo"
+	item_state = "tesh_uniform_robo"
+	icon = 'icons/mob/species/seromi/deptjacket_vr.dmi'
+	icon_override = 'icons/mob/species/seromi/deptjacket_vr.dmi'
+
+/obj/item/clothing/under/seromi/undercoat/jobs/hos_vr
+	name = "head of security undercoat"
+	desc = "A traditional Teshari garb made for the Head of Security."
+	icon_state = "tesh_uniform_hos"
+	item_state = "tesh_uniform_hos"
+	icon = 'icons/mob/species/seromi/deptjacket_vr.dmi'
+	icon_override = 'icons/mob/species/seromi/deptjacket_vr.dmi'
+
+/obj/item/clothing/under/seromi/undercoat/jobs/sec/vr
+	name = "security undercoat"
+	desc = "A traditional Teshari garb made for the Security department"
+	icon_state = "tesh_uniform_sec"
+	item_state = "tesh_uniform_sec"
+	icon = 'icons/mob/species/seromi/deptjacket_vr.dmi'
+	icon_override = 'icons/mob/species/seromi/deptjacket_vr.dmi'
+
+/obj/item/clothing/under/seromi/undercoat/jobs/qm/vr
+	name = "quartermaster undercoat"
+	desc = "A traditional Teshari garb made for the Quartermaster"
+	icon_state = "tesh_uniform_qm"
+	item_state = "tesh_uniform_qm"
+	icon = 'icons/mob/species/seromi/deptjacket_vr.dmi'
+	icon_override = 'icons/mob/species/seromi/deptjacket_vr.dmi'
+
+/obj/item/clothing/under/seromi/undercoat/jobs/service/vr
+	name = "service undercoat"
+	desc = "A traditional Teshari garb made for the Service department"
+	icon_state = "tesh_uniform_serv"
+	item_state = "tesh_uniform_serv"
+	icon = 'icons/mob/species/seromi/deptjacket_vr.dmi'
+	icon_override = 'icons/mob/species/seromi/deptjacket_vr.dmi'
+
+/obj/item/clothing/under/seromi/undercoat/jobs/iaa/vr
+	name = "internal affairs undercoat"
+	desc = "A traditional Teshari garb made for the Internal Affairs Agent"
+	icon_state = "tesh_uniform_iaa"
+	item_state = "tesh_uniform_iaa"
+	icon = 'icons/mob/species/seromi/deptjacket_vr.dmi'
+	icon_override = 'icons/mob/species/seromi/deptjacket_vr.dmi'
diff --git a/icons/mob/species/seromi/deptcloak_cit.dmi b/icons/mob/species/seromi/deptcloak_vr.dmi
similarity index 100%
rename from icons/mob/species/seromi/deptcloak_cit.dmi
rename to icons/mob/species/seromi/deptcloak_vr.dmi
diff --git a/icons/mob/species/seromi/deptjacket_cit.dmi b/icons/mob/species/seromi/deptjacket_cit.dmi
deleted file mode 100644
index a14d060cb3..0000000000
Binary files a/icons/mob/species/seromi/deptjacket_cit.dmi and /dev/null differ
diff --git a/icons/mob/species/seromi/deptjacket_vr.dmi b/icons/mob/species/seromi/deptjacket_vr.dmi
new file mode 100644
index 0000000000..9b65728e65
Binary files /dev/null and b/icons/mob/species/seromi/deptjacket_vr.dmi differ
diff --git a/icons/mob/species/seromi/teshari_cloak_ch.dmi b/icons/mob/species/seromi/teshari_cloak_ch.dmi
deleted file mode 100644
index 70cfc6071b..0000000000
Binary files a/icons/mob/species/seromi/teshari_cloak_ch.dmi and /dev/null differ
diff --git a/icons/mob/species/seromi/teshari_cloak_cit.dmi b/icons/mob/species/seromi/teshari_cloak_cit.dmi
deleted file mode 100644
index 53e7583f5d..0000000000
Binary files a/icons/mob/species/seromi/teshari_cloak_cit.dmi and /dev/null differ
diff --git a/icons/mob/species/seromi/teshari_cloak_vr.dmi b/icons/mob/species/seromi/teshari_cloak_vr.dmi
new file mode 100644
index 0000000000..e765cf364b
Binary files /dev/null and b/icons/mob/species/seromi/teshari_cloak_vr.dmi differ
diff --git a/icons/mob/species/seromi/teshari_hood_ch.dmi b/icons/mob/species/seromi/teshari_hood_vr.dmi
similarity index 100%
rename from icons/mob/species/seromi/teshari_hood_ch.dmi
rename to icons/mob/species/seromi/teshari_hood_vr.dmi
diff --git a/icons/mob/species/seromi/teshari_uniform.dmi b/icons/mob/species/seromi/teshari_uniform.dmi
index 627a03f201..4609db080c 100644
Binary files a/icons/mob/species/seromi/teshari_uniform.dmi and b/icons/mob/species/seromi/teshari_uniform.dmi differ
diff --git a/vorestation.dme b/vorestation.dme
index de23de00ad..f88df54fe7 100644
--- a/vorestation.dme
+++ b/vorestation.dme
@@ -1960,8 +1960,7 @@
 #include "code\modules\clothing\suits\utility_vr.dm"
 #include "code\modules\clothing\suits\wiz_robe.dm"
 #include "code\modules\clothing\suits\aliens\seromi.dm"
-#include "code\modules\clothing\suits\aliens\seromi_ch.dm"
-#include "code\modules\clothing\suits\aliens\seromi_cit.dm"
+#include "code\modules\clothing\suits\aliens\seromi_vr.dm"
 #include "code\modules\clothing\suits\aliens\tajara.dm"
 #include "code\modules\clothing\suits\aliens\unathi.dm"
 #include "code\modules\clothing\suits\aliens\vox.dm"
@@ -1998,6 +1997,7 @@
 #include "code\modules\clothing\under\jobs\security.dm"
 #include "code\modules\clothing\under\jobs\security_vr.dm"
 #include "code\modules\clothing\under\xenos\seromi.dm"
+#include "code\modules\clothing\under\xenos\seromi_vr.dm"
 #include "code\modules\clothing\under\xenos\vox.dm"
 #include "code\modules\customitems\item_spawning.dm"
 #include "code\modules\detectivework\footprints.dm"