PressureImmunity StatusEffects (#43667)

* PressureImmunityStatusEffects

* System

* fix

* fix 2

* oops

* review

* review

* fix

* Update PressureImmunityStatusEffectSystem.cs

* PermanentStatusEffectsSystem

* fix

* oops

Author: Pok27

Content.Server/Atmos/Components/PressureImmunityComponent.cs

@@ -0,0 +1,7 @@
+namespace Content.Server.Atmos.Components;
+
+/// <summary>
+/// Grants immunity to barotrauma while present either as a direct component or as a status effect.
+/// </summary>
+[RegisterComponent]
+public sealed partial class PressureImmunityStatusEffectComponent : Component;

Content.Server/Atmos/Components/PressureImmunityStatusEffectComponent.cs

@@ -18,7 +18,7 @@ public sealed partial class BarotraumaSystem : EntitySystem
         [Dependency] private AtmosphereSystem _atmosphereSystem = default!;
         [Dependency] private DamageableSystem _damageableSystem = default!;
         [Dependency] private AlertsSystem _alertsSystem = default!;
-        [Dependency] private IAdminLogManager _adminLogger= default!;
+        [Dependency] private IAdminLogManager _adminLogger = default!;
         [Dependency] private InventorySystem _inventorySystem = default!;
 
         private const float UpdateTimer = 1f;
@@ -28,27 +28,14 @@ public override void Initialize()
         {
             SubscribeLocalEvent<PressureProtectionComponent, GotEquippedEvent>(OnPressureProtectionEquipped);
             SubscribeLocalEvent<PressureProtectionComponent, GotUnequippedEvent>(OnPressureProtectionUnequipped);
-            SubscribeLocalEvent<PressureProtectionComponent, ComponentInit>(OnUpdateResistance);
+            SubscribeLocalEvent<PressureProtectionComponent, ComponentStartup>(OnUpdateResistance);
             SubscribeLocalEvent<PressureProtectionComponent, ComponentRemove>(OnUpdateResistance);
-
-            SubscribeLocalEvent<PressureImmunityComponent, ComponentInit>(OnPressureImmuneInit);
-            SubscribeLocalEvent<PressureImmunityComponent, ComponentRemove>(OnPressureImmuneRemove);
         }
 
-        private void OnPressureImmuneInit(EntityUid uid, PressureImmunityComponent pressureImmunity, ComponentInit args)
+        [SubscribeLocalEvent]
+        private void OnBarotraumaInit(Entity<BarotraumaComponent> ent, ref MapInitEvent args)
         {
-            if (TryComp<BarotraumaComponent>(uid, out var barotrauma))
-            {
-                barotrauma.HasImmunity = true;
-            }
-        }
-
-        private void OnPressureImmuneRemove(EntityUid uid, PressureImmunityComponent pressureImmunity, ComponentRemove args)
-        {
-            if (TryComp<BarotraumaComponent>(uid, out var barotrauma))
-            {
-                barotrauma.HasImmunity = false;
-            }
+            RefreshPressureImmunity(ent, ent.Comp);
         }
 
         /// <summary>
@@ -168,6 +155,19 @@ public float GetFeltHighPressure(EntityUid uid, BarotraumaComponent barotrauma,
             return Math.Max(modified, Atmospherics.OneAtmosphere);
         }
 
+        /// <summary>
+        /// Refreshes whether the entity is immune to pressure damage.
+        /// </summary>
+        public void RefreshPressureImmunity(EntityUid uid, BarotraumaComponent? barotrauma = null)
+        {
+            if (!Resolve(uid, ref barotrauma, false))
+                return;
+
+            var ev = new RefreshPressureImmunityEvent();
+            RaiseLocalEvent(uid, ref ev);
+            barotrauma.HasImmunity = ev.IsImmune;
+        }
+
         public bool TryGetPressureProtectionValues(
             Entity<PressureProtectionComponent?> ent,
             [NotNullWhen(true)] out float? highMultiplier,

Content.Server/Atmos/EntitySystems/BarotraumaSystem.cs

@@ -0,0 +1,34 @@
+using Content.Server.Atmos.Components;
+using Content.Shared.Atmos;
+using Content.Shared.StatusEffectNew;
+using Robust.Shared.Prototypes;
+
+namespace Content.Server.Atmos.EntitySystems;
+
+/// <summary>
+/// Responds to pressure immunity refreshes for the active status effect.
+/// </summary>
+public sealed partial class PressureImmunityStatusEffectSystem : EntitySystem
+{
+    public static readonly EntProtoId PressureImmunityEffect = "StatusEffectPressureImmunity";
+
+    [Dependency] private BarotraumaSystem _barotrauma = default!;
+
+    [SubscribeLocalEvent]
+    private void OnPressureImmunityStatusApplied(Entity<PressureImmunityStatusEffectComponent> ent, ref StatusEffectAppliedEvent args)
+    {
+        _barotrauma.RefreshPressureImmunity(args.Target);
+    }
+
+    [SubscribeLocalEvent]
+    private void OnPressureImmunityStatusRemoved(Entity<PressureImmunityStatusEffectComponent> ent, ref StatusEffectRemovedEvent args)
+    {
+        _barotrauma.RefreshPressureImmunity(args.Target);
+    }
+
+    [SubscribeLocalEvent]
+    private void OnRefreshPressureImmunity(Entity<PressureImmunityStatusEffectComponent> ent, ref StatusEffectRelayedEvent<RefreshPressureImmunityEvent> args)
+    {
+        args.Args = args.Args with { IsImmune = true };
+    }
+}

Content.Server/Atmos/EntitySystems/PressureImmunityStatusEffectSystem.cs

@@ -0,0 +1,10 @@
+namespace Content.Shared.Atmos;
+
+/// <summary>
+/// Raised on an entity to refresh whether it is currently immune to pressure damage.
+/// </summary>
+[ByRefEvent]
+public record struct RefreshPressureImmunityEvent
+{
+    public bool IsImmune;
+}

Content.Shared/Atmos/RefreshPressureImmunityEvent.cs

@@ -13,5 +13,5 @@ public sealed partial class PermanentStatusEffectsComponent : Component
     /// The status effects to apply.
     /// </summary>
     [DataField(required: true)]
-    public HashSet<EntProtoId> StatusEffects = new();
+    public HashSet<EntProtoId> StatusEffects = [];
 }

Content.Shared/StatusEffectNew/Components/PermanentStatusEffectsComponent.cs

@@ -1,4 +1,5 @@
 using Content.Shared.Body.Events;
+using Content.Shared.Atmos;
 using Content.Shared.Chat;
 using Content.Shared.Damage.Events;
 using Content.Shared.Damage.Systems;
@@ -51,6 +52,7 @@ private void InitializeRelay()
 
         SubscribeLocalEvent<StatusEffectContainerComponent, BleedModifierEvent>(RefRelayStatusEffectEvent);
         SubscribeLocalEvent<StatusEffectContainerComponent, DamageModifyEvent>(RelayStatusEffectEvent);
+        SubscribeLocalEvent<StatusEffectContainerComponent, RefreshPressureImmunityEvent>(RefRelayStatusEffectEvent);
     }
 
     private void RefRelayStatusEffectEvent<T>(EntityUid uid, StatusEffectContainerComponent component, ref T args) where T : struct

Content.Shared/StatusEffectNew/StatusEffectSystem.Relay.cs

@@ -5,7 +5,6 @@ entity-effect-status-effect-SeeingRainbows = hallucinations
 entity-effect-status-effect-Stutter = stuttering
 entity-effect-status-effect-ForcedSleep = unconsciousness
 entity-effect-status-effect-Drunk = drunkenness
-entity-effect-status-effect-PressureImmunity = pressure immunity
 entity-effect-status-effect-Pacified = combat pacification
 entity-effect-status-effect-StaminaModifier = modified stamina
 entity-effect-status-effect-RadiationProtection = radiation protection

Resources/Locale/en-US/guidebook/entity-effects/statuseffects.ftl

@@ -72,7 +72,6 @@
   - type: StatusEffects
     allowed:
     - Electrocution
-    - PressureImmunity
     - Pacified
     - Flashed
     - Adrenaline

Resources/Prototypes/Body/species_base.yml

@@ -3450,7 +3450,9 @@
     tags:
       - DoorBumpOpener
   - type: MovementAlwaysTouching
-  - type: PressureImmunity
+  - type: PermanentStatusEffects
+    statusEffects:
+    - StatusEffectPressureImmunity
   - type: ProtectedFromStepTriggers
   - type: Insulated
   - type: InteractionPopup