Merge branch 'master' into upstream-merge-37582

2018-05-21 08:35:21 -05:00
parent d85fd94570 02887eb721
commit e57cf81636
413 changed files with 10010 additions and 7528 deletions
@@ -87,7 +87,7 @@
 			return FALSE

 		var/turf/there = get_turf(H)
-		return (H.z != 0 || (there && there.z == H.z))
+		return (H.z != 0 || (there && there.z == here.z))

 	return FALSE