Mining adjustments

code/modules/mining/machinery/machine_processing.dm

@@ -69,7 +69,7 @@
 	else
 		data["has_id"] = FALSE
 
-	
+
 	var/list/ores = list()
 	for(var/ore in machine.ores_processing)
 		if(!machine.ores_stored[ore] && !show_all_ores)
@@ -179,7 +179,6 @@
 		"silver" = 16,
 		"gold" = 18,
 		"marble" = 20,
-		"rutile" = 20,
 		"uranium" = 30,
 		"diamond" = 50,
 		"platinum" = 40,
@@ -194,7 +193,7 @@
 		var/ore/OD = GLOB.ore_data[ore]
 		ores_processing[OD.name] = 0
 		ores_stored[OD.name] = 0
-	
+
 	// TODO - Eschew input/output machinery and just use dirs ~Leshana
 	//Locate our output and input machinery.
 	for (var/dir in cardinal)
@@ -236,11 +235,23 @@
 	var/list/tick_alloys = list()
 
 	//Grab some more ore to process this tick.
-	for(var/obj/item/weapon/ore/O in input.loc)
-		if(!isnull(ores_stored[O.material]))
-			ores_stored[O.material]++
-			points += (ore_values[O.material]*points_mult) // Give Points! VOREStation Edit - or give lots of points! or less points! or no points!
-		qdel(O)
+	for(var/obj/structure/ore_box/OB in input.loc)
+		for(var/ore in OB.stored_ore)
+			if(OB.stored_ore[ore] > 0)
+				var/ore_amount = OB.stored_ore[ore]									// How many ores does the box have?
+				ores_stored[ore] += ore_amount 										// Add the ore to the machine.
+				points += (ore_values[ore]*points_mult*ore_amount) 					// Give Points! VOREStation Edit - or give lots of points! or less points! or no points!
+				OB.stored_ore[ore] = 0 												// Set the value of the ore in the box to 0.
+
+
+	for(var/obj/item/ore_chunk/ore_chunk in input.loc) //Special ore chunk item. For conveyor belt. Completely unneeded but keeps asthetics.
+		for(var/ore in ore_chunk.stored_ore)
+			if(ore_chunk.stored_ore[ore] > 0)
+				var/ore_amount = ore_chunk.stored_ore[ore]
+				ores_stored[ore] += ore_amount
+				points += (ore_values[ore]*points_mult*ore_amount)
+				ore_chunk.stored_ore[ore] = 0
+			qdel(ore_chunk)
 
 	if(!active)
 		return