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

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

@@ -521,6 +521,12 @@
 	ckeywhitelist = list("hunterbirk")
 	character_name = list("Aria Blue")
 
+/datum/gear/fluff/elizabeth_conduct_medal
+	path = /obj/item/clothing/accessory/medal/conduct
+	display_name = "Elizabeth's Distinguished Conduct Medal"
+	ckeywhitelist = list("hunterbirk")
+	character_name = list("Elizabeth Bayou")
+
 /datum/gear/fluff/mercury_vopal_ring
 	path = /obj/item/clothing/gloves/ring/material/void_opal/fluff/mercury
 	display_name = "Mercury's Mate Ring"
@@ -1436,15 +1442,9 @@
 
 /datum/gear/fluff/harmony_id
 	path = /obj/item/weapon/card/id/event/polymorphic/itg
-	display_name = "Harmony's ITG-ID card"
+	display_name = "ITG-ID card"
 	ckeywhitelist = list("verysoft")
-	character_name = list("Harmony")
-
-/datum/gear/fluff/shinerunner_id
-	path = /obj/item/weapon/card/id/event/polymorphic/itg
-	display_name = "Shine-Runner's ITG-ID card"
-	ckeywhitelist = list("verysoft")
-	character_name = list("Shine-Runner")
+	character_name = null
 
 /datum/gear/fluff/dessa_hat
 	path = /obj/item/clothing/head/fluff/giantbow/dessa
@@ -1457,6 +1457,13 @@
 	..()
 	gear_tweaks += gear_tweak_free_color_choice
 
+/datum/gear/fluff/casey_glasses
+	path = /obj/item/clothing/glasses/big_round
+	display_name = "Big Round Glasses"
+	slot = slot_glasses
+	ckeywhitelist = list("verysoft")
+	character_name = null
+
 //  W CKEYS
 /datum/gear/fluff/sthasha_bracer
 	path = /obj/item/clothing/accessory/bracer/fluff/xander_sthasha

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

@@ -143,7 +143,7 @@ Talon jumpsuit
 
 //Altevian Uniforms
 /datum/gear/uniform/altevian
-	description = "An extremely comfortable set of clothing that's made to help people handle their day to day work around the fleets with little to no discomfort."
+	description = "A comfortable set of clothing for people to handle their day to day work around the fleets with little to no discomfort."
 	display_name = "altevian uniform selection"
 
 /datum/gear/uniform/altevian/New()

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

@@ -92,7 +92,7 @@
 	sort_category = "Xenowear"
 
 /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."
+	description = "A uniform commonly seen worn by altevians. The material on this uniform is made of a durable thread that can handle the stress of most forms of labor."
 	display_name = "altevian duty jumpsuit selection (Altevian)"
 	whitelisted = SPECIES_ALTEVIAN
 	sort_category = "Xenowear"
@@ -105,7 +105,7 @@
 	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."
+	description = "An emblem found across all altevian vessels. The specific metals and jewels denote ranks. Otherwise, it's just a pretty rat skull emblem with a set of crystals for their eyes and fangs."
 	display_name = "royal altevian navy emblem selection"
 	whitelisted = SPECIES_ALTEVIAN
 	sort_category = "Xenowear"