From 96a0e3cbb2c1d2eb1996451c49a19ad62c157e24 Mon Sep 17 00:00:00 2001
From: Aurorablade <lemastera@gmail.com>
Date: Thu, 22 Sep 2016 18:04:42 -0400
Subject: [PATCH] now shit just isn't fucking undocking...

---
 code/modules/shuttle/shuttle.dm             | 3 ++-
 code/modules/shuttle/shuttle_manipulator.dm | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/code/modules/shuttle/shuttle.dm b/code/modules/shuttle/shuttle.dm
index 04a051ba149..dddb1fb16a1 100644
--- a/code/modules/shuttle/shuttle.dm
+++ b/code/modules/shuttle/shuttle.dm
@@ -373,9 +373,10 @@
 		if(!T0)
 			continue
 
-		for(var/atom/AM in T0.GetAllContents())
+		for(var/AM in T0.GetAllContents())
 			if(istype(AM, /mob/dead))
 				continue
+			world << "[AM]"
 			qdel(AM)
 
 		T0.ChangeTurf(turf_type)
diff --git a/code/modules/shuttle/shuttle_manipulator.dm b/code/modules/shuttle/shuttle_manipulator.dm
index e9475d9a430..2bcb1d8798a 100644
--- a/code/modules/shuttle/shuttle_manipulator.dm
+++ b/code/modules/shuttle/shuttle_manipulator.dm
@@ -107,7 +107,6 @@
 	for(var/i in shuttle_master.mobile)
 		var/obj/docking_port/mobile/M = i
 		var/list/L = list()
-		to_chat(usr, "[M.id]")
 		L["name"] = M.name
 		L["id"] = M.id
 		L["timer"] = M.timer
@@ -246,6 +245,8 @@
 		WARNING(m)
 		throw EXCEPTION(m)
 
+	existing_shuttle.jumpToNullSpace()
+
 	var/result = preview_shuttle.canDock(D)
 	// truthy value means that it cannot dock for some reason
 	// but we can ignore the someone else docked error because we'll