From: GreyMario <mariomister541@gmail.com>
Date: Sat, 20 Jan 2024 23:40:01 +0000 (-0800)
Subject: Remove ability to start pulling while inside a container (#24235)
X-Git-Url: https://git.smokeofanarchy.ru/gitweb.cgi?a=commitdiff_plain;h=1085dbef6524ee8ba7c901459dcea8abf1f1993a;p=space-station-14.git

Remove ability to start pulling while inside a container (#24235)

* why was this even possible

* what coding at 6am does to a mf
---

diff --git a/Content.Shared/Pulling/Systems/SharedPullingSystem.Actions.cs b/Content.Shared/Pulling/Systems/SharedPullingSystem.Actions.cs
index b3f9c0d1c0..1e2bb90c61 100644
--- a/Content.Shared/Pulling/Systems/SharedPullingSystem.Actions.cs
+++ b/Content.Shared/Pulling/Systems/SharedPullingSystem.Actions.cs
@@ -59,7 +59,7 @@ namespace Content.Shared.Pulling
                 return false;
             }
 
-            if (!_containerSystem.IsInSameOrNoContainer(puller, pulled))
+            if(_containerSystem.IsEntityInContainer(puller) || _containerSystem.IsEntityInContainer(pulled))
             {
                 return false;
             }