reduced output message frequency for artifacts and analysis machinery, tweaked tools + finds, added storage item for excav picks

Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>

code/modules/research/xenoarchaeology/analysis/analysis.dm

@@ -23,13 +23,14 @@
 	if(!owned_scanner)
 		owned_scanner = locate(/obj/machinery/anomaly/scanner) in orange(1)
 
+	//for analysis debugging
 	var/obj/item/weapon/reagent_containers/glass/solution_tray/S = new(src.loc)
 	var/turf/simulated/mineral/diamond/D
 	for(var/turf/simulated/mineral/diamond/M in world)
 		D = M
 		break
 	S.reagents.add_reagent("analysis_sample", 1, D.geological_data)
-	S.reagents.add_reagent("calcium", 1, D.geological_data)
+	S.reagents.add_reagent("chlorine", 1, null)
 
 /obj/machinery/anomaly/process()
 	//not sure if everything needs to heat up, or just the GLPC
@@ -48,15 +49,15 @@
 				scan_process = 0
 
 		//show we're busy
-		if(prob(10))
+		if(prob(5))
 			src.visible_message("\blue \icon[src] [pick("whirrs","chuffs","clicks")][pick(" quietly"," softly"," sadly"," excitedly"," energetically"," angrily"," plaintively")].", 2)
 
-	if(temperature > environmental_temp)
+	else if(temperature > environmental_temp)
 		//cool down to match the air
 		temperature -= heat_accumulation_rate + heat_accumulation_rate * rand(-5,5) / 10
 		if(temperature < environmental_temp)
 			temperature = environmental_temp
-		if(prob(10))
+		if(prob(5))
 			src.visible_message("\blue \icon[src] hisses softly.", 2)
 
 	else if(temperature < environmental_temp)
@@ -65,7 +66,7 @@
 		if(temperature > environmental_temp)
 			temperature = environmental_temp
 		else
-			if(prob(10))
+			if(prob(5))
 				src.visible_message("\blue \icon[src] plinks quietly.", 2)
 
 	//warm up the lab slightly
@@ -167,7 +168,7 @@ obj/machinery/anomaly/proc/GetResultSpecifity(var/datum/geosample/scanned_sample
 	if(scanned_sample && carrier_name)
 
 		if(scanned_sample.find_presence.Find(carrier_name))
-			specifity = 0.7 * (scanned_sample.find_presence[carrier_name] / scanned_sample.total_spread) + 0.3
+			specifity = 0.75 * (scanned_sample.find_presence[carrier_name] / scanned_sample.total_spread) + 0.25
 		else
 			specifity = rand(0, 0.5)
 

code/modules/research/xenoarchaeology/finds/finds.dm

@@ -22,6 +22,7 @@
 ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 // Strange rocks
 
+//have all strange rocks be cleared away using welders for now
 /obj/item/weapon/ore/strangerock
 	name = "Strange rock"
 	desc = "Seems to have some unusal strata evident throughout it."
@@ -34,7 +35,7 @@
 /obj/item/weapon/ore/strangerock/New(loc, var/inside_item_type = 0)
 	..(loc)
 
-	method = rand(0,2)
+	//method = rand(0,2)
 	if(inside_item_type)
 		inside = new/obj/item/weapon/archaeological_find(src, new_item_type = inside_item_type)
 		if(!inside)
@@ -275,7 +276,7 @@
 		if(19)
 			apply_prefix = 0
 			new_item = new /obj/item/weapon/claymore(src.loc)
-			name = new_item.name
+			item_type = new_item.name
 		if(20)
 			//arcane clothing
 			apply_prefix = 0
@@ -312,11 +313,12 @@
 
 			var/new_type = pick(possible_spawns)
 			new_item = new new_type(src.loc)
+			item_type = new_item.name
 			apply_material_decorations = 0
 		if(25)
 			apply_prefix = 0
 			new_item = new /obj/item/weapon/katana(src.loc)
-			name = new_item.name
+			item_type = new_item.name
 		if(26)
 			//energy gun
 			var/spawn_type = pick(\
@@ -341,7 +343,7 @@
 			else
 				new_gun.power_supply.charge = 0
 
-			name = "gun"
+			item_type = "gun"
 		if(27)
 			//revolver
 			var/obj/item/weapon/gun/projectile/new_gun = new /obj/item/weapon/gun/projectile(src.loc)
@@ -373,7 +375,7 @@
 						new_gun.loaded.Remove(I)
 						I.loc = null
 
-			name = "gun"
+			item_type = "gun"
 		if(28)
 			//completely unknown alien device
 			if(prob(50))
@@ -405,7 +407,7 @@
 		if(32)
 			//humanoid remains
 			apply_prefix = 0
-			name = "humanoid [pick("remains","skeleton")]"
+			item_type = "humanoid [pick("remains","skeleton")]"
 			icon = 'blood.dmi'
 			icon_state = "remains"
 			additional_desc = pick("They appear almost human.",\
@@ -420,7 +422,7 @@
 		if(33)
 			//robot remains
 			apply_prefix = 0
-			name = "[pick("mechanical","robotic","cyborg")] [pick("remains","chassis","debris")]"
+			item_type = "[pick("mechanical","robotic","cyborg")] [pick("remains","chassis","debris")]"
 			icon = 'blood.dmi'
 			icon_state = "remainsrobot"
 			additional_desc = pick("Almost mistakeable for the remains of a modern cyborg.",\
@@ -435,7 +437,7 @@
 		if(34)
 			//xenos remains
 			apply_prefix = 0
-			name = "alien [pick("remains","skeleton")]"
+			item_type = "alien [pick("remains","skeleton")]"
 			icon = 'blood.dmi'
 			icon_state = "remainsxeno"
 			additional_desc = pick("It looks vaguely reptilian, but with more teeth.",\

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

@@ -26,8 +26,6 @@
 	else
 		user << "\red You can't put the [W] onto the [src]."
 
-
-
 /obj/machinery/bunsen_burner/attack_hand(mob/user as mob)
 	if(held_container)
 		underlays = null
@@ -48,7 +46,7 @@
 			try_heating()
 
 /obj/machinery/bunsen_burner/verb/toggle()
-	set src in oview(1)
+	set src in view(1)
 	set name = "Toggle bunsen burner"
 	set category = "IC"
 

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

@@ -12,6 +12,7 @@
 	excavation_amount = 0.5
 	drill_sound = 'sound/weapons/thudswoosh.ogg'
 	drill_verb = "brushing"
+	w_class = 2
 
 /obj/item/weapon/pickaxe/one_pick
 	name = "1/6 pick"
@@ -23,6 +24,7 @@
 	excavation_amount = 1
 	drill_sound = 'sound/items/Screwdriver.ogg'
 	drill_verb = "delicately picking"
+	w_class = 2
 
 /obj/item/weapon/pickaxe/two_pick
 	name = "1/3 pick"
@@ -34,6 +36,7 @@
 	excavation_amount = 2
 	drill_sound = 'sound/items/Screwdriver.ogg'
 	drill_verb = "delicately picking"
+	w_class = 2
 
 /obj/item/weapon/pickaxe/three_pick
 	name = "1/2 pick"
@@ -45,6 +48,7 @@
 	excavation_amount = 3
 	drill_sound = 'sound/items/Screwdriver.ogg'
 	drill_verb = "delicately picking"
+	w_class = 2
 
 /obj/item/weapon/pickaxe/four_pick
 	name = "2/3 pick"
@@ -56,6 +60,7 @@
 	excavation_amount = 4
 	drill_sound = 'sound/items/Screwdriver.ogg'
 	drill_verb = "delicately picking"
+	w_class = 2
 
 /obj/item/weapon/pickaxe/five_pick
 	name = "5/6 pick"
@@ -78,6 +83,7 @@
 	excavation_amount = 6
 	drill_sound = 'sound/items/Screwdriver.ogg'
 	drill_verb = "delicately picking"
+	w_class = 2
 
 /obj/item/weapon/pickaxe/hand
 	name = "hand pickaxe"
@@ -89,3 +95,38 @@
 	excavation_amount = 15
 	drill_sound = 'sound/items/Crowbar.ogg'
 	drill_verb = "clearing"
+	w_class = 3
+
+////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+// Pack for holding pickaxes
+
+/obj/item/weapon/storage/box/excavation
+	name = "excavation pick set"
+	icon = 'icons/obj/storage.dmi'
+	icon_state = "excavation"
+	desc = "A set of picks for excavation."
+	item_state = "syringe_kit"
+	foldable = /obj/item/stack/sheet/cardboard //BubbleWrap
+	storage_slots = 8
+	w_class = 4
+	can_hold = list("/obj/item/weapon/pickaxe/brush",\
+	"/obj/item/weapon/pickaxe/one_pick",\
+	"/obj/item/weapon/pickaxe/two_pick",\
+	"/obj/item/weapon/pickaxe/three_pick",\
+	"/obj/item/weapon/pickaxe/four_pick",\
+	"/obj/item/weapon/pickaxe/five_pick",\
+	"/obj/item/weapon/pickaxe/six_pick",\
+	"/obj/item/weapon/pickaxe/hand")
+	max_combined_w_class = 20
+	use_to_pickup = 1 // for picking up broken bulbs, not that most people will try
+
+/obj/item/weapon/storage/box/excavation/New()
+	..()
+	new /obj/item/weapon/pickaxe/brush(src)
+	new /obj/item/weapon/pickaxe/one_pick(src)
+	new /obj/item/weapon/pickaxe/two_pick(src)
+	new /obj/item/weapon/pickaxe/three_pick(src)
+	new /obj/item/weapon/pickaxe/four_pick(src)
+	new /obj/item/weapon/pickaxe/five_pick(src)
+	new /obj/item/weapon/pickaxe/six_pick(src)
+	new /obj/item/weapon/pickaxe/hand(src)

code/modules/research/xenoarchaeology/unknown/effects/unknown_effect_badfeeling.dm

@@ -41,7 +41,7 @@
 /datum/artifact_effect/badfeeling/DoEffectAura()
 	if(holder)
 		for (var/mob/living/carbon/human/H in range(src.effectrange,holder))
-			if(prob(10))
+			if(prob(5))
 				if(prob(75))
 					H << "<font color='red'>[pick(messages)]</font>"
 				else

code/modules/research/xenoarchaeology/unknown/effects/unknown_effect_goodfeeling.dm

@@ -39,13 +39,13 @@
 /datum/artifact_effect/goodfeeling/DoEffectAura()
 	if(holder)
 		for (var/mob/living/carbon/human/H in range(src.effectrange,holder))
-			if(prob(10))
+			if(prob(5))
 				if(prob(75))
 					H << "<font color='blue'>[pick(messages)]</font>"
 				else
 					H << "<font color='blue' size='[num2text(rand(1,5))]'><b>[pick(drastic_messages)]</b></font>"
 
-			if(prob(10))
+			if(prob(5))
 				H.dizziness += rand(3,5)
 		return 1