Merge branch 'master' into upstream-merge-13503

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

@@ -91,7 +91,7 @@
 /datum/gear/uniform/pants/New()
 	..()
 	var/list/pants = list()
-	for(var/obj/item/clothing/under/pants/pant_type as anything in typesof(/obj/item/clothing/under/pants))
+	for(var/obj/item/clothing/under/pants/pant_type as anything in (typesof(/obj/item/clothing/under/pants) - typesof(/obj/item/clothing/under/pants/altevian)))
 		pants[initial(pant_type.name)] = pant_type
 	gear_tweaks += new/datum/gear_tweak/path(sortAssoc(pants))
 

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

@@ -36,7 +36,7 @@
 /datum/gear/uniform/job_khi/med
 	display_name = "ge uniform, med" //CHOMPedit: changed to GE suit
 	path = /obj/item/clothing/under/rank/khi/med
-	allowed_roles = list("Chief Medical Officer","Medical Doctor","Chemist","Paramedic","Geneticist","Field Medic")
+	allowed_roles = list("Chief Medical Officer","Medical Doctor","Chemist","Paramedic","Geneticist","Field Medic","Psychiatrist")
 
 /datum/gear/uniform/job_khi/eng
 	display_name = "ge uniform, eng" //CHOMPedit: changed to GE suit
@@ -290,3 +290,38 @@ Talon jumpsuit
 	display_name = "undersuit, command (SM/HoP)"
 	allowed_roles = list("Site Manager", "Head of Personnel")
 	path = /obj/item/clothing/under/undersuit/command
+
+//Altevian Uniforms
+/datum/gear/uniform/job_altevian/cmd
+	display_name = "altevian uniform, cmd"
+	path = /obj/item/clothing/under/pants/altevian/command
+	allowed_roles = list("Head of Security","Site Manager","Head of Personnel","Chief Engineer","Research Director","Chief Medical Officer")
+
+/datum/gear/uniform/job_altevian/sec
+	display_name = "altevian uniform, sec"
+	path = /obj/item/clothing/under/pants/altevian/security
+	allowed_roles = list("Head of Security", "Warden", "Detective", "Security Officer")
+
+/datum/gear/uniform/job_altevian/med
+	display_name = "altevian uniform, med"
+	path = /obj/item/clothing/under/pants/altevian/medical
+	allowed_roles = list("Chief Medical Officer","Medical Doctor","Chemist","Paramedic","Geneticist","Field Medic","Psychiatrist")
+
+/datum/gear/uniform/job_altevian/eng
+	display_name = "altevian uniform, eng"
+	path = /obj/item/clothing/under/pants/altevian/engineering
+	allowed_roles = list("Chief Engineer","Atmospheric Technician","Engineer")
+
+/datum/gear/uniform/job_altevian/sci
+	display_name = "altevian uniform, sci"
+	path = /obj/item/clothing/under/pants/altevian/science
+	allowed_roles = list("Research Director", "Scientist", "Roboticist", "Xenobiologist", "Xenobotanist")
+
+/datum/gear/uniform/job_altevian/crg
+	display_name = "altevian uniform, cargo"
+	path = /obj/item/clothing/under/pants/altevian/cargo
+	allowed_roles = list("Quartermaster", "Cargo Technician", "Shaft Miner")
+
+/datum/gear/uniform/job_altevian/civ
+	display_name = "altevian uniform, civ"
+	path = /obj/item/clothing/under/pants/altevian

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

@@ -167,9 +167,9 @@
 	sort_category = "Xenowear"
 
 /datum/gear/uniform/dept/undercoat/cap
-	display_name = "facility director undercoat (Teshari)"
+	display_name = "site manager undercoat (Teshari)"
 	path = /obj/item/clothing/under/teshari/undercoat/jobs/cap
-	allowed_roles = list("Facility Director")
+	allowed_roles = list("Site Manager")
 
 /datum/gear/uniform/dept/undercoat/hop
 	display_name = "head of personnel undercoat (Teshari)"
@@ -276,9 +276,9 @@
 	sort_category = "Xenowear"
 
 /datum/gear/suit/dept/cloak/cap
-	display_name = "facility director cloak (Teshari)"
+	display_name = "site manager cloak (Teshari)"
 	path = /obj/item/clothing/suit/storage/teshari/cloak/jobs
-	allowed_roles = list("Facility Director")
+	allowed_roles = list("Site Manager")
 
 /datum/gear/suit/dept/cloak/hop
 	display_name = "head of personnel cloak (Teshari)"