Reworks things. Closer to intended functionality. Adds paths to all items, restrictions.

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

@@ -60,19 +60,20 @@ var/list/gear_datums = list()
 	to_file(S["gear_list"], pref.gear_list)
 	to_file(S["gear_slot"], pref.gear_slot)
 
-/* Vorestation Edit. Defined in a _vr file
 /datum/category_item/player_setup_item/loadout/proc/valid_gear_choices(var/max_cost)
 	. = list()
 	var/mob/preference_mob = preference_mob()
 	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]))
 			continue
 		if(max_cost && G.cost > max_cost)
 			continue
+		if(G.ckeywhitelist && !(preference_mob.ckey in G.ckeywhitelist)) //Vorestation Edit 
+			continue  //Vorestation Edit 
+		if(G.character_name && !(preference_mob.real_name in G.character_name))  //Vorestation Edit 
+			continue  //Vorestation Edit 
 		. += gear_name
-*/
 
 /datum/category_item/player_setup_item/loadout/sanitize_character()
 	var/mob/preference_mob = preference_mob()
@@ -90,7 +91,7 @@ var/list/gear_datums = list()
 			preference_mob << "<span class='warning'>You cannot have more than one of the \the [gear_name]</span>"
 			pref.gear -= gear_name
 		else if(!(gear_name in valid_gear_choices()))
-			preference_mob << "<span class='warning'>You cannot take \the [gear_name] as you are not whitelisted for the species.</span>"
+			preference_mob << "<span class='warning'>You cannot take \the [gear_name] as you are not whitelisted for the species or item.</span>"		//CITADEL CHANGE
 			pref.gear -= gear_name
 		else
 			var/datum/gear/G = gear_datums[gear_name]
@@ -102,6 +103,7 @@ var/list/gear_datums = list()
 
 /datum/category_item/player_setup_item/loadout/content()
 	. = list()
+	var/mob/preference_mob = preference_mob()	//Vorestation Edit
 	var/total_cost = 0
 	if(pref.gear && pref.gear.len)
 		for(var/i = 1; i <= pref.gear.len; i++)
@@ -147,6 +149,10 @@ var/list/gear_datums = list()
 	. += "<tr><td colspan=3><hr></td></tr>"
 	for(var/gear_name in LC.gear)
 		var/datum/gear/G = LC.gear[gear_name]
+		if(G.ckeywhitelist && !(preference_mob.ckey in G.ckeywhitelist)) //Vorestation Edit
+			continue //Vorestation Edit
+		if(G.character_name && !(preference_mob.real_name in G.character_name)) //Vorestation Edit
+			continue //Vorestation Edit
 		var/ticked = (G.display_name in pref.gear)
 		. += "<tr style='vertical-align:top;'><td width=25%><a style='white-space:normal;' [ticked ? "class='linkOn' " : ""]href='?src=\ref[src];toggle_gear=[html_encode(G.display_name)]'>[G.display_name]</a></td>"
 		. += "<td width = 10% style='vertical-align:top'>[G.cost]</td>"
@@ -264,4 +270,4 @@ var/list/gear_datums = list()
 	var/item = new gd.path(gd.location)
 	for(var/datum/gear_tweak/gt in gear_tweaks)
 		gt.tweak_item(item, metadata["[gt]"])
-	return item
+	return item

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

@@ -4,35 +4,42 @@
 	display_name = "If this item can be chosen or seen, ping a coder immediately!"
 	ckeywhitelist = list("This entry should never be choosable with this variable set.") //If it does, then that means somebody fucked up the whitelist system pretty hard
 	character_name = list("This entry should never be choosable with this variable set.")
+	allowed_roles = list()
 	cost = 0
 
 /* 
 /datum/gear/fluff/testhorn
-	display_name = "Airhorn - Example Item"
 	path = /obj/item/weapon/bikehorn
+	display_name = "Airhorn - Example Item"
+	description = "An example item that you probably shouldn't see!"
 	ckeywhitelist = list("mewchild")
-	req_access = list("3")
+	allowed_roles = list("Station Engineer")
+
 */
 
 //  0-9 CKEYS
 /datum/gear/fluff/malady_crop
 	path = /obj/item/weapon/material/twohanded/fluff/riding_crop/malady
+	display_name = "Malady's Crop"
 	ckeywhitelist = list("1r1s")
 	character_name = list("Malady Blanche")
 
 //  A CKEYS
 /datum/gear/fluff/lethe_helmet
 	path = /obj/item/clothing/head/helmet/hos/fluff/lethe
+	display_name = "Lethe's Helmet"
 	ckeywhitelist = list("adk09")
 	character_name = list("Lethe")
 
 /datum/gear/fluff/xander_bracer
 	path = /obj/item/clothing/accessory/bracer/fluff/xander_sthasha
+	display_name = "Xander's Bracer"
 	ckeywhitelist = list("aegisoa")
 	character_name = list("Xander Bevin")
 
 /datum/gear/fluff/lynn_penlight
 	path = /obj/item/device/flashlight/pen/fluff/lynn
+	display_name = "Lynn's Penlight"
 	ckeywhitelist = list("argobargsoup")
 	character_name = list("Lynn Shady")
 
@@ -52,138 +59,163 @@
 
 /datum/gear/fluff/aronai_ccid
 	path = /obj/item/weapon/card/id/centcom/station/fluff/aronai
+	display_name = "Aronai's CC ID"
 	ckeywhitelist = list("arokha")
 	character_name = list("Aronai Kadigan")
 
 //  B CKEYS
 /datum/gear/fluff/yuuko_kimono
 	path = /obj/item/clothing/under/fluff/sakura_hokkaido_kimono
+	display_name = "Yuuko's Kimono"
 	ckeywhitelist = list("benemuel")
 	character_name = list("Yuuko Shimmerpond")
 
 /datum/gear/fluff/cassandra_box
 	path = /obj/item/weapon/storage/box/fluff/cassandra
+	display_name = "Cassandra's Box"
 	ckeywhitelist = list("beyondmylife")
 	character_name = list("Cassandra Selone")
 
 /datum/gear/fluff/kilano_dress
 	path = /obj/item/clothing/under/dress/fluff/kilano
+	display_name = "Kilano's Dress"
 	ckeywhitelist = list("beyondmylife")
 	character_name = list("Kilano Soryu")
 
 /datum/gear/fluff/kilano_gloves
 	path = /obj/item/clothing/gloves/fluff/kilano
+	display_name = "Kilano's Gloves"
 	ckeywhitelist = list("beyondmylife")
 	character_name = list("Kilano Soryu")
 
 /datum/gear/fluff/netra_box
 	path = /obj/item/weapon/storage/box/fluff/kilano
+	display_name = "Ne'tra's Box"
 	ckeywhitelist = list("beyondmylife")
 	character_name = list("Ne'tra Ky'ram")
 
 /datum/gear/fluff/xin_sovietuniform
 	path = /obj/item/clothing/under/soviet
+	display_name = "Xin's Soviet Uniform"
 	ckeywhitelist = list("britishrabbit")
 	character_name = list("Xin Xiao")
 	description = "This soviet uniform has seen considerable use over the years, it's rather worn in some places, frayed in others and the stomach region has signs of being stretched out repeatedly."
 
 /datum/gear/fluff/tasald_box
 	path = /obj/item/weapon/storage/box/fluff/tasald
+	display_name = "Tasald's Box"
 	ckeywhitelist = list("bwoincognito")
 	character_name = list("Tasald Corlethian")
 
 /datum/gear/fluff/octavius_box
 	path = /obj/item/weapon/storage/box/fluff/octavious
+	display_name = "Octavious' Box"
 	ckeywhitelist = list("bwoincognito")
 	character_name = list("Octavious Ward")
 
 /datum/gear/fluff/jayda_meduniform
 	path = /obj/item/clothing/under/solgov/utility/sifguard/medical/fluff
+	display_name = "Jayda's Uniform"
 	ckeywhitelist = list("burritojustice")
 	character_name = list("Jayda Wilson")
 
 //  C CKEYS
 /datum/gear/fluff/james_disk
 	path = /obj/item/weapon/disk/data
+	display_name = "James' Disk"
 	ckeywhitelist = list("cockatricexl")
 	character_name = list("James Holder")
 
 /datum/gear/fluff/jasmine_implant
 	path = /obj/item/weapon/implanter/reagent_generator/jasmine
+	display_name = "Jasmine's Implant"
 	ckeywhitelist = list("cameron653")
 	character_name = list("Jasmine Lizden")
 
 /datum/gear/fluff/diana_robe
 	path = /obj/item/clothing/suit/fluff/purp_robes
+	display_name = "Diana's Robes"
 	ckeywhitelist = list("cameron653")
 	character_name = list("Diana Kuznetsova")
 
 /datum/gear/fluff/diana_tiara
 	path = /obj/item/clothing/head/fluff/pink_tiara
+	display_name = "Diana's Tiara"
 	ckeywhitelist = list("cameron653")
 	character_name = list("Diana Kuznetsova")
 
 /datum/gear/fluff/aika_coat
 	path = /obj/item/clothing/suit/fluff/blue_trimmed_coat
+	display_name = "Aika's Coat"
 	ckeywhitelist = list("chaoko99")
 	character_name = list("Aika Hisakawa")
 
 /datum/gear/fluff/sariU_disk
 	path = /obj/item/weapon/disk/limb/eggnerdltd
+	display_name = "Sari-U's Eggnerd Disk"
 	ckeywhitelist = list("cross_exonar")
 	character_name = list("Sari-U")
 
 /datum/gear/fluff/sariE_disk
 	path = /obj/item/weapon/disk/limb/eggnerdltd
+	display_name = "Sari-E's Eggnerd Disk"
 	ckeywhitelist = list("cross_exonar")
 	character_name = list("Sari-E")
 
 //  D CKEYS
 /datum/gear/fluff/dhaeleena_medal
 	path = /obj/item/clothing/accessory/medal/silver/security/fluff/dhael
+	display_name = "Dhaeleena's Medal"
 	ckeywhitelist = list("dhaeleena")
 	character_name = list("Dhaeleena M'iar")
 
 /datum/gear/fluff/elliot_belt
 	path = /obj/item/weapon/storage/belt/champion
+	display_name = "Elliot's Belt"
 	ckeywhitelist = list("dickfreedomjohnson")
 	character_name = list("Elliot Richards")
 
 /datum/gear/fluff/drake_box
 	path = /obj/item/weapon/storage/box/fluff/drake
+	display_name = "Drake's Box"
 	ckeywhitelist = list("drakefrostpaw")
 	character_name = list("Drake Frostpaw")
 
 /datum/gear/fluff/theseus_coin
 	path = /obj/item/weapon/coin/diamond
+	display_name  = "Theseus' Diamond coin"
 	ckeywhitelist = list("draycu")
 	character_name = list("Theseus")
-	display_name  = "theseus' diamond coin"
 	description = "An engraved coin made of diamond. On the side for heads is printed the year 2541, along with the letter T. On the side for tails, the letter Y can be seen."
 
 /datum/gear/fluff/yonra_box
 	path = /obj/item/weapon/storage/box/fluff/yonra
+	display_name = "Yonra's Box"
 	ckeywhitelist = list("draycu")
 	character_name = list("Schae Yonra")
 
 //  E CKEYS
-/datum/gear/fluff/serkii_box
+/datum/gear/fluff/serkii_slippers
 	path = /obj/item/clothing/shoes/slippers
+	display_name = "Serkii's Slippers"
 	ckeywhitelist = list("eekasqueak")
 	character_name = list("Serkii Miishy")
 
 /datum/gear/fluff/serkii_skirt
 	path = /obj/item/clothing/under/skirt/fluff/serkii
+	display_name = "Serkii's Skirt"
 	ckeywhitelist = list("eekasqueak")
 	character_name = list("Serkii Miishy")
 
 /datum/gear/fluff/jessie_coat
 	path = /obj/item/clothing/suit/storage/hooded/wintercoat/jessie
+	display_name = "Jessie's Coat"
 	ckeywhitelist = list("epiccharger")
 	character_name = list("Jessie Mare")
 
 /datum/gear/fluff/verd_medal
 	path = /obj/item/clothing/accessory/medal/bronze_heart
+	display_name = "Verd's Medal"
 	ckeywhitelist = list("epigraphzero")
 	character_name = list("Verd Woodrow")
 	
@@ -192,252 +224,299 @@
 //  G CKEYS
 /datum/gear/fluff/eldi_implant
 	path = /obj/item/weapon/implanter/reagent_generator/eldi
+	display_name = "Eldi's Implant"
 	ckeywhitelist = list("Gowst")
 	character_name = list("Eldi Moljir")
 
 //  H CKEYS
 /datum/gear/fluff/lauren_medal
 	path = /obj/item/clothing/accessory/medal/conduct
+	display_name = "Lauren's Medal"
 	ckeywhitelist = list("heroman3003")
 	character_name = list("Lauren Zackson")
 
 /datum/gear/fluff/lauren_string
 	path = /obj/item/clothing/accessory/collar/fluff/goldenstring
+	display_name = "Lauren's String"
 	ckeywhitelist = list("heroman3003")
 	character_name = list("Lauren Zackson")
 
 /datum/gear/fluff/belle_sizegun
 	path = /obj/item/weapon/gun/energy/sizegun
+	display_name = "Belle's Sizegun"
 	ckeywhitelist = list("hottokeeki")
 	character_name = list("Belle Day")
 
 /datum/gear/fluff/belle_implant
 	path = /obj/item/weapon/implanter/reagent_generator/belle
+	display_name = "Belle's Implant"
 	ckeywhitelist = list("hottokeeki")
 	character_name = list("Belle Day")
 
 //  I CKEYS
 /datum/gear/fluff/ruda_badge
 	path = /obj/item/clothing/accessory/badge/holo/detective/ruda
+	display_name = "Ruda's Detective Badge"
 	ckeywhitelist = list("interrolouis")
 	character_name = list(" Ruda Lizden")
 
 /datum/gear/fluff/kai_modkit
 	path = /obj/item/borg/upgrade/modkit/chassis_mod/kai
+	display_name = "Kai's Modkit"
 	ckeywhitelist = list("interrolouis")
 	character_name = list("Kai Highlands")
 
 /datum/gear/fluff/ivy_backpack
 	path = /obj/item/weapon/storage/backpack/messenger/sec/fluff/ivymoomoo
+	display_name = "Ivy's Backpack"
 	ckeywhitelist = list("ivymoomoo")
 	character_name = list("Ivy Baladeva")
 
 //  J CKEYS
 /datum/gear/fluff/mor_box
 	path = /obj/item/weapon/storage/box/fluff/morxaina
+	display_name = "Mor's Box"
 	ckeywhitelist = list("jacknoir413")
 	character_name = list("Mor Xaina")
 
 /datum/gear/fluff/areax_staff
 	path = /obj/item/weapon/storage/backpack/fluff/stunstaff
+	display_name = "Areax's Stun Staff"
 	ckeywhitelist = list("jacknoir413")
 	character_name = list("Areax Third")
 	allowed_roles = list("Security Officer, Warden, Head of Security")
 
 /datum/gear/fluff/earthen_uniform
 	path = /obj/item/clothing/under/fluff/earthenbreath
+	display_name = "Earthen's Uniform"
 	ckeywhitelist = list("jacobdragon")
 	character_name = list("Earthen Breath")
 
 /datum/gear/fluff/earthen_hairpin
 	path = /obj/item/clothing/head/fluff/hairflowerpin
+	display_name = "Earthen's Flower Pin"
 	ckeywhitelist = list("jacobdragon")
 	character_name = list("Earthen Breath")
 
 /datum/gear/fluff/cirra_box
 	path = /obj/item/weapon/storage/box/fluff/cirra
+	display_name = "Cirra's Box"
 	ckeywhitelist = list("jemli")
 	character_name = list("Cirra Mayhem")
 
 /datum/gear/fluff/jemli_fedora
 	path = /obj/item/clothing/head/fedora/fluff/jemli
+	display_name = "Jemli's Fedora"
 	ckeywhitelist = list("jemli")
 	character_name = list("Jemli")
 
 /datum/gear/fluff/jeremiah_permit
 	path = /obj/item/clothing/accessory/permit/gun/fluff/ace
+	display_name = "Ace's Gun Permit"
 	ckeywhitelist = list("jertheace")
 	character_name = list("Jeremiah Acacius")
 	allowed_roles = list("Colony Director", "Warden", "Head of Security")
 
 /datum/gear/fluff/jeremiah_gun
 	path = /obj/item/weapon/gun/projectile/p92x/large/preban/hp
+	display_name = "Ace's Gun"
 	ckeywhitelist = list("jertheace")
 	character_name = list("Jeremiah Acacius")
 	allowed_roles = list("Colony Director", "Warden", "Head of Security")
 
 /datum/gear/fluff/jeremiah_ammo
 	path = /obj/item/ammo_magazine/m9mm/large/preban/hp //Spare ammo
+	display_name = "Ace's Spare Ammo"
 	ckeywhitelist = list("jertheace")
 	character_name = list("Jeremiah Acacius")
 	allowed_roles = list("Colony Director", "Warden", "Head of Security")
 
 /datum/gear/fluff/jeremiah_holster
 	path = /obj/item/clothing/accessory/holster/armpit
+	display_name = "Ace's Holster"
 	ckeywhitelist = list("jertheace")
 	character_name = list("Jeremiah Acacius")
 	allowed_roles = list("Colony Director", "Warden", "Head of Security")
 
 /datum/gear/fluff/jeremiah_boots
 	path = /obj/item/clothing/shoes/boots/combat
+	display_name = "Ace's Boots"
 	ckeywhitelist = list("jertheace")
 	character_name = list("Jeremiah Acacius")
 
 /datum/gear/fluff/jeremiah_combatuniform
 	path = /obj/item/clothing/under/syndicate/combat
+	display_name = "Ace's Combat Uniform"
 	ckeywhitelist = list("jertheace")
 	character_name = list("Jeremiah Acacius")
 
 /datum/gear/fluff/joan_backpack
 	path = /obj/item/weapon/storage/backpack/dufflebag/sec/fluff/joanrisu
+	display_name = "Joan's backpack"
 	ckeywhitelist = list("joanrisu")
 	character_name = list("Joan Risu")
 
 
 /datum/gear/fluff/katarina_backpack
 	path = /obj/item/weapon/storage/backpack/dufflebag/sec/fluff/katarina
+	display_name = "Katarina's Backpack"
 	ckeywhitelist = list("joanrisu")
 	character_name = list("Katarina Eine")
 	allowed_roles = list("Colony Director", "Warden", "Head of Security")
 
 /datum/gear/fluff/emoticon_box
 	path = /obj/item/weapon/storage/box/fluff/emoticon
+	display_name = "Emoticon's Box"
 	ckeywhitelist = list("joey4298")
 	character_name = list("Emoticon")
 
 /datum/gear/fluff/emoticon_mimeuniform
 	path = /obj/item/clothing/under/sexymime
+	display_name = "Emoticon's Mime Uniform"
 	ckeywhitelist = list("joey4298")
 	character_name = list("Emoticon")
 
 /datum/gear/fluff/emoticon_mimemask
 	path = /obj/item/clothing/mask/gas/sexymime
+	display_name = "Emoticon's Mime Mask"
 	ckeywhitelist = list("joey4298")
 	character_name = list("Emoticon")
 
 /datum/gear/fluff/harmony_medal
 	path = /obj/item/clothing/accessory/medal/gold/heroism
+	display_name = "Harmony's Heroism Medal"
 	ckeywhitelist = list("john.wayne9392")
 	character_name = list("Harmony Pretchl")
 
 /datum/gear/fluff/harmony_modkit
 	path = /obj/item/device/modkit_conversion/fluff/harmonysuit
+	display_name = "Harmony's Modkit"
 	ckeywhitelist = list("john.wayne9392")
 	character_name = list("Harmony Pretchl")
 
 /datum/gear/fluff/harmony_spacemodkit
 	path = /obj/item/device/modkit_conversion/fluff/harmonyspace
+	display_name = "Harmony's Modkit 2"
 	ckeywhitelist = list("john.wayne9392")
 	character_name = list("Harmony Pretchl")
 
 /datum/gear/fluff/koyo_box
 	path = /obj/item/weapon/storage/box/fluff/koyoakimomi
+	display_name = "Koyo's Box"
 	ckeywhitelist = list("jwguy")
 	character_name = list("Koyo Akimomi")
 
 //  K CKEYS
 /datum/gear/fluff/smu_medal
 	path = /obj/item/clothing/accessory/medal/nobel_science
+	display_name = "SMU's Nobel Science Award"
 	ckeywhitelist = list("keekenox")
 	character_name = list("SMU-453")
 
 /datum/gear/fluff/ketrai_hat
 	path = /obj/item/clothing/head/fluff/ketrai
+	display_name = "Ketrai's Hat"
 	ckeywhitelist = list("ketrai")
 	character_name = list("Ketrai")
 
 /datum/gear/fluff/amaya_id
 	path = /obj/item/weapon/card/id/fluff/amaya
+	display_name = "Amaya's ID"
 	ckeywhitelist = list("kiraalitruss")
 	character_name = list("Amaya Rahl")
 
 /datum/gear/fluff/kisuke_glasses
 	path = /obj/item/clothing/glasses/omnihud/kamina
+	display_name = "Kisuke's Kamina Glasses"
 	ckeywhitelist = list("kisukegema")
 	character_name = list("Kisuke Gema")
 
 /datum/gear/fluff/lassara_sheath
 	path = /obj/item/clothing/accessory/storage/knifeharness
+	display_name = "Lassara's Knife Harness"
 	ckeywhitelist = list("Killjaden")
 	character_name = list("Lassara Faaira'Nrezi")
 
 /datum/gear/fluff/rana_medal
 	path = /obj/item/clothing/accessory/medal/silver/unity
+	display_name = "Rana's Unity Medal"
 	ckeywhitelist = list("kitchifox")
 	character_name = list("Rana Uma")
 
-/datum/gear/fluff/taifa_uniform
+/datum/gear/fluff/taiga_uniform
 	path = /obj/item/clothing/under/fluff/taiga
+	display_name = "Taifa's Uniform"
 	ckeywhitelist = list("KiwiDaNinja")
 	character_name = list("Chakat Taiga")
 
 /datum/gear/fluff/rischi_implant
 	path = /obj/item/weapon/implanter/reagent_generator/rischi
+	display_name = "Rischi's Implant"
 	ckeywhitelist = list("konabird")
 	character_name = list("Rischi")
 
 /datum/gear/fluff/ashley_medal
 	path = /obj/item/clothing/accessory/medal/nobel_science/fluff/ashley
+	display_name = "Ashley's Medal"
 	ckeywhitelist = list("knightfall5")
 	character_name = list("Ashley Kifer")
 
 //  L CKEYS
 /datum/gear/fluff/kenzie_hypospray
 	path = /obj/item/weapon/reagent_containers/hypospray/vial/kenzie
+	display_name = "Kenzie's Hypospray"
 	ckeywhitelist = list("lm40")
 	character_name = list("Kenzie Houser")
 	allowed_roles = list("Chief Medical Officer","Medical Doctor","Chemist","Psychiatrist","Paramedic", "Field Medic")
 
 /datum/gear/fluff/brianna_backpack
 	path = /obj/item/weapon/storage/backpack/messenger/black/fluff/briana
+	display_name = "Briana's Backpack"
 	ckeywhitelist = list("luminescentring")
 	character_name = list("Briana Moore")
 
 /datum/gear/fluff/savannah_implant
 	path = /obj/item/weapon/implanter/reagent_generator/savannah
+	display_name = "Savannah's Implant"
 	ckeywhitelist = list("Lycanthorph")
 	character_name = list("Savannah Dixon")
 
 //  M CKEYS
 /datum/gear/fluff/phi_box
 	path = /obj/item/weapon/storage/box/fluff/phi
+	display_name = "Phi's Box"
 	ckeywhitelist = list("mewchild")
 	character_name = list("Phi Vietsi")
 
 /datum/gear/fluff/giliana_labcoat
 	path = /obj/item/clothing/suit/storage/toggle/labcoat/fluff/molenar
+	display_name = "Giliana's Labcoat"
 	ckeywhitelist = list("molenar")
 	character_name = list("Giliana Gamish")
 
 /datum/gear/fluff/myryan_belt
 	path = /obj/item/weapon/storage/belt/utility/fluff/vulpine
+	display_name = "Myryan's Belt"
 	ckeywhitelist = list("myryan")
 	character_name = list("Myryan Karnage-Cunningham")
 
 /datum/gear/fluff/resh_uniform
 	path = /obj/item/clothing/suit/security/navyhos
+	display_name = "Resh's HoS Uniform"
 	ckeywhitelist = list("mr_signmeup")
 	character_name = list("Reshskakskakss Seekiseekis")
 	allowed_roles = list("Head of Security")
 
 /datum/gear/fluff/daniel_medal
 	path = /obj/item/clothing/accessory/medal/conduct
+	display_name = "Daniel's Conduct Medal"
 	ckeywhitelist = list("mr_signmeup")
 	character_name = list("Daniel Fisher")
 
 //  N CKEYS
 /datum/gear/fluff/awen_hat
 	path = /obj/item/clothing/head/fluff/wolfgirl
+	display_name = "Awen's Hat"
 	ckeywhitelist = list("natje")
 	character_name = list("Awen Henry")
 
@@ -448,38 +527,45 @@
 
 /datum/gear/fluff/awen_uniform
 	path = /obj/item/clothing/under/fluff/wolfgirl
+	display_name = "Awen's Uniform"
 	ckeywhitelist = list("natje")
 	character_name = list("Awen Henry")
 
 /datum/gear/fluff/pumila_vines
 	path = /obj/item/clothing/under/fluff/aluranevines
+	display_name = "Pumila's Vines"
 	ckeywhitelist = list("natje")
 	character_name = list("Pumila")
 
 /datum/gear/fluff/annie_sweater
 	path = /obj/item/clothing/accessory/sweater/fluff/annie
+	display_name = "Annie's Sweater"
 	ckeywhitelist = list("nepox")
 	character_name = list("Annie Rose")
 
 //  O CKEYS
 /datum/gear/fluff/richard_chain
 	path = /obj/item/weapon/melee/fluff/holochain
+	display_name = "Richard's Holochain"
 	ckeywhitelist = list("orbisa")
 	character_name = list("Richard D'angelo")
 
 //  P CKEYS
 /datum/gear/fluff/lily_medal
 	path = /obj/item/clothing/accessory/medal/silver/unity
+	display_name = "Lily's Unity Medal"
 	ckeywhitelist = list("phoaly")
 	character_name = list("Lily Maximus")
 
 /datum/gear/fluff/lucuis_battery
 	path = /obj/item/weapon/fluff/dragor_dot
+	display_name = "Lucuis' Spare Battery"
 	ckeywhitelist = list("pontifexminimus")
 	character_name = list("Lucius Null")
 
 /datum/gear/fluff/lucia_battery
 	path = /obj/item/weapon/fluff/dragor_dot
+	display_name = "Lucia's Spare Battery"
 	ckeywhitelist = list("pontifexminimus")
 	character_name = list("Lucia Null")
 
@@ -488,6 +574,7 @@
 //  R CKEYS
 /datum/gear/fluff/tiemli_weldinggoggles
 	path = /obj/item/clothing/glasses/welding/tiemgogs
+	display_name = "Tiemli's Welding Goggles"
 	ckeywhitelist = list("radiantaurora")
 	character_name = list("Tiemli Kroto")
 	allowed_roles = list("Roboticist")
@@ -495,118 +582,144 @@
 //  S CKEYS
 /datum/gear/fluff/kateryna_voidsuit
 	path = /obj/item/clothing/suit/space/void/engineering/kate
+	display_name = "Kateryna's Voidsuit"
 	ckeywhitelist = list("samanthafyre")
 	character_name = list("Kateryna Petrovitch")
+	allowed_roles = list("Station Engineer", "Chief Engineer", "Atmospheric Technician")
 
 /datum/gear/fluff/katerina_spacesuit
 	path = /obj/item/clothing/head/helmet/space/fluff/kate
+	display_name = "Kateryna's Helmet"
 	ckeywhitelist = list("samanthafyre")
 	character_name = list("Kateryna Petrovitch")
+	allowed_roles = list("Station Engineer", "Chief Engineer", "Atmospheric Technician")
 
 /datum/gear/fluff/kateryna_armorvest
 	path = /obj/item/clothing/suit/armor/vest/wolftaur/kate
+	display_name = "Kateryna's Armor Vest"
 	ckeywhitelist = list("samanthafyre")
 	character_name = list("Kateryna Petrovitch")
+	allowed_roles = list("Security Officer", "Warden", "Head of Security", "Colony Director", "Head of Personnel")
 
 /datum/gear/fluff/viktor_flask
 	path = /obj/item/weapon/reagent_containers/food/drinks/flask/vacuumflask/fluff/viktor
+	display_name = "Viktor's Flask"
 	ckeywhitelist = list("semaun")
 	character_name = list("Viktor Solothurn")
 
 /datum/gear/fluff/scree_modkit
 	path = /obj/item/device/modkit_conversion/fluff/screekit
+	display_name = "Scree's Modkit"
 	ckeywhitelist = list("scree")
 	character_name = list("Scree")
 
 /datum/gear/fluff/scree_pompom
 	path = /obj/item/clothing/head/fluff/pompom
+	display_name = "Scree's Weird PopPom thing"
 	ckeywhitelist = list("scree")
 	character_name = list("Scree")
 
 /datum/gear/fluff/alfonso_sunglasses
 	path = /obj/item/clothing/glasses/sunglasses/fluff/alfonso
+	display_name = "Alfonso's Sunglasses"
 	ckeywhitelist = list("seiga")
 	character_name = list("Alfonso Oak Telanor")
 
 /datum/gear/fluff/nthasd_modkit //Converts a Security suit's sprite
 	path = /obj/item/device/modkit_conversion/hasd
+	display_name = "NT-HASD #556's Modkit"
 	ckeywhitelist = list("silencedmp5a5")
 	character_name = list("NT-HASD #556")
 	allowed_roles = list("Colony Director", "Head of Personnel", "Security Officer", "Warden", "Head of Security","Detective")
 
 /datum/gear/fluff/tasy_clownuniform
 	path = /obj/item/clothing/under/sexyclown
+	display_name = "Tasy's Clown Uniform"
 	ckeywhitelist = list("silvertalismen")
 	character_name = list("Tasy Ruffles")
 
-/datum/gear/fluff/evian_implant
-	path = /obj/item/weapon/implanter/reagent_generator/evian
-	ckeywhitelist = list("silvertalismen")
-	character_name = list("Evian")
-
 /datum/gear/fluff/tasy_clownmask
 	path = /obj/item/clothing/mask/gas/sexyclown
+	display_name = "Tasy's Clownmask"
 	ckeywhitelist = list("silvertalismen")
 	character_name = list("Tasy Ruffles")
 
 /datum/gear/fluff/tasy_clownPDA
 	path = /obj/item/device/pda/clown
+	display_name = "Tasy's Clown PDA"
 	ckeywhitelist = list("silvertalismen")
 	character_name = list("Tasy Ruffles")
 
+/datum/gear/fluff/evian_implant
+	path = /obj/item/weapon/implanter/reagent_generator/evian
+	display_name = "Evian's Implant"
+	ckeywhitelist = list("silvertalismen")
+	character_name = list("Evian")
+
 /datum/gear/fluff/fortune_backpack
 	path = /obj/item/weapon/storage/backpack/satchel/fluff/swat43bag
+	display_name = "Fortune's Backpack"
 	ckeywhitelist = list("Swat43")
 	character_name = list("Fortune Bloise")
 
 /datum/gear/fluff/alexis_cane
 	path = /obj/item/weapon/cane/wand
+	display_name = "Alexis' Cane"
 	ckeywhitelist = list("stobarico")
 	character_name = list("Alexis Bloise")
 
 /datum/gear/fluff/roiz_implant
 	path = /obj/item/weapon/implanter/reagent_generator/roiz
+	display_name = "Roiz's Implant"
 	ckeywhitelist = list("SpoopyLizz")
 	character_name = list("Roiz Lizden")
 
 /datum/gear/fluff/roiz_coat
 	path = /obj/item/clothing/suit/storage/hooded/wintercoat/roiz
+	display_name = "Roiz's Coat"
 	ckeywhitelist = list("SpoopyLizz")
 	character_name = list("Roiz Lizden")
 
 /datum/gear/fluff/silent_mimemask
 	path = /obj/item/clothing/mask/gas/sexymime
+	display_name = "Silent Stripe's Mime Mask"
 	ckeywhitelist = list("suicidalpickles")
 	character_name = list("Silent Stripes")
 
 /datum/gear/fluff/silent_mimeuniform
 	path = /obj/item/clothing/under/sexymime
+	display_name = "Silent Stripe's Mime Uniform"
 	ckeywhitelist = list("suicidalpickles")
 	character_name = list("Silent Stripes")
 
 //  T CKEYS
 /datum/gear/fluff/ascian_medal
 	path = /obj/item/clothing/accessory/medal/silver/unity
+	display_name = "Ascian's Unity Medal"
 	ckeywhitelist = list("tabiranth")
 	character_name = list("Ascian")
 
 /datum/gear/fluff/ascian_spiritspawner
 	path = /obj/item/weapon/grenade/spawnergrenade/spirit
+	display_name = "The Best Kitten"
 	ckeywhitelist = list("tabiranth")
 	character_name = list("Ascian")
 
 /datum/gear/fluff/ascian_shelterpod
 	path = /obj/item/device/survivalcapsule/tabiranth
+	display_name = "Ascian's Shelterpod"
 	ckeywhitelist = list("tabiranth")
 	character_name = list("Ascian")
 
 /datum/gear/fluff/lasshseeki_ealimplant
 	path = /obj/item/weapon/implant/language/eal
+	display_name = "Lasshseeki's EAL Implant"
 	ckeywhitelist = list("techtypes")
 	character_name = list("Lasshseeki Korss")
 
 /datum/gear/fluff/konor_medal
 	path = /obj/item/clothing/accessory/medal/silver/unity
+	display_name = "Konor's Unity Medal"
 	ckeywhitelist = list("tinydude16")
 	character_name = list("Konor Foxe")
 
@@ -615,133 +728,161 @@
 //  V CKEYS
 /datum/gear/fluff/vakashi_permit
 	path = /obj/item/clothing/accessory/permit/gun/fluff/Vakashi
+	display_name = "Vakashi's Pepperspray Permit"
 	ckeywhitelist = list("vailthewolf")
 	character_name = list("Vakashi")
 
 /datum/gear/fluff/vakashi_pepperspray
 	path = /obj/item/weapon/reagent_containers/spray/pepper
+	display_name = "Vakashi's Pepperspray"
 	ckeywhitelist = list("vailthewolf")
 	character_name = list("Vakashi")
 
 /datum/gear/fluff/cameron_glasses
 	path = /obj/item/clothing/glasses/fluff/science_proper
+	display_name = "Cameron's Science Glasses"
 	ckeywhitelist = list("verkister")
 	character_name = list("Cameron Eggbert")
 
 /datum/gear/fluff/cameron_disk
 	path = /obj/item/weapon/disk/limb/eggnerdltd
+	display_name = "Cameron's Eggnerd Disk"
 	ckeywhitelist = list("verkister")
 	character_name = list("Cameron Eggbert")
 
 /datum/gear/fluff/opie_glasses
 	path = /obj/item/clothing/glasses/fluff/spiffygogs
+	display_name = "Opie's Goggles"
 	ckeywhitelist = list("verkister")
 	character_name = list("Opie Eggbert")
 
 /datum/gear/fluff/verin_hazardvest
 	path = /obj/item/clothing/suit/storage/hazardvest/fluff/verin
+	display_name = "Verin's Hazard Vest"
 	ckeywhitelist = list("virgo113")
 	character_name = list("Verin Raharra")
 
 /datum/gear/fluff/lucina_pda
 	path = /obj/item/device/pda/heads/cmo/fluff/lucinapda
+	display_name = "Lucina's PDA"
 	ckeywhitelist = list("vorrarkul")
 	character_name = list("Lucina Dakarim")
 
 /datum/gear/fluff/lucina_medal
 	path = /obj/item/clothing/accessory/medal/gold/fluff/lucina
+	display_name = "Lucina's Gold Medal"
 	ckeywhitelist = list("vorrarkul")
 	character_name = list("Lucina Dakarim")
 
 /datum/gear/fluff/lucina_dress
 	path = /obj/item/clothing/under/dress/fluff/lucinadress
+	display_name = "Lucina's Dress"
 	ckeywhitelist = list("vorrarkul")
 	character_name = list("Lucina Dakarim")
 
 /datum/gear/fluff/nyssa_coat
 	path = /obj/item/clothing/suit/storage/hooded/wintercoat/cargo
+	display_name = "Nyssa's Coat"
 	ckeywhitelist = list("vorrarkul")
 	character_name = list("Nyssa Brennan")
 
 /datum/gear/fluff/theodora_suit
 	path = /obj/item/clothing/suit/chococoat
+	display_name = "Theodora's Coat"
 	ckeywhitelist = list("vorrarkul")
 	character_name = list("Theodora Lindt")
 
 /datum/gear/fluff/theodora_implant
 	path = /obj/item/weapon/implanter/reagent_generator/vorrarkul
+	display_name = "Theodora's Implant"
 	ckeywhitelist = list("vorrarkul")
 	character_name = list("Theodora Lindt")
 
 /datum/gear/fluff/kaitlyn_plush
 	path = /obj/item/toy/plushie/mouse/fluff
+	display_name = "Kaitlyn's Mouse Plush"
 	ckeywhitelist = list("vorrarkul")
 	character_name = list("Kaitlyn Fiasco")
 
 /datum/gear/fluff/keturah_maiddress
 	path = /obj/item/clothing/under/dress/maid/
+	display_name = "Keturah's Maid Dress"
 	ckeywhitelist = list("Viveret")
 	character_name = list("Keturah")
 
 /datum/gear/fluff/silentio_mimeuniform
 	path = /obj/item/clothing/under/sexymime
+	display_name = "Silentio's Mime Uniform"
 	ckeywhitelist = list("Viveret")
 	character_name = list("Silentio")
 
 /datum/gear/fluff/silentio_mimemask
 	path = /obj/item/clothing/mask/gas/sexymime
+	display_name = "Silentio's Mime Mask"
 	ckeywhitelist = list("Viveret")
 	character_name = list("Silentio")
 
 //  W CKEYS
 /datum/gear/fluff/sthasha_bracer
 	path = /obj/item/clothing/accessory/bracer/fluff/xander_sthasha
+	display_name = "S'thasha's Bracer"
 	ckeywhitelist = list("wanderingdeviant")
 	character_name = list("S'thasha Tavakdavi")
 
 /datum/gear/fluff/silas_glasses
 	path = /obj/item/clothing/glasses/threedglasses
+	display_name = "Silas' 3-D Glasses"
 	ckeywhitelist = list("werebear")
 	character_name = list("Silas Newton")
 
 /datum/gear/fluff/vinjj_weldingmask
 	path = /obj/item/clothing/head/welding/fluff/vinjj
+	display_name = "Vinjj's Welding Mask"
 	ckeywhitelist = list("whiskyrose")
 	character_name = list("Vinjj")
 
 /datum/gear/fluff/tempest_hudglases
 	path = /obj/item/clothing/glasses/omnihud/med/fluff/wickedtemphud
+	display_name = "Tempest's Medical Hud"
 	ckeywhitelist = list("wickedtemp")
 	character_name = list("Chakat Tempest Venesare")
+	allowed_roles = list("Chief Medical Officer","Medical Doctor","Chemist","Psychiatrist","Paramedic", "Field Medic")
 
 /datum/gear/fluff/tempest_hypospray
 	path = /obj/item/weapon/reagent_containers/hypospray/vial/tempest
+	display_name = "Tempest's Hypospray"
 	ckeywhitelist = list("wickedtemp")
 	character_name = list("Chakat Tempest Venesare")
+	allowed_roles = list("Chief Medical Officer","Medical Doctor","Chemist","Psychiatrist","Paramedic", "Field Medic")
 
 /datum/gear/fluff/tempest_backpack
 	path = /obj/item/weapon/storage/backpack/saddlebag/tempest
+	display_name = "Tempest's Saddlebag"
 	ckeywhitelist = list("wickedtemp")
 	character_name = list("Chakat Tempest Venesare")
 
 /datum/gear/fluff/tempest_implant
 	path = /obj/item/weapon/implanter/reagent_generator/tempest
+	display_name = "Tempest's Implant"
 	ckeywhitelist = list("wickedtemp")
 	character_name = list("Chakat Tempest Venesare")
 
 //  X CKEYS
 /datum/gear/fluff/penelope_box
 	path = /obj/item/weapon/storage/box/fluff/penelope
+	display_name = "Penelope's Box"
 	ckeywhitelist = list("Xsdew")
 	character_name = list("Penelope Allen")
 
 /datum/gear/fluff/amy_id
 	path = /obj/item/weapon/card/id/fluff/xennith
+	display_name = "Amy's ID Card"
 	ckeywhitelist = list("Xennith")
 	character_name = list("Amy Lessen")
 
 /datum/gear/fluff/ali_medal
 	path = /obj/item/clothing/accessory/medal/silver/unity
+	display_name = "Ali's Unity Medal"
 	ckeywhitelist = list("Xonkon")
 	character_name = list("Ali")
 
@@ -750,10 +891,12 @@
 //  Z CKEYS
 /datum/gear/fluff/zaoozaoo_hat
 	path = /obj/item/clothing/head/fluff/zao
+	display_name = "Zaoozaoo's Hat"
 	ckeywhitelist = list("zigfe")
 	character_name = list("Zaoozaoo Xrimxuqmqixzix")
 
 /datum/gear/fluff/nehi_radio
 	path = /obj/item/device/radio/headset/fluff/zodiacshadow
+	display_name = "Nehi's Radio"
 	ckeywhitelist = list("zodiacshadow")
 	character_name = list("Nehi Maximus")

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

@@ -1,19 +1,3 @@
 /datum/gear
 	var/list/ckeywhitelist
-	var/list/character_name
-
-/datum/category_item/player_setup_item/loadout/proc/valid_gear_choices(var/max_cost)
-	. = list()
-	var/mob/preference_mob = preference_mob()
-	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]))
-			continue
-		if(max_cost && G.cost > max_cost)
-			continue
-		if(G.ckeywhitelist && !(preference_mob.ckey in G.ckeywhitelist)) 
-			continue 
-		if(G.character_name && !(preference_mob.real_name in G.character_name)) 
-			continue 
-		. += gear_name
+	var/list/character_name