Merge pull request #11572 from VOREStation/upstream-merge-8272

[MIRROR] Expands the ring selection

code/__defines/materials.dm

@@ -49,6 +49,10 @@
 #define MAT_BOROSILICATE	"borosilicate glass"
 #define MAT_SANDSTONE		"sandstone"
 #define MAT_FLINT           "flint"
+#define MAT_PLATINUM		"platinum"
+#define MAT_TRITIUM			"tritium"
+#define MAT_DEUTERIUM		"deuterium"
+
 
 #define DEFAULT_TABLE_MATERIAL MAT_PLASTIC
 #define DEFAULT_WALL_MATERIAL MAT_STEEL

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

@@ -92,14 +92,17 @@
 	ringtype["engagement ring"] = /obj/item/clothing/gloves/ring/engagement
 	ringtype["signet ring"] = /obj/item/clothing/gloves/ring/seal/signet
 	ringtype["masonic ring"] = /obj/item/clothing/gloves/ring/seal/mason
-	ringtype["ring, steel"] = /obj/item/clothing/gloves/ring/material/steel
-	ringtype["ring, iron"] = /obj/item/clothing/gloves/ring/material/iron
-	ringtype["ring, silver"] = /obj/item/clothing/gloves/ring/material/silver
-	ringtype["ring, gold"] = /obj/item/clothing/gloves/ring/material/gold
-	ringtype["ring, platinum"] = /obj/item/clothing/gloves/ring/material/platinum
 	ringtype["ring, glass"] = /obj/item/clothing/gloves/ring/material/glass
 	ringtype["ring, wood"] = /obj/item/clothing/gloves/ring/material/wood
 	ringtype["ring, plastic"] = /obj/item/clothing/gloves/ring/material/plastic
+	ringtype["ring, iron"] = /obj/item/clothing/gloves/ring/material/iron
+	ringtype["ring, bronze"] = /obj/item/clothing/gloves/ring/material/bronze
+	ringtype["ring, steel"] = /obj/item/clothing/gloves/ring/material/steel
+	ringtype["ring, copper"] = /obj/item/clothing/gloves/ring/material/copper
+	ringtype["ring, silver"] = /obj/item/clothing/gloves/ring/material/silver
+	ringtype["ring, gold"] = /obj/item/clothing/gloves/ring/material/gold
+	ringtype["ring, platinum"] = /obj/item/clothing/gloves/ring/material/platinum
+
 	gear_tweaks += new/datum/gear_tweak/path(ringtype)
 
 /datum/gear/gloves/circuitry

code/modules/clothing/rings/material.dm

@@ -20,28 +20,52 @@
 	return material
 
 /obj/item/clothing/gloves/ring/material/wood/New(var/newloc)
-	..(newloc, "wood")
+	..(newloc, MAT_WOOD)
 
 /obj/item/clothing/gloves/ring/material/plastic/New(var/newloc)
-	..(newloc, "plastic")
+	..(newloc, MAT_PLASTIC)
 
 /obj/item/clothing/gloves/ring/material/iron/New(var/newloc)
-	..(newloc, "iron")
+	..(newloc, MAT_IRON)
-
-/obj/item/clothing/gloves/ring/material/steel/New(var/newloc)
-	..(newloc, "steel")
-
-/obj/item/clothing/gloves/ring/material/silver/New(var/newloc)
-	..(newloc, "silver")
-
-/obj/item/clothing/gloves/ring/material/gold/New(var/newloc)
-	..(newloc, "gold")
-
-/obj/item/clothing/gloves/ring/material/platinum/New(var/newloc)
-	..(newloc, "platinum")
-
-/obj/item/clothing/gloves/ring/material/phoron/New(var/newloc)
-	..(newloc, "phoron")
 
 /obj/item/clothing/gloves/ring/material/glass/New(var/newloc)
-	..(newloc, "glass")
+	..(newloc, MAT_GLASS)
+
+/obj/item/clothing/gloves/ring/material/steel/New(var/newloc)
+	..(newloc, MAT_STEEL)
+
+/obj/item/clothing/gloves/ring/material/silver/New(var/newloc)
+	..(newloc, MAT_SILVER)
+
+/obj/item/clothing/gloves/ring/material/gold/New(var/newloc)
+	..(newloc, MAT_GOLD)
+
+/obj/item/clothing/gloves/ring/material/platinum/New(var/newloc)
+	..(newloc, MAT_PLATINUM)
+
+/obj/item/clothing/gloves/ring/material/phoron/New(var/newloc)
+	..(newloc, MAT_PHORON)
+
+/obj/item/clothing/gloves/ring/material/titanium/New(var/newloc)
+	..(newloc, MAT_TITANIUM)
+
+/obj/item/clothing/gloves/ring/material/copper/New(var/newloc)
+	..(newloc, MAT_COPPER)
+
+/obj/item/clothing/gloves/ring/material/bronze/New(var/newloc)
+	..(newloc, MAT_BRONZE)
+
+/obj/item/clothing/gloves/ring/material/uranium/New(var/newloc)
+	..(newloc, MAT_URANIUM)
+
+/obj/item/clothing/gloves/ring/material/osmium/New(var/newloc)
+	..(newloc, MAT_OSMIUM)
+
+/obj/item/clothing/gloves/ring/material/lead/New(var/newloc)
+	..(newloc, MAT_LEAD)
+
+/obj/item/clothing/gloves/ring/material/diamond/New(var/newloc)
+	..(newloc, MAT_DIAMOND)
+
+/obj/item/clothing/gloves/ring/material/tin/New(var/newloc)
+	..(newloc, MAT_TIN)