Actually compiles

code/modules/mining/mine_turfs.dm

@@ -18,12 +18,24 @@ var/global/list/rockTurfEdgeCache
 	temperature = TCMB
 	var/mineralType = null
 	var/mineralAmt = 3
+	var/mineralName = null
 	var/spread = 0 //will the seam spread?
 	var/spreadChance = 0 //the percentual chance of an ore spreading to the neighbouring tiles
 	var/last_act = 0
 	var/scan_state = null //Holder for the image we display when we're pinged by a mining scanner
 	var/hidden = 1
 
+	//start xenoarch vars
+	var/datum/geosample/geologic_data
+	var/excavation_level = 0
+	var/list/finds
+	var/next_rock = 0
+	var/archaeo_overlay = ""
+	var/excav_overlay = ""
+	var/obj/item/weapon/last_find
+	var/datum/artifact_find/artifact_find
+	//end xenaorch vars
+
 /turf/simulated/mineral/ex_act(severity, target)
 	..()
 	switch(severity)
@@ -164,6 +176,7 @@ var/global/list/rockTurfEdgeCache
 	name = "iron deposit"
 	icon_state = "rock_Iron"
 	mineralType = /obj/item/weapon/ore/iron
+	mineralName = "Iron"
 	spreadChance = 20
 	spread = 1
 	hidden = 0
@@ -171,6 +184,7 @@ var/global/list/rockTurfEdgeCache
 /turf/simulated/mineral/uranium
 	name = "uranium deposit"
 	mineralType = /obj/item/weapon/ore/uranium
+	mineralName = "Uranium"
 	spreadChance = 5
 	spread = 1
 	hidden = 1
@@ -179,6 +193,7 @@ var/global/list/rockTurfEdgeCache
 /turf/simulated/mineral/diamond
 	name = "diamond deposit"
 	mineralType = /obj/item/weapon/ore/diamond
+	mineralName = "Diamond"
 	spreadChance = 0
 	spread = 1
 	hidden = 1
@@ -187,6 +202,7 @@ var/global/list/rockTurfEdgeCache
 /turf/simulated/mineral/gold
 	name = "gold deposit"
 	mineralType = /obj/item/weapon/ore/gold
+	mineralName = "Gold"
 	spreadChance = 5
 	spread = 1
 	hidden = 1
@@ -195,6 +211,7 @@ var/global/list/rockTurfEdgeCache
 /turf/simulated/mineral/silver
 	name = "silver deposit"
 	mineralType = /obj/item/weapon/ore/silver
+	mineralName = "Silver"
 	spreadChance = 5
 	spread = 1
 	hidden = 1
@@ -204,6 +221,7 @@ var/global/list/rockTurfEdgeCache
 	name = "plasma deposit"
 	icon_state = "rock_Plasma"
 	mineralType = /obj/item/weapon/ore/plasma
+	mineralName = "Plasma"
 	spreadChance = 8
 	spread = 1
 	hidden = 1
@@ -213,6 +231,7 @@ var/global/list/rockTurfEdgeCache
 	name = "bananium deposit"
 	icon_state = "rock_Clown"
 	mineralType = /obj/item/weapon/ore/bananium
+	mineralName = "Bananium"
 	mineralAmt = 3
 	spreadChance = 0
 	spread = 0
@@ -222,6 +241,7 @@ var/global/list/rockTurfEdgeCache
 	name = "bluespace crystal deposit"
 	icon_state = "rock_BScrystal"
 	mineralType = /obj/item/bluespace_crystal
+	mineralName = "Bluespace crystal"
 	mineralAmt = 1
 	spreadChance = 0
 	spread = 0
@@ -233,6 +253,7 @@ var/global/list/rockTurfEdgeCache
 	name = "gibtonite deposit"
 	icon_state = "rock_Gibtonite"
 	mineralAmt = 1
+	mineralName = "Gibtonite"
 	spreadChance = 0
 	spread = 0
 	hidden = 1

code/modules/mining/ore.dm

@@ -201,3 +201,10 @@
 
 /obj/item/weapon/ore/ex_act()
 	return
+
+/obj/item/weapon/ore/attackby(obj/item/weapon/W as obj, mob/user as mob)
+	if(istype(W,/obj/item/device/core_sampler))
+		var/obj/item/device/core_sampler/C = W
+		C.sample_item(src, user)
+	else
+		return ..()

code/modules/research/xenoarchaeology/artifact/artifact_gigadrill.dm

@@ -29,7 +29,7 @@
 			anchored = 1
 			spawn(drill_time)
 				if(get_turf(src) == drilling_turf && active)
-					M.GetDrilled()
+					M.gets_drilled()
 					src.loc = M
 				drilling_turf = null
 				anchored = 0

code/modules/research/xenoarchaeology/geosample.dm

@@ -58,8 +58,8 @@
 
 	age = rand(1,999)
 
-	if(container.mineral)
-		switch(container.mineral.name)
+	if(container.mineralName)
+		switch(container.mineralName)
 			if("Uranium")
 				age_million = rand(1, 704)
 				age_thousand = rand(1,999)
@@ -97,6 +97,12 @@
 				age_thousand = rand(-1,-999)
 				find_presence["plasma"] = rand(1,1000) / 100
 				source_mineral = "plasma"
+			if("Bluespace crystal")
+				age_thousand = rand(1,999)
+				find_presence["plasma"] = rand(1,1000) / 100
+			if("Gibtonite")
+				age_thousand = rand(1, 50)
+				find_presence["plasma"] = rand(1,1000) / 100
 
 	if(prob(75))
 		find_presence["phosphorus"] = rand(1,500) / 100

code/modules/research/xenoarchaeology/tools/tools_depthscanner.dm

@@ -34,7 +34,7 @@
 			D.coords = "[M.x].[rand(0,9)]:[M.y].[rand(0,9)]:[10 * M.z].[rand(0,9)]"
 			D.time = worldtime2text()
 			D.record_index = positive_locations.len + 1
-			D.material = M.mineral ? M.mineral.display_name : "Rock"
+			D.material = M.mineralName ? M.mineralName : "Rock"
 
 			//find the first artifact and store it
 			if(M.finds.len)