StaminaSystem to SharedStaminaSystem (#37199)

* Init Commit

* Partial class

* Hands system slipped through
This commit is contained in:
Princess Cheeseballs
2025-05-06 09:39:05 -07:00
committed by GitHub
parent ef881fe655
commit 9c165cb5a0
11 changed files with 23 additions and 9 deletions

View File

@@ -0,0 +1,7 @@
using Content.Shared.Damage.Systems;
namespace Content.Client.Damage.Systems;
public sealed partial class StaminaSystem : SharedStaminaSystem
{
}

View File

@@ -0,0 +1,7 @@
using Content.Shared.Damage.Systems;
namespace Content.Server.Damage.Systems;
public sealed partial class StaminaSystem : SharedStaminaSystem
{
}

View File

@@ -52,7 +52,7 @@ namespace Content.Server.Hands.Systems
{ {
base.Initialize(); 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, PullStartedMessage>(HandlePullStarted);
SubscribeLocalEvent<HandsComponent, PullStoppedMessage>(HandlePullStopped); SubscribeLocalEvent<HandsComponent, PullStoppedMessage>(HandlePullStopped);

View File

@@ -33,7 +33,7 @@ public sealed partial class GunSystem : SharedGunSystem
[Dependency] private readonly DamageExamineSystem _damageExamine = default!; [Dependency] private readonly DamageExamineSystem _damageExamine = default!;
[Dependency] private readonly PricingSystem _pricing = default!; [Dependency] private readonly PricingSystem _pricing = default!;
[Dependency] private readonly SharedColorFlashEffectSystem _color = 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 SharedContainerSystem _container = default!;
[Dependency] private readonly PowerCellSystem _powerCell = default!; [Dependency] private readonly PowerCellSystem _powerCell = default!;
[Dependency] private readonly SharedMapSystem _map = default!; [Dependency] private readonly SharedMapSystem _map = default!;

View File

@@ -9,7 +9,7 @@ namespace Content.Shared.Damage.Components;
[RegisterComponent] [RegisterComponent]
[NetworkedComponent] [NetworkedComponent]
[AutoGenerateComponentState] [AutoGenerateComponentState]
[Access(typeof(StaminaSystem))] [Access(typeof(SharedStaminaSystem))]
public sealed partial class StaminaDamageOnEmbedComponent : Component public sealed partial class StaminaDamageOnEmbedComponent : Component
{ {
[ViewVariables(VVAccess.ReadWrite), DataField, AutoNetworkedField] [ViewVariables(VVAccess.ReadWrite), DataField, AutoNetworkedField]

View File

@@ -6,7 +6,7 @@ namespace Content.Shared.Damage.Components;
/// <summary> /// <summary>
/// Multiplies the entity's <see cref="StaminaComponent.StaminaDamage"/> by the <see cref="Modifier"/>. /// Multiplies the entity's <see cref="StaminaComponent.StaminaDamage"/> by the <see cref="Modifier"/>.
/// </summary> /// </summary>
[RegisterComponent, NetworkedComponent, AutoGenerateComponentState, Access(typeof(StaminaSystem))] [RegisterComponent, NetworkedComponent, AutoGenerateComponentState, Access(typeof(SharedStaminaSystem))]
public sealed partial class StaminaModifierComponent : Component public sealed partial class StaminaModifierComponent : Component
{ {
/// <summary> /// <summary>

View File

@@ -2,7 +2,7 @@ using Content.Shared.Damage.Components;
namespace Content.Shared.Damage.Systems; namespace Content.Shared.Damage.Systems;
public sealed partial class StaminaSystem public partial class SharedStaminaSystem
{ {
private void InitializeModifier() private void InitializeModifier()
{ {

View File

@@ -5,7 +5,7 @@ using Content.Shared.Inventory;
namespace Content.Shared.Damage.Systems; namespace Content.Shared.Damage.Systems;
public sealed partial class StaminaSystem public partial class SharedStaminaSystem
{ {
private void InitializeResistance() private void InitializeResistance()
{ {

View File

@@ -24,7 +24,7 @@ using Robust.Shared.Timing;
namespace Content.Shared.Damage.Systems; 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 IGameTiming _timing = default!;
[Dependency] private readonly INetManager _net = default!; [Dependency] private readonly INetManager _net = default!;

View File

@@ -32,7 +32,7 @@ public abstract class SharedEnsnareableSystem : EntitySystem
[Dependency] private readonly SharedDoAfterSystem _doAfter = default!; [Dependency] private readonly SharedDoAfterSystem _doAfter = default!;
[Dependency] private readonly SharedHandsSystem _hands = default!; [Dependency] private readonly SharedHandsSystem _hands = default!;
[Dependency] protected readonly SharedPopupSystem Popup = default!; [Dependency] protected readonly SharedPopupSystem Popup = default!;
[Dependency] private readonly StaminaSystem _stamina = default!; [Dependency] private readonly SharedStaminaSystem _stamina = default!;
public override void Initialize() public override void Initialize()
{ {

View File

@@ -60,7 +60,7 @@ public abstract class SharedMeleeWeaponSystem : EntitySystem
[Dependency] private readonly SharedPhysicsSystem _physics = default!; [Dependency] private readonly SharedPhysicsSystem _physics = default!;
[Dependency] protected readonly SharedPopupSystem PopupSystem = default!; [Dependency] protected readonly SharedPopupSystem PopupSystem = default!;
[Dependency] protected readonly SharedTransformSystem TransformSystem = 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); private const int AttackMask = (int) (CollisionGroup.MobMask | CollisionGroup.Opaque);