Merge branch 'master' into debris

2020-12-28 19:04:22 +01:00
parent 57d85f7e86 b1be0159e2
commit 46a0c65e46
44 changed files with 287 additions and 76 deletions
@@ -164,6 +164,8 @@

 		while (pulling != null)
 			var/next_pulling = pulling.pulling
+			if(next_pulling == pulling)
+				break		// no loops

 			var/turf/T = get_step(puller.loc, turn(puller.dir, 180))
 			pulling.can_be_z_moved = FALSE