Merge branch 'master' of https://github.com/Baystation12/Baystation12 into bleeding-edge-freeze

Conflicts:
	html/changelog.html
	maps/tgstation.2.1.0.0.1.dmm

code/modules/mining/mine_turfs.dm

@@ -311,7 +311,7 @@ commented out in r5061, I left it because of the shroom thingies
 	if (istype(W, /obj/item/device/measuring_tape))
 		var/obj/item/device/measuring_tape/P = W
 		user.visible_message("\blue[user] extends [P] towards [src].","\blue You extend [P] towards [src].")
-		if(do_after(user,40))
+		if(do_after(user,25))
 			user << "\blue \icon[P] [src] has been excavated to a depth of [2*src.excavation_level]cm."
 		return
 

code/modules/research/xenoarchaeology/machinery/analysis_accelerator.dm

@@ -1,4 +1,6 @@
 
+// This machine shows the age for extremely old finds
+
 obj/machinery/anomaly/accelerator
 	name = "Accelerator spectrometer"
 

code/modules/research/xenoarchaeology/machinery/analysis_base.dm

@@ -23,7 +23,7 @@
 
 	var/obj/item/weapon/reagent_containers/glass/held_container
 	var/obj/item/weapon/tank/fuel_container
-	var/target_scan_ticks = 60
+	var/target_scan_ticks = 30
 	var/report_num = 0
 	var/scan_process = 0
 	var/temperature = 273	//measured in kelvin, if this exceeds 1200, the machine is damaged and requires repairs
@@ -50,8 +50,10 @@
 	if(scan_process)
 		if(scan_process++ > target_scan_ticks)
 			FinishScan()
-
-		if(temperature > 350 && prob(10))
+		else if(temperature > 400)
+			src.visible_message("\blue \icon[src] shuts down from the heat!", 2)
+			scan_process = 0
+		else if(temperature > 350 && prob(10))
 			src.visible_message("\blue \icon[src] bleets plaintively.", 2)
 			if(temperature > 400)
 				scan_process = 0
@@ -107,7 +109,7 @@
 	user.machine = src
 	var/dat = "<B>[src.name]</B><BR>"
 	dat += "Module heat level: [temperature] kelvin<br>"
-	dat += "Safeties set at 300k, shielding failure at 400k. Failure to maintain safe heat levels may result in equipment damage.<br>"
+	dat += "Safeties set at 350k, shielding failure at 400k. Failure to maintain safe heat levels may result in equipment damage.<br>"
 	dat += "<hr>"
 	if(scan_process)
 		dat += "Scan in progress<br><br><br>"
@@ -178,7 +180,7 @@ obj/machinery/anomaly/Topic(href, href_list)
 		fuel_container.loc = src.loc
 		fuel_container = null
 	if(href_list["begin"])
-		if(temperature >= 300)
+		if(temperature >= 350)
 			var/proceed = input("Unsafe internal temperature detected, enter YES below to continue.","Warning")
 			if(proceed == "YES" && get_dist(src, usr) <= 1)
 				scan_process = 1

code/modules/research/xenoarchaeology/machinery/analysis_fourier_transform.dm

@@ -1,4 +1,6 @@
 
+// This machine tells the distance to a nearby artifact, if there is one
+
 obj/machinery/anomaly/fourier_transform
 	name = "Fourier Transform spectroscope"
 

code/modules/research/xenoarchaeology/machinery/analysis_gas_chromatography.dm

@@ -1,4 +1,6 @@
 
+// This machine shows the materials that are present
+
 obj/machinery/anomaly/gas_chromatography
 	name = "Gas Chromatography spectrometer"
 

code/modules/research/xenoarchaeology/machinery/analysis_ion_mobility.dm

@@ -1,4 +1,6 @@
 
+// This machine shows the amount of a certain material that is present
+
 obj/machinery/anomaly/ion_mobility
 	name = "Ion Mobility Spectrometer"
 	desc = "A specialised, complex analysis machine."

code/modules/research/xenoarchaeology/machinery/analysis_isotope_ratio.dm

@@ -1,4 +1,6 @@
 
+// This machine shows the age for newer finds
+
 obj/machinery/anomaly/isotope_ratio
 	name = "Isotope ratio spectrometer"
 	desc = "A specialised, complex analysis machine."

code/modules/research/xenoarchaeology/misc.dm

@@ -100,6 +100,7 @@
 		new /obj/item/clothing/glasses/meson(src)
 		new /obj/item/weapon/pickaxe(src)
 		new /obj/item/device/measuring_tape(src)
+		new /obj/item/weapon/pickaxe/hand(src)
 		return
 
 //---- Isolation room air alarms

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

@@ -24,4 +24,5 @@
 		"/obj/item/weapon/anodevice",
 		"/obj/item/clothing/glasses",
 		"/obj/item/weapon/wrench",
+		"/obj/item/weapon/storage/box/excavation",
 		"/obj/item/weapon/anobattery")

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

@@ -85,6 +85,7 @@
 		dat += "Anomaly depth: [current.depth] cm<br>"
 		dat += "Clearance above anomaly depth: [current.clearance] cm<br>"
 		dat += "Dissonance spread: [current.dissonance_spread]<br>"
+		dat += "Anomaly material: [current.material]<br>"
 		dat += "<A href='?src=\ref[src];clear=[current.record_index]'>clear entry</a><br>"
 	else
 		dat += "Select an entry from the list<br>"

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

@@ -7,7 +7,7 @@
 	icon = 'icons/obj/xenoarchaeology.dmi'
 	icon_state = "pick_brush"
 	item_state = "syringe_0"
-	digspeed = 50
+	digspeed = 20
 	desc = "Thick metallic wires for clearing away dust and loose scree (1 centimetre excavation depth)."
 	excavation_amount = 0.5
 	drill_sound = 'sound/weapons/thudswoosh.ogg'
@@ -19,7 +19,7 @@
 	icon = 'icons/obj/xenoarchaeology.dmi'
 	icon_state = "pick1"
 	item_state = "syringe_0"
-	digspeed = 50
+	digspeed = 20
 	desc = "A miniature excavation tool for precise digging (2 centimetre excavation depth)."
 	excavation_amount = 1
 	drill_sound = 'sound/items/Screwdriver.ogg'
@@ -31,7 +31,7 @@
 	icon = 'icons/obj/xenoarchaeology.dmi'
 	icon_state = "pick2"
 	item_state = "syringe_0"
-	digspeed = 50
+	digspeed = 20
 	desc = "A miniature excavation tool for precise digging (4 centimetre excavation depth)."
 	excavation_amount = 2
 	drill_sound = 'sound/items/Screwdriver.ogg'
@@ -43,7 +43,7 @@
 	icon = 'icons/obj/xenoarchaeology.dmi'
 	icon_state = "pick3"
 	item_state = "syringe_0"
-	digspeed = 50
+	digspeed = 20
 	desc = "A miniature excavation tool for precise digging (6 centimetre excavation depth)."
 	excavation_amount = 3
 	drill_sound = 'sound/items/Screwdriver.ogg'
@@ -55,7 +55,7 @@
 	icon = 'icons/obj/xenoarchaeology.dmi'
 	icon_state = "pick4"
 	item_state = "syringe_0"
-	digspeed = 50
+	digspeed = 20
 	desc = "A miniature excavation tool for precise digging (8 centimetre excavation depth)."
 	excavation_amount = 4
 	drill_sound = 'sound/items/Screwdriver.ogg'
@@ -67,7 +67,7 @@
 	icon = 'icons/obj/xenoarchaeology.dmi'
 	icon_state = "pick5"
 	item_state = "syringe_0"
-	digspeed = 50
+	digspeed = 20
 	desc = "A miniature excavation tool for precise digging (10 centimetre excavation depth)."
 	excavation_amount = 5
 	drill_sound = 'sound/items/Screwdriver.ogg'
@@ -79,7 +79,7 @@
 	icon = 'icons/obj/xenoarchaeology.dmi'
 	icon_state = "pick6"
 	item_state = "syringe_0"
-	digspeed = 50
+	digspeed = 20
 	desc = "A miniature excavation tool for precise digging (12 centimetre excavation depth)."
 	excavation_amount = 6
 	drill_sound = 'sound/items/Screwdriver.ogg'
@@ -91,7 +91,7 @@
 	icon = 'icons/obj/xenoarchaeology.dmi'
 	icon_state = "pick_hand"
 	item_state = "syringe_0"
-	digspeed = 50
+	digspeed = 30
 	desc = "A smaller, more precise version of the pickaxe (30 centimetre excavation depth)."
 	excavation_amount = 15
 	drill_sound = 'sound/items/Crowbar.ogg'
@@ -108,16 +108,15 @@
 	desc = "A set of picks for excavation."
 	item_state = "syringe_kit"
 	foldable = /obj/item/stack/sheet/cardboard //BubbleWrap
-	storage_slots = 8
-	w_class = 3
+	storage_slots = 7
+	w_class = 2
 	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")
+	"/obj/item/weapon/pickaxe/six_pick")
 	max_combined_w_class = 17
 	max_w_class = 4
 	use_to_pickup = 1 // for picking up broken bulbs, not that most people will try
@@ -131,4 +130,3 @@
 	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)