From ee8c705e3a85f79addf58ba1a7b7f701c17cbf3e Mon Sep 17 00:00:00 2001
From: Heroman3003 <31296024+Heroman3003@users.noreply.github.com>
Date: Tue, 18 Jul 2023 15:20:53 +1000
Subject: [PATCH] Merge pull request #15156 from Heroman3003/fluffstuff

Fluff updates
---
 .../preference_setup/loadout/loadout_fluffitems_vr.dm     | 6 ++++++
 code/modules/clothing/rings/material.dm                   | 3 +++
 code/modules/materials/materials/gems.dm                  | 8 ++++----
 code/modules/vore/fluffstuff/custom_clothes_vr.dm         | 6 ++++++
 config/alienwhitelist.txt                                 | 1 +
 5 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/code/modules/client/preference_setup/loadout/loadout_fluffitems_vr.dm b/code/modules/client/preference_setup/loadout/loadout_fluffitems_vr.dm
index 960508f9f4..384944f23b 100644
--- a/code/modules/client/preference_setup/loadout/loadout_fluffitems_vr.dm
+++ b/code/modules/client/preference_setup/loadout/loadout_fluffitems_vr.dm
@@ -459,6 +459,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
diff --git a/code/modules/clothing/rings/material.dm b/code/modules/clothing/rings/material.dm
index 8fdbda704e..30242fef66 100644
--- a/code/modules/clothing/rings/material.dm
+++ b/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)
\ No newline at end of file
diff --git a/code/modules/materials/materials/gems.dm b/code/modules/materials/materials/gems.dm
index be619444bc..30276bfab7 100644
--- a/code/modules/materials/materials/gems.dm
+++ b/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"
diff --git a/code/modules/vore/fluffstuff/custom_clothes_vr.dm b/code/modules/vore/fluffstuff/custom_clothes_vr.dm
index f1e40680ae..edd849d4fa 100644
--- a/code/modules/vore/fluffstuff/custom_clothes_vr.dm
+++ b/code/modules/vore/fluffstuff/custom_clothes_vr.dm
@@ -2670,3 +2670,9 @@ End CHOMP Removal*/
 
 	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"
\ No newline at end of file
diff --git a/config/alienwhitelist.txt b/config/alienwhitelist.txt
index 86bed07082..b740cd1546 100644
--- a/config/alienwhitelist.txt
+++ b/config/alienwhitelist.txt
@@ -3,6 +3,7 @@ some~user - Species
 admiraldragon - Vox
 aetherelemental - Daemon
 arandomalien - Xenochimera
+arminazenith - Protean
 arokha - Protean
 aruis - Diona
 aruis - Xenochimera