fix: allow airless chute flushing of small items (ParadiseSS13#26037)

kano-dot · Jul 1, 2024 · 87e6460 · 87e6460
1 parent 61f970b
commit 87e6460
Showing 1 changed file with 8 additions and 0 deletions.
diff --git a/code/modules/recycling/sortingmachinery.dm b/code/modules/recycling/sortingmachinery.dm
@@ -287,6 +287,14 @@
 /obj/machinery/disposal/deliveryChute/Bumped(atom/movable/AM) //Go straight into the chute
 	if(isprojectile(AM)	|| isAI(AM) || QDELETED(AM))
 		return
+
+	// We may already contain the object because thrown objects
+	// call CanPass which has a chance to immediately forceMove
+	// them into us.
+	if(AM.loc == src)
+		flush()
+		return
+
 	switch(dir)
 		if(NORTH)
 			if(AM.loc.y != loc.y + 1) return