From a4ec8db7b727f6029e91f0b674461d1d76573347 Mon Sep 17 00:00:00 2001
From: Geeves <ggrobler447@gmail.com>
Date: Tue, 23 Feb 2021 15:36:55 +0200
Subject: [PATCH] Xenoarch Fossil Finder (#11218)

---
 code/modules/mining/ore_detector.dm           | 12 +++++--
 code/modules/research/xenoarchaeology/misc.dm | 34 +++++++++----------
 .../geeves-xenoarch_fossil_finder.yml         |  7 ++++
 3 files changed, 33 insertions(+), 20 deletions(-)
 create mode 100644 html/changelogs/geeves-xenoarch_fossil_finder.yml

diff --git a/code/modules/mining/ore_detector.dm b/code/modules/mining/ore_detector.dm
index be8fdc39a64..3cdbd154702 100644
--- a/code/modules/mining/ore_detector.dm
+++ b/code/modules/mining/ore_detector.dm
@@ -1,3 +1,6 @@
+#define MINOR_ARTIFACTS "Minor Artifacts" // defined solely so someone doesn't typo it
+#define MAJOR_ARTIFACTS "Major Artifacts"
+
 /obj/item/ore_detector
 	name = "ore detector"
 	desc = "A device capable of locating and displaying ores to the average untrained hole explorer."
@@ -45,6 +48,8 @@
 			var/ore/O = ore_data[ore_n]
 			var/ore_name = O.display_name
 			ore_names += ore_name
+		ore_names += MINOR_ARTIFACTS
+		ore_names += MAJOR_ARTIFACTS
 	if(loc == user)
 		var/datum/vueui/ui = SSvueui.get_open_ui(user, src)
 		if(!ui)
@@ -86,7 +91,7 @@
 	for(var/turf/simulated/mineral/mine_turf in RANGE_TURFS(7, our_turf))
 		if(isnull(our_user)) // in the event it's dropped midsweep
 			return
-		if(mine_turf.mineral && (mine_turf.mineral.display_name in search_ores))
+		if((length(mine_turf.finds) && (MINOR_ARTIFACTS in search_ores)) || (mine_turf.artifact_find && (MAJOR_ARTIFACTS in search_ores)) || (mine_turf.mineral && (mine_turf.mineral.display_name in search_ores)))
 			var/image/ore_ping = image(icon = 'icons/obj/contained_items/tools/ore_scanner.dmi', icon_state = "signal_overlay", loc = our_turf, layer = OBFUSCATION_LAYER + 0.1)
 			pixel_shift_to_turf(ore_ping, our_turf, mine_turf)
 			M << ore_ping
@@ -116,4 +121,7 @@
 	deactivate()
 
 /obj/item/ore_detector/on_give()
-	deactivate()
\ No newline at end of file
+	deactivate()
+
+#undef MINOR_ARTIFACTS
+#undef MAJOR_ARTIFACTS
\ No newline at end of file
diff --git a/code/modules/research/xenoarchaeology/misc.dm b/code/modules/research/xenoarchaeology/misc.dm
index 774f5f8378a..8c8ca46034a 100644
--- a/code/modules/research/xenoarchaeology/misc.dm
+++ b/code/modules/research/xenoarchaeology/misc.dm
@@ -87,24 +87,22 @@
 	icon_closed = "toolcloset"
 	icon_opened = "toolclosetopen"
 
-	New()
-		..()
-		sleep(2)
-		new /obj/item/storage/belt/archaeology(src)
-		new /obj/item/storage/box/excavation(src)
-		new /obj/item/device/flashlight/lantern(src)
-		new /obj/item/device/ano_scanner(src)
-		new /obj/item/device/depth_scanner(src)
-		new /obj/item/device/core_sampler(src)
-		new /obj/item/device/gps(src)
-		new /obj/item/device/beacon_locator(src)
-		new /obj/item/device/radio/beacon(src)
-		new /obj/item/pickaxe(src)
-		new /obj/item/device/measuring_tape(src)
-		new /obj/item/pickaxe/hand(src)
-		new /obj/item/storage/bag/fossils(src)
-		new /obj/item/device/hand_labeler(src)
-		return
+/obj/structure/closet/excavation/fill()
+	new /obj/item/storage/belt/archaeology(src)
+	new /obj/item/storage/box/excavation(src)
+	new /obj/item/device/flashlight/lantern(src)
+	new /obj/item/device/ano_scanner(src)
+	new /obj/item/device/depth_scanner(src)
+	new /obj/item/device/core_sampler(src)
+	new /obj/item/device/gps(src)
+	new /obj/item/device/beacon_locator(src)
+	new /obj/item/device/radio/beacon(src)
+	new /obj/item/pickaxe(src)
+	new /obj/item/device/measuring_tape(src)
+	new /obj/item/pickaxe/hand(src)
+	new /obj/item/storage/bag/fossils(src)
+	new /obj/item/device/hand_labeler(src)
+	new /obj/item/ore_detector(src)
 
 //---- Isolation room air alarms
 
diff --git a/html/changelogs/geeves-xenoarch_fossil_finder.yml b/html/changelogs/geeves-xenoarch_fossil_finder.yml
new file mode 100644
index 00000000000..1908ef5d585
--- /dev/null
+++ b/html/changelogs/geeves-xenoarch_fossil_finder.yml
@@ -0,0 +1,7 @@
+author: Geeves
+
+delete-after: True
+
+changes:
+  - rscadd: "Added the ability for ore detectors to find minor xenoarch finds, as well as major artifacts."
+  - rscadd: "Added ore detectors to xenoarch excavation lockers."
\ No newline at end of file