Merge pull request #1121 from Citadel-Station-13/upstream-merge-27409

[MIRROR] Mesons no longer show turfs on lavaland, but miners no longer need mesons to see minerals scanned by a mineral scanner through walls

code/game/mecha/equipment/tools/mining_tools.dm

@@ -106,36 +106,19 @@
 	icon_state = "mecha_analyzer"
 	selectable = 0
 	equip_cooldown = 30
-	var/scanning = 0
+	var/scanning_time = 0
 
 /obj/item/mecha_parts/mecha_equipment/mining_scanner/New()
 	..()
 	START_PROCESSING(SSobj, src)
 
-/obj/item/mecha_parts/mecha_equipment/mining_scanner/attach(obj/mecha/M)
-	..()
-	M.occupant_sight_flags |= SEE_TURFS
-	if(M.occupant)
-		M.occupant.update_sight()
-
-/obj/item/mecha_parts/mecha_equipment/mining_scanner/detach()
-	chassis.occupant_sight_flags &= ~SEE_TURFS
-	if(chassis.occupant)
-		chassis.occupant.update_sight()
-	return ..()
-
 /obj/item/mecha_parts/mecha_equipment/mining_scanner/process()
 	if(!loc)
 		STOP_PROCESSING(SSobj, src)
 		qdel(src)
-	if(scanning)
-		return
-	if(istype(loc,/obj/mecha/working))
+	if(istype(loc,/obj/mecha/working) && scanning_time <= world.time)
 		var/obj/mecha/working/mecha = loc
 		if(!mecha.occupant)
 			return
-		var/list/L = list(mecha.occupant)
-		scanning = 1
-		mineral_scan_pulse(L,get_turf(loc))
-		spawn(equip_cooldown)
-			scanning = 0
+		scanning_time = world.time + equip_cooldown
+		mineral_scan_pulse(get_turf(src))

code/game/turfs/simulated/minerals.dm

@@ -73,6 +73,8 @@
 		for(i in 1 to mineralAmt)
 			new mineralType(src)
 			SSblackbox.add_details("ore_mined",mineralType)
+	for(var/obj/effect/temp_visual/mining_overlay/M in src)
+		qdel(M)
 	ChangeTurf(turf_type, defer_change)
 	addtimer(CALLBACK(src, .proc/AfterChange), 1, TIMER_UNIQUE)
 	playsound(src, 'sound/effects/break_stone.ogg', 50, 1) //beautiful destruction