Merge branch 'dev' into ofResearchAndPrototypes

Conflicts:
	baystation12.dme
	code/defines/obj/weapon.dm
	code/game/mecha/equipment/tools/medical_tools.dm
	code/game/mecha/equipment/tools/tools.dm
	code/game/mecha/mecha.dm
	code/game/mecha/mecha_parts.dm
	code/game/objects/items/devices/flash.dm
	code/game/objects/items/devices/powersink.dm
	code/game/objects/items/devices/scanners.dm
	code/game/objects/items/stacks/sheets/glass.dm
	code/game/objects/items/stacks/sheets/sheet_types.dm
	code/game/objects/items/weapons/RCD.dm
	code/game/objects/items/weapons/circuitboards/machinery/biogenerator.dm
	code/game/objects/items/weapons/circuitboards/machinery/cloning.dm
	code/game/objects/items/weapons/circuitboards/machinery/mining_drill.dm
	code/game/objects/items/weapons/circuitboards/machinery/pacman.dm
	code/game/objects/items/weapons/circuitboards/machinery/power.dm
	code/game/objects/items/weapons/circuitboards/machinery/recharge_station.dm
	code/game/objects/items/weapons/circuitboards/machinery/research.dm
	code/game/objects/items/weapons/circuitboards/machinery/shieldgen.dm
	code/game/objects/items/weapons/circuitboards/machinery/telecomms.dm
	code/game/objects/items/weapons/circuitboards/machinery/unary_atmos.dm
	code/game/objects/items/weapons/flamethrower.dm
	code/game/objects/items/weapons/handcuffs.dm
	code/game/objects/items/weapons/kitchen.dm
	code/game/objects/items/weapons/shields.dm
	code/game/objects/items/weapons/storage/backpack.dm
	code/game/objects/items/weapons/surgery_tools.dm
	code/game/objects/items/weapons/teleportation.dm
	code/game/objects/items/weapons/tools.dm
	code/modules/assembly/igniter.dm
	code/modules/assembly/infrared.dm
	code/modules/assembly/mousetrap.dm
	code/modules/assembly/proximity.dm
	code/modules/assembly/signaler.dm
	code/modules/assembly/timer.dm
	code/modules/assembly/voice.dm
	code/modules/clothing/glasses/glasses.dm
	code/modules/hydroponics/trays/tray_tools.dm
	code/modules/mining/drilling/scanner.dm
	code/modules/mining/mine_items.dm
	code/modules/mining/ore.dm
	code/modules/mob/living/silicon/robot/analyzer.dm
	code/modules/power/rust/circuits_and_design.dm
	code/modules/projectiles/ammunition/boxes.dm
	code/modules/projectiles/guns/energy/laser.dm
	code/modules/projectiles/guns/energy/special.dm
	code/modules/projectiles/guns/energy/stun.dm
	code/modules/research/circuitprinter.dm
	code/modules/research/designs.dm
	code/modules/research/destructive_analyzer.dm
	code/modules/research/protolathe.dm
	code/modules/research/rdconsole.dm
	code/modules/research/research.dm
	code/modules/research/server.dm
	code/modules/research/xenoarchaeology/genetics/reconstitutor.dm

code/modules/mining/abandonedcrates.dm

@@ -120,7 +120,7 @@
 			new/obj/item/clothing/mask/gas/clown_hat(src)
 			new/obj/item/weapon/bikehorn(src)
 			//new/obj/item/weapon/stamp/clown(src) I'd add it, but only clowns can use it
-			new/obj/item/toy/crayon/rainbow(src)
+			new/obj/item/weapon/pen/crayon/rainbow(src)
 			new/obj/item/toy/waterflower(src)
 		if(95)
 			new/obj/item/clothing/under/mime(src)
@@ -130,7 +130,7 @@
 			new/obj/item/clothing/mask/gas/mime(src)
 			new/obj/item/clothing/head/beret(src)
 			new/obj/item/clothing/suit/suspenders(src)
-			new/obj/item/toy/crayon/mime(src)
+			new/obj/item/weapon/pen/crayon/mime(src)
 			new/obj/item/weapon/reagent_containers/food/drinks/bottle/bottleofnothing(src)
 		if(96)
 			new/obj/item/weapon/vampiric(src)
@@ -164,7 +164,7 @@
 					user << "<span class='danger'>The crate's anti-tamper system activates!</span>"
 					var/turf/T = get_turf(src.loc)
 					explosion(T, 0, 0, 0, 1)
-					del(src)
+					qdel(src)
 					return
 		else
 			user << "<span class='notice'>You attempt to interact with the device using a hand gesture, but it appears this crate is from before the DECANECT came out.</span>"

code/modules/mining/alloys.dm

@@ -19,7 +19,7 @@
 	product = /obj/item/stack/sheet/plasteel
 
 /datum/alloy/steel
-	metaltag = "steel"
+	metaltag = DEFAULT_WALL_MATERIAL
 	requires = list(
 		"coal" = 1,
 		"hematite" = 1

code/modules/mining/drilling/scanner.dm

@@ -4,8 +4,8 @@
 	icon = 'icons/obj/device.dmi'
 	icon_state = "forensic0-old" //GET A BETTER SPRITE.
 	item_state = "electronic"
-	matter = list("metal" = 150)
 	origin_tech = list(TECH_MAGNET = 1, TECH_ENGINERING = 1)
+	matter = list(DEFAULT_WALL_MATERIAL = 150)
 
 /obj/item/weapon/mining_scanner/attack_self(mob/user as mob)
 	user << "You begin sweeping \the [src] about, scanning for metal deposits."

code/modules/mining/machine_processing.dm

@@ -18,7 +18,7 @@
 		if (machine)
 			machine.console = src
 		else
-			del(src)
+			qdel(src)
 
 /obj/machinery/mineral/processing_unit_console/attack_hand(mob/user)
 	add_fingerprint(user)
@@ -42,8 +42,9 @@
 	for(var/ore in machine.ores_processing)
 
 		if(!machine.ores_stored[ore] && !show_all_ores) continue
-
-		dat += "<tr><td width = 40><b>[capitalize(ore)]</b></td><td width = 30>[machine.ores_stored[ore]]</td><td width = 100><font color='"
+		var/ore/O = ore_data[ore]
+		if(!O) continue
+		dat += "<tr><td width = 40><b>[capitalize(O.display_name)]</b></td><td width = 30>[machine.ores_stored[ore]]</td><td width = 100><font color='"
 		if(machine.ores_processing[ore])
 			switch(machine.ores_processing[ore])
 				if(0)
@@ -104,14 +105,13 @@
 	icon_state = "furnace"
 	density = 1
 	anchored = 1
-	luminosity = 3
+	light_range = 3
 	var/obj/machinery/mineral/input = null
 	var/obj/machinery/mineral/output = null
 	var/obj/machinery/mineral/console = null
 	var/sheets_per_tick = 10
 	var/list/ores_processing[0]
 	var/list/ores_stored[0]
-	var/list/ore_data[0]
 	var/list/alloy_data[0]
 	var/active = 0
 
@@ -123,11 +123,12 @@
 	for(var/alloytype in typesof(/datum/alloy)-/datum/alloy)
 		alloy_data += new alloytype()
 
-	for(var/oretype in typesof(/datum/ore)-/datum/ore)
-		var/datum/ore/OD = new oretype()
-		ore_data[OD.oretag] = OD
-		ores_processing[OD.oretag] = 0
-		ores_stored[OD.oretag] = 0
+	if(!ore_data || !ore_data.len)
+		for(var/oretype in typesof(/ore)-/ore)
+			var/ore/OD = new oretype()
+			ore_data[OD.name] = OD
+			ores_processing[OD.name] = 0
+			ores_stored[OD.name] = 0
 
 	//Locate our output and input machinery.
 	spawn(5)
@@ -150,8 +151,10 @@
 	for(var/i = 0,i<sheets_per_tick,i++)
 		var/obj/item/weapon/ore/O = locate() in input.loc
 		if(!O) break
-		if(!isnull(ores_stored[O.oretag])) ores_stored[O.oretag]++
-		O.loc = null
+		if(!isnull(ores_stored[O.material]))
+			ores_stored[O.material]++
+
+		qdel(O)
 
 	if(!active)
 		return
@@ -164,7 +167,7 @@
 
 		if(ores_stored[metal] > 0 && ores_processing[metal] != 0)
 
-			var/datum/ore/O = ore_data[metal]
+			var/ore/O = ore_data[metal]
 
 			if(!O) continue
 
@@ -206,24 +209,28 @@
 				var/can_make = Clamp(ores_stored[metal],0,sheets_per_tick-sheets)
 				if(can_make%2>0) can_make--
 
-				if(!can_make || ores_stored[metal] < 1)
+				var/material/M = name_to_material[O.compresses_to]
+
+				if(!istype(M) || !can_make || ores_stored[metal] < 1)
 					continue
 
 				for(var/i=0,i<can_make,i+=2)
 					ores_stored[metal]-=2
 					sheets+=2
-					new O.compresses_to(output.loc)
+					new M.stack_type(output.loc)
 
 			else if(ores_processing[metal] == 1 && O.smelts_to) //Smelting.
 
 				var/can_make = Clamp(ores_stored[metal],0,sheets_per_tick-sheets)
-				if(!can_make || ores_stored[metal] < 1)
+
+				var/material/M = name_to_material[O.smelts_to]
+				if(!istype(M) || !can_make || ores_stored[metal] < 1)
 					continue
 
 				for(var/i=0,i<can_make,i++)
 					ores_stored[metal]--
 					sheets++
-					new O.smelts_to(output.loc)
+					new M.stack_type(output.loc)
 			else
 				ores_stored[metal]--
 				sheets++
@@ -231,4 +238,4 @@
 		else
 			continue
 
-	console.updateUsrDialog()
+	console.updateUsrDialog()

code/modules/mining/machine_stacking.dm

@@ -18,7 +18,7 @@
 		if (machine)
 			machine.console = src
 		else
-			del(src)
+			qdel(src)
 
 /obj/machinery/mineral/stacking_unit_console/attack_hand(mob/user)
 	add_fingerprint(user)
@@ -85,12 +85,12 @@
 		var/obj/item/stack/S = new stacktype(src)
 		stack_storage[S.name] = 0
 		stack_paths[S.name] = stacktype
-		del(S)
+		qdel(S)
 
 	stack_storage["glass"] = 0
 	stack_paths["glass"] = /obj/item/stack/sheet/glass
-	stack_storage["metal"] = 0
-	stack_paths["metal"] = /obj/item/stack/sheet/metal
+	stack_storage[DEFAULT_WALL_MATERIAL] = 0
+	stack_paths[DEFAULT_WALL_MATERIAL] = /obj/item/stack/sheet/metal
 	stack_storage["plasteel"] = 0
 	stack_paths["plasteel"] = /obj/item/stack/sheet/plasteel
 

code/modules/mining/mine_items.dm

@@ -1,12 +1,3 @@
-/**********************Light************************/
-
-//this item is intended to give the effect of entering the mine, so that light gradually fades
-/obj/effect/light_emitter
-	name = "Light-emtter"
-	anchored = 1
-	unacidable = 1
-	luminosity = 8
-
 /**********************Miner Lockers**************************/
 
 /obj/structure/closet/secure_closet/miner
@@ -35,8 +26,7 @@
 	new /obj/item/device/flashlight/lantern(src)
 	new /obj/item/weapon/shovel(src)
 	new /obj/item/weapon/pickaxe(src)
-	new /obj/item/clothing/glasses/meson(src)
-
+	new /obj/item/clothing/glasses/material(src)
 
 /******************************Lantern*******************************/
 
@@ -59,10 +49,10 @@
 	icon_state = "pickaxe"
 	item_state = "jackhammer"
 	w_class = 4.0
-	matter = list("metal" = 3750)
+	matter = list(DEFAULT_WALL_MATERIAL = 3750)
 	var/digspeed = 40 //moving the delay to an item var so R&D can make improved picks. --NEO
 	origin_tech = list(TECH_MATERIAL = 1, TECH_ENGINERING = 1)
-	attack_verb = list("hit", "pierced", "sliced", "attacked", "drilled")
+	attack_verb = list("hit", "pierced", "sliced", "attacked")
 	var/drill_sound = 'sound/weapons/Genhit.ogg'
 	var/drill_verb = "drilling"
 	sharp = 1
@@ -107,6 +97,7 @@
 	digspeed = 20
 	origin_tech = list(TECH_MATERIAL = 4)
 	desc = "This makes no metallurgic sense."
+	drill_verb = "picking"
 
 /obj/item/weapon/pickaxe/plasmacutter
 	name = "plasma cutter"
@@ -118,6 +109,7 @@
 	origin_tech = list(TECH_MATERIAL = 4, TECH_PHORON = 3, TECH_ENGINERING = 3)
 	desc = "A rock cutter that uses bursts of hot plasma. You could use it to cut limbs off of xenos! Or, you know, mine stuff."
 	drill_verb = "cutting"
+	drill_sound = 'sound/items/Welder.ogg'
 	sharp = 1
 	edge = 1
 
@@ -127,7 +119,8 @@
 	item_state = "dpickaxe"
 	digspeed = 10
 	origin_tech = list(TECH_MATERIAL = 6, TECH_ENGINERING = 4)
-	desc = "A pickaxe with a diamond pick head, this is just like minecraft."
+	desc = "A pickaxe with a diamond pick head."
+	drill_verb = "picking"
 
 /obj/item/weapon/pickaxe/diamonddrill //When people ask about the badass leader of the mining tools, they are talking about ME!
 	name = "diamond mining drill"
@@ -159,8 +152,8 @@
 	throwforce = 4.0
 	item_state = "shovel"
 	w_class = 3.0
-	matter = list("metal" = 50)
 	origin_tech = list(TECH_MATERIAL = 1, TECH_ENGINERING = 1)
+	matter = list(DEFAULT_WALL_MATERIAL = 50)
 	attack_verb = list("bashed", "bludgeoned", "thrashed", "whacked")
 	sharp = 0
 	edge = 1

code/modules/mining/mine_turfs.dm

@@ -11,7 +11,7 @@
 	density = 1
 	blocks_air = 1
 	temperature = T0C
-	var/mineral/mineral
+	var/ore/mineral
 	var/mined_ore = 0
 	var/last_act = 0
 	var/emitter_blasts_taken = 0 // EMITTER MINING! Muhehe.
@@ -95,13 +95,13 @@
 
 
 /turf/simulated/mineral/proc/UpdateMineral()
+	clear_ore_effects()
 	if(!mineral)
 		name = "\improper Rock"
 		icon_state = "rock"
 		return
 	name = "\improper [mineral.display_name] deposit"
-	overlays.Cut()
-	overlays += "rock_[mineral.name]"
+	new /obj/effect/mineral(src, mineral)
 
 //Not even going to touch this pile of spaghetti
 /turf/simulated/mineral/attackby(obj/item/weapon/W as obj, mob/user as mob)
@@ -234,10 +234,15 @@
 	else
 		return attack_hand(user)
 
+/turf/simulated/mineral/proc/clear_ore_effects()
+	for(var/obj/effect/mineral/M in contents)
+		qdel(M)
+
 /turf/simulated/mineral/proc/DropMineral()
 	if(!mineral)
 		return
 
+	clear_ore_effects()
 	var/obj/item/weapon/ore/O = new mineral.ore (src)
 	if(istype(O))
 		geologic_data.UpdateNearbyArtifactInfo(src)
@@ -274,6 +279,7 @@
 	var/list/step_overlays = list("n" = NORTH, "s" = SOUTH, "e" = EAST, "w" = WEST)
 
 	//Add some rubble,  you did just clear out a big chunk of rock.
+
 	var/turf/simulated/floor/plating/airless/asteroid/N = ChangeTurf(/turf/simulated/floor/plating/airless/asteroid)
 	N.overlay_detail = "asteroid[rand(0,9)]"
 
@@ -319,7 +325,7 @@
 		if(!S || S.field_type != get_responsive_reagent(F.find_type))
 			if(X)
 				visible_message("\red<b>[pick("[display_name] crumbles away into dust","[display_name] breaks apart")].</b>")
-				del(X)
+				qdel(X)
 
 	finds.Remove(F)
 
@@ -369,12 +375,9 @@
 /turf/simulated/mineral/random/New()
 	if (prob(mineralChance) && !mineral)
 		var/mineral_name = pickweight(mineralSpawnChanceList) //temp mineral name
-
-		if(!name_to_mineral)
-			SetupMinerals()
-
-		if (mineral_name && mineral_name in name_to_mineral)
-			mineral = name_to_mineral[mineral_name]
+		mineral_name = lowertext(mineral_name)
+		if (mineral_name && (mineral_name in ore_data))
+			mineral = ore_data[mineral_name]
 			UpdateMineral()
 
 	. = ..()
@@ -507,7 +510,7 @@
 	..()
 	if(istype(M,/mob/living/silicon/robot))
 		var/mob/living/silicon/robot/R = M
-		if(istype(R.module, /obj/item/weapon/robot_module/miner))
+		if(R.module)
 			if(istype(R.module_state_1,/obj/item/weapon/storage/bag/ore))
 				attackby(R.module_state_1,R)
 			else if(istype(R.module_state_2,/obj/item/weapon/storage/bag/ore))

code/modules/mining/mineral_effect.dm

@@ -0,0 +1,26 @@
+/obj/effect/mineral
+	name = "mineral vein"
+	icon = 'icons/obj/mining.dmi'
+	desc = "Shiny."
+	mouse_opacity = 0
+	density = 0
+	anchored = 1
+	var/ore_key
+	var/image/scanner_image
+
+/obj/effect/mineral/New(var/newloc, var/ore/M)
+	..(newloc)
+	name = "[M.display_name] deposit"
+	ore_key = M.name
+	icon_state = "rock_[ore_key]"
+	var/turf/T = get_turf(src)
+	layer = T.layer+0.1
+
+/obj/effect/mineral/proc/get_scan_overlay()
+	if(!scanner_image)
+		var/ore/O = ore_data[ore_key]
+		if(O)
+			scanner_image = image(icon, loc = get_turf(src), icon_state = (O.scan_icon ? O.scan_icon : icon_state))
+		else
+			world << "No ore data for [src]!"
+	return scanner_image

code/modules/mining/minerals.dm

@@ -1,72 +0,0 @@
-var/list/name_to_mineral
-
-/proc/SetupMinerals()
-	name_to_mineral = list()
-	for(var/type in typesof(/mineral) - /mineral)
-		var/mineral/new_mineral = new type
-		if(!new_mineral.name)
-			continue
-		name_to_mineral[new_mineral.name] = new_mineral
-	return 1
-
-/mineral
-	var/name	      // Tag for use in overlay generation/list population	.
-	var/display_name  // What am I called?
-	var/result_amount // How much ore?
-	var/spread = 1	  // Does this type of deposit spread?
-	var/spread_chance // Chance of spreading in any direction
-	var/ore	          // Path to the ore produced when tile is mined.
-
-
-/mineral/New()
-	. = ..()
-	if(!display_name)
-		display_name = name
-
-/mineral/uranium
-	name = "Uranium"
-	result_amount = 5
-	spread_chance = 10
-	ore = /obj/item/weapon/ore/uranium
-
-/mineral/platinum
-	name = "Platinum"
-	result_amount = 5
-	spread_chance = 10
-	ore = /obj/item/weapon/ore/osmium
-
-/mineral/iron
-	name = "Iron"
-	result_amount = 5
-	spread_chance = 25
-	ore = /obj/item/weapon/ore/iron
-
-/mineral/coal
-	name = "Coal"
-	result_amount = 5
-	spread_chance = 25
-	ore = /obj/item/weapon/ore/coal
-
-/mineral/diamond
-	name = "Diamond"
-	result_amount = 5
-	spread_chance = 10
-	ore = /obj/item/weapon/ore/diamond
-
-/mineral/gold
-	name = "Gold"
-	result_amount = 5
-	spread_chance = 10
-	ore = /obj/item/weapon/ore/gold
-
-/mineral/silver
-	name = "Silver"
-	result_amount = 5
-	spread_chance = 10
-	ore = /obj/item/weapon/ore/silver
-
-/mineral/phoron
-	name = "Phoron"
-	result_amount = 5
-	spread_chance = 25
-	ore = /obj/item/weapon/ore/phoron

code/modules/mining/mint.dm

@@ -17,7 +17,7 @@
 	var/amt_uranium = 0
 	var/newCoins = 0   //how many coins the machine made in it's last load
 	var/processing = 0
-	var/chosen = "metal" //which material will be used to make coins
+	var/chosen = DEFAULT_WALL_MATERIAL //which material will be used to make coins
 	var/coinsToProduce = 10
 
 
@@ -42,22 +42,22 @@
 		if(O)
 			if (istype(O,/obj/item/stack/sheet/mineral/gold))
 				amt_gold += 100 * O.get_amount()
-				del(O)
+				qdel(O)
 			if (istype(O,/obj/item/stack/sheet/mineral/silver))
 				amt_silver += 100 * O.get_amount()
-				del(O)
+				qdel(O)
 			if (istype(O,/obj/item/stack/sheet/mineral/diamond))
 				amt_diamond += 100 * O.get_amount()
-				del(O)
+				qdel(O)
 			if (istype(O,/obj/item/stack/sheet/mineral/phoron))
 				amt_phoron += 100 * O.get_amount()
-				del(O)
+				qdel(O)
 			if (istype(O,/obj/item/stack/sheet/mineral/uranium))
 				amt_uranium += 100 * O.get_amount()
-				del(O)
+				qdel(O)
 			if (istype(O,/obj/item/stack/sheet/metal))
 				amt_iron += 100 * O.get_amount()
-				del(O)
+				qdel(O)
 
 /obj/machinery/mineral/mint/attack_hand(user as mob)
 
@@ -81,7 +81,7 @@
 	else
 		dat += text("<A href='?src=\ref[src];choose=silver'>Choose</A>")
 	dat += text("<br><font color='#555555'><b>Iron inserted: </b>[amt_iron]</font> ")
-	if (chosen == "metal")
+	if (chosen == DEFAULT_WALL_MATERIAL)
 		dat += text("chosen")
 	else
 		dat += text("<A href='?src=\ref[src];choose=metal'>Choose</A>")
@@ -133,7 +133,7 @@
 			icon_state = "coinpress1"
 			var/obj/item/weapon/moneybag/M
 			switch(chosen)
-				if("metal")
+				if(DEFAULT_WALL_MATERIAL)
 					while(amt_iron > 0 && coinsToProduce > 0)
 						if (locate(/obj/item/weapon/moneybag,output.loc))
 							M = locate(/obj/item/weapon/moneybag,output.loc)

code/modules/mining/ore.dm

@@ -4,71 +4,71 @@
 	icon_state = "ore2"
 	w_class = 2
 	var/datum/geosample/geologic_data
-	var/oretag
+	var/material
 
 /obj/item/weapon/ore/uranium
 	name = "pitchblende"
-	icon_state = "Uranium ore"
+	icon_state = "ore_uranium"
 	origin_tech = list(TECH_MATERIAL = 5)
-	oretag = "uranium"
+	material = "uranium"
 
 /obj/item/weapon/ore/iron
 	name = "hematite"
-	icon_state = "Iron ore"
+	icon_state = "ore_iron"
 	origin_tech = list(TECH_MATERIAL = 1)
-	oretag = "hematite"
+	material = "hematite"
 
 /obj/item/weapon/ore/coal
-	name = "carbonaceous rock"
-	icon_state = "Coal ore"
+	name = "raw carbon"
+	icon_state = "ore_coal"
 	origin_tech = list(TECH_MATERIAL = 1)
-	oretag = "coal"
+	material = "carbon"
 
 /obj/item/weapon/ore/glass
 	name = "impure silicates"
-	icon_state = "Glass ore"
+	icon_state = "ore_glass"
 	origin_tech = list(TECH_MATERIAL = 1)
-	oretag = "sand"
+	material = "sand"
 
 /obj/item/weapon/ore/phoron
 	name = "phoron crystals"
-	icon_state = "Phoron ore"
+	icon_state = "ore_phoron"
 	origin_tech = list(TECH_MATERIAL = 2)
-	oretag = "phoron"
+	material = "phoron"
 
 /obj/item/weapon/ore/silver
 	name = "native silver ore"
-	icon_state = "Silver ore"
+	icon_state = "ore_silver"
 	origin_tech = list(TECH_MATERIAL = 3)
-	oretag = "silver"
+	material = "silver"
 
 /obj/item/weapon/ore/gold
 	name = "native gold ore"
-	icon_state = "Gold ore"
+	icon_state = "ore_gold"
 	origin_tech = list(TECH_MATERIAL = 4)
-	oretag = "gold"
+	material = "gold"
 
 /obj/item/weapon/ore/diamond
 	name = "diamonds"
-	icon_state = "Diamond ore"
+	icon_state = "ore_diamond"
 	origin_tech = list(TECH_MATERIAL = 6)
-	oretag = "diamond"
+	material = "diamond"
 
 /obj/item/weapon/ore/osmium
 	name = "raw platinum"
-	icon_state = "Platinum ore"
-	oretag = "platinum"
+	icon_state = "ore_platinum"
+	material = "platinum"
 
 /obj/item/weapon/ore/hydrogen
 	name = "raw hydrogen"
-	icon_state = "Phazon"
-	oretag = "hydrogen"
+	icon_state = "ore_hydrogen"
+	material = "mhydrogen"
 
 /obj/item/weapon/ore/slag
 	name = "Slag"
-	desc = "Completely useless"
+	desc = "Someone screwed up..."
 	icon_state = "slag"
-	oretag = "slag"
+	material = null
 
 /obj/item/weapon/ore/New()
 	pixel_x = rand(0,16)-8

code/modules/mining/ore_datum.dm

@@ -1,52 +1,133 @@
-/datum/ore
-	var/oretag
+var/global/list/ore_data = list()
+
+/ore
+	var/name
+	var/display_name
 	var/alloy
 	var/smelts_to
 	var/compresses_to
+	var/result_amount     // How much ore?
+	var/spread = 1	      // Does this type of deposit spread?
+	var/spread_chance     // Chance of spreading in any direction
+	var/ore	              // Path to the ore produced when tile is mined.
+	var/scan_icon         // Overlay for ore scanners.
+	// Xenoarch stuff. No idea what it's for, just refactored it to be less awful.
+	var/list/xarch_ages = list(
+		"thousand" = 999,
+		"million" = 999
+		)
+	var/xarch_source_mineral = "iron"
 
-/datum/ore/uranium
-	smelts_to = /obj/item/stack/sheet/mineral/uranium
-	oretag = "uranium"
+/ore/New()
+	. = ..()
+	if(!display_name)
+		display_name = name
 
-/datum/ore/iron
-	smelts_to = /obj/item/stack/sheet/mineral/iron
+/ore/uranium
+	name = "uranium"
+	display_name = "pitchblende"
+	smelts_to = "uranium"
+	result_amount = 5
+	spread_chance = 10
+	ore = /obj/item/weapon/ore/uranium
+	scan_icon = "mineral_uncommon"
+	xarch_ages = list(
+		"thousand" = 999,
+		"million" = 704
+		)
+	xarch_source_mineral = "potassium"
+
+/ore/hematite
+	name = "hematite"
+	display_name = "hematite"
+	smelts_to = "iron"
 	alloy = 1
-	oretag = "hematite"
+	result_amount = 5
+	spread_chance = 25
+	ore = /obj/item/weapon/ore/iron
+	scan_icon = "mineral_common"
 
-/datum/ore/coal
-	smelts_to = /obj/item/stack/sheet/mineral/plastic
+/ore/coal
+	name = "carbon"
+	display_name = "raw carbon"
+	smelts_to = "plastic"
 	alloy = 1
-	oretag = "coal"
+	result_amount = 5
+	spread_chance = 25
+	ore = /obj/item/weapon/ore/coal
+	scan_icon = "mineral_common"
 
-/datum/ore/glass
-	smelts_to = /obj/item/stack/sheet/glass
-	compresses_to = /obj/item/stack/sheet/mineral/sandstone
-	oretag = "sand"
+/ore/glass
+	name = "sand"
+	display_name = "impure silicates"
+	smelts_to = "glass"
+	compresses_to = "sandstone"
 
-/datum/ore/phoron
+/ore/phoron
+	name = "phoron"
+	display_name = "phoron crystals"
+	compresses_to = "phoron"
 	//smelts_to = something that explodes violently on the conveyor, huhuhuhu
-	compresses_to = /obj/item/stack/sheet/mineral/phoron
-	oretag = "phoron"
+	result_amount = 5
+	spread_chance = 25
+	ore = /obj/item/weapon/ore/phoron
+	scan_icon = "mineral_uncommon"
+	xarch_ages = list(
+		"thousand" = 999,
+		"million" = 999,
+		"billion" = 13,
+		"billion_lower" = 10
+		)
+	xarch_source_mineral = "phoron"
 
-/datum/ore/silver
-	smelts_to = /obj/item/stack/sheet/mineral/silver
-	oretag = "silver"
+/ore/silver
+	name = "silver"
+	display_name = "native silver"
+	smelts_to = "silver"
+	result_amount = 5
+	spread_chance = 10
+	ore = /obj/item/weapon/ore/silver
+	scan_icon = "mineral_uncommon"
 
-/datum/ore/gold
-	smelts_to = /obj/item/stack/sheet/mineral/gold
-	oretag = "gold"
+/ore/gold
+	smelts_to = "gold"
+	name = "gold"
+	display_name = "native gold"
+	result_amount = 5
+	spread_chance = 10
+	ore = /obj/item/weapon/ore/gold
+	scan_icon = "mineral_uncommon"
+	xarch_ages = list(
+		"thousand" = 999,
+		"million" = 999,
+		"billion" = 4,
+		"billion_lower" = 3
+		)
 
-/datum/ore/diamond
-	compresses_to = /obj/item/stack/sheet/mineral/diamond
-	oretag = "diamond"
+/ore/diamond
+	name = "diamond"
+	display_name = "diamond"
+	compresses_to = "diamond"
+	result_amount = 5
+	spread_chance = 10
+	ore = /obj/item/weapon/ore/diamond
+	scan_icon = "mineral_rare"
+	xarch_source_mineral = "nitrogen"
 
-/datum/ore/osmium
-	smelts_to = /obj/item/stack/sheet/mineral/platinum
-	compresses_to = /obj/item/stack/sheet/mineral/osmium
+/ore/platinum
+	name = "platinum"
+	display_name = "raw platinum"
+	smelts_to = "platinum"
+	compresses_to = "osmium"
 	alloy = 1
-	oretag = "platinum"
+	result_amount = 5
+	spread_chance = 10
+	ore = /obj/item/weapon/ore/osmium
+	scan_icon = "mineral_rare"
 
-/datum/ore/hydrogen
-	smelts_to = /obj/item/stack/sheet/mineral/tritium
-	compresses_to = /obj/item/stack/sheet/mineral/mhydrogen
-	oretag = "hydrogen"
+/ore/hydrogen
+	name = "mhydrogen"
+	display_name = "metallic hydrogen"
+	smelts_to = "tritium"
+	compresses_to = "mhydrogen"
+	scan_icon = "mineral_rare"

code/modules/mining/satchel_ore_boxdm.dm

@@ -97,5 +97,5 @@
 		for (var/obj/item/weapon/ore/O in contents)
 			O.loc = src.loc
 			O.ex_act(severity++)
-		del(src)
+		qdel(src)
 		return