First merge from upstream

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

@@ -66,7 +66,7 @@ var/list/gear_datums = list()
 	for(var/gear_name in gear_datums)
 		var/datum/gear/G = gear_datums[gear_name]
 
-		if(G.whitelisted && !is_alien_whitelisted(preference_mob, all_species[G.whitelisted]))
+		if(G.whitelisted && !is_alien_whitelisted(preference_mob, GLOB.all_species[G.whitelisted]))
 			continue
 		if(max_cost && G.cost > max_cost)
 			continue

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

@@ -45,11 +45,11 @@
 
 /datum/gear/accessory/brown_vest
 	display_name = "webbing, brown (Eng, Sec, Med, Exploration, Miner)"
-	allowed_roles = list("Station Engineer","Atmospheric Technician","Chief Engineer","Security Officer","Detective","Head of Security","Warden","Paramedic","Chief Medical Officer","Medical Doctor","Chemist","Field Medic","Pathfinder","Shaft Miner", "Blueshield Guard")
+	allowed_roles = list("Station Engineer","Atmospheric Technician","Chief Engineer","Security Officer","Detective","Head of Security","Warden","Paramedic","Chief Medical Officer","Medical Doctor","Chemist","Field Medic","Explorer","Pathfinder","Shaft Miner", "Blueshield Guard")
 
 /datum/gear/accessory/black_vest
 	display_name = "webbing, black (Eng, Sec, Med, Exploration, Miner)"
-	allowed_roles = list("Station Engineer","Atmospheric Technician","Chief Engineer","Security Officer","Detective","Head of Security","Warden","Paramedic","Chief Medical Officer","Medical Doctor","Chemist","Field Medic","Pathfinder","Shaft Miner", "Blueshield Guard")
+	allowed_roles = list("Station Engineer","Atmospheric Technician","Chief Engineer","Security Officer","Detective","Head of Security","Warden","Paramedic","Chief Medical Officer","Medical Doctor","Chemist","Field Medic","Explorer","Pathfinder","Shaft Miner", "Blueshield Guard")
 
 /datum/gear/accessory/white_vest
 	display_name = "webbing, white (Medical)"
@@ -57,11 +57,11 @@
 
 /datum/gear/accessory/brown_drop_pouches
 	display_name = "drop pouches, brown (Eng, Sec, Med, Exploration, Miner)"
-	allowed_roles = list("Station Engineer","Atmospheric Technician","Chief Engineer","Security Officer","Detective","Head of Security","Warden","Paramedic","Chief Medical Officer","Medical Doctor","Chemist","Field Medic","Pathfinder","Shaft Miner", "Blueshield Guard")
+	allowed_roles = list("Station Engineer","Atmospheric Technician","Chief Engineer","Security Officer","Detective","Head of Security","Warden","Paramedic","Chief Medical Officer","Medical Doctor","Chemist","Field Medic","Explorer","Pathfinder","Shaft Miner", "Blueshield Guard")
 
 /datum/gear/accessory/black_drop_pouches
 	display_name = "drop pouches, black (Eng, Sec, Med, Exploration, Miner)"
-	allowed_roles = list("Station Engineer","Atmospheric Technician","Chief Engineer","Security Officer","Detective","Head of Security","Warden","Paramedic","Chief Medical Officer","Medical Doctor","Chemist","Field Medic","Pathfinder","Shaft Miner", "Blueshield Guard")
+	allowed_roles = list("Station Engineer","Atmospheric Technician","Chief Engineer","Security Officer","Detective","Head of Security","Warden","Paramedic","Chief Medical Officer","Medical Doctor","Chemist","Field Medic","Explorer","Pathfinder","Shaft Miner", "Blueshield Guard")
 
 /datum/gear/accessory/white_drop_pouches
 	display_name = "drop pouches, white (Medical)"

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

@@ -83,7 +83,7 @@
 /datum/gear/eyes/material
 	display_name = "Optical Material Scanners (Mining)"
 	path = /obj/item/clothing/glasses/material
-	allowed_roles = list("Shaft Miner")
+	allowed_roles = list("Shaft Miner","Quartermaster")
 
 /datum/gear/eyes/material/prescription
 	display_name = "Prescription Optical Material Scanners (Mining)"

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

@@ -471,7 +471,7 @@
 	path = /obj/item/clothing/accessory/medal/silver/unity
 	display_name = "Rana's Unity Medal"
 	ckeywhitelist = list("kitchifox")
-	character_name = list("Rana Uma")
+	character_name = list("Rana Starsong-Uma")
 
 /datum/gear/fluff/taiga_uniform
 	path = /obj/item/clothing/under/fluff/taiga

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

@@ -124,6 +124,7 @@
 	ckeywhitelist = list("blackangelsace")
 	character_name = list("Strix Hades")
 
+//Plague Doctor Boye
 /datum/gear/fluff/kel_plague_box
 	path = /obj/item/weapon/storage/box/fluff/kelplague
 	display_name = "Plague Outfit Box"
@@ -794,16 +795,22 @@
 	description = "A golden necklace, the symbol for the Zahirn clan can be found on it's pendant."
 	ckeywhitelist = list("radiantflash")
 	character_name = list("Vasharr Zahirn")
+/datum/gear/fluff/vasharr_coffee
+	path = /obj/item/weapon/reagent_containers/food/drinks/bluespace_coffee
+	display_name = "Bluespace Coffee"
+	description = "Dreamt up in a strange feverish dream, this coffee cup seems to have been heavily modified with a variety of unlikely parts and wires, and never seems to run out of coffee. Truly the differance between madmen and genius is success."
+	ckeywhitelist = list("radiantflash")
+	character_name = list("Vasharr Zahirn")
 
 /datum/gear/fluff/vasharr_under
-	path = /obj/item/clothing/under/utility/sifguard/engineering/command/fluff/vasharr
+	path = /obj/item/clothing/under/explorer/utility/command/engineering/fluff/vasharr
 	display_name = "Cartographer Engineering Command Uniform"
 	description = "A Engineering Command Uniform from the Galactic Cartographers Society, A group of intrepid explorers. This one has gold trim and organge blazes."
 	ckeywhitelist = list("radiantflash")
 	character_name = list("Vasharr Zahirn")
 
 /datum/gear/fluff/vasharr_coat
-	path = /obj/item/clothing/suit/storage/service/sifguard/engineering/command/fluff/vasharr
+	path = /obj/item/clothing/suit/storage/explorer/engineering/command/fluff/vasharr
 	display_name = "Cartographer Engineering Command Jacket"
 	description = "A Engineering Command Jacket from the Galactic Cartographers Society, A group of intrepid explorers. It has gold buttons and orange trim."
 	ckeywhitelist = list("radiantflash")

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

@@ -32,4 +32,9 @@
 
 /datum/gear/suit/gntop
 	display_name = "GN crop jacket"
-	path = /obj/item/clothing/suit/storage/fluff/gntop
+	path = /obj/item/clothing/suit/storage/fluff/gntop
+
+/datum/gear/suit/old_poncho //This is made from an old sprite which has been here for quite some time. Called old poncho because duplicates
+	display_name = "Colorful poncho"
+	description = "A mexican looking poncho. It look like it fits wolf taurs as well."
+	path = /obj/item/clothing/suit/poncho

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

@@ -517,3 +517,43 @@
 /datum/gear/uniform/lilacdress
 	display_name = "lilac dress"
 	path = /obj/item/clothing/under/dress/lilacdress
+
+/datum/gear/uniform/polka
+	display_name = "polka dot dress"
+	path = /obj/item/clothing/under/dress/polka
+
+/datum/gear/uniform/twistfront
+	display_name = "twistfront crop dress"
+	path = /obj/item/clothing/under/dress/twistfront
+
+/datum/gear/uniform/cropdress
+	display_name = "crop dress"
+	path = /obj/item/clothing/under/dress/cropdress
+
+/datum/gear/uniform/vneckdress
+	display_name = "v-neck dress"
+	path = /obj/item/clothing/under/dress/vneck
+
+/datum/gear/uniform/bluedress
+	display_name = "blue dress"
+	path = /obj/item/clothing/under/dress/bluedress
+
+/datum/gear/uniform/wench
+	display_name = "wench's dress"
+	path = /obj/item/clothing/under/dress/wench
+
+/datum/gear/uniform/littleblackdress
+	display_name = "little black dress"
+	path = /obj/item/clothing/under/dress/littleblackdress
+
+/datum/gear/uniform/pinktutu
+	display_name = "pink tutu"
+	path = /obj/item/clothing/under/dress/pinktutu
+
+/datum/gear/uniform/festivedress
+	display_name = "festive dress"
+	path = /obj/item/clothing/under/dress/festivedress
+
+/datum/gear/uniform/haltertop
+	display_name = "halter top"
+	path = /obj/item/clothing/under/haltertop

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

@@ -74,3 +74,14 @@
 	path = /obj/item/clothing/glasses/sunglasses/sechud/tajblind
 	//whitelisted = SPECIES_TAJ
 	sort_category = "Xenowear"
+
+// Taur stuff
+/datum/gear/suit/taur/drake_cloak
+	display_name = "drake cloak (Drake-taur)"
+	path = /obj/item/clothing/suit/drake_cloak
+	sort_category = "Xenowear"
+
+/datum/gear/suit/taur/white_dress
+	display_name = "white wedding dress (Wolf/Horse-taur)"
+	path = /obj/item/clothing/suit/taur_dress/white
+	sort_category = "Xenowear"