Industrial Expansion (#7811)

* Begins work on the Industrial expansion, ft hidden Lore

* Removed Painite, Quartz, and Void Opal from generation pending their eventual uses. Recipes modified to use them have been reverted of this use.

Fix Fix.

* Reset map to master.

* Add copper to Robotics, R&D, Engineering, and EVA.

code/modules/mining/alloys.dm

@@ -43,4 +43,12 @@
 		"platinum" = 1,
 		"sand" = 2
 		)
-	product = /obj/item/stack/material/glass/phoronglass
+	product = /obj/item/stack/material/glass/phoronglass
+
+/datum/alloy/bronze
+	metaltag = "bronze"
+	requires = list(
+		"copper" = 2,
+		"tin" = 1
+		)
+	product = /obj/item/stack/material/bronze

code/modules/mining/coins.dm

@@ -46,6 +46,18 @@
 	name = "platinum coin"
 	icon_state = "coin_adamantine"
 
+/obj/item/weapon/coin/morphium
+	name = "morphium coin"
+	icon_state = "coin_morphium"
+
+/obj/item/weapon/coin/aluminium
+	name = "aluminium coin"
+	icon_state = "coin_aluminium"
+
+/obj/item/weapon/coin/verdantium
+	name = "verdantium coin"
+	icon_state = "coin_verdantium"
+
 /obj/item/weapon/coin/attackby(obj/item/weapon/W as obj, mob/user as mob)
 	if(istype(W,/obj/item/stack/cable_coil))
 		var/obj/item/stack/cable_coil/CC = W

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
 		)
 
@@ -58,7 +65,7 @@
 	cell = default_use_hicell()
 
 /obj/machinery/mining/drill/get_cell()
-	return cell	
+	return cell
 
 /obj/machinery/mining/drill/loaded
 	cell = /obj/item/weapon/cell/high

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]
 

code/modules/mining/machine_processing.dm

@@ -174,10 +174,17 @@
 		"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,
+		"rutile" = 20,
 		"uranium" = 30,
 		"diamond" = 50,
 		"platinum" = 40,

code/modules/mining/mine_turfs.dm

@@ -53,7 +53,14 @@ var/list/mining_overlay_cache = list()
 		"carbon" = /obj/item/weapon/ore/coal,
 		"verdantium" = /obj/item/weapon/ore/verdantium,
 		"marble" = /obj/item/weapon/ore/marble,
-		"lead" = /obj/item/weapon/ore/lead
+		"lead" = /obj/item/weapon/ore/lead,
+		"copper" = /obj/item/weapon/ore/copper,
+		"tin" = /obj/item/weapon/ore/tin,
+		"bauxite" = /obj/item/weapon/ore/bauxite,
+//		"void opal" = /obj/item/weapon/ore/void_opal,
+//		"painite" = /obj/item/weapon/ore/painite,
+//		"quartz" = /obj/item/weapon/ore/quartz,
+		"rutile" = /obj/item/weapon/ore/rutile
 	)
 
 	has_resources = 1
@@ -643,10 +650,10 @@ turf/simulated/mineral/floor/light_corner
 
 	var/mineral_name
 	if(rare_ore)
-		mineral_name = pickweight(list("marble" = 5, "uranium" = 10, "platinum" = 10, "hematite" = 20, "carbon" = 20, "diamond" = 2, "gold" = 10, "silver" = 10, "phoron" = 20, "lead" = 5, "verdantium" = 1))
+		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*/))
 
 	else
-		mineral_name = pickweight(list("marble" = 3, "uranium" = 10, "platinum" = 10, "hematite" = 70, "carbon" = 70, "diamond" = 2, "gold" = 10, "silver" = 10, "phoron" = 20, "lead" = 2, "verdantium" = 1))
+		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*/))
 
 	if(mineral_name && (mineral_name in ore_data))
 		mineral = ore_data[mineral_name]

code/modules/mining/ore.dm

@@ -107,6 +107,41 @@
 	material = MAT_LEAD
 	origin_tech = list(TECH_MATERIAL = 3)
 
+/obj/item/weapon/ore/copper
+	name = "raw copper"
+	icon_state = "ore_copper"
+	material = "copper"
+
+/obj/item/weapon/ore/tin
+	name = "raw tin"
+	icon_state = "ore_tin"
+	material = "tin"
+
+/obj/item/weapon/ore/bauxite
+	name = "raw bauxite"
+	icon_state = "ore_bauxite"
+	material = "bauxite"
+
+/obj/item/weapon/ore/rutile
+	name = "raw rutile"
+	icon_state = "ore_rutile"
+	material = "rutile"
+
+/obj/item/weapon/ore/void_opal
+	name = "raw void opal"
+	icon_state = "ore_void_opal"
+	material = "void opal"
+
+/obj/item/weapon/ore/painite
+	name = "raw painite"
+	icon_state = "ore_painite"
+	material = "painite"
+
+/obj/item/weapon/ore/quartz
+	name = "raw quartz"
+	icon_state = "ore_quartz"
+	material = "quartz"
+
 /obj/item/weapon/ore/slag
 	name = "Slag"
 	desc = "Someone screwed up..."

code/modules/mining/ore_datum.dm

@@ -177,3 +177,70 @@ var/global/list/ore_data = list()
 	ore = /obj/item/weapon/ore/lead
 	scan_icon = "mineral_rare"
 	reagent = "lead"
+
+/ore/copper
+	name = "copper"
+	display_name = "copper"
+	smelts_to = "copper"
+	alloy = 1
+	result_amount = 5
+	spread_chance = 15
+	ore = /obj/item/weapon/ore/copper
+	scan_icon = "mineral_common"
+	reagent = "copper"
+
+/ore/tin
+	name = "tin"
+	display_name = "tin"
+	smelts_to = "tin"
+	alloy = 1
+	result_amount = 5
+	spread_chance = 10
+	ore = /obj/item/weapon/ore/tin
+	scan_icon = "mineral_common"
+
+/ore/quartz
+	name = "quartz"
+	display_name = "unrefined quartz"
+	compresses_to = "quartz"
+	result_amount = 5
+	spread_chance = 5
+	ore = /obj/item/weapon/ore/quartz
+	scan_icon = "mineral_common"
+
+/ore/bauxite
+	name = "bauxite"
+	display_name = "bauxite"
+	smelts_to = "aluminium"
+	result_amount = 5
+	spread_chance = 25
+	ore = /obj/item/weapon/ore/bauxite
+	scan_icon = "mineral_common"
+	reagent = "aluminum"
+
+/ore/rutile
+	name = "rutile"
+	display_name = "rutile"
+	smelts_to = "titanium"
+	result_amount = 5
+	spread_chance = 12
+	ore = /obj/item/weapon/ore/rutile
+	scan_icon = "mineral_uncommon"
+
+/ore/painite
+	name = "painite"
+	display_name = "rough painite"
+	compresses_to = "painite"
+	result_amount = 5
+	spread_chance = 3
+	ore = /obj/item/weapon/ore/painite
+	scan_icon = "mineral_rare"
+
+/ore/void_opal
+	name = "void opal"
+	display_name = "rough void opal"
+	compresses_to = "void opal"
+	result_amount = 5
+	spread_chance = 1
+	ore = /obj/item/weapon/ore/void_opal
+	scan_icon = "mineral_rare"