Merge branch 'Fansana:master' into Nikko-Items

.github/workflows/publish-stable.yml

@@ -1,12 +1,10 @@
-name: Publish
+name: Publish stable
 
 concurrency:
   group: publish
 
 on:
   workflow_dispatch:
-  schedule:
-    - cron: '0 6 * * *'
 
 jobs:
   build:

.github/workflows/publish-testing.yml

@@ -1,4 +1,4 @@
-name: Publish
+name: Publish test
 
 concurrency:
   group: publish

Content.Client/Clothing/ClientClothingSystem.cs

@@ -1,9 +1,12 @@
 using System.Diagnostics.CodeAnalysis;
 using System.Linq;
+using System.Numerics;
+using Content.Client.DisplacementMap;
 using Content.Client.Inventory;
 using Content.Shared.Clothing;
 using Content.Shared.Clothing.Components;
 using Content.Shared.Clothing.EntitySystems;
+using Content.Shared.DisplacementMap;
 using Content.Shared.Humanoid;
 using Content.Shared.Inventory;
 using Content.Shared.Inventory.Events;
@@ -49,6 +52,7 @@ public sealed class ClientClothingSystem : ClothingSystem
     [Dependency] private readonly IResourceCache _cache = default!;
     [Dependency] private readonly ISerializationManager _serialization = default!;
     [Dependency] private readonly InventorySystem _inventorySystem = default!;
+    [Dependency] private readonly DisplacementMapSystem _displacement = default!;
 
     public override void Initialize()
     {
@@ -63,15 +67,14 @@ public override void Initialize()
 
     private void OnAppearanceUpdate(EntityUid uid, InventoryComponent component, ref AppearanceChangeEvent args)
     {
-        // May need to update jumpsuit stencils if the sex changed. Also required to properly set the stencil on init
+        // May need to update displacement maps if the sex changed. Also required to properly set the stencil on init
         if (args.Sprite == null)
             return;
 
-        if (_inventorySystem.TryGetSlotEntity(uid, Jumpsuit, out var suit, component)
-            && TryComp(suit, out ClothingComponent? clothing))
+        var enumerator = _inventorySystem.GetSlotEnumerator((uid, component));
+        while (enumerator.NextItem(out var item, out var slot))
         {
-            SetGenderedMask(uid, args.Sprite, clothing);
-            return;
+            RenderEquipment(uid, item, slot.Name, component);
         }
 
         // No clothing equipped -> make sure the layer is hidden, though this should already be handled by on-unequip.
@@ -113,6 +116,7 @@ private void OnGetVisuals(EntityUid uid, ClothingComponent item, GetEquipmentVis
                 i++;
             }
 
+            item.MappedLayer = key;
             args.Layers.Add((key, layer));
         }
     }
@@ -153,13 +157,9 @@ private bool TryGetDefaultVisuals(EntityUid uid, ClothingComponent clothing, str
 
         // species specific
         if (speciesId != null && rsi.TryGetState($"{state}-{speciesId}", out _))
-        {
             state = $"{state}-{speciesId}";
-        }
         else if (!rsi.TryGetState(state, out _))
-        {
             return false;
-        }
 
         var layer = new PrototypeLayerData();
         layer.RsiPath = rsi.Path.ToString();
@@ -181,14 +181,6 @@ private void OnVisualsChanged(EntityUid uid, InventoryComponent component, Visua
 
     private void OnDidUnequip(EntityUid uid, SpriteComponent component, DidUnequipEvent args)
     {
-        // Hide jumpsuit mask layer.
-        if (args.Slot == Jumpsuit
-            && TryComp(uid, out SpriteComponent? sprite)
-            && sprite.LayerMapTryGet(HumanoidVisualLayers.StencilMask, out var maskLayer))
-        {
-                sprite.LayerSetVisible(maskLayer, false);
-        }
-
         if (!TryComp(uid, out InventorySlotsComponent? inventorySlots))
             return;
 
@@ -233,9 +225,6 @@ private void RenderEquipment(EntityUid equipee, EntityUid equipment, string slot
             return;
         }
 
-        if (slot == Jumpsuit)
-            SetGenderedMask(equipee, sprite, clothingComponent);
-
         if (!_inventorySystem.TryGetSlot(equipee, slot, out var slotDef, inventory))
             return;
 
@@ -267,7 +256,25 @@ private void RenderEquipment(EntityUid equipee, EntityUid equipment, string slot
         // temporary, until layer draw depths get added. Basically: a layer with the key "slot" is being used as a
         // bookmark to determine where in the list of layers we should insert the clothing layers.
         bool slotLayerExists = sprite.LayerMapTryGet(slot, out var index);
-        var displacementData = inventory.Displacements.GetValueOrDefault(slot);
+
+        // Select displacement maps
+        var displacementData = inventory.Displacements.GetValueOrDefault(slot); //Default unsexed map
+
+        var equipeeSex = CompOrNull<HumanoidAppearanceComponent>(equipee)?.Sex;
+        if (equipeeSex != null)
+        {
+            switch (equipeeSex)
+            {
+                case Sex.Male:
+                    if (inventory.MaleDisplacements.Count > 0)
+                        displacementData = inventory.MaleDisplacements.GetValueOrDefault(slot);
+                    break;
+                case Sex.Female:
+                    if (inventory.FemaleDisplacements.Count > 0)
+                        displacementData = inventory.FemaleDisplacements.GetValueOrDefault(slot);
+                    break;
+            }
+        }
 
         // add the new layers
         foreach (var (key, layerData) in ev.Layers)
@@ -287,12 +294,14 @@ private void RenderEquipment(EntityUid equipee, EntityUid equipment, string slot
 
                 if (layerData.Color != null)
                     sprite.LayerSetColor(key, layerData.Color.Value);
+                if (layerData.Scale != null)
+                    sprite.LayerSetScale(key, layerData.Scale.Value);
             }
             else
                 index = sprite.LayerMapReserveBlank(key);
 
             if (sprite[index] is not Layer layer)
-                return;
+                continue;
 
             // In case no RSI is given, use the item's base RSI as a default. This cuts down on a lot of unnecessary yaml entries.
             if (layerData.RsiPath == null
@@ -303,78 +312,19 @@ private void RenderEquipment(EntityUid equipee, EntityUid equipment, string slot
                 layer.SetRsi(clothingSprite.BaseRSI);
             }
 
-            // Another "temporary" fix for clothing stencil masks.
-            // Sprite layer redactor when
-            // Sprite "redactor" just a week away.
-            if (slot == Jumpsuit)
-                layerData.Shader ??= "StencilDraw";
-
             sprite.LayerSetData(index, layerData);
             layer.Offset += slotDef.Offset;
 
-            if (displacementData != null)
+            if (displacementData is not null)
             {
-                if (displacementData.ShaderOverride != null)
-                    sprite.LayerSetShader(index, displacementData.ShaderOverride);
-
-                var displacementKey = $"{key}-displacement";
-                if (!revealedLayers.Add(displacementKey))
-                {
-                    Log.Warning($"Duplicate key for clothing visuals DISPLACEMENT: {displacementKey}.");
+                //Checking that the state is not tied to the current race. In this case we don't need to use the displacement maps.
+                if (layerData.State is not null && inventory.SpeciesId is not null && layerData.State.EndsWith(inventory.SpeciesId))
                     continue;
-                }
-
-                var displacementLayer = _serialization.CreateCopy(displacementData.Layer, notNullableOverride: true);
-                displacementLayer.CopyToShaderParameters!.LayerKey = key;
-
-                // Add before main layer for this item.
-                sprite.AddLayer(displacementLayer, index);
-                sprite.LayerMapSet(displacementKey, index);
 
-                revealedLayers.Add(displacementKey);
+                _displacement.TryAddDisplacement(displacementData, sprite, index, key, revealedLayers);
             }
         }
 
         RaiseLocalEvent(equipment, new EquipmentVisualsUpdatedEvent(equipee, slot, revealedLayers), true);
     }
-
-
-    /// <summary>
-    ///     Sets a sprite's gendered mask based on gender (obviously).
-    /// </summary>
-    /// <param name="sprite">Sprite to modify</param>
-    /// <param name="humanoid">Humanoid, to get gender from</param>
-    /// <param name="clothing">Clothing component, to get mask sprite type</param>
-    private void SetGenderedMask(EntityUid uid, SpriteComponent sprite, ClothingComponent clothing)
-    {
-        if (!sprite.LayerMapTryGet(HumanoidVisualLayers.StencilMask, out var layer))
-            return;
-
-        ClothingMask mask;
-        string prefix;
-
-        switch (CompOrNull<HumanoidAppearanceComponent>(uid)?.Sex)
-        {
-            case Sex.Male:
-                mask = clothing.MaleMask;
-                prefix = "male_";
-                break;
-            case Sex.Female:
-                mask = clothing.FemaleMask;
-                prefix = "female_";
-                break;
-            default:
-                mask = clothing.UnisexMask;
-                prefix = "unisex_";
-                break;
-        }
-
-        sprite.LayerSetState(layer, mask switch
-        {
-            ClothingMask.NoMask => $"{prefix}none",
-            ClothingMask.UniformTop => $"{prefix}top",
-            _ => $"{prefix}full",
-        });
-        sprite.LayerSetVisible(layer, true);
-    }
 }

Content.Client/Consent/UI/Windows/ConsentWindow.xaml.cs

@@ -37,6 +37,14 @@ public ConsentWindow()
         ConsentFreetext.OnTextChanged += _ => UnsavedChanges();
     }
 
+    protected override void Dispose(bool disposing)
+    {
+        base.Dispose(disposing);
+
+        if (disposing)
+            _consentManager.OnServerDataLoaded -= UpdateUi;
+    }
+
     private PlayerConsentSettings GetSettings()
     {
         var text = Rope.Collapse(ConsentFreetext.TextRope);
@@ -145,8 +153,8 @@ public void UpdateUi()
 
         ConsentFreetext.TextRope = new Rope.Leaf(consent.Freetext);
 
-        if (ConsentList.ChildCount > 0)
-            ConsentList.RemoveAllChildren();
+        ConsentList.RemoveAllChildren();
+
         _entries.Clear();
 
         var consentprototypelist = _protoManager.EnumeratePrototypes<ConsentTogglePrototype>();

Content.Client/DisplacementMap/DisplacementMapSystem.cs

@@ -0,0 +1,65 @@
+using Content.Shared.DisplacementMap;
+using Robust.Client.GameObjects;
+using Robust.Client.Graphics;
+using Robust.Shared.Serialization.Manager;
+
+namespace Content.Client.DisplacementMap;
+
+public sealed class DisplacementMapSystem : EntitySystem
+{
+    [Dependency] private readonly ISerializationManager _serialization = default!;
+
+    public bool TryAddDisplacement(DisplacementData data, SpriteComponent sprite, int index, string key, HashSet<string> revealedLayers)
+    {
+        if (data.ShaderOverride != null)
+            sprite.LayerSetShader(index, data.ShaderOverride);
+
+        var displacementKey = $"{key}-displacement";
+        if (!revealedLayers.Add(displacementKey))
+        {
+            Log.Warning($"Duplicate key for DISPLACEMENT: {displacementKey}.");
+            return false;
+        }
+
+        //allows you not to write it every time in the YML
+        foreach (var pair in data.SizeMaps)
+        {
+            pair.Value.CopyToShaderParameters??= new()
+            {
+                LayerKey = "dummy",
+                ParameterTexture = "displacementMap",
+                ParameterUV = "displacementUV",
+            };
+        }
+
+        if (!data.SizeMaps.ContainsKey(32))
+        {
+            Log.Error($"DISPLACEMENT: {displacementKey} don't have 32x32 default displacement map");
+            return false;
+        }
+
+        // We choose a displacement map from the possible ones, matching the size with the original layer size.
+        // If there is no such a map, we use a standard 32 by 32 one
+        var displacementDataLayer = data.SizeMaps[EyeManager.PixelsPerMeter];
+        var actualRSI = sprite.LayerGetActualRSI(index);
+        if (actualRSI is not null)
+        {
+            if (actualRSI.Size.X != actualRSI.Size.Y)
+                Log.Warning($"DISPLACEMENT: {displacementKey} has a resolution that is not 1:1, things can look crooked");
+
+            var layerSize = actualRSI.Size.X;
+            if (data.SizeMaps.ContainsKey(layerSize))
+                displacementDataLayer = data.SizeMaps[layerSize];
+        }
+
+        var displacementLayer = _serialization.CreateCopy(displacementDataLayer, notNullableOverride: true);
+        displacementLayer.CopyToShaderParameters!.LayerKey = key;
+
+        sprite.AddLayer(displacementLayer, index);
+        sprite.LayerMapSet(displacementKey, index);
+
+        revealedLayers.Add(displacementKey);
+
+        return true;
+    }
+}

Content.Client/Hands/Systems/HandsSystem.cs

@@ -1,5 +1,6 @@
 using System.Diagnostics.CodeAnalysis;
 using System.Linq;
+using Content.Client.DisplacementMap;
 using Content.Client.Examine;
 using Content.Client.Strip;
 using Content.Client.Verbs.UI;
@@ -28,6 +29,7 @@ public sealed class HandsSystem : SharedHandsSystem
         [Dependency] private readonly SharedContainerSystem _containerSystem = default!;
         [Dependency] private readonly StrippableSystem _stripSys = default!;
         [Dependency] private readonly ExamineSystem _examine = default!;
+        [Dependency] private readonly DisplacementMapSystem _displacement = default!;
 
         public event Action<string, HandLocation>? OnPlayerAddHand;
         public event Action<string>? OnPlayerRemoveHand;
@@ -345,6 +347,10 @@ private void UpdateHandVisuals(EntityUid uid, EntityUid held, Hand hand, HandsCo
                 }
 
                 sprite.LayerSetData(index, layerData);
+
+                //Add displacement maps
+                if (handComp.HandDisplacement is not null)
+                    _displacement.TryAddDisplacement(handComp.HandDisplacement, sprite, index, key, revealedLayers);
             }
 
             RaiseLocalEvent(held, new HeldVisualsUpdatedEvent(uid, revealedLayers), true);

Content.Server/Communications/CommunicationsConsoleSystem.cs

@@ -205,6 +205,10 @@ private bool CanCallOrRecall(CommunicationsConsoleComponent comp)
                 || !comp.CanShuttle)
                 return false;
 
+            // Calling shuttle checks
+            if (_roundEndSystem.ExpectedCountdownEnd is null)
+                return comp.CanShuttle;
+
             // Recalling shuttle checks
             var recallThreshold = _cfg.GetCVar(CCVars.EmergencyRecallTurningPoint);