From 5b0196e859abbf27844d57556c1e5ea4eb878531 Mon Sep 17 00:00:00 2001
From: Citinited <kendo123@hotmail.co.uk>
Date: Sat, 25 May 2019 22:58:50 +0100
Subject: [PATCH] Fixes bug that deletes stuff in blocked trunks

---
 code/modules/recycling/disposal.dm | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/code/modules/recycling/disposal.dm b/code/modules/recycling/disposal.dm
index 6413765c99c..72a2430607a 100644
--- a/code/modules/recycling/disposal.dm
+++ b/code/modules/recycling/disposal.dm
@@ -692,11 +692,9 @@
 // pipe is deleted
 // ensure if holder is present, it is expelled
 /obj/structure/disposalpipe/Destroy()
-	var/obj/structure/disposalholder/H = locate() in src
-	if(H)
-		// holder was present
+	for(var/obj/structure/disposalholder/H in contents)
 		H.active = 0
-		var/turf/T = src.loc
+		var/turf/T = loc
 		if(T.density)
 			// deleting pipe is inside a dense turf (wall)
 			// this is unlikely, but just dump out everything into the turf in case
@@ -709,8 +707,7 @@
 			return
 
 		// otherwise, do normal expel from turf
-		if(H)
-			expel(H, T, 0)
+		expel(H, T, 0)
 	return ..()
 
 /obj/structure/disposalpipe/singularity_pull(S, current_size)