Moved pulled container check to CanOpen

Also added a line to check if the user is inside the container. With the previous commit, the user could leave using the movement keys, since that method bypassed ToggleOpen. This now allows trapped users to leave both with movement keys and interact.
formlessnameless · Nov 25, 2024 · c08ca6c · c08ca6c
1 parent 67a8de4
commit c08ca6c
Showing 1 changed file with 9 additions and 9 deletions.
diff --git a/Content.Shared/Storage/EntitySystems/SharedEntityStorageSystem.cs b/Content.Shared/Storage/EntitySystems/SharedEntityStorageSystem.cs
@@ -182,15 +182,6 @@ public void ToggleOpen(EntityUid user, EntityUid target, SharedEntityStorageComp
         if (!ResolveStorage(target, ref component))
             return;
 
-        // impstation edit
-        // prevent dumbasses from opening crates that are being dragged
-        if (
-            TryComp<PullableComponent>(target, out var pull) &&
-            pull.BeingPulled &&
-            pull.Puller != user
-        )
-            return;
-
         if (component.Open)
         {
             TryCloseStorage(target);
@@ -381,6 +372,15 @@ public bool CanOpen(EntityUid user, EntityUid target, bool silent = false, Share
             }
         }
 
+        // impstation edit: prevent opening containers being pulled by others
+        if (
+            TryComp<PullableComponent>(target, out var pullable) && // Can be pulled
+            pullable.BeingPulled && // Someone is pulling it
+            pullable.Puller != user && // It is not the user
+            !component.Contents.Contains(user) // The user is not inside of it
+        )
+            return false;
+
         //Checks to see if the opening position, if offset, is inside of a wall.
         if (component.EnteringOffset != new Vector2(0, 0) && !HasComp<WallMountComponent>(target)) //if the entering position is offset
         {