Merge remote-tracking branch 'upstream/dev' into 150822-Intercoms

code/_helpers/unsorted.dm

@@ -1053,12 +1053,10 @@ proc/get_mob_with_client_list()
 
 //gets the turf the atom is located in (or itself, if it is a turf).
 //returns null if the atom is not in a turf.
-/proc/get_turf(atom/location)
-	while(location)
-		if(isturf(location))
-			return location
-		location = location.loc
-	return null
+/proc/get_turf(atom/A)
+	if(!istype(A)) return
+	for(A, A && !isturf(A), A=A.loc);
+	return A
 
 /proc/get(atom/loc, type)
 	while(loc)