From 6d03802c7540513e44f985b6be1cb88cf3cbaba9 Mon Sep 17 00:00:00 2001
From: Cael_Aislinn <cael_aislinn@yahoo.com.au>
Date: Tue, 14 May 2013 13:08:30 +1000
Subject: [PATCH] reduced the chance of safely extracting xenoarch finds
 without the proper process

Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
---
 code/modules/mining/mine_turfs.dm             | 29 +++++--------------
 .../research/xenoarchaeology/finds/finds.dm   |  4 ++-
 2 files changed, 10 insertions(+), 23 deletions(-)

diff --git a/code/modules/mining/mine_turfs.dm b/code/modules/mining/mine_turfs.dm
index 94c1d350ddc..43dbadb4c21 100644
--- a/code/modules/mining/mine_turfs.dm
+++ b/code/modules/mining/mine_turfs.dm
@@ -344,14 +344,13 @@ commented out in r5061, I left it because of the shroom thingies
 
 		user << "\red You start [P.drill_verb][fail_message ? fail_message : ""]."
 
-		if(fail_message)
-			if(prob(50))
-				if(prob(25))
-					excavate_find(5, src.finds[1])
-				else if(prob(50))
-					src.finds.Remove(src.finds[1])
-					if(prob(50))
-						artifact_debris()
+		if(fail_message && prob(90))
+			if(prob(25))
+				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."
@@ -425,8 +424,6 @@ commented out in r5061, I left it because of the shroom thingies
 			//extract pesky minerals while we're excavating
 			while(excavation_minerals.len && src.excavation_level > excavation_minerals[excavation_minerals.len])
 				drop_mineral()
-				//have a 50% chance to extract bonus minerals this way
-				//if(prob(50))
 				pop(excavation_minerals)
 				mineralAmt--
 
@@ -456,13 +453,6 @@ commented out in r5061, I left it because of the shroom thingies
 		O = new /obj/item/weapon/ore/plasma(src)
 	if (src.mineralName == "Diamond")
 		O = new /obj/item/weapon/ore/diamond(src)
-	/*if (src.mineralName == "Archaeo")
-		//new /obj/item/weapon/archaeological_find(src)
-		//if(prob(10) || delicate)
-		if(prob(50)) //Don't have delicate tools (hand pick/excavation tool) yet, temporarily change to 50% instead of 10% -Mij
-			O = new /obj/item/weapon/ore/strangerock(src)
-		else
-			destroyed = 1*/
 	if (src.mineralName == "Clown")
 		O = new /obj/item/weapon/ore/clown(src)
 	if(O)
@@ -496,14 +486,9 @@ commented out in r5061, I left it because of the shroom thingies
 					M.Stun(5)
 			M.apply_effect(25, IRRADIATE)
 
-	/*if (prob(src.artifactChance))
-		//spawn a rare artifact here
-		new /obj/machinery/artifact(src)*/
 	var/turf/simulated/floor/plating/airless/asteroid/N = ChangeTurf(/turf/simulated/floor/plating/airless/asteroid)
 	N.fullUpdateMineralOverlays()
 
-	/*if(destroyed)  //Display message about being a terrible miner
-		usr << "\red You destroy some of the rocks!"*/
 	return
 
 /turf/simulated/mineral/proc/excavate_find(var/prob_clean = 0, var/datum/find/F)
diff --git a/code/modules/research/xenoarchaeology/finds/finds.dm b/code/modules/research/xenoarchaeology/finds/finds.dm
index 3cad5daef09..f183dbb5315 100644
--- a/code/modules/research/xenoarchaeology/finds/finds.dm
+++ b/code/modules/research/xenoarchaeology/finds/finds.dm
@@ -9,7 +9,7 @@
 	var/view_range = 20				//how close excavation has to come to show an overlay on the turf
 	var/clearance_range = 3			//how close excavation has to come to extract the item
 									//if excavation hits var/excavation_required exactly, it's contained find is extracted cleanly without the ore
-	var/prob_delicate = 75			//probability it requires an active suspension field to not insta-crumble
+	var/prob_delicate = 90			//probability it requires an active suspension field to not insta-crumble
 	var/dissonance_spread = 1		//proportion of the tile that is affected by this find
 									//used in conjunction with analysis machines to determine correct suspension field type
 
@@ -276,6 +276,7 @@
 		if(19)
 			apply_prefix = 0
 			new_item = new /obj/item/weapon/claymore(src.loc)
+			new_item.force = 10
 			item_type = new_item.name
 		if(20)
 			//arcane clothing
@@ -318,6 +319,7 @@
 		if(25)
 			apply_prefix = 0
 			new_item = new /obj/item/weapon/katana(src.loc)
+			new_item.force = 10
 			item_type = new_item.name
 		if(26)
 			//energy gun