From 1ea46edd1b4cbacd8101c4a5eb361aac60863252 Mon Sep 17 00:00:00 2001
From: SkyratBot <59378654+SkyratBot@users.noreply.github.com>
Date: Fri, 20 Nov 2020 10:39:37 +0100
Subject: [PATCH] [MIRROR] You can't defy lack of gravity through the power of
 love. (#1742)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* You can't defy lack of gravity through the power of love. (#55037)

About The Pull Request

Title. Law of conservation of energy, not handholding.
Why It's Good For The Game

This will close #53192.
Changelog

🆑
fix: You can't defy lack of gravity through the power of love.
/🆑

* You can't defy lack of gravity through the power of love.

Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com>
---
 code/game/atoms_movable.dm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/game/atoms_movable.dm b/code/game/atoms_movable.dm
index ff14734ffb3..4f25ded8428 100644
--- a/code/game/atoms_movable.dm
+++ b/code/game/atoms_movable.dm
@@ -617,7 +617,7 @@
 	if(has_gravity(src))
 		return TRUE
 
-	if(pulledby)
+	if(pulledby && (pulledby.pulledby != src || moving_from_pull))
 		return TRUE
 
 	if(throwing)