Sort of compiles

Time to fix xenoarch, and then the map.

code/modules/mining/coins.dm

@@ -80,7 +80,7 @@
 	cmineral = "valid"
 	desc = "A novelty coin that helps the heart know what hard evidence cannot prove."
 	sideslist = list("valid", "salad")
-	value = 20
+	credits = 20
 
 /obj/item/weapon/coin/antagtoken/New()
 	return

code/modules/mining/equipment_locker.dm

@@ -61,11 +61,6 @@
 			var/obj/item/stack/sheet/s = new processed_sheet(src,0)
 			s.amount = 0
 			stack_list[processed_sheet] = s
-			if(s.name != "glass" && s.name != "metal")		//we can get these from cargo anyway
-				var/msg = "[capitalize(s.name)] sheets are now available in the Cargo Bay."
-				for(var/obj/machinery/requests_console/D in allConsoles)
-					if(D.department == "Science" || D.department == "Robotics" || D.department == "Research Director's Desk" || (D.department == "Chemistry" && s.name == "uranium"))
-						D.createmessage("Ore Redemption Machine", "New minerals available!", msg, 1, 0)
 		var/obj/item/stack/sheet/storage = stack_list[processed_sheet]
 		storage.amount += sheet_per_ore //Stack the sheets
 		O.loc = null //Let the old sheet...
@@ -106,7 +101,7 @@
 	if(exchange_parts(user, W))
 		return
 
-	if(default_pry_open(W))
+	if(default_deconstruction_crowbar(W))
 		return
 
 	if(default_unfasten_wrench(user, W))
@@ -283,7 +278,7 @@
 		new /datum/data/mining_equipment("Lazarus Injector",    /obj/item/weapon/lazarus_injector,                                1000),
 		new /datum/data/mining_equipment("Diamond Pickaxe",		/obj/item/weapon/pickaxe/diamond,				                  1200),
 		new /datum/data/mining_equipment("Jetpack",             /obj/item/weapon/tank/jetpack/carbondioxide/mining,               1500),
-		new /datum/data/mining_equipment("Space Cash",    		/obj/item/stack/spacecash/c1000,                    			  2000),
+		new /datum/data/mining_equipment("Space Cash",    		/obj/item/weapon/spacecash/c1000,                    			  2000),
 		new /datum/data/mining_equipment("Point Transfer Card", /obj/item/weapon/card/mining_point_card,               			   500),
 		)
 
@@ -378,7 +373,7 @@
 
 /obj/machinery/mineral/equipment_vendor/proc/RedeemVoucher(obj/item/weapon/mining_voucher/voucher, mob/redeemer)
 	var/selection = input(redeemer, "Pick your equipment", "Mining Voucher Redemption") as null|anything in list("Kinetic Accelerator", "Resonator", "Mining Drone", "Advanced Scanner")
-	if(!selection || !Adjacent(redeemer) || voucher.gc_destroyed || voucher.loc != redeemer)
+	if(!selection || !Adjacent(redeemer) || voucher.loc != redeemer)
 		return
 	switch(selection)
 		if("Kinetic Accelerator")
@@ -598,7 +593,14 @@
 	mouse_opacity = 1
 	faction = list("neutral")
 	a_intent = "harm"
-	atmos_requirements = list("min_oxy" = 0, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 0, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0)
+	min_oxy = 0
+	max_oxy = 0
+	min_tox = 0
+	max_tox = 0
+	min_co2 = 0
+	max_co2 = 0
+	min_n2 = 0
+	max_n2 = 0
 	minbodytemp = 0
 	wander = 0
 	idle_vision_range = 5
@@ -644,7 +646,7 @@
 /mob/living/simple_animal/hostile/mining_drone/death()
 	..()
 	visible_message("<span class='danger'>[src] is destroyed!</span>")
-	new /obj/effect/decal/cleanable/robot_debris(src.loc)
+	new /obj/effect/decal/cleanable/blood/gibs/robot(src.loc)
 	DropOre()
 	qdel(src)
 	return

code/modules/mining/laborcamp/laborstacker.dm

@@ -29,7 +29,7 @@
 			if(t == src.door_tag)
 				src.release_door = d
 		if (machine && (release_door || !use_release_door))
-			machine.console = src
+			machine.CONSOLE = src
 		else
 			qdel(src)
 
@@ -65,7 +65,7 @@
 	if(istype(I, /obj/item/weapon/card/id))
 		return attack_hand(user)
 	..()
-	
+
 /obj/machinery/mineral/labor_claim_console/emag_act(user as mob)
 	emag(user)
 
@@ -109,9 +109,9 @@
 							usr << "<span class='notice'>Shuttle received message and will be sent shortly.</span>"
 							shuttle.launch()
 						else
-							usr << "\blue Shuttle is already moving."
+							usr << "<span class='notice'>Shuttle is already moving.</span>"
 					else
-						usr << "\blue Shuttle is already on-station."
+						usr << "<span class='notice'>Shuttle is already on-station.</span>"
 
 			if(href_list["choice"] == "release")
 				if(alone_in_area(get_area(loc), usr))
@@ -132,7 +132,7 @@
 
 /obj/machinery/mineral/stacking_machine/laborstacker
 	var/points = 0 //The unclaimed value of ore stacked.  Value for each ore loosely relative to its rarity.
-	var/list/ore_values = list(("glass" = 1), ("metal" = 2), ("iron" = 3), ("solid plasma" = 20), ("plasteel" = 23), ("reinforced glass" = 4), ("gold" = 20), ("silver" = 20), ("uranium" = 20), ("diamond" = 25), ("bananium" = 50))
+	var/list/ore_values = list(("glass" = 1), ("metal" = 2), ("solid plasma" = 20), ("plasteel" = 23), ("reinforced glass" = 4), ("gold" = 20), ("silver" = 20), ("uranium" = 20), ("diamond" = 25), ("bananium" = 50))
 
 /obj/machinery/mineral/stacking_machine/laborstacker/proc/get_ore_values()
 	var/dat = "<table border='0' width='200'>"
@@ -142,31 +142,13 @@
 	dat += "</table>"
 	return dat
 
-/obj/machinery/mineral/stacking_machine/laborstacker/process()
-	if (src.output && src.input)
-		var/turf/T = get_turf(input)
-		for(var/obj/item/O in T.contents)
-			if(!O) return
-			if(istype(O,/obj/item/stack))
-				var/obj/item/stack/S = O
-				if(S.name in ore_values)
-					points += ore_values[S.name] * S.amount
-					S.loc = null
-				else
-					S.loc = output.loc
-			else
-				O.loc = output.loc
-				
-	//Output amounts that are past stack_amt.
-	for(var/sheet in stack_storage)
-		if(stack_storage[sheet] >= stack_amt)
-			var/stacktype = stack_paths[sheet]
-			var/obj/item/stack/sheet/S = new stacktype (get_turf(output))
-			S.amount = stack_amt
-			stack_storage[sheet] -= stack_amt
-
-	console.updateUsrDialog()
-	return
+/obj/machinery/mineral/stacking_machine/laborstacker/process_sheet(obj/item/stack/sheet/inp)
+	if(istype(inp))
+		var/n = inp.name
+		var/a = inp.amount
+		if(n in ore_values)
+			points += ore_values[n] * a
+	..()
 
 
 /**********************Point Lookup Console**************************/

code/modules/mining/machine_unloading.dm

@@ -10,37 +10,19 @@
 	input_dir = WEST
 	output_dir = EAST
 
-
-/obj/machinery/mineral/unloading_machine/New()
-	..()
-	spawn( 5 )
-		for (var/dir in cardinal)
-			src.input = locate(/obj/machinery/mineral/input, get_step(src, dir))
-			if(src.input) break
-		for (var/dir in cardinal)
-			src.output = locate(/obj/machinery/mineral/output, get_step(src, dir))
-			if(src.output) break
-		return
-	return
-
 /obj/machinery/mineral/unloading_machine/process()
-	if (src.output && src.input)
-		if (locate(/obj/structure/ore_box, input.loc))
-			var/obj/structure/ore_box/BOX = locate(/obj/structure/ore_box, input.loc)
-			var/i = 0
-			for (var/obj/item/weapon/ore/O in BOX.contents)
-				BOX.contents -= O
-				O.loc = output.loc
-				i++
-				if (i>=10)
+	var/turf/T = get_step(src,input_dir)
+	if(T)
+		var/limit
+		for(var/obj/structure/ore_box/B in T)
+			for (var/obj/item/weapon/ore/O in B)
+				B.contents -= O
+				unload_mineral(O)
+				limit++
+				if (limit>=10)
 					return
-		if (locate(/obj/item, input.loc))
-			var/obj/item/O
-			var/i
-			for (i = 0; i<10; i++)
-				O = locate(/obj/item, input.loc)
-				if (O)
-					O.loc = src.output.loc
-				else
-					return
-	return
+		for(var/obj/item/I in T)
+			unload_mineral(I)
+			limit++
+			if (limit>=10)
+				return

code/modules/mining/mine_turfs.dm

@@ -393,7 +393,6 @@ var/global/list/rockTurfEdgeCache
 
 /turf/simulated/floor/plating/asteroid //floor piece
 	name = "Asteroid"
-	baseturf = /turf/simulated/floor/plating/asteroid
 	icon = 'icons/turf/floors.dmi'
 	icon_state = "asteroid"
 	icon_plating = "asteroid"
@@ -471,17 +470,6 @@ var/global/list/rockTurfEdgeCache
 				O.attackby(W,user)
 				return
 
-	if(istype(W, /obj/item/stack/tile))
-		var/obj/item/stack/tile/Z = W
-		if(!Z.use(1))
-			return
-		var/turf/simulated/floor/T = ChangeTurf(Z.turf_type)
-		if(istype(Z,/obj/item/stack/tile/light)) //TODO: get rid of this ugly check somehow
-			var/obj/item/stack/tile/light/L = Z
-			var/turf/simulated/floor/light/F = T
-			F.state = L.state
-		playsound(src, 'sound/weapons/Genhit.ogg', 50, 1)
-
 /turf/simulated/floor/plating/asteroid/proc/gets_dug()
 	if(dug)
 		return

code/modules/mining/mint.dm

@@ -46,9 +46,6 @@
 			if (istype(O, /obj/item/stack/sheet/mineral/bananium))
 				amt_clown += 100 * O.amount
 				O.loc = null
-			if (istype(O, /obj/item/stack/sheet/mineral/adamantine))
-				amt_adamantine += 100 * O.amount
-				O.loc = null //Commented out for now. -Durandan
 			return
 
 

code/modules/mining/ore.dm

@@ -4,6 +4,7 @@
 	icon_state = "ore"
 	var/points = 0 //How many points this ore gets you from the ore redemption machine
 	var/refined_type = null //What this ore defaults to being refined into
+	var/datum/geosample/geologic_data
 
 /obj/item/weapon/ore/attackby(obj/item/I as obj, mob/user as mob, params)
 	if(istype(I, /obj/item/weapon/weldingtool))