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

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

@@ -27,6 +27,14 @@
 	..()
 	gear_tweaks += gear_tweak_free_color_choice
 
+/datum/gear/eyes/thinblindfold
+	display_name = "blindfold, thin white (recolorable)"
+	path = /obj/item/clothing/glasses/sunglasses/thinblindfold
+
+/datum/gear/eyes/thinblindfold/New()
+	..()
+	gear_tweaks += gear_tweak_free_color_choice
+
 /datum/gear/eyes/glasses
 	display_name = "Glasses, prescription"
 	path = /obj/item/clothing/glasses/regular

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

@@ -88,9 +88,9 @@
 	ckeywhitelist = list("arokha")
 	character_name = list("Aronai Sieyes")
 
-/datum/gear/fluff/astraether_ritualknife
-    path = /obj/item/weapon/material/knife/ritual
-    display_name = "Astra's Ritual Knife"
+/datum/gear/fluff/astra_ritualknife
+    path = /obj/item/weapon/material/knife/ritual/fluff/astra
+    display_name = "Polished Ritual Knife"
     description = "A well kept strange ritual knife, There is a small tag with the name 'Astra Ether' on it. They are probably looking for this."
     ckeywhitelist = list("astraether")
     character_name = list("Astra Ether")

code/modules/client/preference_setup/vore/03_egg.dm

@@ -1,15 +1,3 @@
-var/UNATHI_EGG 		= "Unathi"
-var/TAJARAN_EGG 		= "Tajaran"
-var/AKULA_EGG 		= "Akula"
-var/SKRELL_EGG		= "Skrell"
-var/SERGAL_EGG 		= "Sergal"
-var/HUMAN_EGG 		= "Human"
-var/NEVREAN_EGG		= "nevrean"
-var/SLIME_EGG 		= "Slime"
-var/EGG_EGG 			= "Egg"
-var/XENOCHIMERA_EGG 	= "Xenochimera"
-var/XENOMORPH_EGG 	= "Xenomorph"
-
 // Define a place to save appearance in character setup
 /datum/preferences
 	var/vore_egg_type = "Egg" //The egg type they have.
@@ -26,8 +14,7 @@ var/XENOMORPH_EGG 	= "Xenomorph"
 	S["vore_egg_type"]		<< pref.vore_egg_type
 
 /datum/category_item/player_setup_item/vore/egg/sanitize_character()
-	var/valid_vore_egg_types = global_vore_egg_types
-	pref.vore_egg_type	 = sanitize_inlist(pref.vore_egg_type, valid_vore_egg_types, initial(pref.vore_egg_type))
+	pref.vore_egg_type	 = sanitize_inlist(pref.vore_egg_type, global_vore_egg_types, initial(pref.vore_egg_type))
 
 /datum/category_item/player_setup_item/vore/egg/copy_to_mob(var/mob/living/carbon/human/character)
 	character.vore_egg_type	= pref.vore_egg_type
@@ -44,7 +31,7 @@ var/XENOMORPH_EGG 	= "Xenomorph"
 		var/list/vore_egg_types = global_vore_egg_types
 		var/selection = input(user, "Choose your character's egg type:", "Character Preference", pref.vore_egg_type) as null|anything in vore_egg_types
 		if(selection)
-			pref.vore_egg_type = vore_egg_types[selection]
+			pref.vore_egg_type = selection
 			return TOPIC_REFRESH
 	else
 		return