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

fix ripleys being able to grab everything (#13944)

Browse Source 
Co-authored-by: AJCM-git <60196617+AJCM-git@users.noreply.github.com>
This commit is contained in:
Nemanja
2023-02-05 14:44:35 -05:00
committed by GitHub
parent b95f4f474b
commit 587df4c625
1 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
Content.Server/Mech/Equipment/EntitySystems/MechGrabberSystem.cs
View File

@@ -4,12 +4,12 @@ using Content.Server.Interaction;
using Content.Server.Mech.Components; using Content.Server.Mech.Components;
using Content.Server.Mech.Equipment.Components; using Content.Server.Mech.Equipment.Components;
using Content.Server.Mech.Systems; using Content.Server.Mech.Systems;
using Content.Shared.Construction.Components;
using Content.Shared.Interaction; using Content.Shared.Interaction;
using Content.Shared.Mech; using Content.Shared.Mech;
using Content.Shared.Mech.Equipment.Components; using Content.Shared.Mech.Equipment.Components;
using Content.Shared.Mobs.Components; using Content.Shared.Mobs.Components;
using Content.Shared.Wall; using Content.Shared.Wall;
using Robust.Server.GameObjects;
using Robust.Shared.Containers; using Robust.Shared.Containers;
using Robust.Shared.Map; using Robust.Shared.Map;
using Robust.Shared.Physics; using Robust.Shared.Physics;
@@ -27,6 +27,7 @@ public sealed class MechGrabberSystem : EntitySystem
[Dependency] private readonly DoAfterSystem _doAfter = default!; [Dependency] private readonly DoAfterSystem _doAfter = default!;
[Dependency] private readonly InteractionSystem _interaction = default!; [Dependency] private readonly InteractionSystem _interaction = default!;
[Dependency] private readonly SharedAudioSystem _audio = default!; [Dependency] private readonly SharedAudioSystem _audio = default!;
[Dependency] private readonly TransformSystem _transform = default!;
/// <inheritdoc/> /// <inheritdoc/>
public override void Initialize() public override void Initialize()
@@ -78,8 +79,10 @@ public sealed class MechGrabberSystem : EntitySystem
var mechxform = Transform(mech); var mechxform = Transform(mech);
var xform = Transform(toRemove); var xform = Transform(toRemove);
xform.AttachToGridOrMap(); xform.AttachToGridOrMap();
xform.WorldPosition = mechxform.WorldPosition + mechxform.WorldRotation.RotateVec(component.DepositOffset);
xform.WorldRotation = Angle.Zero; var offset = _transform.GetWorldPosition(mechxform) + _transform.GetWorldRotation(mechxform).RotateVec(component.DepositOffset);
_transform.SetWorldPosition(xform, offset);
_transform.SetWorldRotation(xform, Angle.Zero);
_mech.UpdateUserInterface(mech); _mech.UpdateUserInterface(mech);
} }
@@ -122,13 +125,16 @@ public sealed class MechGrabberSystem : EntitySystem
if (args.Handled || args.Target is not {} target) if (args.Handled || args.Target is not {} target)
return; return;
if (TryComp<PhysicsComponent>(uid, out var physics) && physics.BodyType == BodyType.Static && !HasComp<AnchorableComponent>(uid) || if (TryComp<PhysicsComponent>(target, out var physics) && physics.BodyType == BodyType.Static ||
HasComp<WallMountComponent>(target) || HasComp<WallMountComponent>(target) ||
HasComp<MobStateComponent>(target)) HasComp<MobStateComponent>(target))
{ {
return; return;
} }
if (Transform(target).Anchored)
return;
if (component.ItemContainer.ContainedEntities.Count >= component.MaxContents) if (component.ItemContainer.ContainedEntities.Count >= component.MaxContents)
return; return;