Allow pulling while buckled (#18520)
This commit is contained in:
@@ -306,7 +306,7 @@ public abstract partial class SharedBuckleSystem
|
|||||||
|
|
||||||
AppearanceSystem.SetData(strapUid, StrapVisuals.State, true);
|
AppearanceSystem.SetData(strapUid, StrapVisuals.State, true);
|
||||||
|
|
||||||
Dirty(strapComp);
|
Dirty(strapUid, strapComp);
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -10,6 +10,7 @@ using Content.Shared.Standing;
|
|||||||
using Robust.Shared.Containers;
|
using Robust.Shared.Containers;
|
||||||
using Robust.Shared.Map;
|
using Robust.Shared.Map;
|
||||||
using Robust.Shared.Network;
|
using Robust.Shared.Network;
|
||||||
|
using Robust.Shared.Physics.Systems;
|
||||||
using Robust.Shared.Players;
|
using Robust.Shared.Players;
|
||||||
using Robust.Shared.Timing;
|
using Robust.Shared.Timing;
|
||||||
|
|
||||||
@@ -22,17 +23,18 @@ public abstract partial class SharedBuckleSystem : EntitySystem
|
|||||||
[Dependency] private readonly ISharedAdminLogManager _adminLogger = default!;
|
[Dependency] private readonly ISharedAdminLogManager _adminLogger = default!;
|
||||||
[Dependency] private readonly ISharedPlayerManager _playerManager = default!;
|
[Dependency] private readonly ISharedPlayerManager _playerManager = default!;
|
||||||
|
|
||||||
[Dependency] protected readonly SharedAppearanceSystem AppearanceSystem = default!;
|
|
||||||
[Dependency] protected readonly ActionBlockerSystem ActionBlockerSystem = default!;
|
[Dependency] protected readonly ActionBlockerSystem ActionBlockerSystem = default!;
|
||||||
[Dependency] private readonly SharedTransformSystem _transformSystem = default!;
|
|
||||||
[Dependency] private readonly SharedContainerSystem _containerSystem = default!;
|
|
||||||
[Dependency] private readonly SharedInteractionSystem _interactionSystem = default!;
|
|
||||||
[Dependency] private readonly SharedAudioSystem _audioSystem = default!;
|
|
||||||
[Dependency] private readonly SharedPopupSystem _popupSystem = default!;
|
|
||||||
[Dependency] private readonly SharedPullingSystem _pullingSystem = default!;
|
|
||||||
[Dependency] private readonly StandingStateSystem _standingSystem = default!;
|
|
||||||
[Dependency] private readonly AlertsSystem _alertsSystem = default!;
|
[Dependency] private readonly AlertsSystem _alertsSystem = default!;
|
||||||
[Dependency] private readonly MobStateSystem _mobStateSystem = default!;
|
[Dependency] private readonly MobStateSystem _mobStateSystem = default!;
|
||||||
|
[Dependency] protected readonly SharedAppearanceSystem AppearanceSystem = default!;
|
||||||
|
[Dependency] private readonly SharedAudioSystem _audioSystem = default!;
|
||||||
|
[Dependency] private readonly SharedContainerSystem _containerSystem = default!;
|
||||||
|
[Dependency] private readonly SharedInteractionSystem _interactionSystem = default!;
|
||||||
|
[Dependency] private readonly SharedJointSystem _joints = default!;
|
||||||
|
[Dependency] private readonly SharedPopupSystem _popupSystem = default!;
|
||||||
|
[Dependency] private readonly SharedPullingSystem _pullingSystem = default!;
|
||||||
|
[Dependency] private readonly SharedTransformSystem _transformSystem = default!;
|
||||||
|
[Dependency] private readonly StandingStateSystem _standingSystem = default!;
|
||||||
|
|
||||||
/// <inheritdoc/>
|
/// <inheritdoc/>
|
||||||
public override void Initialize()
|
public override void Initialize()
|
||||||
@@ -71,6 +73,7 @@ public abstract partial class SharedBuckleSystem : EntitySystem
|
|||||||
return;
|
return;
|
||||||
|
|
||||||
_transformSystem.SetLocalRotation(buckleUid, Angle.Zero, buckleTransform);
|
_transformSystem.SetLocalRotation(buckleUid, Angle.Zero, buckleTransform);
|
||||||
|
_joints.RefreshRelay(buckleUid, strapUid);
|
||||||
|
|
||||||
switch (strapComp.Position)
|
switch (strapComp.Position)
|
||||||
{
|
{
|
||||||
|
|||||||
Reference in New Issue
Block a user