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

hands ECS (#7081)

Browse Source
This commit is contained in:
Leon Friedrich
2022-03-17 20:13:31 +13:00
committed by GitHub
parent 7b84362901
commit bfd95c493b
94 changed files with 1454 additions and 2185 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Content.Server/Disposal/Tube/Components/DisposalTaggerComponent.cs
View File

@@ -84,6 +84,7 @@ namespace Content.Server.Disposal.Tube.Components
{
SoundSystem.Play(Filter.Pvs(Owner), _clickSound.GetSound(), Owner, AudioParams.Default.WithVolume(-2f));
}
protected override void OnRemove()
{
base.OnRemove();

6
Content.Server/Disposal/Tube/DisposalTubeSystem.cs
View File

@@ -1,4 +1,4 @@
using Content.Server.Disposal.Tube.Components;
using Content.Server.Disposal.Tube.Components;
using Content.Server.UserInterface;
using Content.Server.Hands.Components;
using Content.Shared.Movement;
@@ -81,7 +81,7 @@ namespace Content.Server.Disposal.Tube
return;
}
var activeHandEntity = hands.GetActiveHandItem?.Owner;
var activeHandEntity = hands.ActiveHandEntity;
if (activeHandEntity != null)
{
args.Cancel();
@@ -96,7 +96,7 @@ namespace Content.Server.Disposal.Tube
return;
}
var activeHandEntity = hands.GetActiveHandItem?.Owner;
var activeHandEntity = hands.ActiveHandEntity;
if (activeHandEntity != null)
{
args.Cancel();

14
Content.Server/Disposal/Unit/EntitySystems/DisposalUnitSystem.cs
View File

@@ -16,21 +16,16 @@ using Content.Shared.Atmos;
using Content.Shared.Disposal;
using Content.Shared.Disposal.Components;
using Content.Shared.DragDrop;
using Content.Shared.Hands.EntitySystems;
using Content.Shared.Interaction;
using Content.Shared.Item;
using Content.Shared.Movement;
using Content.Shared.Popups;
using Content.Shared.Throwing;
using Content.Shared.Verbs;
using Robust.Server.GameObjects;
using Robust.Shared.Audio;
using Robust.Shared.Containers;
using Robust.Shared.GameObjects;
using Robust.Shared.IoC;
using Robust.Shared.Localization;
using Robust.Shared.Log;
using Robust.Shared.Map;
using Robust.Shared.Maths;
using Robust.Shared.Player;
using Robust.Shared.Random;
@@ -43,6 +38,7 @@ namespace Content.Server.Disposal.Unit.EntitySystems
[Dependency] private readonly ActionBlockerSystem _actionBlockerSystem = default!;
[Dependency] private readonly AtmosphereSystem _atmosSystem = default!;
[Dependency] private readonly DoAfterSystem _doAfterSystem = default!;
[Dependency] private readonly SharedHandsSystem _handsSystem = default!;
private readonly List<DisposalUnitComponent> _activeDisposals = new();
@@ -140,7 +136,7 @@ namespace Content.Server.Disposal.Unit.EntitySystems
Category = VerbCategory.Insert,
Act = () =>
{
args.Hands.Drop(args.Using.Value, component.Container);
_handsSystem.TryDropIntoContainer(args.User, args.Using.Value, component.Container, checkActionBlocker: false, args.Hands);
AfterInsert(component, args.Using.Value);
}
};
@@ -248,8 +244,8 @@ namespace Content.Server.Disposal.Unit.EntitySystems
{
return;
}
if (!CanInsert(component, args.Used) || !hands.Drop(args.Used, component.Container))
if (!CanInsert(component, args.Used) || !_handsSystem.TryDropIntoContainer(args.User, args.Used, component.Container))
{
return;
}