TG Sync 12/15/17

s

s

code/modules/orbit/orbit.dm

@@ -43,6 +43,10 @@
 	if (!orbiter.orbiting) //admin wants to stop the orbit.
 		orbiter.orbiting = src //set it back to us first
 		orbiter.stop_orbit()
+	var/atom/movable/AM = orbiting
+	if(istype(AM) && AM.orbiting && AM.orbiting.orbiting == orbiter)
+		orbiter.stop_orbit()
+		return
 	lastprocess = world.time
 	if (!targetloc)
 		targetloc = get_turf(orbiting)
@@ -54,7 +58,7 @@
 	lastloc = orbiter.loc
 	for(var/other_orbit in orbiter.orbiters)
 		var/datum/orbit/OO = other_orbit
-		if(OO == src)
+		if(OO == src || OO.orbiter == orbiting)
 			continue
 		OO.Check(targetloc)