From 20defaba8e28d0d330099c3ef88097011421cb16 Mon Sep 17 00:00:00 2001
From: kevinz000 <2003111+kevinz000@users.noreply.github.com>
Date: Sun, 8 Dec 2019 21:46:53 -0700
Subject: [PATCH 1/2] Update conveyor2.dm

---
 code/modules/recycling/conveyor2.dm | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/code/modules/recycling/conveyor2.dm b/code/modules/recycling/conveyor2.dm
index 5875e821a3..5e075177e6 100644
--- a/code/modules/recycling/conveyor2.dm
+++ b/code/modules/recycling/conveyor2.dm
@@ -135,6 +135,10 @@ GLOBAL_LIST_EMPTY(conveyors_by_id)
 	addtimer(CALLBACK(src, .proc/convey, affecting), 1)
 
 /obj/machinery/conveyor/proc/convey(list/affecting)
+	var/turf/T = get_turf(src)
+	T = get_step(T, movedir)
+	if(length(T.contents) > 150)
+		return
 	for(var/atom/movable/A in affecting)
 		if((A.loc == loc) && A.has_gravity())
 			A.ConveyorMove(movedir)

From ded283fa5587a49b00b1fda960bfd85a906ebc10 Mon Sep 17 00:00:00 2001
From: kevinz000 <2003111+kevinz000@users.noreply.github.com>
Date: Wed, 11 Dec 2019 14:41:58 -0700
Subject: [PATCH 2/2] Update conveyor2.dm

---
 code/modules/recycling/conveyor2.dm | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/code/modules/recycling/conveyor2.dm b/code/modules/recycling/conveyor2.dm
index 5e075177e6..7701e58616 100644
--- a/code/modules/recycling/conveyor2.dm
+++ b/code/modules/recycling/conveyor2.dm
@@ -135,8 +135,7 @@ GLOBAL_LIST_EMPTY(conveyors_by_id)
 	addtimer(CALLBACK(src, .proc/convey, affecting), 1)
 
 /obj/machinery/conveyor/proc/convey(list/affecting)
-	var/turf/T = get_turf(src)
-	T = get_step(T, movedir)
+	var/turf/T = get_step(src, movedir)
 	if(length(T.contents) > 150)
 		return
 	for(var/atom/movable/A in affecting)