[MIRROR] Converts gas, ore, plants and reagent strings to defines (#9611)

Co-authored-by: Heroman3003 <31296024+Heroman3003@users.noreply.github.com> Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com>
2025-12-10 18:22:39 +00:00 · 2024-12-11 18:11:06 -07:00
parent d5b62d4159
commit fd5d9267ff
622 changed files with 11273 additions and 9558 deletions
--- a/code/modules/mining/alloys.dm
+++ b/code/modules/mining/alloys.dm
@@ -9,22 +9,22 @@
 	var/metaltag

 /datum/alloy/durasteel
-	metaltag = "durasteel"
+	metaltag = MAT_DURASTEEL
 	requires = list(
-		"diamond" = 1,
-		"platinum" = 1,
-		"carbon" = 2,
-		"hematite" = 2
+		ORE_DIAMOND = 1,
+		ORE_PLATINUM = 1,
+		ORE_CARBON = 2,
+		ORE_HEMATITE = 2
 		)
 	product_mod = 0.3
 	product = /obj/item/stack/material/durasteel

 /datum/alloy/plasteel
-	metaltag = "plasteel"
+	metaltag = MAT_PLASTEEL
 	requires = list(
-		"platinum" = 1,
-		"carbon" = 2,
-		"hematite" = 2
+		ORE_PLATINUM = 1,
+		ORE_CARBON = 2,
+		ORE_HEMATITE = 2
 		)
 	product_mod = 0.3
 	product = /obj/item/stack/material/plasteel
@@ -32,24 +32,24 @@
 /datum/alloy/steel
 	metaltag = MAT_STEEL
 	requires = list(
-		"carbon" = 1,
-		"hematite" = 1
+		ORE_CARBON = 1,
+		ORE_HEMATITE = 1
 		)
 	product = /obj/item/stack/material/steel

 /datum/alloy/borosilicate
-	metaltag = "borosilicate glass"
+	metaltag = MAT_PGLASS
 	requires = list(
-		"platinum" = 1,
-		"sand" = 2
+		ORE_PLATINUM = 1,
+		ORE_SAND = 2
 		)
 	product = /obj/item/stack/material/glass/phoronglass
 /*
 /datum/alloy/bronze
-	metaltag = "bronze"
+	metaltag = MAT_BRONZE
 	requires = list(
-		"copper" = 2,
-		"tin" = 1
+		ORE_COPPER = 2,
+		ORE_TIN = 1
 		)
 	product = /obj/item/stack/material/bronze
-*/
+*/
--- a/code/modules/mining/alloys_vr.dm
+++ b/code/modules/mining/alloys_vr.dm
@@ -1,9 +1,9 @@
 /datum/alloy/plastitanium
 	metaltag = MAT_PLASTITANIUM
 	requires = list(
-		"rutile" = 1,
-		"platinum" = 1,
-		"carbon" = 2,
+		ORE_RUTILE = 1,
+		ORE_PLATINUM = 1,
+		ORE_CARBON = 2,
 		)
 	product_mod = 0.3
 	product = /obj/item/stack/material/plastitanium
@@ -11,8 +11,8 @@
 /datum/alloy/tiglass
 	metaltag = MAT_TITANIUMGLASS
 	requires = list(
-		"rutile" = 1,
-		"sand" = 2
+		ORE_RUTILE = 1,
+		ORE_SAND = 2
 		)
 	product_mod = 1
 	product = /obj/item/stack/material/glass/titanium
@@ -20,10 +20,10 @@
 /datum/alloy/plastiglass
 	metaltag = MAT_PLASTITANIUMGLASS
 	requires = list(
-		"rutile" = 1,
-		"sand" = 2,
-		"platinum" = 1,
-		"carbon" = 2,
+		ORE_RUTILE = 1,
+		ORE_SAND = 2,
+		ORE_PLATINUM = 1,
+		ORE_CARBON = 2,
 		)
 	product_mod = 1
-	product = /obj/item/stack/material/glass/plastitanium
+	product = /obj/item/stack/material/glass/plastitanium
--- a/code/modules/mining/drilling/drill.dm
+++ b/code/modules/mining/drilling/drill.dm
@@ -22,42 +22,42 @@
 	var/current_capacity = 0

 	var/list/stored_ore = list(
-		"sand" = 0,
-		"hematite" = 0,
-		"carbon" = 0,
-		"raw copper" = 0,
-		"raw tin" = 0,
-		"void opal" = 0,
-		"painite" = 0,
-		"quartz" = 0,
-		"raw bauxite" = 0,
-		"phoron" = 0,
-		"silver" = 0,
-		"gold" = 0,
-		"marble" = 0,
-		"uranium" = 0,
-		"diamond" = 0,
-		"platinum" = 0,
-		"lead" = 0,
-		"mhydrogen" = 0,
-		"verdantium" = 0,
-		"rutile" = 0)
+		ORE_SAND = 0,
+		ORE_HEMATITE = 0,
+		ORE_CARBON = 0,
+		ORE_COPPER = 0,
+		ORE_TIN = 0,
+		ORE_VOPAL = 0,
+		ORE_PAINITE = 0,
+		ORE_QUARTZ = 0,
+		ORE_BAUXITE = 0,
+		ORE_PHORON = 0,
+		ORE_SILVER = 0,
+		ORE_GOLD = 0,
+		ORE_MARBLE = 0,
+		ORE_URANIUM = 0,
+		ORE_DIAMOND = 0,
+		ORE_PLATINUM = 0,
+		ORE_LEAD = 0,
+		ORE_MHYDROGEN = 0,
+		ORE_VERDANTIUM = 0,
+		ORE_RUTILE = 0)

 	var/list/ore_types = list(
-		"hematite" = /obj/item/ore/iron,
-		"uranium" = /obj/item/ore/uranium,
-		"gold" = /obj/item/ore/gold,
-		"silver" = /obj/item/ore/silver,
-		"diamond" = /obj/item/ore/diamond,
-		"phoron" = /obj/item/ore/phoron,
-		"platinum" = /obj/item/ore/osmium,
-		"mhydrogen" = /obj/item/ore/hydrogen,
-		"sand" = /obj/item/ore/glass,
-		"carbon" = /obj/item/ore/coal,
-	//	"copper" = /obj/item/ore/copper,
-	//	"tin" = /obj/item/ore/tin,
-	//	"bauxite" = /obj/item/ore/bauxite,
-		"rutile" = /obj/item/ore/rutile
+		ORE_HEMATITE = /obj/item/ore/iron,
+		ORE_URANIUM = /obj/item/ore/uranium,
+		ORE_GOLD = /obj/item/ore/gold,
+		ORE_SILVER = /obj/item/ore/silver,
+		ORE_DIAMOND = /obj/item/ore/diamond,
+		ORE_PHORON = /obj/item/ore/phoron,
+		ORE_PLATINUM = /obj/item/ore/osmium,
+		ORE_MHYDROGEN = /obj/item/ore/hydrogen,
+		ORE_SAND = /obj/item/ore/glass,
+		ORE_CARBON = /obj/item/ore/coal,
+	//	ORE_COPPER = /obj/item/ore/copper,
+	//	ORE_TIN = /obj/item/ore/tin,
+	//	ORE_BAUXITE = /obj/item/ore/bauxite,
+		ORE_RUTILE = /obj/item/ore/rutile
 		)

 	//Upgrades
@@ -69,16 +69,16 @@

 	// Found with an advanced laser. exotic_drilling >= 1
 	var/list/ore_types_uncommon = list(
-		MAT_MARBLE = /obj/item/ore/marble,
-		//"painite" = /obj/item/ore/painite,
-		//"quartz" = /obj/item/ore/quartz,
-		MAT_LEAD = /obj/item/ore/lead
+		ORE_MARBLE = /obj/item/ore/marble,
+		//ORE_PAINITE = /obj/item/ore/painite,
+		//ORE_QUARTZ = /obj/item/ore/quartz,
+		ORE_LEAD = /obj/item/ore/lead
 		)

 	// Found with an ultra laser. exotic_drilling >= 2
 	var/list/ore_types_rare = list(
-		//"void opal" = /obj/item/ore/void_opal,
-		MAT_VERDANTIUM = /obj/item/ore/verdantium
+		//ORE_VOPAL = /obj/item/ore/void_opal,
+		ORE_VERDANTIUM = /obj/item/ore/verdantium
 		)

 	//Flags
--- a/code/modules/mining/drilling/scanner.dm
+++ b/code/modules/mining/drilling/scanner.dm
@@ -41,13 +41,13 @@
 			var/ore_type

 			switch(metal)
-				if("sand", "carbon", "marble", /*"quartz"*/)	ore_type = "surface minerals"
-				if("hematite", /*"tin", "copper", "bauxite",*/ "lead")	ore_type = "industrial metals"
-				if("gold", "silver", "rutile")					ore_type = "precious metals"
-				if("diamond", /*"painite"*/)	ore_type = "precious gems"
-				if("uranium")									ore_type = "nuclear fuel"
-				if("phoron", "platinum", "mhydrogen")				ore_type = "exotic matter"
-				if("verdantium", /*"void opal"*/)				ore_type = "anomalous matter"
+				if(ORE_SAND, ORE_CARBON, ORE_MARBLE, /*ORE_QUARTZ*/)	ore_type = "surface minerals"
+				if(ORE_HEMATITE, /*ORE_TIN, ORE_COPPER, ORE_BAUXITE,*/ ORE_LEAD)	ore_type = "industrial metals"
+				if(ORE_GOLD, ORE_SILVER, ORE_RUTILE)					ore_type = "precious metals"
+				if(ORE_DIAMOND, /*ORE_PAINITE*/)	ore_type = "precious gems"
+				if(ORE_URANIUM)									ore_type = "nuclear fuel"
+				if(ORE_PHORON, ORE_PLATINUM, ORE_MHYDROGEN)				ore_type = "exotic matter"
+				if(ORE_VERDANTIUM, /*ORE_VOPAL*/)				ore_type = "anomalous matter"

 			if(ore_type) metals[ore_type] += T.resources[metal]

--- a/code/modules/mining/machinery/machine_processing.dm
+++ b/code/modules/mining/machinery/machine_processing.dm
@@ -166,26 +166,26 @@
 	var/points = 0
 	var/points_mult = 1 //VOREStation Add - multiplier for points generated when ore hits the processors
 	var/static/list/ore_values = list(
-		"sand" = 1,
-		"hematite" = 1,
-		"carbon" = 1,
-		"raw copper" = 1,
-		"raw tin" = 1,
-		"void opal" = 3,
-		"painite" = 3,
-		"quartz" = 3,
-		"raw bauxite" = 5,
-		"phoron" = 15,
-		"silver" = 16,
-		"gold" = 18,
-		"marble" = 20,
-		"uranium" = 30,
-		"diamond" = 50,
-		"platinum" = 40,
-		"lead" = 40,
-		"mhydrogen" = 40,
-		"verdantium" = 60,
-		"rutile" = 40) //VOREStation Add
+		ORE_SAND = 1,
+		ORE_HEMATITE = 1,
+		ORE_CARBON = 1,
+		ORE_COPPER = 1,
+		ORE_TIN = 1,
+		ORE_VOPAL = 3,
+		ORE_PAINITE = 3,
+		ORE_QUARTZ= 3,
+		ORE_BAUXITE = 5,
+		ORE_PHORON = 15,
+		ORE_SILVER = 16,
+		ORE_GOLD = 18,
+		ORE_MARBLE = 20,
+		ORE_URANIUM = 30,
+		ORE_DIAMOND = 50,
+		ORE_PLATINUM = 40,
+		ORE_LEAD = 40,
+		ORE_MHYDROGEN = 40,
+		ORE_VERDANTIUM = 60,
+		ORE_RUTILE = 40) //VOREStation Add

 /obj/machinery/mineral/processing_unit/Initialize()
 	. = ..()
--- a/code/modules/mining/machinery/machine_unloading.dm
+++ b/code/modules/mining/machinery/machine_unloading.dm
@@ -47,45 +47,45 @@
 					BOX.stored_ore[ore] = 0

 					//Icon code here. Going from most to least common.
-					if(ore == "sand")
+					if(ore == ORE_SAND)
 						ore_chunk.icon_state = "ore_glass"
-					else if(ore == "carbon")
+					else if(ore == ORE_CARBON)
 						ore_chunk.icon_state = "ore_coal"
-					else if(ore == "hematite")
+					else if(ore == ORE_HEMATITE)
 						ore_chunk.icon_state = "ore_iron"
-					else if(ore == "phoron")
+					else if(ore == ORE_PHORON)
 						ore_chunk.icon_state = "ore_phoron"
-					else if(ore == "silver")
+					else if(ore == ORE_SILVER)
 						ore_chunk.icon_state = "ore_silver"
-					else if(ore == "gold")
+					else if(ore == ORE_GOLD)
 						ore_chunk.icon_state = "ore_gold"
-					else if(ore == "uranium")
+					else if(ore == ORE_URANIUM)
 						ore_chunk.icon_state = "ore_uranium"
-					else if(ore == "diamond")
+					else if(ore == ORE_DIAMOND)
 						ore_chunk.icon_state = "ore_diamond"
-					else if(ore == "platinum")
+					else if(ore == ORE_PLATINUM)
 						ore_chunk.icon_state = "ore_platinum"
-					else if(ore == "marble")
+					else if(ore == ORE_MARBLE)
 						ore_chunk.icon_state = "ore_marble"
-					else if(ore == "lead")
+					else if(ore == ORE_LEAD)
 						ore_chunk.icon_state = "ore_lead"
-					else if(ore == "rutile")
+					else if(ore == ORE_RUTILE)
 						ore_chunk.icon_state = "ore_rutile"
-					else if(ore == "quartz")
+					else if(ore == ORE_QUARTZ)
 						ore_chunk.icon_state = "ore_quartz"
-					else if(ore == "mhydrogen")
+					else if(ore == ORE_MHYDROGEN)
 						ore_chunk.icon_state = "ore_hydrogen"
-					else if(ore == "verdantium")
+					else if(ore == ORE_VERDANTIUM)
 						ore_chunk.icon_state = "ore_verdantium"
-					else if(ore == "raw copper")
+					else if(ore == ORE_COPPER)
 						ore_chunk.icon_state = "ore_copper"
-					else if(ore == "raw tin")
+					else if(ore == ORE_TIN)
 						ore_chunk.icon_state = "ore_tin"
-					else if(ore == "void opal")
+					else if(ore == ORE_VOPAL)
 						ore_chunk.icon_state = "ore_void_opal"
-					else if(ore == "raw bauxite")
+					else if(ore == ORE_BAUXITE)
 						ore_chunk.icon_state = "ore_bauxite"
-					else if(ore == "painite")
+					else if(ore == ORE_PAINITE)
 						ore_chunk.icon_state = "ore_painite"
 					else
 						ore_chunk.icon_state = "boulder[rand(1,4)]"
@@ -102,4 +102,4 @@
 					O.loc = src.output.loc
 				else
 					return
-	return
+	return
--- a/code/modules/mining/mine_turfs.dm
+++ b/code/modules/mining/mine_turfs.dm
@@ -54,26 +54,26 @@ var/list/mining_overlay_cache = list()
 	var/ignore_mapgen

 	var/static/list/ore_types = list(
-		"hematite" = /obj/item/ore/iron,
-		"uranium" = /obj/item/ore/uranium,
-		"gold" = /obj/item/ore/gold,
-		"silver" = /obj/item/ore/silver,
-		"diamond" = /obj/item/ore/diamond,
-		"phoron" = /obj/item/ore/phoron,
-		"platinum" = /obj/item/ore/osmium,
-		"mhydrogen" = /obj/item/ore/hydrogen,
-		"sand" = /obj/item/ore/glass,
-		"carbon" = /obj/item/ore/coal,
-		"verdantium" = /obj/item/ore/verdantium,
-		"marble" = /obj/item/ore/marble,
-		"lead" = /obj/item/ore/lead,
-//		"copper" = /obj/item/ore/copper,
-//		"tin" = /obj/item/ore/tin,
-//		"bauxite" = /obj/item/ore/bauxite,
-//		"void opal" = /obj/item/ore/void_opal,
-//		"painite" = /obj/item/ore/painite,
-//		"quartz" = /obj/item/ore/quartz,
-		"rutile" = /obj/item/ore/rutile
+		ORE_HEMATITE = /obj/item/ore/iron,
+		ORE_URANIUM = /obj/item/ore/uranium,
+		ORE_GOLD = /obj/item/ore/gold,
+		ORE_SILVER = /obj/item/ore/silver,
+		ORE_DIAMOND = /obj/item/ore/diamond,
+		ORE_PHORON = /obj/item/ore/phoron,
+		ORE_PLATINUM = /obj/item/ore/osmium,
+		ORE_MHYDROGEN = /obj/item/ore/hydrogen,
+		ORE_SAND = /obj/item/ore/glass,
+		ORE_CARBON = /obj/item/ore/coal,
+		ORE_VERDANTIUM = /obj/item/ore/verdantium,
+		ORE_MARBLE = /obj/item/ore/marble,
+		ORE_LEAD = /obj/item/ore/lead,
+//		ORE_COPPER = /obj/item/ore/copper,
+//		ORE_TIN = /obj/item/ore/tin,
+//		ORE_BAUXITE = /obj/item/ore/bauxite,
+//		ORE_VOPAL = /obj/item/ore/void_opal,
+//		ORE_PAINITE = /obj/item/ore/painite,
+//		ORE_QUARTZ = /obj/item/ore/quartz,
+		ORE_RUTILE = /obj/item/ore/rutile
 	)

 	has_resources = 1
@@ -734,10 +734,10 @@ var/list/mining_overlay_cache = list()

 	var/mineral_name
 	if(rare_ore)
-		mineral_name = pickweight(list("marble" = 5,/* "quartz" = 15, "copper" = 10, "tin" = 5, "bauxite" = 5*/, "uranium" = 15, "platinum" = 20, "hematite" = 15, "rutile" = 20, "carbon" = 15, "diamond" = 3, "gold" = 15, "silver" = 15, "phoron" = 25, "lead" = 5,/* "void opal" = 1,*/ "verdantium" = 2/*, "painite" = 1*/))
+		mineral_name = pickweight(list(ORE_MARBLE = 5,/* ORE_QUARTZ = 15, ORE_COPPER = 10, ORE_TIN = 5, ORE_BAUXITE = 5*/, ORE_URANIUM = 15, ORE_PLATINUM = 20, ORE_HEMATITE = 15, ORE_RUTILE = 20, ORE_CARBON = 15, ORE_DIAMOND = 3, ORE_GOLD = 15, ORE_SILVER = 15, ORE_PHORON = 25, ORE_LEAD = 5,/* ORE_VOPAL = 1,*/ ORE_VERDANTIUM = 2/*, ORE_PAINITE = 1*/))

 	else
-		mineral_name = pickweight(list("marble" = 3,/* "quartz" = 10, "copper" = 20, "tin" = 15, "bauxite" = 15*/, "uranium" = 10, "platinum" = 10, "hematite" = 70, "rutile" = 15, "carbon" = 70, "diamond" = 2, "gold" = 10, "silver" = 10, "phoron" = 20, "lead" = 3,/* "void opal" = 1,*/ "verdantium" = 1/*, "painite" = 1*/))
+		mineral_name = pickweight(list(ORE_MARBLE = 3,/* ORE_QUARTZ = 10, ORE_COPPER = 20, ORE_TIN = 15, ORE_BAUXITE = 15*/, ORE_URANIUM = 10, ORE_PLATINUM = 10, ORE_HEMATITE = 70, ORE_RUTILE = 15, ORE_CARBON = 70, ORE_DIAMOND = 2, ORE_GOLD = 10, ORE_SILVER = 10, ORE_PHORON = 20, ORE_LEAD = 3,/* ORE_VOPAL = 1,*/ ORE_VERDANTIUM = 1/*, ORE_PAINITE = 1*/))

 	if(mineral_name && (mineral_name in GLOB.ore_data))
 		mineral = GLOB.ore_data[mineral_name]
--- a/code/modules/mining/ore.dm
+++ b/code/modules/mining/ore.dm
@@ -11,31 +11,31 @@
 	name = "pitchblende"
 	icon_state = "ore_uranium"
 	origin_tech = list(TECH_MATERIAL = 5)
-	material = "uranium"
+	material = ORE_URANIUM

 /obj/item/ore/iron
-	name = "hematite"
+	name = ORE_HEMATITE
 	icon_state = "ore_iron"
 	origin_tech = list(TECH_MATERIAL = 1)
-	material = "hematite"
+	material = ORE_HEMATITE

 /obj/item/ore/coal
 	name = "raw carbon"
 	icon_state = "ore_coal"
 	origin_tech = list(TECH_MATERIAL = 1)
-	material = "carbon"
+	material = ORE_CARBON

 /obj/item/ore/marble
 	name = "recrystallized carbonate"
 	icon_state = "ore_marble"
 	origin_tech = list(TECH_MATERIAL = 1)
-	material = "marble"
+	material = ORE_MARBLE

 /obj/item/ore/glass
-	name = "sand"
+	name = ORE_SAND
 	icon_state = "ore_glass"
 	origin_tech = list(TECH_MATERIAL = 1)
-	material = "sand"
+	material = ORE_SAND
 	slot_flags = SLOT_HOLSTER

 // POCKET SAND!
@@ -54,40 +54,40 @@
 	name = "phoron crystals"
 	icon_state = "ore_phoron"
 	origin_tech = list(TECH_MATERIAL = 2)
-	material = "phoron"
+	material = ORE_PHORON

 /obj/item/ore/silver
 	name = "native silver ore"
 	icon_state = "ore_silver"
 	origin_tech = list(TECH_MATERIAL = 3)
-	material = "silver"
+	material = ORE_SILVER

 /obj/item/ore/gold
 	name = "native gold ore"
 	icon_state = "ore_gold"
 	origin_tech = list(TECH_MATERIAL = 4)
-	material = "gold"
+	material = ORE_GOLD

 /obj/item/ore/diamond
 	name = "diamonds"
 	icon_state = "ore_diamond"
 	origin_tech = list(TECH_MATERIAL = 6)
-	material = "diamond"
+	material = ORE_DIAMOND

 /obj/item/ore/osmium
 	name = "raw platinum"
 	icon_state = "ore_platinum"
-	material = "platinum"
+	material = ORE_PLATINUM

 /obj/item/ore/hydrogen
 	name = "raw hydrogen"
 	icon_state = "ore_hydrogen"
-	material = "mhydrogen"
+	material = ORE_MHYDROGEN

 /obj/item/ore/verdantium
 	name = "verdantite dust"
 	icon_state = "ore_verdantium"
-	material = MAT_VERDANTIUM
+	material = ORE_VERDANTIUM
 	origin_tech = list(TECH_MATERIAL = 7)

 // POCKET ... Crystal dust.
@@ -104,43 +104,43 @@
 /obj/item/ore/lead
 	name = "lead glance"
 	icon_state = "ore_lead"
-	material = MAT_LEAD
+	material = ORE_LEAD
 	origin_tech = list(TECH_MATERIAL = 3)
 /*
 /obj/item/ore/copper
 	name = "raw copper"
 	icon_state = "ore_copper"
-	material = "copper"
+	material = ORE_COPPER

 /obj/item/ore/tin
 	name = "raw tin"
 	icon_state = "ore_tin"
-	material = "tin"
+	material = ORE_TIN

 /obj/item/ore/bauxite
 	name = "raw bauxite"
 	icon_state = "ore_bauxite"
-	material = "bauxite"
+	material = ORE_BAUXITE
 */
 /obj/item/ore/rutile
 	name = "raw rutile"
 	icon_state = "ore_rutile"
-	material = "rutile"
+	material = ORE_RUTILE
 /*
 /obj/item/ore/void_opal
 	name = "raw void opal"
 	icon_state = "ore_void_opal"
-	material = "void opal"
+	material = ORE_VOPAL

 /obj/item/ore/painite
 	name = "raw painite"
 	icon_state = "ore_painite"
-	material = "painite"
+	material = ORE_PAINITE

 /obj/item/ore/quartz
 	name = "raw quartz"
 	icon_state = "ore_quartz"
-	material = "quartz"
+	material = ORE_QUARTZ
 */
 /obj/item/ore/slag
 	name = "Slag"
@@ -179,26 +179,26 @@
 	randpixel = 8
 	w_class = ITEMSIZE_LARGE //CHOMPEdit
 	var/list/stored_ore = list(
-		"sand" = 0,
-		"hematite" = 0,
-		"carbon" = 0,
-		"raw copper" = 0,
-		"raw tin" = 0,
-		"void opal" = 0,
-		"painite" = 0,
-		"quartz" = 0,
-		"raw bauxite" = 0,
-		"phoron" = 0,
-		"silver" = 0,
-		"gold" = 0,
-		"marble" = 0,
-		"uranium" = 0,
-		"diamond" = 0,
-		"platinum" = 0,
-		"lead" = 0,
-		"mhydrogen" = 0,
-		"verdantium" = 0,
-		"rutile" = 0)
+		ORE_SAND = 0,
+		ORE_HEMATITE = 0,
+		ORE_CARBON = 0,
+		ORE_COPPER = 0,
+		ORE_TIN = 0,
+		ORE_VOPAL = 0,
+		ORE_PAINITE = 0,
+		ORE_QUARTZ = 0,
+		ORE_BAUXITE = 0,
+		ORE_PHORON = 0,
+		ORE_SILVER = 0,
+		ORE_GOLD = 0,
+		ORE_MARBLE = 0,
+		ORE_URANIUM = 0,
+		ORE_DIAMOND = 0,
+		ORE_PLATINUM = 0,
+		ORE_LEAD = 0,
+		ORE_MHYDROGEN = 0,
+		ORE_VERDANTIUM = 0,
+		ORE_RUTILE = 0)

 /obj/item/ore_chunk/examine(mob/user)
 	. = ..()
--- a/code/modules/mining/ore_box.dm
+++ b/code/modules/mining/ore_box.dm
@@ -8,26 +8,26 @@
 	density = TRUE
 	var/last_update = 0
 	var/list/stored_ore = list(
-		"sand" = 0,
-		"hematite" = 0,
-		"carbon" = 0,
-		"raw copper" = 0,
-		"raw tin" = 0,
-		"void opal" = 0,
-		"painite" = 0,
-		"quartz" = 0,
-		"raw bauxite" = 0,
-		"phoron" = 0,
-		"silver" = 0,
-		"gold" = 0,
-		"marble" = 0,
-		"uranium" = 0,
-		"diamond" = 0,
-		"platinum" = 0,
-		"lead" = 0,
-		"mhydrogen" = 0,
-		"verdantium" = 0,
-		"rutile" = 0)
+		ORE_SAND = 0,
+		ORE_HEMATITE = 0,
+		ORE_CARBON = 0,
+		ORE_COPPER = 0,
+		ORE_TIN = 0,
+		ORE_VOPAL = 0,
+		ORE_PAINITE = 0,
+		ORE_QUARTZ = 0,
+		ORE_BAUXITE = 0,
+		ORE_PHORON = 0,
+		ORE_SILVER = 0,
+		ORE_GOLD = 0,
+		ORE_MARBLE = 0,
+		ORE_URANIUM = 0,
+		ORE_DIAMOND = 0,
+		ORE_PLATINUM = 0,
+		ORE_LEAD = 0,
+		ORE_MHYDROGEN = 0,
+		ORE_VERDANTIUM = 0,
+		ORE_RUTILE = 0)


 /obj/structure/ore_box/attackby(obj/item/W as obj, mob/user as mob)
--- a/code/modules/mining/ore_datum.dm
+++ b/code/modules/mining/ore_datum.dm
@@ -14,8 +14,8 @@
 		"thousand" = 999,
 		"million" = 999
 		)
-	var/xarch_source_mineral = "iron"
-	var/reagent = "silicate"
+	var/xarch_source_mineral = REAGENT_ID_IRON
+	var/reagent = REAGENT_SILICATE

 /ore/New()
 	. = ..()
@@ -23,9 +23,9 @@
 		display_name = name

 /ore/uranium
-	name = "uranium"
+	name = ORE_LEAD
 	display_name = "pitchblende"
-	smelts_to = "uranium"
+	smelts_to = MAT_URANIUM
 	result_amount = 5
 	spread_chance = 10
 	ore = /obj/item/ore/uranium
@@ -34,43 +34,43 @@
 		"thousand" = 999,
 		"million" = 704
 		)
-	xarch_source_mineral = "potassium"
-	reagent = "uranium"
+	xarch_source_mineral = REAGENT_ID_POTASSIUM
+	reagent = REAGENT_ID_URANIUM

 /ore/hematite
-	name = "hematite"
-	display_name = "hematite"
-	smelts_to = "iron"
+	name = ORE_HEMATITE
+	display_name = ORE_HEMATITE
+	smelts_to = MAT_IRON
 	alloy = 1
 	result_amount = 5
 	spread_chance = 25
 	ore = /obj/item/ore/iron
 	scan_icon = "mineral_common"
-	reagent = "iron"
+	reagent = REAGENT_ID_IRON

 /ore/coal
-	name = "carbon"
+	name = ORE_CARBON
 	display_name = "raw carbon"
-	smelts_to = "plastic"
-	compresses_to = "graphite"
+	smelts_to = MAT_PLASTIC
+	compresses_to = MAT_GRAPHITE
 	alloy = 1
 	result_amount = 5
 	spread_chance = 25
 	ore = /obj/item/ore/coal
 	scan_icon = "mineral_common"
-	reagent = "carbon"
+	reagent = REAGENT_ID_CARBON

 /ore/glass
-	name = "sand"
-	display_name = "sand"
-	smelts_to = "glass"
+	name = ORE_SAND
+	display_name = ORE_SAND
+	smelts_to = MAT_GLASS
 	alloy = 1
-	compresses_to = "sandstone"
+	compresses_to = MAT_SANDSTONE

 /ore/phoron
-	name = "phoron"
+	name = ORE_PHORON
 	display_name = "phoron crystals"
-	compresses_to = "phoron"
+	compresses_to = MAT_PHORON
 	//smelts_to = something that explodes violently on the conveyor, huhuhuhu
 	result_amount = 5
 	spread_chance = 25
@@ -82,22 +82,22 @@
 		"billion" = 13,
 		"billion_lower" = 10
 		)
-	xarch_source_mineral = "phoron"
-	reagent = "phoron"
+	xarch_source_mineral = REAGENT_ID_PHORON
+	reagent = REAGENT_ID_PHORON

 /ore/silver
-	name = "silver"
+	name = ORE_SILVER
 	display_name = "native silver"
-	smelts_to = "silver"
+	smelts_to = MAT_SILVER
 	result_amount = 5
 	spread_chance = 10
 	ore = /obj/item/ore/silver
 	scan_icon = "mineral_uncommon"
-	reagent = "silver"
+	reagent = REAGENT_ID_SILVER

 /ore/gold
-	smelts_to = "gold"
-	name = "gold"
+	name = ORE_GOLD
+	smelts_to = MAT_GOLD
 	display_name = "native gold"
 	result_amount = 5
 	spread_chance = 10
@@ -109,42 +109,42 @@
 		"billion" = 4,
 		"billion_lower" = 3
 		)
-	reagent = "gold"
+	reagent = REAGENT_ID_GOLD

 /ore/diamond
-	name = "diamond"
-	display_name = "diamond"
+	name = ORE_DIAMOND
+	display_name = ORE_DIAMOND
 	alloy = 1
-	compresses_to = "diamond"
+	compresses_to = MAT_DIAMOND
 	result_amount = 5
 	spread_chance = 10
 	ore = /obj/item/ore/diamond
 	scan_icon = "mineral_rare"
-	xarch_source_mineral = "nitrogen"
-	reagent = "carbon"
+	xarch_source_mineral = REAGENT_ID_NITROGEN
+	reagent = REAGENT_ID_CARBON

 /ore/platinum
-	name = "platinum"
+	name = ORE_PLATINUM
 	display_name = "raw platinum"
-	smelts_to = "platinum"
-	compresses_to = "osmium"
+	smelts_to = MAT_PLATINUM
+	compresses_to = MAT_OSMIUM
 	alloy = 1
 	result_amount = 5
 	spread_chance = 10
 	ore = /obj/item/ore/osmium
 	scan_icon = "mineral_rare"
-	reagent = "platinum"
+	reagent = REAGENT_ID_PLATINUM

 /ore/hydrogen
-	name = "mhydrogen"
+	name = ORE_MHYDROGEN
 	display_name = "metallic hydrogen"
-	smelts_to = "tritium"
-	compresses_to = "mhydrogen"
+	smelts_to = MAT_TRITIUM
+	compresses_to = MAT_METALHYDROGEN
 	scan_icon = "mineral_rare"
-	reagent = "hydrogen"
+	reagent = REAGENT_ID_HYDROGEN

 /ore/verdantium
-	name = MAT_VERDANTIUM
+	name = ORE_VERDANTIUM
 	display_name = "crystalline verdantite"
 	compresses_to = MAT_VERDANTIUM
 	result_amount = 2
@@ -157,40 +157,40 @@
 		)

 /ore/marble
-	name = MAT_MARBLE
+	name = ORE_MARBLE
 	display_name = "recrystallized carbonate"
-	compresses_to = "marble"
+	compresses_to = MAT_MARBLE
 	result_amount = 1
 	spread_chance = 10
 	ore = /obj/item/ore/marble
 	scan_icon = "mineral_common"
-	reagent = "calciumcarbonate"
+	reagent = REAGENT_ID_CALCIUMCARBONATE

 /ore/lead
-	name = MAT_LEAD
+	name = ORE_LEAD
 	display_name = "lead glance"
-	smelts_to = "lead"
+	smelts_to = MAT_LEAD
 	result_amount = 3
 	spread_chance = 20
 	ore = /obj/item/ore/lead
 	scan_icon = "mineral_rare"
-	reagent = "lead"
+	reagent = REAGENT_ID_LEAD
 /*
 /ore/copper
-	name = "copper"
-	display_name = "copper"
-	smelts_to = "copper"
+	name = ORE_COPPER
+	display_name = ORE_COPPER
+	smelts_to = MAT_COPPER
 	alloy = 1
 	result_amount = 5
 	spread_chance = 15
 	ore = /obj/item/ore/copper
 	scan_icon = "mineral_common"
-	reagent = "copper"
+	reagent = REAGENT_ID_COPPER

 /ore/tin
-	name = "tin"
-	display_name = "tin"
-	smelts_to = "tin"
+	name = ORE_TIN
+	display_name = ORE_TIN
+	smelts_to = MAT_TIN
 	alloy = 1
 	result_amount = 5
 	spread_chance = 10
@@ -198,28 +198,28 @@
 	scan_icon = "mineral_common"

 /ore/quartz
-	name = "quartz"
+	name = ORE_QUARTZ
 	display_name = "unrefined quartz"
-	compresses_to = "quartz"
+	compresses_to = MAT_QUARTZ
 	result_amount = 5
 	spread_chance = 5
 	ore = /obj/item/ore/quartz
 	scan_icon = "mineral_common"

 /ore/bauxite
-	name = "bauxite"
-	display_name = "bauxite"
-	smelts_to = "aluminium"
+	name = ORE_BAUXITE
+	display_name = ORE_BAUXITE
+	smelts_to = MAT_ALUMINIUM
 	result_amount = 5
 	spread_chance = 25
 	ore = /obj/item/ore/bauxite
 	scan_icon = "mineral_common"
-	reagent = "aluminum"
+	reagent = REAGENT_ID_ALUMINIUM
 */
 /ore/rutile
-	name = "rutile"
-	display_name = "rutile"
-	smelts_to = "titanium"
+	name = ORE_RUTILE
+	display_name = ORE_RUTILE
+	smelts_to = MAT_TITANIUM
 	result_amount = 5
 	spread_chance = 12
 	alloy = 1
@@ -227,20 +227,20 @@
 	scan_icon = "mineral_uncommon"
 /*
 /ore/painite
-	name = "painite"
+	name = ORE_PAINITE
 	display_name = "rough painite"
-	compresses_to = "painite"
+	compresses_to = MAT_PAINITE
 	result_amount = 5
 	spread_chance = 3
 	ore = /obj/item/ore/painite
 	scan_icon = "mineral_rare"

 /ore/void_opal
-	name = "void opal"
+	name = ORE_VOPAL
 	display_name = "rough void opal"
-	compresses_to = "void opal"
+	compresses_to = MAT_VOPAL
 	result_amount = 5
 	spread_chance = 1
 	ore = /obj/item/ore/void_opal
 	scan_icon = "mineral_rare"
-*/
+*/
--- a/code/modules/mining/ore_datum_vr.dm
+++ b/code/modules/mining/ore_datum_vr.dm
@@ -1,9 +1,9 @@
 /ore/rutile
-	name = "rutile"
-	display_name = "rutile"
-	smelts_to = "titanium"
+	name = ORE_RUTILE
+	display_name = ORE_RUTILE
+	smelts_to = MAT_TITANIUM
 	alloy = 1
 	result_amount = 5
 	spread_chance = 10
 	ore = /obj/item/ore/rutile
-	scan_icon = "mineral_rare"
+	scan_icon = "mineral_rare"
--- a/code/modules/mining/ore_redemption_machine/equipment_vendor.dm
+++ b/code/modules/mining/ore_redemption_machine/equipment_vendor.dm
@@ -108,7 +108,7 @@
 		EQUIPMENT("Hardsuit - Proto-Kinetic Gauntlets",		/obj/item/rig_module/gauntlets,					2000),
 	)
 	prize_list["Miscellaneous"] = list(
-		EQUIPMENT("Absinthe",					/obj/item/reagent_containers/food/drinks/bottle/absinthe,	125),
+		EQUIPMENT(REAGENT_ABSINTHE,					/obj/item/reagent_containers/food/drinks/bottle/absinthe,	125),
 		EQUIPMENT("Cigar",						/obj/item/clothing/mask/smokable/cigarette/cigar/havana,			150),
 		EQUIPMENT("Digital Tablet - Standard",	/obj/item/modular_computer/tablet/preset/custom_loadout/standard,	500),
 		EQUIPMENT("Digital Tablet - Advanced",	/obj/item/modular_computer/tablet/preset/custom_loadout/advanced,	1000),
@@ -120,7 +120,7 @@
 		EQUIPMENT("Thalers - 100",				/obj/item/spacecash/c100,									1000),
 		EQUIPMENT("Thalers - 1000",				/obj/item/spacecash/c1000,									10000),
 		EQUIPMENT("Umbrella",					/obj/item/melee/umbrella/random,								200),
-		EQUIPMENT("Whiskey",					/obj/item/reagent_containers/food/drinks/bottle/whiskey,		125),
+		EQUIPMENT(REAGENT_WHISKEY,					/obj/item/reagent_containers/food/drinks/bottle/whiskey,		125),
 		EQUIPMENT("Mining PSG Upgrade Disk",	/obj/item/borg/upgrade/shield_upgrade,								2500),
 	//CHOMPedit Start
 		EQUIPMENT("Mining PSG", 				/obj/item/personal_shield_generator/belt/mining/loaded,      2000),
--- a/code/modules/mining/ore_redemption_machine/survey_vendor.dm
+++ b/code/modules/mining/ore_redemption_machine/survey_vendor.dm
@@ -12,8 +12,8 @@
 		new /datum/data/mining_equipment("1 Marker Beacon",				/obj/item/stack/marker_beacon,										1),
 		new /datum/data/mining_equipment("10 Marker Beacons",			/obj/item/stack/marker_beacon/ten,									10),
 		new /datum/data/mining_equipment("30 Marker Beacons",			/obj/item/stack/marker_beacon/thirty,								30),
-		new /datum/data/mining_equipment("Whiskey",						/obj/item/reagent_containers/food/drinks/bottle/whiskey,		120),
-		new /datum/data/mining_equipment("Absinthe",					/obj/item/reagent_containers/food/drinks/bottle/absinthe,	120),
+		new /datum/data/mining_equipment(REAGENT_WHISKEY,						/obj/item/reagent_containers/food/drinks/bottle/whiskey,		120),
+		new /datum/data/mining_equipment(REAGENT_ABSINTHE,					/obj/item/reagent_containers/food/drinks/bottle/absinthe,	120),
 		new /datum/data/mining_equipment("Cigar",						/obj/item/clothing/mask/smokable/cigarette/cigar/havana,			15),
 		new /datum/data/mining_equipment("Soap",						/obj/item/soap/nanotrasen,									20),
 		new /datum/data/mining_equipment("Laser Pointer",				/obj/item/laser_pointer,										90),
@@ -108,8 +108,8 @@
 		EQUIPMENT("Survey Tools - Binoculars",		/obj/item/binoculars,40),
 	)
 	prize_list["Miscellaneous"] = list(
-		EQUIPMENT("Absinthe",					/obj/item/reagent_containers/food/drinks/bottle/absinthe,	10),
-		EQUIPMENT("Whiskey",					/obj/item/reagent_containers/food/drinks/bottle/whiskey,		10),
+		EQUIPMENT(REAGENT_ABSINTHE,					/obj/item/reagent_containers/food/drinks/bottle/absinthe,	10),
+		EQUIPMENT(REAGENT_WHISKEY,					/obj/item/reagent_containers/food/drinks/bottle/whiskey,		10),
 		EQUIPMENT("Cigar",						/obj/item/clothing/mask/smokable/cigarette/cigar/havana,			15),
 		EQUIPMENT("Digital Tablet - Standard",	/obj/item/modular_computer/tablet/preset/custom_loadout/standard,	50),
 		EQUIPMENT("Digital Tablet - Advanced",	/obj/item/modular_computer/tablet/preset/custom_loadout/advanced,	100),