Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac

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

@@ -133,3 +133,9 @@ Talon pin
 	display_name = "Talon pin"
 	description = "A small enamel pin of the Talon logo."
 	path = /obj/item/clothing/accessory/talon
+
+//Rat badge
+
+/datum/gear/accessory/altevian_badge
+	display_name = "altevian badge"
+	path = /obj/item/clothing/accessory/altevian_badge

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

@@ -66,6 +66,10 @@
 	display_name = "Security HUDpatch MKII"
 	path = /obj/item/clothing/glasses/hud/security/eyepatch2
 
+/datum/gear/eyes/security/tac_sec_visor
+	display_name = "Tactical AR visor (Security)"
+	path = /obj/item/clothing/glasses/sunglasses/sechud/tactical_sec_vis
+
 /datum/gear/eyes/medical/medpatch
 	display_name = "Health HUDpatch"
 	path = /obj/item/clothing/glasses/hud/health/eyepatch

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

@@ -320,6 +320,18 @@
 	ckeywhitelist = list("chaleur")
 	character_name = list("Hisako Arato")
 
+/datum/gear/fluff/perrin_robes
+	path = /obj/item/clothing/under/fluff/gildedrobe_perrin
+	display_name = "Perrin's Robes"
+	ckeywhitelist = list("codeme")
+	character_name = list("Perrin Kade")
+
+/datum/gear/fluff/perrin_shoes
+	path = /obj/item/clothing/shoes/fluff/gildedshoes_perrin
+	display_name = "Perrin's Shoes"
+	ckeywhitelist = list("codeme")
+	character_name = list("Perrin Kade")
+
 /datum/gear/fluff/jade_stamp
 	path = /obj/item/weapon/stamp/fluff/jade_horror
 	display_name = "Official Council of Mid Horror rubber stamp"
@@ -1114,6 +1126,12 @@
 	ckeywhitelist = list("stiphs")
 	character_name = list("Lilith Vespers")
 
+/datum/gear/fluff/greek_dress
+    path = /obj/item/clothing/under/fluff/greek_dress
+    display_name = "mytilenean Dress"
+    ckeywhitelist = list("sudate")
+    character_name = list("Shea Corbett")
+
 /datum/gear/fluff/silent_mimemask
 	path = /obj/item/clothing/mask/gas/sexymime
 	display_name = "Silent Stripe's Mime Mask"
@@ -1177,6 +1195,13 @@
 	ckeywhitelist = list("thedavestdave")
 	character_name = list("Roy Tilton")
 
+/datum/gear/fluff/lucky_amour
+	path = /obj/item/clothing/suit/armor/combat/crusader_costume/lucky
+	display_name = "Lucky's amour"
+	ckeywhitelist = list ("thedavestdave")
+	character_name = list("Lucky")
+	allowed_roles = list("Chaplain")
+
 /datum/gear/fluff/monty_balaclava
 	path = /obj/item/clothing/mask/balaclava
 	display_name = "Monty's Balaclava"
@@ -1438,16 +1463,3 @@
 	display_name = "Health Service Achievement medal"
 	ckeywhitelist = list("zodiacshadow")
 	character_name = list("Nehi Maximus")
-
-/datum/gear/fluff/lucky_amour
-	path = /obj/item/clothing/suit/armor/combat/crusader_costume/lucky
-	display_name = "Lucky's amour"
-	ckeywhitelist = list ("thedavestdave")
-	character_name = list("Lucky")
-	allowed_roles = "Chaplain"
-
-/datum/gear/fluff/greek_dress
-    path = /obj/item/clothing/under/fluff/greek_dress
-    display_name = "mytilenean Dress"
-    ckeywhitelist = list("sudate")
-    character_name = list("Shea Corbett")

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

@@ -94,6 +94,7 @@
 /datum/gear/uniform/altevian_outfit
 	description = "A uniform commonly seen from altevians during their work. The material on this uniform seems to be made of durable thread that can handle the stress of most matters of labor."
 	display_name = "altevian duty jumpsuit selection (Altevian)"
+	whitelisted = SPECIES_ALTEVIAN
 	sort_category = "Xenowear"
 
 /datum/gear/uniform/altevian_outfit/New()
@@ -103,6 +104,24 @@
 		pants[initial(uniform_type.name)] = uniform_type
 	gear_tweaks += new/datum/gear_tweak/path(sortAssoc(pants))
 
+/datum/gear/accessory/altevian_aquila
+	description = "An emblem commonly seen worn by the altevians for their work operations."
+	display_name = "royal altevian navy emblem selection"
+	whitelisted = SPECIES_ALTEVIAN
+	sort_category = "Xenowear"
+
+/datum/gear/accessory/altevian_aquila/New()
+	..()
+	var/list/badges = list(
+						"gold emblem" = /obj/item/clothing/accessory/altevian_badge/aquila,
+						"silver emblem" = /obj/item/clothing/accessory/altevian_badge/aquila/silver,
+						"bronze emblem" = /obj/item/clothing/accessory/altevian_badge/aquila/bronze,
+						"black emblem" = /obj/item/clothing/accessory/altevian_badge/aquila/black,
+						"blue emblem" = /obj/item/clothing/accessory/altevian_badge/aquila/exotic,
+						"purple emblem" = /obj/item/clothing/accessory/altevian_badge/aquila/phoron,
+						"red emblem" = /obj/item/clothing/accessory/altevian_badge/aquila/hydrogen)
+	gear_tweaks += new/datum/gear_tweak/path(sortAssoc(badges))
+
 // Taur stuff
 /datum/gear/suit/taur/drake_cloak
 	display_name = "drake cloak (Drake-taur)"