TG: Changes a & to an && from last commit

Raises the loopsanity variable in /turf/entered from 10 to 100.  Having the
value so low means it generally evaluates the nine surrounding turfs and then
the area, and no objects.  Raising the value makes proximity-based items work
again.
Revision: r3212
Author: 	 VivianFoxfoot

code/game/turf.dm

@@ -80,7 +80,7 @@
 
 
 /turf/Entered(atom/movable/M as mob|obj)
-//	var/loopsanity = 100
+	var/loopsanity = 100
 	if(ismob(M))
 		if(!M:lastarea)
 			M:lastarea = get_area(M.loc)
@@ -97,12 +97,18 @@
 		else if(!istype(src, /turf/space))
 			M:inertia_dir = 0
 	..()
+	var/objects = 0
 	for(var/atom/A as mob|obj|turf|area in src)
+		if(objects > loopsanity)	break
+		objects++
 		spawn( 0 )
 			if ((A && M))
 				A.HasEntered(M, 1)
 			return
+	objects = 0
 	for(var/atom/A as mob|obj|turf|area in range(1))
+		if(objects > loopsanity)	break
+		objects++
 		spawn( 0 )
 			if ((A && M))
 				A.HasProximity(M, 1)