From 6c1ab66d446b3dfca29053b107bb9f4a964c63da Mon Sep 17 00:00:00 2001
From: Aronai Sieyes <arokha@arokha.com>
Date: Sun, 28 Jan 2018 04:10:20 -0500
Subject: [PATCH] POLARIS: Allow pulling objects through step teleports.
 (#4635)

---
 code/game/objects/effects/step_triggers.dm | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/code/game/objects/effects/step_triggers.dm b/code/game/objects/effects/step_triggers.dm
index 5590b70316..a42df7f3e9 100644
--- a/code/game/objects/effects/step_triggers.dm
+++ b/code/game/objects/effects/step_triggers.dm
@@ -96,7 +96,18 @@
 	Trigger(var/atom/movable/A)
 		if(teleport_x && teleport_y && teleport_z)
 			var/turf/T = locate(teleport_x, teleport_y, teleport_z)
-			A.forceMove(T)
+			if(isliving(A))
+				var/mob/living/L = A
+				if(L.pulling)
+					var/atom/movable/P = L.pulling
+					L.stop_pulling()
+					P.forceMove(T)
+					L.forceMove(T)
+					L.start_pulling(P)
+				else
+					A.forceMove(T)
+			else
+				A.forceMove(T)
 
 /* Random teleporter, teleports atoms to locations ranging from teleport_x - teleport_x_offset, etc */