Merge pull request #12220 from Fox-McCloud/lavaland-update-mech-scanner

Lavaland Update: Mechs and Scanners

code/modules/mining/equipment/mineral_scanner.dm

@@ -8,19 +8,17 @@
 	w_class = WEIGHT_CLASS_SMALL
 	flags = CONDUCT
 	slot_flags = SLOT_BELT
-	var/cooldown = 0
+	var/cooldown = 35
+	var/current_cooldown = 0
+
 	origin_tech = "engineering=1;magnets=1"
 
 /obj/item/mining_scanner/attack_self(mob/user)
 	if(!user.client)
 		return
-	if(!cooldown)
-		cooldown = 1
-		spawn(40)
-			cooldown = 0
-		var/list/mobs = list()
-		mobs |= user
-		mineral_scan_pulse(mobs, get_turf(user))
+	if(current_cooldown <= world.time)
+		current_cooldown = world.time + cooldown
+		mineral_scan_pulse(get_turf(user))
 
 
 //Debug item to identify all ore spread quickly
@@ -41,76 +39,47 @@
 	flags = CONDUCT
 	slot_flags = SLOT_BELT
 	var/cooldown = 35
-	var/on_cooldown = 0
+	var/current_cooldown = 0
 	var/range = 7
-	var/meson = TRUE
 	origin_tech = "engineering=3;magnets=3"
 
 /obj/item/t_scanner/adv_mining_scanner/cyborg
 	flags = CONDUCT | NODROP
 
-/obj/item/t_scanner/adv_mining_scanner/material
-	meson = FALSE
-	desc = "A scanner that automatically checks surrounding rock for useful minerals; it can also be used to stop gibtonite detonations. Wear material scanners for optimal results. This one has an extended range."
-
 /obj/item/t_scanner/adv_mining_scanner/lesser
 	name = "automatic mining scanner"
 	desc = "A scanner that automatically checks surrounding rock for useful minerals; it can also be used to stop gibtonite detonations. Wear meson scanners for optimal results."
 	range = 4
 	cooldown = 50
 
-/obj/item/t_scanner/adv_mining_scanner/lesser/material
-	desc = "A scanner that automatically checks surrounding rock for useful minerals; it can also be used to stop gibtonite detonations. Wear material scanners for optimal results."
-	meson = FALSE
-
 /obj/item/t_scanner/adv_mining_scanner/scan()
-	if(!on_cooldown)
-		on_cooldown = 1
-		spawn(cooldown)
-			on_cooldown = 0
+	if(current_cooldown <= world.time)
+		current_cooldown = world.time + cooldown
 		var/turf/t = get_turf(src)
-		var/list/mobs = recursive_mob_check(t, client_check = 1, sight_check = 0, include_radio = 0)
-		if(!mobs.len)
-			return
-		if(meson)
-			mineral_scan_pulse(mobs, t, range)
-		else
-			mineral_scan_pulse_material(mobs, t, range)
+		mineral_scan_pulse(t, range)
 
-//For use with mesons
-/proc/mineral_scan_pulse(list/mobs, turf/T, range = world.view)
+/proc/mineral_scan_pulse(turf/T, range = world.view)
 	var/list/minerals = list()
 	for(var/turf/simulated/mineral/M in range(range, T))
 		if(M.scan_state)
 			minerals += M
-	if(minerals.len)
-		for(var/mob/user in mobs)
-			if(user.client)
-				var/client/C = user.client
-				for(var/turf/simulated/mineral/M in minerals)
-					var/turf/F = get_turf(M)
-					var/image/I = image('icons/turf/mining.dmi', loc = F, icon_state = M.scan_state, layer = 18)
-					C.images += I
-					spawn(30)
-						if(C)
-							C.images -= I
-
-//For use with material scanners
-/proc/mineral_scan_pulse_material(list/mobs, turf/T, range = world.view)
-	var/list/minerals = list()
-	for(var/turf/simulated/mineral/M in range(range, T))
-		if(M.scan_state)
-			minerals += M
-	if(minerals.len)
+	if(LAZYLEN(minerals))
 		for(var/turf/simulated/mineral/M in minerals)
-			var/obj/effect/temp_visual/mining_overlay/C = new/obj/effect/temp_visual/mining_overlay(M)
+			var/obj/effect/temp_visual/mining_overlay/oldC = locate(/obj/effect/temp_visual/mining_overlay) in M
+			if(oldC)
+				qdel(oldC)
+			var/obj/effect/temp_visual/mining_overlay/C = new /obj/effect/temp_visual/mining_overlay(M)
 			C.icon_state = M.scan_state
 
 /obj/effect/temp_visual/mining_overlay
-	layer = 18
-	icon = 'icons/turf/mining.dmi'
-	anchored = 1
-	mouse_opacity = MOUSE_OPACITY_TRANSPARENT
-	duration = 30
-	pixel_x = -4
-	pixel_y = -4
+	plane = FULLSCREEN_PLANE
+	layer = FLASH_LAYER
+	icon = 'icons/effects/ore_visuals.dmi'
+	appearance_flags = 0 //to avoid having TILE_BOUND in the flags, so that the 480x480 icon states let you see it no matter where you are
+	duration = 35
+	pixel_x = -224
+	pixel_y = -224
+
+/obj/effect/temp_visual/mining_overlay/Initialize(mapload)
+	. = ..()
+	animate(src, alpha = 0, time = duration, easing = EASE_IN)