From abef4bf9430c3d0995fc40a15ce434a4d211ac28 Mon Sep 17 00:00:00 2001
From: Hubblenaut <aschnelle@web.de>
Date: Wed, 2 Jul 2014 22:35:11 +0200
Subject: [PATCH] Fixes teleporting while buckled

---
 code/datums/helper_datums/teleport.dm | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/code/datums/helper_datums/teleport.dm b/code/datums/helper_datums/teleport.dm
index cb67c3f5f1..0d817b7c8d 100644
--- a/code/datums/helper_datums/teleport.dm
+++ b/code/datums/helper_datums/teleport.dm
@@ -108,12 +108,19 @@
 
 		playSpecials(curturf,effectin,soundin)
 
+		var/obj/structure/stool/bed/chair/C = null
+		if(isliving(teleatom))
+			var/mob/living/L = teleatom
+			if(L.buckled)
+				C = L.buckled
 		if(force_teleport)
 			teleatom.forceMove(destturf)
 			playSpecials(destturf,effectout,soundout)
 		else
 			if(teleatom.Move(destturf))
 				playSpecials(destturf,effectout,soundout)
+		if(C)
+			C.forceMove(destturf)
 
 		destarea.Entered(teleatom)