From 338adfad4d32aca24285fa615cb1205ab009eb7e Mon Sep 17 00:00:00 2001
From: YPO <30683121+YPOQ@users.noreply.github.com>
Date: Wed, 24 Jan 2018 13:15:44 -0700
Subject: [PATCH] Fixes orbiting stopping when entering disposals

---
 code/modules/recycling/disposal/bin.dm    | 2 +-
 code/modules/recycling/disposal/holder.dm | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/code/modules/recycling/disposal/bin.dm b/code/modules/recycling/disposal/bin.dm
index 69c716bb0bc..2af691679c7 100644
--- a/code/modules/recycling/disposal/bin.dm
+++ b/code/modules/recycling/disposal/bin.dm
@@ -189,7 +189,7 @@
 	sleep(5)
 	if(QDELETED(src))
 		return
-	var/obj/structure/disposalholder/H = new()
+	var/obj/structure/disposalholder/H = new(src)
 	newHolderDestination(H)
 	H.init(src)
 	air_contents = new()
diff --git a/code/modules/recycling/disposal/holder.dm b/code/modules/recycling/disposal/holder.dm
index cf9b5a2b580..65a5dce1f54 100644
--- a/code/modules/recycling/disposal/holder.dm
+++ b/code/modules/recycling/disposal/holder.dm
@@ -45,6 +45,8 @@
 	// note AM since can contain mobs or objs
 	for(var/A in D)
 		var/atom/movable/AM = A
+		if(AM == src)
+			continue
 		AM.forceMove(src)
 		if(istype(AM, /obj/structure/bigDelivery) && !hasmob)
 			var/obj/structure/bigDelivery/T = AM