Merge branch 'master' into upstream-merge-33537

2017-12-30 13:14:48 -06:00
parent 69930a192d 68c5c6cfe2
commit d3f6cf4dd8
918 changed files with 13347 additions and 23233 deletions
@@ -21,8 +21,8 @@ SUBSYSTEM_DEF(parallax)
 				return
 			continue
 		var/atom/movable/A = C.eye
-		if(!A)
-			return
+		if(!istype(A))
+			continue
 		for (A; isloc(A.loc) && !isturf(A.loc); A = A.loc);

 		if(A != C.movingmob)