diff --git a/code/modules/mining/ore_detector.dm b/code/modules/mining/ore_detector.dm
index 8b7d7106ab4..6f664fdeb71 100644
--- a/code/modules/mining/ore_detector.dm
+++ b/code/modules/mining/ore_detector.dm
@@ -1,6 +1,11 @@
 #define MINOR_ARTIFACTS "Minor Artifacts" // defined solely so someone doesn't typo it
 #define MAJOR_ARTIFACTS "Major Artifacts"
 
+#define SURFACE_MINERALS "Surface Minerals"
+#define PRECIOUS_METALS "Precious Metals"
+#define NUCLEAR_FUEL "Nuclear Fuel"
+#define EXOTIC_MATTER "Exotic Matter"
+
 /obj/item/ore_detector
 	name = "ore detector"
 	desc = "A device capable of locating and displaying ores to the average untrained hole explorer."
@@ -12,6 +17,7 @@
 	force = 1
 	var/active = FALSE
 	var/datum/weakref/our_user
+	var/list/ore_pings = list()
 	var/list/search_ores = list()
 	var/ping_rate = 4 SECONDS
 	var/last_ping = 0
@@ -46,12 +52,16 @@
 			var/ore/O = ore_data[ore_n]
 			var/ore_name = O.display_name
 			ore_names += ore_name
+		ore_names += SURFACE_MINERALS
+		ore_names += PRECIOUS_METALS
+		ore_names += NUCLEAR_FUEL
+		ore_names += EXOTIC_MATTER
 		ore_names += MINOR_ARTIFACTS
 		ore_names += MAJOR_ARTIFACTS
 
 	var/list/data = list()
 	data["ore_names"] = ore_names
-	data["search_ores"] = search_ores 
+	data["search_ores"] = search_ores
 	data["enabled"] = active
 	return data
 
@@ -81,20 +91,44 @@
 	if(isnull(our_user))
 		deactivate()
 		return
+	clear_images()
 	var/mob/M = our_user.resolve()
 	if(loc != M && loc.loc != M)
 		deactivate()
 		return
 	last_ping = world.time
 	var/turf/our_turf = get_turf(src)
-	for(var/turf/simulated/mineral/mine_turf in RANGE_TURFS(7, our_turf))
+	for(var/turf/turf as anything in RANGE_TURFS(7, our_turf))
 		if(isnull(our_user)) // in the event it's dropped midsweep
 			return
-		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/found_ores = FALSE
+		if(
+			length(turf.resources) && \
+			( \
+				((SURFACE_MINERALS in search_ores) && (ORE_IRON in turf.resources)) || \
+				((PRECIOUS_METALS in search_ores) && ((ORE_GOLD in turf.resources) || (ORE_SILVER in turf.resources) || (ORE_DIAMOND in turf.resources))) || \
+				((NUCLEAR_FUEL in search_ores) && (ORE_URANIUM in turf.resources)) || \
+				((EXOTIC_MATTER in search_ores) && ((ORE_PHORON in turf.resources) || (ORE_PLATINUM in turf.resources) || (ORE_HYDROGEN in turf.resources))) \
+			) \
+		)
+			found_ores = TRUE
+
+		if(!found_ores)
+			var/turf/simulated/mineral/mine_turf = turf
+			if(istype(mine_turf, /turf/simulated/mineral))
+				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)))
+					found_ores = TRUE
+
+		if(found_ores)
 			var/image/ore_ping = image(icon = 'icons/obj/item/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
-			QDEL_IN(ore_ping, 4 SECONDS)
+			ore_ping.pixel_x = rand(-6, 6)
+			ore_ping.pixel_y = rand(-6, 6)
+			ore_ping.alpha = rand(180, 255)
+			pixel_shift_to_turf(ore_ping, our_turf, turf)
+			if(M.client)
+				M.client.images += ore_ping
+			ore_pings += ore_ping
 
 /obj/item/ore_detector/emp_act()
 	deactivate()
@@ -104,15 +138,22 @@
 		return
 	START_PROCESSING(SSprocessing, src)
 	our_user = WEAKREF(user)
-	active=TRUE
+	active = TRUE
 	update_icon()
 
 /obj/item/ore_detector/proc/deactivate()
-	active=FALSE
+	active = FALSE
 	STOP_PROCESSING(SSprocessing, src)
+	clear_images()
 	our_user = null
 	update_icon()
 
+/obj/item/ore_detector/proc/clear_images()
+	var/mob/M = our_user?.resolve()
+	if(M?.client)
+		M.client.images -= ore_pings
+	ore_pings.Cut()
+
 /obj/item/ore_detector/throw_at()
 	..()
 	deactivate()
@@ -126,3 +167,8 @@
 
 #undef MINOR_ARTIFACTS
 #undef MAJOR_ARTIFACTS
+
+#undef SURFACE_MINERALS
+#undef PRECIOUS_METALS
+#undef NUCLEAR_FUEL
+#undef EXOTIC_MATTER
diff --git a/html/changelogs/geeves-ore_detector_tweaks.yml b/html/changelogs/geeves-ore_detector_tweaks.yml
new file mode 100644
index 00000000000..141d138cbdb
--- /dev/null
+++ b/html/changelogs/geeves-ore_detector_tweaks.yml
@@ -0,0 +1,7 @@
+author: Geeves
+
+delete-after: True
+
+changes:
+  - rscadd: "Added drillable ores to the ore detector list."
+  - tweak: "Tweaked the opacity and offset of ore detector pings."