Merge pull request #5110 from Citadel-Station-13/upstream-merge-34897

[MIRROR] Fixes orbiting stopping when entering disposals

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()

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