Merge pull request #15156 from Heroman3003/fluffstuff

Fluff updates

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/mercury_vopal_ring
+	path = /obj/item/clothing/gloves/ring/material/void_opal/fluff/mercury
+	display_name = "Mercury's Mate Ring"
+	ckeywhitelist = list("haloren")
+	character_name = list("Mercury")
+
 //  I CKEYS
 /datum/gear/fluff/ruda_badge
 	path = /obj/item/clothing/accessory/badge/holo/detective/ruda

code/modules/clothing/rings/material.dm

@@ -69,3 +69,6 @@
 
 /obj/item/clothing/gloves/ring/material/tin/New(var/newloc)
 	..(newloc, MAT_TIN)
+
+/obj/item/clothing/gloves/ring/material/void_opal/New(var/newloc)
+	..(newloc, MAT_VOPAL)

code/modules/materials/materials/gems.dm

@@ -30,7 +30,7 @@
 */
 
 /datum/material/diamond
-	name = "diamond"
+	name = MAT_DIAMOND
 	stack_type = /obj/item/stack/material/diamond
 	flags = MATERIAL_UNMELTABLE
 	cut_delay = 60
@@ -46,7 +46,7 @@
 	supply_conversion_value = 8
 
 /datum/material/quartz
-	name = "quartz"
+	name = MAT_QUARTZ
 	display_name = "quartz"
 	use_name = "quartz"
 	icon_colour = "#e6d7df"
@@ -57,7 +57,7 @@
 	supply_conversion_value = 4
 
 /datum/material/painite
-	name = "painite"
+	name = MAT_PAINITE
 	display_name = "painite"
 	use_name = "painite"
 	icon_colour = "#6b4947"
@@ -70,7 +70,7 @@
 	supply_conversion_value = 4
 
 /datum/material/void_opal
-	name = "void opal"
+	name = MAT_VOPAL
 	display_name = "void opal"
 	use_name = "void opal"
 	icon_colour = "#0f0f0f"

code/modules/vore/fluffstuff/custom_clothes_vr.dm

@@ -2703,3 +2703,9 @@ Departamental Swimsuits, for general use
 
 	icon_override = 'icons/vore/custom_clothes_vr.dmi'
 	item_state = "giantbow_mob"
+
+//Halored: Mercury
+
+/obj/item/clothing/gloves/ring/material/void_opal/fluff/mercury
+	name = "Mercury's Mate Ring"
+	desc = "A band of void opal, given to Mercury by Lumen"

config/alienwhitelist.txt

@@ -6,6 +6,7 @@ alphaprime1 - Protean
 amarewolf - Xenochimera
 amshaegaar - Vox
 arandomalien - Xenochimera
+arminazenith - Protean
 arokha - Protean
 aruis - Diona
 aruis - Protean