Conflicts!!!

2020-06-22 17:39:24 +03:00
parent 66cbdd1174 a0a4007332
commit c41d2e78be
395 changed files with 84463 additions and 336540 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)