New Species: Plasmaman

Content.Client/Lobby/UI/HumanoidProfileEditor.xaml.cs

@@ -18,6 +18,7 @@
 using Content.Shared.Humanoid.Markings;
 using Content.Shared.Humanoid.Prototypes;
 using Content.Shared.Preferences;
+using Content.Shared.Prototypes;
 using Content.Shared.Roles;
 using Content.Shared.StatusIcon;
 using Content.Shared.Traits;
@@ -2024,18 +2025,45 @@ public void UpdateLoadouts(bool? showUnusable = null, bool reload = false)
             _loadouts.Clear();
             foreach (var loadout in _prototypeManager.EnumeratePrototypes<LoadoutPrototype>())
             {
-                var usable = _characterRequirementsSystem.CheckRequirementsValid(
-                    loadout.Requirements,
-                    highJob ?? new JobPrototype(),
-                    Profile ?? HumanoidCharacterProfile.DefaultWithSpecies(),
-                    _requirements.GetRawPlayTimeTrackers(),
-                    _requirements.IsWhitelisted(),
-                    loadout,
-                    _entManager,
-                    _prototypeManager,
-                    _cfgManager,
-                    out _
-                );
+                var groupUsable = loadout.Groups.Count == 0 ? true : false;
+
+                // Check group requirement reasons
+                foreach (var groupID in loadout.Groups)
+                {
+                    if (!_prototypeManager.TryIndex<CharacterItemGroupPrototype>(groupID, out var group))
+                        continue;
+
+                    groupUsable = _characterRequirementsSystem.CheckRequirementsValid(
+                        group.Requirements,
+                        highJob ?? new JobPrototype(),
+                        Profile ?? HumanoidCharacterProfile.DefaultWithSpecies(),
+                        _requirements.GetRawPlayTimeTrackers(),
+                        _requirements.IsWhitelisted(),
+                        loadout,
+                        _entManager,
+                        _prototypeManager,
+                        _cfgManager,
+                        out _
+                    );
+
+                    if (groupUsable)
+                        break;
+                }
+
+                var usable = groupUsable ?
+                    _characterRequirementsSystem.CheckRequirementsValid(
+                        loadout.Requirements,
+                        highJob ?? new JobPrototype(),
+                        Profile ?? HumanoidCharacterProfile.DefaultWithSpecies(),
+                        _requirements.GetRawPlayTimeTrackers(),
+                        _requirements.IsWhitelisted(),
+                        loadout,
+                        _entManager,
+                        _prototypeManager,
+                        _cfgManager,
+                        out _
+                    ) : false;
+
                 _loadouts.Add(loadout, usable);
 
                 var list = _loadoutPreferences.ToList();

Content.Client/Lobby/UI/LoadoutPreferenceSelector.xaml.cs

@@ -11,6 +11,7 @@
 using Content.Shared.Customization.Systems;
 using Content.Shared.Paint;
 using Content.Shared.Preferences;
+using Content.Shared.Prototypes;
 using Content.Shared.Roles;
 using Robust.Client.AutoGenerated;
 using Robust.Client.Graphics;
@@ -233,6 +234,27 @@ void UpdateGuidebook() => GuidebookButton.Visible =
         if (!string.IsNullOrEmpty(loadoutDesc))
             tooltip.Append($"{Loc.GetString(loadoutDesc)}");
 
+        // Get group requirement reasons
+        foreach (var groupID in loadout.Groups)
+        {
+            if (!prototypeManager.TryIndex<CharacterItemGroupPrototype>(groupID, out var group))
+                continue;
+
+            characterRequirementsSystem.CheckRequirementsValid(
+                group.Requirements, highJob, profile, new Dictionary<string, TimeSpan>(),
+                jobRequirementsManager.IsWhitelisted(), group,
+                entityManager, prototypeManager, configManager,
+                out var groupReasons);
+
+            if (groupReasons.Count != 0)
+            {
+                foreach (var groupReason in groupReasons)
+                {
+                    tooltip.Append($"\n{groupReason}");
+                }
+            }
+        }
+
         // Get requirement reasons
         characterRequirementsSystem.CheckRequirementsValid(
             loadout.Requirements, highJob, profile, new Dictionary<string, TimeSpan>(),

Content.Server/Atmos/Components/FlammableComponent.cs

@@ -67,6 +67,13 @@ public sealed partial class FlammableComponent : Component
         [DataField]
         public bool CanExtinguish = true;
 
+        /// <summary>
+        ///     Should the component ignore fire protection when on fire?
+        /// </summary>
+        [ViewVariables(VVAccess.ReadWrite)]
+        [DataField]
+        public bool IgnoreFireProtection = false;
+
         /// <summary>
         ///     How many firestacks should be applied to component when being set on fire?
         /// </summary>

Content.Server/Atmos/Components/IgniteFromGasComponent.cs

@@ -0,0 +1,49 @@
+using Content.Shared.Atmos;
+using Content.Shared.Body.Part;
+
+namespace Content.Server.Atmos.Components;
+
+/// <summary>
+///   Component that can be used to add (or remove) fire stacks when exposed to a type of gas, unless wearing ignition immunity.
+/// </summary>
+[RegisterComponent]
+public sealed partial class IgniteFromGasComponent : Component
+{
+    /// <summary>
+    ///   What type of gas triggers ignition.
+    /// </summary>
+    [DataField(required: true)]
+    public Gas Gas;
+
+    /// <summary>
+    ///   The total calculated fire stacks to apply every second without immunity.
+    ///   This is calculated from BaseFireStacks + the exposed body parts' fire stacks
+    ///   from IgnitableBodyParts.
+    /// </summary>
+    [DataField]
+    public float FireStacks = 0f;
+
+    /// <summary>
+    ///   The base amount of fire stacks to apply every second without immunity.
+    /// </summary>
+    [DataField]
+    public float BaseFireStacks = 0.13f;
+
+    /// <summary>
+    ///   The body parts that are vulnerable to ignition when exposed, and their fire stack values.
+    /// </summary>
+    [ViewVariables(VVAccess.ReadWrite)]
+    public Dictionary<(BodyPartType, BodyPartSymmetry), float> IgnitableBodyParts = default!;
+
+    /// <summary>
+    ///   How many moles of the gas is needed to trigger ignition.
+    /// </summary>
+    [DataField]
+    public float MolesToIgnite = 0.5f;
+
+    /// <summary>
+    ///   Whether the entity is currently immune to ignition.
+    /// </summary>
+    [ViewVariables(VVAccess.ReadWrite)]
+    public bool HasImmunity = false;
+}

Content.Server/Atmos/Components/IgniteFromGasImmunityComponent.cs

@@ -0,0 +1,10 @@
+
+namespace Content.Server.Atmos.Components;
+
+/// <summary>
+///   Component that is used on clothing to prevent ignition when exposed to a specific gas.
+/// </summary>
+[RegisterComponent]
+public sealed partial class IgniteFromGasImmunityComponent : Component
+{
+}

Content.Server/Atmos/Components/IgniteFromGasPartComponent.cs

@@ -0,0 +1,23 @@
+using Content.Shared.Atmos;
+
+namespace Content.Server.Atmos.Components;
+
+/// <summary>
+///   Component that can be used on body parts to add fire stacks and trigger ignition
+///   when the body part is exposed to a type of gas, unless wearing ignition immunity.
+/// </summary>
+[RegisterComponent]
+public sealed partial class IgniteFromGasPartComponent : Component
+{
+    /// <summary>
+    ///   What type of gas triggers ignition.
+    /// </summary>
+    [DataField(required: true)]
+    public Gas Gas;
+
+    /// <summary>
+    ///   How many fire stacks this body part applies when exposed.
+    /// </summary>
+    [DataField]
+    public float FireStacks = 0.02f;
+}

Content.Server/Atmos/EntitySystems/AtmosphereSystem.BreathTool.cs

@@ -10,21 +10,21 @@ private void InitializeBreathTool()
         SubscribeLocalEvent<BreathToolComponent, ComponentShutdown>(OnBreathToolShutdown);
     }
 
-    private void OnBreathToolShutdown(EntityUid uid, BreathToolComponent component, ComponentShutdown args)
+    private void OnBreathToolShutdown(Entity<BreathToolComponent> entity, ref ComponentShutdown args)
     {
-        DisconnectInternals(component);
+        DisconnectInternals(entity);
     }
 
-    public void DisconnectInternals(BreathToolComponent component)
+    public void DisconnectInternals(Entity<BreathToolComponent> entity)
     {
-        var old = component.ConnectedInternalsEntity;
-        component.ConnectedInternalsEntity = null;
+        var old = entity.Comp.ConnectedInternalsEntity;
+        entity.Comp.ConnectedInternalsEntity = null;
 
         if (TryComp<InternalsComponent>(old, out var internalsComponent))
         {
-            _internals.DisconnectBreathTool((old.Value, internalsComponent));
+            _internals.DisconnectBreathTool((old.Value, internalsComponent), entity.Owner);
         }
 
-        component.IsFunctional = false;
+        entity.Comp.IsFunctional = false;
     }
 }

Content.Server/Atmos/EntitySystems/FlammableSystem.cs

@@ -310,14 +310,15 @@ public void Extinguish(EntityUid uid, FlammableComponent? flammable = null)
             _adminLogger.Add(LogType.Flammable, $"{ToPrettyString(uid):entity} stopped being on fire damage");
             flammable.OnFire = false;
             flammable.FireStacks = 0;
+            flammable.IgnoreFireProtection = false;
 
             _ignitionSourceSystem.SetIgnited(uid, false);
 
             UpdateAppearance(uid, flammable);
         }
 
         public void Ignite(EntityUid uid, EntityUid ignitionSource, FlammableComponent? flammable = null,
-            EntityUid? ignitionSourceUser = null)
+            EntityUid? ignitionSourceUser = null, bool ignoreFireProtection = false)
         {
             if (!Resolve(uid, ref flammable))
                 return;
@@ -336,6 +337,9 @@ public void Ignite(EntityUid uid, EntityUid ignitionSource, FlammableComponent?
                 flammable.OnFire = true;
             }
 
+            if (ignoreFireProtection)
+                flammable.IgnoreFireProtection = ignoreFireProtection;
+
             UpdateAppearance(uid, flammable);
         }
 
@@ -382,7 +386,7 @@ public void Resist(EntityUid uid,
             uid.SpawnTimer(2000, () =>
             {
                 flammable.Resisting = false;
-                flammable.FireStacks -= 1f;
+                flammable.FireStacks -= flammable.FirestackFade * 10f;
                 UpdateAppearance(uid, flammable);
             });
         }
@@ -448,14 +452,20 @@ public override void Update(float frameTime)
                     if (TryComp(uid, out TemperatureComponent? temp))
                         _temperatureSystem.ChangeHeat(uid, 12500 * flammable.FireStacks, false, temp);
 
-                    var ev = new GetFireProtectionEvent();
-                    // let the thing on fire handle it
-                    RaiseLocalEvent(uid, ref ev);
-                    // and whatever it's wearing
-                    if (_inventoryQuery.TryComp(uid, out var inv))
-                        _inventory.RelayEvent((uid, inv), ref ev);
+                    var multiplier = 1f;
+                    if (!flammable.IgnoreFireProtection)
+                    {
+                        var ev = new GetFireProtectionEvent();
+                        // let the thing on fire handle it
+                        RaiseLocalEvent(uid, ref ev);
+                        // and whatever it's wearing
+                        if (_inventoryQuery.TryComp(uid, out var inv))
+                            _inventory.RelayEvent((uid, inv), ref ev);
+
+                        multiplier = ev.Multiplier;
+                    }
 
-                    _damageableSystem.TryChangeDamage(uid, flammable.Damage * flammable.FireStacks * ev.Multiplier, interruptsDoAfters: false);
+                    _damageableSystem.TryChangeDamage(uid, flammable.Damage * flammable.FireStacks * multiplier, interruptsDoAfters: false);
 
                     AdjustFireStacks(uid, flammable.FirestackFade * (flammable.Resisting ? 10f : 1f), flammable);
                 }

Content.Server/Atmos/EntitySystems/GasTankSystem.cs

@@ -220,7 +220,7 @@ public GasMixture RemoveAirVolume(Entity<GasTankComponent> gasTank, float volume
         public bool CanConnectToInternals(GasTankComponent component)
         {
             var internals = GetInternalsComponent(component, component.User);
-            return internals != null && internals.BreathToolEntity != null && !component.IsValveOpen;
+            return internals != null && internals.BreathTools.Count != 0 && !component.IsValveOpen;
         }
 
         public void ConnectToInternals(Entity<GasTankComponent> ent)