Merge remote-tracking branch 'origin/master' into semi-sync

2020-12-29 10:37:06 +08:00
parent 7e2da69d23 1772c83a75
commit 51143f89e5
36 changed files with 236 additions and 49 deletions
@@ -189,6 +189,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