[MIRROR] Industrial Expansion

code/modules/mining/drilling/drill.dm

@@ -27,7 +27,11 @@
 		"osmium" = /obj/item/weapon/ore/osmium,
 		"hydrogen" = /obj/item/weapon/ore/hydrogen,
 		"silicates" = /obj/item/weapon/ore/glass,
-		"carbon" = /obj/item/weapon/ore/coal
+		"carbon" = /obj/item/weapon/ore/coal,
+		"copper" = /obj/item/weapon/ore/copper,
+		"tin" = /obj/item/weapon/ore/tin,
+		"bauxite" = /obj/item/weapon/ore/bauxite,
+		"rutile" = /obj/item/weapon/ore/rutile
 		)
 
 	//Upgrades
@@ -40,11 +44,14 @@
 	// Found with an advanced laser. exotic_drilling >= 1
 	var/list/ore_types_uncommon = list(
 		MAT_MARBLE = /obj/item/weapon/ore/marble,
+		"painite" = /obj/item/weapon/ore/painite,
+		"quartz" = /obj/item/weapon/ore/quartz,
 		MAT_LEAD = /obj/item/weapon/ore/lead
 		)
 
 	// Found with an ultra laser. exotic_drilling >= 2
 	var/list/ore_types_rare = list(
+		"void opal" = /obj/item/weapon/ore/void_opal,
 		MAT_VERDANTIUM = /obj/item/weapon/ore/verdantium
 		)
 

code/modules/mining/drilling/scanner.dm

@@ -20,6 +20,7 @@
 /obj/item/weapon/mining_scanner/proc/ScanTurf(var/atom/target, var/mob/user, var/exact = FALSE)
 	var/list/metals = list(
 		"surface minerals" = 0,
+		"industrial metals" = 0,
 		"precious metals" = 0,
 		"precious gems" = 0,
 		"nuclear fuel" = 0,
@@ -38,12 +39,13 @@
 			var/ore_type
 
 			switch(metal)
-				if("silicates", "carbon", "hematite", "marble")	ore_type = "surface minerals"
-				if("gold", "silver", "lead")					ore_type = "precious metals"
-				if("diamond")									ore_type = "precious gems"
+				if("silicates", "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", "osmium", "hydrogen")				ore_type = "exotic matter"
-				if("verdantium")				ore_type = "anomalous matter"
+				if("verdantium", "void opal")				ore_type = "anomalous matter"
 
 			if(ore_type) metals[ore_type] += T.resources[metal]