Merge pull request #12545 from Citadel-Station-13/kevinz000-patch-1

maybe fixes conveyors being a crash vector
2020-06-18 13:34:31 -05:00
parent 1f53cd34d3 a0ecf85e4b
commit 7d30d7c7ff
1 changed files with 1 additions and 0 deletions
@@ -138,6 +138,7 @@ GLOBAL_LIST_EMPTY(conveyors_by_id)
 	var/turf/T = get_step(src, movedir)
 	if(length(T.contents) > 150)
 		return
+	affecting.len = min(affecting.len, 150 - length(T.contents))
 	for(var/atom/movable/A in affecting)
 		if((A.loc == loc) && A.has_gravity())
 			A.ConveyorMove(movedir)