Merge branch 'master' into boxstation-disposal-fixes

BeeStation · Aug 25, 2024 · 462e7ff · 462e7ff
2 parents a8a3c7c + 808d9d7
commit 462e7ff
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/code/modules/recycling/disposal/pipe_sorting.dm b/code/modules/recycling/disposal/pipe_sorting.dm
@@ -109,7 +109,7 @@
 	initialize_dirs = DISP_DIR_RIGHT | DISP_DIR_FLIP
 
 /obj/structure/disposalpipe/sorting/unsorted/check_sorting(obj/structure/disposalholder/H)
-	return H.unsorted && (H.destinationTag || H.tomail)
+	return H.unsorted && (H.destinationTag > 1 || H.tomail)
 
 /obj/structure/disposalpipe/sorting/unsorted/flip
 	icon_state = "pipe-j2s"

diff --git a/html/changelogs/AutoChangeLog-pr-11375.yml b/html/changelogs/AutoChangeLog-pr-11375.yml
@@ -0,0 +1,7 @@
+author: PowerfulBacon
+delete-after: true
+changes:
+  - rscadd: Adds a dispoal pipe that filters items which haven't been sorted but need
+      to be sorted.
+  - tweak: Tweaks the code of the disposal pipe filtering so that items not entering
+      from the input will not be sorted.