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

Weldable cleanup (#19809)

Browse Source
This commit is contained in:
metalgearsloth
2023-09-05 00:07:01 +10:00
committed by GitHub
parent 88454b046a
commit db1ff07821
24 changed files with 159 additions and 210 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -12,6 +12,7 @@ using Content.Shared.Movement.Events;
using Content.Shared.Placeable;
using Content.Shared.Popups;
using Content.Shared.Storage.Components;
using Content.Shared.Tools.Systems;
using Content.Shared.Verbs;
using Content.Shared.Wall;
using Content.Shared.Whitelist;
@@ -29,18 +30,19 @@ namespace Content.Shared.Storage.EntitySystems;
public abstract class SharedEntityStorageSystem : EntitySystem
{
[Dependency] private readonly IGameTiming _timing = default!;
[Dependency] private readonly INetManager _net = default!;
[Dependency] private readonly EntityLookupSystem _lookup = default!;
[Dependency] private readonly PlaceableSurfaceSystem _placeableSurface = default!;
[Dependency] private readonly SharedAppearanceSystem _appearance = default!;
[Dependency] private readonly SharedAudioSystem _audio = default!;
[Dependency] private readonly SharedContainerSystem _container = default!;
[Dependency] private readonly SharedInteractionSystem _interaction = default!;
[Dependency] private readonly SharedJointSystem _joints = default!;
[Dependency] private readonly SharedPhysicsSystem _physics = default!;
[Dependency] private readonly IGameTiming _timing = default!;
[Dependency] private readonly INetManager _net = default!;
[Dependency] private readonly EntityLookupSystem _lookup = default!;
[Dependency] private readonly PlaceableSurfaceSystem _placeableSurface = default!;
[Dependency] private readonly SharedAppearanceSystem _appearance = default!;
[Dependency] private readonly SharedAudioSystem _audio = default!;
[Dependency] private readonly SharedContainerSystem _container = default!;
[Dependency] private readonly SharedInteractionSystem _interaction = default!;
[Dependency] private readonly SharedJointSystem _joints = default!;
[Dependency] private readonly SharedPhysicsSystem _physics = default!;
[Dependency] protected readonly SharedPopupSystem Popup = default!;
[Dependency] private readonly SharedTransformSystem _transform = default!;
[Dependency] private readonly SharedTransformSystem _transform = default!;
[Dependency] private readonly WeldableSystem _weldable = default!;
public const string ContainerName = "entity_storage";
@@ -50,8 +52,7 @@ public abstract class SharedEntityStorageSystem : EntitySystem
component.Capacity,
component.IsCollidableWhenOpen,
component.OpenOnMove,
component.EnteringRange,
component.IsWeldedShut);
component.EnteringRange);
}
protected void OnHandleState(EntityUid uid, SharedEntityStorageComponent component, ref ComponentHandleState args)
@@ -63,7 +64,6 @@ public abstract class SharedEntityStorageSystem : EntitySystem
component.IsCollidableWhenOpen = state.IsCollidableWhenOpen;
component.OpenOnMove = state.OpenOnMove;
component.EnteringRange = state.EnteringRange;
component.IsWeldedShut = state.IsWeldedShut;
}
protected virtual void OnComponentInit(EntityUid uid, SharedEntityStorageComponent component, ComponentInit args)
@@ -323,10 +323,10 @@ public abstract class SharedEntityStorageSystem : EntitySystem
if (!HasComp<HandsComponent>(user))
return false;
if (component.IsWeldedShut)
if (_weldable.IsWelded(target))
{
if (!silent && !component.Contents.Contains(user) && _net.IsServer)
Popup.PopupEntity(Loc.GetString("entity-storage-component-welded-shut-message"), target);
if (!silent && !component.Contents.Contains(user))
Popup.PopupClient(Loc.GetString("entity-storage-component-welded-shut-message"), target, user);
return false;
}