Merge branch 'ClothingOps2' of https://github.com/Smugman/Delta-v int…

…o ClothingOps2

Content.Client/_DV/Abilities/Felinid/FelinidSystem.cs

@@ -0,0 +1,5 @@
+using Content.Shared._DV.Abilities.Felinid;
+
+namespace Content.Shared._DV.Abilities.Felinid;
+
+public sealed class FelinidSystem : SharedFelinidSystem;

Content.Server/Chemistry/EntitySystems/InjectorSystem.cs

@@ -1,6 +1,6 @@
-using Content.Server.Abilities.Chitinid;
 using Content.Server.Body.Components;
 using Content.Server.Body.Systems;
+using Content.Shared._DV.Chemistry.Components; // DeltaV
 using Content.Shared.Chemistry;
 using Content.Shared.Chemistry.Components;
 using Content.Shared.Chemistry.Components.SolutionManager;

Content.Server/_DV/Abilities/Chitinid/ChitinidComponent.cs

@@ -1,26 +1,30 @@
 using Content.Shared.Damage;
-using Content.Shared.Damage.Prototypes;
 using Content.Shared.FixedPoint;
-using Robust.Shared.Prototypes;
 using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom;
 
-namespace Content.Server.Abilities.Chitinid;
+namespace Content.Server._DV.Abilities.Chitinid;
 
-[RegisterComponent]
+/// <summary>
+/// Passively heals radiation up to a limit, which then uses <c>ItemCougherComponent</c> to cough up Chitzite.
+/// After that it will heal radiation damage again.
+/// </summary>
+[RegisterComponent, Access(typeof(ChitinidSystem))]
+[AutoGenerateComponentPause]
 public sealed partial class ChitinidComponent : Component
 {
     [DataField]
-    public EntProtoId ChitzitePrototype = "Chitzite";
-
-    [DataField]
-    public EntProtoId ChitziteActionId = "ActionChitzite";
-
-    [DataField]
-    public EntityUid? ChitziteAction;
+    public FixedPoint2 AmountAbsorbed = 0f;
 
+    /// <summary>
+    /// Once this much damage is absorbed, it will stop healing and require you to cough up chitzite.
+    /// </summary>
     [DataField]
-    public FixedPoint2 AmountAbsorbed = 0f;
+    public FixedPoint2 MaximumAbsorbed = 30f;
 
+    /// <summary>
+    /// What damage is healed, by adding, every <see cref="UpdateInterval"/>.
+    /// This must be negative.
+    /// </summary>
     [DataField]
     public DamageSpecifier Healing = new()
     {
@@ -30,12 +34,10 @@ public sealed partial class ChitinidComponent : Component
         }
     };
 
-    [DataField]
-    public FixedPoint2 MaximumAbsorbed = 30f;
-
     [DataField]
     public TimeSpan UpdateInterval = TimeSpan.FromSeconds(1);
 
     [DataField(customTypeSerializer: typeof(TimeOffsetSerializer))]
+    [AutoPausedField]
     public TimeSpan NextUpdate;
 }