]> git.smokeofanarchy.ru Git - space-station-14.git/commitdiff
Remove ability to start pulling while inside a container (#24235)
authorGreyMario <mariomister541@gmail.com>
Sat, 20 Jan 2024 23:40:01 +0000 (15:40 -0800)
committerGitHub <noreply@github.com>
Sat, 20 Jan 2024 23:40:01 +0000 (18:40 -0500)
* why was this even possible

* what coding at 6am does to a mf

Content.Shared/Pulling/Systems/SharedPullingSystem.Actions.cs

index b3f9c0d1c04ca5e1f18388dabab614e0cf2766cd..1e2bb90c61eb34df56cf5313ce622bae3493df11 100644 (file)
@@ -59,7 +59,7 @@ namespace Content.Shared.Pulling
                 return false;
             }
 
-            if (!_containerSystem.IsInSameOrNoContainer(puller, pulled))
+            if(_containerSystem.IsEntityInContainer(puller) || _containerSystem.IsEntityInContainer(pulled))
             {
                 return false;
             }