renamed a bunch of files to be a little more visible, added the beginnings of the new artifact scanners

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

baystation12.dme

@@ -1143,14 +1143,13 @@
 #include "code\modules\research\xenoarchaeology\geosample.dm"
 #include "code\modules\research\xenoarchaeology\misc.dm"
 #include "code\modules\research\xenoarchaeology\readme.dm"
-#include "code\modules\research\xenoarchaeology\analysis\analysis.dm"
-#include "code\modules\research\xenoarchaeology\analysis\analysis_accelerator.dm"
-#include "code\modules\research\xenoarchaeology\analysis\analysis_fourier_transform.dm"
-#include "code\modules\research\xenoarchaeology\analysis\analysis_gas_chromatography.dm"
-#include "code\modules\research\xenoarchaeology\analysis\analysis_hyperspectral.dm"
-#include "code\modules\research\xenoarchaeology\analysis\analysis_ion_mobility.dm"
-#include "code\modules\research\xenoarchaeology\analysis\analysis_isotope_ratio.dm"
-#include "code\modules\research\xenoarchaeology\analysis\analysis_scanner.dm"
+#include "code\modules\research\xenoarchaeology\analysis\accelerator.dm"
+#include "code\modules\research\xenoarchaeology\analysis\fourier_transform.dm"
+#include "code\modules\research\xenoarchaeology\analysis\gas_chromatography.dm"
+#include "code\modules\research\xenoarchaeology\analysis\hyperspectral.dm"
+#include "code\modules\research\xenoarchaeology\analysis\ion_mobility.dm"
+#include "code\modules\research\xenoarchaeology\analysis\isotope_ratio.dm"
+#include "code\modules\research\xenoarchaeology\analysis\machinery_base.dm"
 #include "code\modules\research\xenoarchaeology\artifact\artifact.dm"
 #include "code\modules\research\xenoarchaeology\artifact\artifact_autocloner.dm"
 #include "code\modules\research\xenoarchaeology\artifact\artifact_crystal.dm"
@@ -1170,8 +1169,9 @@
 #include "code\modules\research\xenoarchaeology\tools\tools_depthscanner.dm"
 #include "code\modules\research\xenoarchaeology\tools\tools_locater.dm"
 #include "code\modules\research\xenoarchaeology\tools\tools_pickaxe.dm"
+#include "code\modules\research\xenoarchaeology\unknown\analysis.dm"
+#include "code\modules\research\xenoarchaeology\unknown\scanner.dm"
 #include "code\modules\research\xenoarchaeology\unknown\unknown.dm"
-#include "code\modules\research\xenoarchaeology\unknown\unknown_analysis.dm"
 #include "code\modules\research\xenoarchaeology\unknown\unknown_db.dm"
 #include "code\modules\research\xenoarchaeology\unknown\unknown_effect.dm"
 #include "code\modules\research\xenoarchaeology\unknown\unknown_harvester.dm"

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

@@ -12,16 +12,9 @@
 	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
-	var/scanner_dir = 0
-	var/obj/machinery/anomaly/scanner/owned_scanner = null
 
 /obj/machinery/anomaly/New()
 	..()
-	//connect to a nearby scanner pad
-	if(scanner_dir)
-		owned_scanner = locate(/obj/machinery/anomaly/scanner) in get_step(src, scanner_dir)
-	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)

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

@@ -0,0 +1,44 @@
+
+//cael - some changes here. the analysis pad is entirely new
+
+/obj/machinery/anomaly/artifact_analyser
+	name = "Artifact Analyser"
+	desc = "Studies the structure of artifacts to discover their uses."
+	icon = 'virology.dmi'
+	icon_state = "analyser"
+	anchored = 1
+	density = 1
+	var/scan_progress = 0
+	var/scan_num = 0
+	var/cur_scanning_atom
+	var/obj/machinery/scanner/owned_scanner = null
+
+/obj/machinery/anomaly/artifact_analyser/New()
+	..()
+
+	//connect to a nearby scanner pad
+	owned_scanner = locate(/obj/machinery/anomaly/scanner) in get_step(src, dir)
+	if(!owned_scanner)
+		owned_scanner = locate(/obj/machinery/anomaly/scanner) in orange(1, src)
+
+
+/obj/machinery/anomaly/artifact_analyser/attack_hand(var/mob/user as mob)
+	if(stat & (NOPOWER|BROKEN))
+		return
+	user.machine = src
+	var/dat = "<B>Anomalous material analyser</B><BR>"
+	dat += "<HR>"
+	if(!owned_pad)
+		owned_pad = locate() in orange(1, src)
+
+	if(!owned_pad)
+		dat += "<b><font color=red>Unable to locate analysis pad.</font></b><br>"
+	else if(scan_progress)
+		dat += "<b>Please wait. Analysis in progress.</b><br>"
+	else
+		dat += "Place an item to be scanned on the pad to begin."
+
+	dat += "<hr>"
+	dat += "<a href='?src=\ref[src]'>Refresh</a> <a href='?src=\ref[src];close=1'>Close</a>"
+	user << browse(dat, "window=artanalyser;size=450x500")
+	onclose(user, "artanalyser")

code/modules/research/xenoarchaeology/unknown/analysis_old.dm

@@ -29,7 +29,7 @@
 	var/list/alltriggers = list("Contact with Living Organism","Heavy Impact","Contact with Energy Source","Contact with Hydrogen","Contact with Corrosive Substance","Contact with Volatile Substance","Contact with Toxins","Exposure to Heat")
 	var/list/alleffects = list("Healing Device","Anti-biological Weapon","Non-lethal Stunning Trap","Mechanoid Repair Module","Mechanoid Deconstruction Device","Power Generator","Power Drain","Stellar Mineral Attractor","Agriculture Regulator","Shield Generator","Space-Time Displacer")
 	var/list/allranges = list("Constant Short-Range Energy Field","Medium Range Energy Pulses","Long Range Energy Pulses","Extreme Range Energy Pulses","Requires contact with subject")
-/*
+
 /obj/machinery/artifact_analyser/New()
 	..()
 	origin_bonuses = new/list()
@@ -316,4 +316,3 @@
 				analyser.owned_pad = src
 				world << "pad set analyser to self"
 				break*/
-*/

code/modules/research/xenoarchaeology/unknown/scanner.dm

@@ -1,5 +1,5 @@
 
-/obj/machinery/anomaly/scanner
+/obj/machinery/scanner
 	name = "scanner pad"
 	desc = "Place larger objects here for scanning."
 	icon = 'stationobjs.dmi'