Mech updates

.github/workflows/rsi-diff.yml

@@ -5,22 +5,13 @@ on:
     paths:
       - '**.rsi/**.png'
 
-permissions: # Explicitly define permissions
-  contents: write
-  pull-requests: write
-
 jobs:
   diff:
     name: Diff
     runs-on: ubuntu-latest
     steps:
-      - name: Checkout PR HEAD
+      - name: Checkout
         uses: actions/checkout@v4.2.2
-        with:
-          repository: ${{ github.event.pull_request.head.repo.full_name }}
-          ref: ${{ github.event.pull_request.head.ref }}
-          token: ${{ secrets.PAT_TOKEN }}
-          fetch-depth: 0
 
       - name: Get changed files
         id: files

Content.Client/Drunk/DrunkOverlay.cs

@@ -1,3 +1,12 @@
+// SPDX-FileCopyrightText: 2022 Kara D
+// SPDX-FileCopyrightText: 2022 Leon Friedrich
+// SPDX-FileCopyrightText: 2023 Waylon Cude
+// SPDX-FileCopyrightText: 2023 metalgearsloth
+// SPDX-FileCopyrightText: 2024 Pieter-Jan Briers
+// SPDX-FileCopyrightText: 2025 ark1368
+//
+// SPDX-License-Identifier: MPL-2.0
+
 using Content.Shared.Drunk;
 using Content.Shared.StatusEffect;
 using Robust.Client.Graphics;
@@ -64,7 +73,11 @@ protected override bool BeforeDraw(in OverlayDrawArgs args)
         if (args.Viewport.Eye != eyeComp.Eye)
             return false;
 
-        _visualScale = BoozePowerToVisual(CurrentBoozePower);
+        var visualPower = CurrentBoozePower;
+        if (_entityManager.TryGetComponent(_playerManager.LocalEntity, out Content.Shared.Traits.Assorted.AlcoholToleranceComponent? tolerance))
+            visualPower *= tolerance.VisualScaleMultiplier;
+
+        _visualScale = BoozePowerToVisual(visualPower);
         return _visualScale > 0;
     }
 

Content.Client/Humanoid/HumanoidAppearanceSystem.cs

@@ -1,4 +1,6 @@
 using System.Numerics;
+using Content.Client._Common.Consent;
+using Content.Shared._Common.Consent;
 using Content.Shared.Humanoid;
 using Content.Shared.Humanoid.Markings;
 using Content.Shared.Humanoid.Prototypes;
@@ -15,13 +17,18 @@ public sealed class HumanoidAppearanceSystem : SharedHumanoidAppearanceSystem
     [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
     [Dependency] private readonly MarkingManager _markingManager = default!;
     [Dependency] private readonly AppearanceSystem _appearance = default!;
+    [Dependency] private readonly IClientConsentManager _consentManager = default!; // Hardlight
+
+    private static readonly ProtoId<ConsentTogglePrototype> GenitalMarkingsConsent = "GenitalMarkings"; // Hardlight
 
     public override void Initialize()
     {
         base.Initialize();
 
         SubscribeLocalEvent<HumanoidAppearanceComponent, AfterAutoHandleStateEvent>(OnHandleState);
         SubscribeLocalEvent<HumanoidAppearanceComponent, AppearanceChangeEvent>(OnAppearanceChange);
+
+        _consentManager.OnServerDataLoaded += OnConsentChanged;
     }
 
     private void OnHandleState(EntityUid uid, HumanoidAppearanceComponent component, ref AfterAutoHandleStateEvent args)
@@ -55,6 +62,15 @@ private void OnAppearanceChange(EntityUid uid, HumanoidAppearanceComponent comp,
         }
     }
 
+    private void OnConsentChanged()
+    {
+        var humanoidQuery = EntityManager.AllEntityQueryEnumerator<HumanoidAppearanceComponent, SpriteComponent>();
+        while (humanoidQuery.MoveNext(out var _, out var humanoid, out var sprite))
+        {
+            UpdateSprite(humanoid, sprite);
+        }
+    }
+
     private static bool IsHidden(HumanoidAppearanceComponent humanoid, HumanoidVisualLayers layer)
         => humanoid.HiddenLayers.ContainsKey(layer) || humanoid.PermanentlyHidden.Contains(layer);
 
@@ -312,6 +328,15 @@ private void ApplyMarking(MarkingPrototype markingPrototype,
         visible &= humanoid.BaseLayers.TryGetValue(markingPrototype.BodyPart, out var setting)
            && setting.AllowsMarkings;
 
+        visible &= !humanoid.HiddenMarkings.Contains(markingPrototype.ID); // FLOOF ADD
+        // FLOOF ADD END
+
+        // Hardlight: genital markings consent toggle
+        if (!(_consentManager.GetConsentSettings().Toggles.TryGetValue(GenitalMarkingsConsent, out var val) && val == "on"))
+        {
+            visible &= markingPrototype.MarkingCategory != MarkingCategories.Genital;
+        }
+
         for (var j = 0; j < markingPrototype.Sprites.Count; j++)
         {
             var markingSprite = markingPrototype.Sprites[j];
@@ -329,13 +354,13 @@ private void ApplyMarking(MarkingPrototype markingPrototype,
                 sprite.LayerMapSet(layerId, layer);
                 sprite.LayerSetSprite(layerId, rsi);
             }
-		    // impstation edit begin - check if there's a shader defined in the markingPrototype's shader datafield, and if there is...
-			if (markingPrototype.Shader != null)
-			{
-			// use spriteComponent's layersetshader function to set the layer's shader to that which is specified.
-				sprite.LayerSetShader(layerId, markingPrototype.Shader);
-			}
-			// impstation edit end
+            // impstation edit begin - check if there's a shader defined in the markingPrototype's shader datafield, and if there is...
+            if (markingPrototype.Shader != null)
+            {
+                // use spriteComponent's layersetshader function to set the layer's shader to that which is specified.
+                sprite.LayerSetShader(layerId, markingPrototype.Shader);
+            }
+            // impstation edit end
             sprite.LayerSetVisible(layerId, visible);
 
             if (!visible || setting == null) // this is kinda implied

Content.Client/Humanoid/MarkingPicker.xaml.cs

@@ -129,8 +129,9 @@ public MarkingPicker()
         IoCManager.InjectDependencies(this);
 
         _sprite = _entityManager.System<SpriteSystem>();
-
-        CMarkingCategoryButton.OnItemSelected +=  OnCategoryChange;
+
+        // Subscribe to consent changes to refresh categories
+        CMarkingCategoryButton.OnItemSelected += OnCategoryChange;
         CMarkingsUnused.OnItemSelected += item =>
             _selectedUnusedMarking = CMarkingsUnused[item.ItemIndex];
 
@@ -157,8 +158,9 @@ private void SetupCategoryButtons()
         {
             var category = _markingCategories[i];
             var markings = GetMarkings(category);
-            if (_ignoreCategories.Contains(category) ||
-                markings.Count == 0)
+
+            // Check if the category should be ignored
+            if (_ignoreCategories.Contains(category) || markings.Count == 0)
             {
                 continue;
             }