diff --git a/code/game/objects/items/devices/scanners.dm b/code/game/objects/items/devices/scanners.dm
index b6c857f4a74..18d3303168e 100644
--- a/code/game/objects/items/devices/scanners.dm
+++ b/code/game/objects/items/devices/scanners.dm
@@ -29,6 +29,7 @@ MASS SPECTROMETER
 
 /obj/item/device/t_scanner/proc/flick_sonar(obj/pipe)
 	var/image/I = image('icons/effects/effects.dmi', pipe, "blip", pipe.layer+1)
+	I.alpha = 128
 	var/list/nearby = list()
 	for(var/mob/M in viewers(pipe))
 		if(M.client)
@@ -44,18 +45,15 @@ MASS SPECTROMETER
 /obj/item/device/t_scanner/proc/scan()
 
 	for(var/turf/T in range(2, src.loc) )
-
-		if(!T.intact)
-			continue
-
 		for(var/obj/O in T.contents)
 
 			if(O.level != 1)
 				continue
-
+			
+			var/mob/living/L = locate() in O
+			
 			if(O.invisibility == 101)
 				O.invisibility = 0
-				var/mob/living/L = locate() in O
 				if(L)
 					flick_sonar(O)
 				spawn(10)
@@ -63,13 +61,9 @@ MASS SPECTROMETER
 						var/turf/U = O.loc
 						if(U.intact)
 							O.invisibility = 101
-
-		var/mob/living/M = locate() in T
-		if(M && M.invisibility == 2)
-			M.invisibility = 0
-			spawn(2)
-				if(M)
-					M.invisibility = INVISIBILITY_LEVEL_TWO
+			else
+				if(L)
+					flick_sonar(O)
 
 
 /obj/item/device/healthanalyzer