tommy/tbd-station-14
2
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Prevent crates, pet carriers and other things from going into disposals (#35557)

Browse Source 
* Initial commit

* Solve underlying bug, readd to disposals

* Apply suggestions from code review

---------

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
This commit is contained in:
SlamBamActionman
2025-02-27 18:43:56 +01:00
committed by GitHub
parent 19c23682b0
commit c7b9a76342
5 changed files with 39 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
Content.Shared/Storage/EntitySystems/SharedEntityStorageSystem.cs
View File

@@ -301,8 +301,20 @@ public abstract class SharedEntityStorageSystem : EntitySystem
if (!ResolveStorage(container, ref component))
return false;
RemComp<InsideEntityStorageComponent>(toRemove);
_container.Remove(toRemove, component.Contents);
if (_container.IsEntityInContainer(container))
{
if (_container.TryGetOuterContainer(container, Transform(container), out var outerContainer) &&
!HasComp<HandsComponent>(outerContainer.Owner))
{
_container.Insert(toRemove, outerContainer);
return true;
}
}
RemComp<InsideEntityStorageComponent>(toRemove);
var pos = TransformSystem.GetWorldPosition(xform) + TransformSystem.GetWorldRotation(xform).RotateVec(component.EnteringOffset);
TransformSystem.SetWorldPosition(toRemove, pos);
return true;
@@ -366,17 +378,6 @@ public abstract class SharedEntityStorageSystem : EntitySystem
return false;
}
if (_container.IsEntityInContainer(target))
{
if (_container.TryGetOuterContainer(target,Transform(target) ,out var container) &&
!HasComp<HandsComponent>(container.Owner))
{
Popup.PopupClient(Loc.GetString("entity-storage-component-already-contains-user-message"), user, user);
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
{