From a1f0f7e377981acda98feb6ffed53c4535d76d08 Mon Sep 17 00:00:00 2001
From: GDN <96800819+GDNgit@users.noreply.github.com>
Date: Wed, 29 Nov 2023 11:37:03 -0600
Subject: [PATCH] fixes some strange behavior with righting tilted objects
 (#23273)

---
 code/datums/components/tilted.dm | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/code/datums/components/tilted.dm b/code/datums/components/tilted.dm
index c4e97ee6efd..7027fdbc5e8 100644
--- a/code/datums/components/tilted.dm
+++ b/code/datums/components/tilted.dm
@@ -82,14 +82,14 @@
 
 	if(user)
 		user.visible_message(
-			"[user] begins to right [parent].",
-			"You begin to right [parent]."
+			"[user] begins to right [atom_parent].",
+			"You begin to right [atom_parent]."
 		)
-		if(!do_after(user, duration, TRUE, parent))
+		if(!do_after(user, duration, TRUE, parent) || QDELETED(src))
 			return
 		user.visible_message(
-			"<span class='notice'>[user] rights [parent].</span>",
-			"<span class='notice'>You right [parent].</span>",
+			"<span class='notice'>[user] rights [atom_parent].</span>",
+			"<span class='notice'>You right [atom_parent].</span>",
 			"<span class='notice'>You hear a loud clang.</span>"
 		)
 
@@ -98,7 +98,7 @@
 
 	atom_parent.unbuckle_all_mobs(TRUE)
 
-	SEND_SIGNAL(parent, COMSIG_MOVABLE_UNTILTED, user)
+	SEND_SIGNAL(atom_parent, COMSIG_MOVABLE_UNTILTED, user)
 
 	atom_parent.layer = initial(atom_parent.layer)