From d0c648b702726795f05fb1ee08bd59ef1396d609 Mon Sep 17 00:00:00 2001
From: Jordan Brown <Cyberboss@users.noreply.github.com>
Date: Thu, 25 Jan 2018 22:47:09 -0500
Subject: [PATCH 1/2] Merge pull request #34897 from YPOQ/orbitfix

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 271aad7e4d..fee9e55d47 100644
--- a/code/modules/recycling/disposal/bin.dm
+++ b/code/modules/recycling/disposal/bin.dm
@@ -190,7 +190,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 cf9b5a2b58..65a5dce1f5 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