StaminaSystem to SharedStaminaSystem (#37199)
* Init Commit * Partial class * Hands system slipped through
This commit is contained in:
committed by
GitHub
parent
ef881fe655
commit
9c165cb5a0
7
Content.Client/Damage/Systems/StaminaSystem.cs
Normal file
7
Content.Client/Damage/Systems/StaminaSystem.cs
Normal file
@@ -0,0 +1,7 @@
|
||||
using Content.Shared.Damage.Systems;
|
||||
|
||||
namespace Content.Client.Damage.Systems;
|
||||
|
||||
public sealed partial class StaminaSystem : SharedStaminaSystem
|
||||
{
|
||||
}
|
||||
7
Content.Server/Damage/Systems/StaminaSystem.cs
Normal file
7
Content.Server/Damage/Systems/StaminaSystem.cs
Normal file
@@ -0,0 +1,7 @@
|
||||
using Content.Shared.Damage.Systems;
|
||||
|
||||
namespace Content.Server.Damage.Systems;
|
||||
|
||||
public sealed partial class StaminaSystem : SharedStaminaSystem
|
||||
{
|
||||
}
|
||||
@@ -52,7 +52,7 @@ namespace Content.Server.Hands.Systems
|
||||
{
|
||||
base.Initialize();
|
||||
|
||||
SubscribeLocalEvent<HandsComponent, DisarmedEvent>(OnDisarmed, before: new[] {typeof(StunSystem), typeof(StaminaSystem)});
|
||||
SubscribeLocalEvent<HandsComponent, DisarmedEvent>(OnDisarmed, before: new[] {typeof(StunSystem), typeof(SharedStaminaSystem)});
|
||||
|
||||
SubscribeLocalEvent<HandsComponent, PullStartedMessage>(HandlePullStarted);
|
||||
SubscribeLocalEvent<HandsComponent, PullStoppedMessage>(HandlePullStopped);
|
||||
|
||||
@@ -33,7 +33,7 @@ public sealed partial class GunSystem : SharedGunSystem
|
||||
[Dependency] private readonly DamageExamineSystem _damageExamine = default!;
|
||||
[Dependency] private readonly PricingSystem _pricing = default!;
|
||||
[Dependency] private readonly SharedColorFlashEffectSystem _color = default!;
|
||||
[Dependency] private readonly StaminaSystem _stamina = default!;
|
||||
[Dependency] private readonly SharedStaminaSystem _stamina = default!;
|
||||
[Dependency] private readonly SharedContainerSystem _container = default!;
|
||||
[Dependency] private readonly PowerCellSystem _powerCell = default!;
|
||||
[Dependency] private readonly SharedMapSystem _map = default!;
|
||||
|
||||
@@ -9,7 +9,7 @@ namespace Content.Shared.Damage.Components;
|
||||
[RegisterComponent]
|
||||
[NetworkedComponent]
|
||||
[AutoGenerateComponentState]
|
||||
[Access(typeof(StaminaSystem))]
|
||||
[Access(typeof(SharedStaminaSystem))]
|
||||
public sealed partial class StaminaDamageOnEmbedComponent : Component
|
||||
{
|
||||
[ViewVariables(VVAccess.ReadWrite), DataField, AutoNetworkedField]
|
||||
|
||||
@@ -6,7 +6,7 @@ namespace Content.Shared.Damage.Components;
|
||||
/// <summary>
|
||||
/// Multiplies the entity's <see cref="StaminaComponent.StaminaDamage"/> by the <see cref="Modifier"/>.
|
||||
/// </summary>
|
||||
[RegisterComponent, NetworkedComponent, AutoGenerateComponentState, Access(typeof(StaminaSystem))]
|
||||
[RegisterComponent, NetworkedComponent, AutoGenerateComponentState, Access(typeof(SharedStaminaSystem))]
|
||||
public sealed partial class StaminaModifierComponent : Component
|
||||
{
|
||||
/// <summary>
|
||||
|
||||
@@ -2,7 +2,7 @@ using Content.Shared.Damage.Components;
|
||||
|
||||
namespace Content.Shared.Damage.Systems;
|
||||
|
||||
public sealed partial class StaminaSystem
|
||||
public partial class SharedStaminaSystem
|
||||
{
|
||||
private void InitializeModifier()
|
||||
{
|
||||
@@ -5,7 +5,7 @@ using Content.Shared.Inventory;
|
||||
|
||||
namespace Content.Shared.Damage.Systems;
|
||||
|
||||
public sealed partial class StaminaSystem
|
||||
public partial class SharedStaminaSystem
|
||||
{
|
||||
private void InitializeResistance()
|
||||
{
|
||||
@@ -24,7 +24,7 @@ using Robust.Shared.Timing;
|
||||
|
||||
namespace Content.Shared.Damage.Systems;
|
||||
|
||||
public sealed partial class StaminaSystem : EntitySystem
|
||||
public abstract partial class SharedStaminaSystem : EntitySystem
|
||||
{
|
||||
[Dependency] private readonly IGameTiming _timing = default!;
|
||||
[Dependency] private readonly INetManager _net = default!;
|
||||
@@ -32,7 +32,7 @@ public abstract class SharedEnsnareableSystem : EntitySystem
|
||||
[Dependency] private readonly SharedDoAfterSystem _doAfter = default!;
|
||||
[Dependency] private readonly SharedHandsSystem _hands = default!;
|
||||
[Dependency] protected readonly SharedPopupSystem Popup = default!;
|
||||
[Dependency] private readonly StaminaSystem _stamina = default!;
|
||||
[Dependency] private readonly SharedStaminaSystem _stamina = default!;
|
||||
|
||||
public override void Initialize()
|
||||
{
|
||||
|
||||
@@ -60,7 +60,7 @@ public abstract class SharedMeleeWeaponSystem : EntitySystem
|
||||
[Dependency] private readonly SharedPhysicsSystem _physics = default!;
|
||||
[Dependency] protected readonly SharedPopupSystem PopupSystem = default!;
|
||||
[Dependency] protected readonly SharedTransformSystem TransformSystem = default!;
|
||||
[Dependency] private readonly StaminaSystem _stamina = default!;
|
||||
[Dependency] private readonly SharedStaminaSystem _stamina = default!;
|
||||
|
||||
private const int AttackMask = (int) (CollisionGroup.MobMask | CollisionGroup.Opaque);
|
||||
|
||||
|
||||
Reference in New Issue
Block a user