Cinka/OldThink
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Spread items when dumping contents out of a bag (#8678)

Browse Source 
Co-authored-by: Kara <lunarautomaton6@gmail.com>
This commit is contained in:
WilliamECrew
2022-06-05 17:34:44 -07:00
committed by GitHub
parent ec71d87106
commit 4587b64796
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
Content.Server/Storage/EntitySystems/DumpableSystem.cs
View File

@@ -8,6 +8,7 @@ using Content.Server.Disposal.Unit.EntitySystems;
using Content.Server.DoAfter; using Content.Server.DoAfter;
using Content.Shared.Placeable; using Content.Shared.Placeable;
using Robust.Shared.Containers; using Robust.Shared.Containers;
using Robust.Shared.Random;
namespace Content.Server.Storage.EntitySystems namespace Content.Server.Storage.EntitySystems
{ {
@@ -15,6 +16,7 @@ namespace Content.Server.Storage.EntitySystems
{ {
[Dependency] private readonly DoAfterSystem _doAfterSystem = default!; [Dependency] private readonly DoAfterSystem _doAfterSystem = default!;
[Dependency] private readonly DisposalUnitSystem _disposalUnitSystem = default!; [Dependency] private readonly DisposalUnitSystem _disposalUnitSystem = default!;
[Dependency] private readonly IRobustRandom _random = default!;
public override void Initialize() public override void Initialize()
{ {
@@ -146,14 +148,17 @@ namespace Content.Server.Storage.EntitySystems
foreach (var entity in dumpQueue) foreach (var entity in dumpQueue)
{ {
Transform(entity).AttachParentToContainerOrGrid(EntityManager); var transform = Transform(entity);
transform.AttachParentToContainerOrGrid(EntityManager);
transform.LocalPosition = transform.LocalPosition + _random.NextVector2Box() / 2;
transform.LocalRotation = _random.NextAngle();
} }
if (HasComp<PlaceableSurfaceComponent>(args.Target)) if (HasComp<PlaceableSurfaceComponent>(args.Target))
{ {
foreach (var entity in dumpQueue) foreach (var entity in dumpQueue)
{ {
Transform(entity).LocalPosition = Transform(args.Target.Value).LocalPosition; Transform(entity).LocalPosition = Transform(args.Target.Value).LocalPosition + _random.NextVector2Box() / 4;
} }
return; return;
} }