Merge pull request #375 from Neerti/12/1/2015_prox_sensors_code_can_die_in_a_fire

Fixes proximity sensors being passed turfs/areas.

code/game/turfs/turf.dm

@@ -140,7 +140,7 @@ var/const/enterloopsanity = 100
 	..()
 	var/objects = 0
 	if(A && (A.flags & PROXMOVE))
-		for(var/atom/thing as mob|obj|turf|area in range(1))
+		for(var/atom/movable/thing in range(1))
 			if(objects > enterloopsanity) break
 			objects++
 			spawn(0)

code/modules/assembly/infrared.dm

@@ -187,13 +187,10 @@
 	return
 
 /obj/effect/beam/i_beam/process()
-	//world << "i_beam \ref[src] : process"
 
-	if((loc.density || !(master)))
-	//	world << "beam hit loc [loc] or no master [master], deleting"
+	if((loc && loc.density) || !master)
 		qdel(src)
 		return
-	//world << "proccess: [src.left] left"
 
 	if(left > 0)
 		left--

code/modules/assembly/proximity.dm

@@ -40,6 +40,9 @@
 
 
 	HasProximity(atom/movable/AM as mob|obj)
+		if(!istype(AM))
+			log_debug("DEBUG: HasProximity called with [AM] on [src] ([usr]).")
+			return
 		if (istype(AM, /obj/effect/beam))	return
 		if (AM.move_speed < 12)	sense()
 		return