diff --git a/code/modules/mining/mine_turfs.dm b/code/modules/mining/mine_turfs.dm
index c5c24814a2a..94c1d350ddc 100644
--- a/code/modules/mining/mine_turfs.dm
+++ b/code/modules/mining/mine_turfs.dm
@@ -350,6 +350,8 @@ commented out in r5061, I left it because of the shroom thingies
 					excavate_find(5, src.finds[1])
 				else if(prob(50))
 					src.finds.Remove(src.finds[1])
+					if(prob(50))
+						artifact_debris()
 
 		if(do_after(user,P.digspeed))
 			user << "\blue You finish [P.drill_verb] the rock."
@@ -387,8 +389,8 @@ commented out in r5061, I left it because of the shroom thingies
 					B = new(src)
 					if(artifact_find)
 						B.artifact_find = artifact_find
-				else if(src.excavation_level + P.excavation_amount >= 100)
-					artifact_debris()
+				else if(artifact_find && src.excavation_level + P.excavation_amount >= 100)
+					artifact_debris(1)
 
 				gets_drilled(B ? 0 : 1)
 				return
@@ -528,73 +530,60 @@ commented out in r5061, I left it because of the shroom thingies
 		var/obj/effect/suspension_field/S = locate() in src
 		if(!S || S.field_type != get_responsive_reagent(F.find_type))
 			if(X)
-				src.visible_message("\red<b>[pick("[display_name] crumbles away into dust","[display_name] breaks apart","[display_name] collapses onto itself")].</b>")
+				src.visible_message("\red<b>[pick("[display_name] crumbles away into dust","[display_name] breaks apart")].</b>")
 				del(X)
 
 	src.finds.Remove(F)
 
-/turf/simulated/mineral/proc/artifact_debris()
+/turf/simulated/mineral/proc/artifact_debris(var/severity = 0)
 	//cael's patented random limited drop componentized loot system!
+	severity = max(min(severity,1),0)
 	var/materials = 0
 	var/list/viable_materials = list(1,2,4,8,16,32,64,128,256)
 
-	var/num_materials = rand(1,5)
+	var/num_materials = rand(1,3 + severity*2)
 	for(var/i=0, i<num_materials, i++)
 		var/chosen = pick(viable_materials)
 		materials |= chosen
 		viable_materials.Remove(chosen)
 
 	if(materials & 1)
-		var/quantity = rand(0,3)
-		for(var/i=0, i<quantity, i++)
-			var/obj/item/stack/rods/R = new(src)
-			R.amount = rand(5,25)
+		var/obj/item/stack/rods/R = new(src)
+		R.amount = rand(5,25)
 
 	if(materials & 2)
-		var/quantity = pick(0, 0, 1)
-		for(var/i=0, i<quantity, i++)
-			var/obj/item/stack/tile/R = new(src)
-			R.amount = rand(1,5)
+		var/obj/item/stack/tile/R = new(src)
+		R.amount = rand(1,5)
 
 	if(materials & 4)
-		var/quantity = rand(0,3)
-		for(var/i=0, i<quantity, i++)
-			var/obj/item/stack/sheet/metal/R = new(src)
-			R.amount = rand(5,25)
+		var/obj/item/stack/sheet/metal/R = new(src)
+		R.amount = rand(5,25)
 
 	if(materials & 8)
-		var/quantity = rand(0,3)
-		for(var/i=0, i<quantity, i++)
-			var/obj/item/stack/sheet/plasteel/R = new(src)
-			R.amount = rand(5,25)
+		var/obj/item/stack/sheet/plasteel/R = new(src)
+		R.amount = rand(5,25)
 
 	if(materials & 16)
-		var/quantity = rand(0,3)
+		var/quantity = rand(1,3)
 		for(var/i=0, i<quantity, i++)
 			new /obj/item/weapon/shard(src)
 
 	if(materials & 32)
-		var/quantity = rand(0,3)
+		var/quantity = rand(1,3)
 		for(var/i=0, i<quantity, i++)
 			new /obj/item/weapon/shard/plasma(src)
 
 	if(materials & 64)
-		var/quantity = rand(0,3)
-		for(var/i=0, i<quantity, i++)
-			var/obj/item/stack/sheet/mineral/uranium/R = new(src)
-			R.amount = rand(5,25)
+		var/obj/item/stack/sheet/mineral/uranium/R = new(src)
+		R.amount = rand(5,25)
 
 	if(materials & 128)
-		var/quantity = rand(0,3)
-		for(var/i=0, i<quantity, i++)
-			var/obj/item/stack/sheet/mineral/mythril/R = new(src)
-			R.amount = rand(5,25)
+		var/obj/item/stack/sheet/mineral/mythril/R = new(src)
+		R.amount = rand(1,5)
 
 	if(materials & 256)
-		var/quantity = rand(0,3)
-		for(var/i=0, i<quantity, i++)
-			var/obj/item/stack/sheet/mineral/adamantine/R = new(src)
-			R.amount = rand(5,25)
+		var/obj/item/stack/sheet/mineral/adamantine/R = new(src)
+		R.amount = rand(1,5)
 
 /*
 /turf/simulated/mineral/proc/setRandomMinerals()
diff --git a/code/modules/research/xenoarchaeology/machinery/analysis_base.dm b/code/modules/research/xenoarchaeology/machinery/analysis_base.dm
index 2f29eb6a1d7..5319102be94 100644
--- a/code/modules/research/xenoarchaeology/machinery/analysis_base.dm
+++ b/code/modules/research/xenoarchaeology/machinery/analysis_base.dm
@@ -12,7 +12,7 @@
 	var/target_scan_ticks = 60
 	var/report_num = 0
 	var/scan_process = 0
-	var/heat_accumulation_rate = 1
+	var/heat_accumulation_rate = 0.25
 	var/temperature = 273	//measured in kelvin, if this exceeds 1200, the machine is damaged and requires repairs
 							//if this exceeds 600 and safety is enabled it will shutdown
 							//temp greater than 600 also requires a safety prompt to initiate scanning