From 8493c70b678427b4443a10a54419f21065b3ef77 Mon Sep 17 00:00:00 2001
From: PowerfulBacon <26465327+PowerfulBacon@users.noreply.github.com>
Date: Thu, 27 Jun 2024 10:41:44 +0100
Subject: [PATCH] Prevent drifting while not on a turf

---
 code/datums/components/drift.dm | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/code/datums/components/drift.dm b/code/datums/components/drift.dm
index 76a450ec58bcc..db71505c82d55 100644
--- a/code/datums/components/drift.dm
+++ b/code/datums/components/drift.dm
@@ -62,6 +62,10 @@
 /datum/component/drift/proc/before_move(datum/source)
 	SIGNAL_HANDLER
 	var/atom/movable/movable_parent = parent
+	// We cannot drift while not on a turf
+	if (!isturf(movable_parent.loc))
+		qdel(src)
+		return MOVELOOP_SKIP_STEP
 	movable_parent.inertia_moving = TRUE
 	old_dir = movable_parent.dir