порнокопытные

Content.Client/ADT/Humanoid/MarkingLayerHiderComponent.cs

@@ -0,0 +1,10 @@
+using Content.Shared.Humanoid;
+
+namespace Content.Client.ADT.Humanoid;
+
+[RegisterComponent]
+public sealed partial class MarkingLayerHiderComponent : Component
+{
+    [ViewVariables]
+    public readonly Dictionary<HumanoidVisualLayers, HashSet<EntityUid>> HiddenBy = new();
+}

Content.Client/ADT/Humanoid/MarkingLayerHiderSystem.cs

@@ -0,0 +1,73 @@
+using Content.Shared.Humanoid;
+using Content.Shared.Humanoid.Markings;
+using Robust.Client.GameObjects;
+
+namespace Content.Client.ADT.Humanoid;
+
+public sealed class MarkingLayerHiderSystem : EntitySystem
+{
+    [Dependency] private readonly MarkingManager _marking = default!;
+    [Dependency] private readonly SpriteSystem _sprite = default!;
+
+    public void SetHiddenByOrgan(EntityUid body, EntityUid organ, List<Marking> applied)
+    {
+        var wanted = new HashSet<HumanoidVisualLayers>();
+        foreach (var marking in applied)
+        {
+            if (!_marking.TryGetMarking(marking, out var proto) || proto.HidesLayers == null)
+                continue;
+
+            wanted.UnionWith(proto.HidesLayers);
+        }
+
+        var comp = CompOrNull<MarkingLayerHiderComponent>(body);
+
+        if (comp == null)
+        {
+            if (wanted.Count == 0)
+                return;
+
+            comp = AddComp<MarkingLayerHiderComponent>(body);
+        }
+
+        var touched = new HashSet<HumanoidVisualLayers>(wanted);
+
+        foreach (var (layer, organs) in comp.HiddenBy)
+        {
+            if (organs.Remove(organ))
+                touched.Add(layer);
+        }
+
+        foreach (var layer in wanted)
+        {
+            if (!comp.HiddenBy.TryGetValue(layer, out var organs))
+            {
+                organs = new HashSet<EntityUid>();
+                comp.HiddenBy[layer] = organs;
+            }
+
+            organs.Add(organ);
+        }
+
+        foreach (var layer in touched)
+        {
+            Refresh(body, comp, layer);
+        }
+    }
+
+    private void Refresh(EntityUid body, MarkingLayerHiderComponent comp, HumanoidVisualLayers layer)
+    {
+        var hiddenByMarking = comp.HiddenBy.TryGetValue(layer, out var organs) && organs.Count > 0;
+
+        if (!hiddenByMarking)
+            comp.HiddenBy.Remove(layer);
+
+        var hiddenByClothing = CompOrNull<HideableHumanoidLayersComponent>(body)?.HiddenLayers is { } clothingLayers
+            && clothingLayers.ContainsKey(layer);
+
+        var visible = !hiddenByMarking && !hiddenByClothing;
+
+        if (_sprite.LayerMapTryGet(body, layer, out var index, false))
+            _sprite.LayerSetVisible(body, index, visible);
+    }
+}

Content.Client/Body/VisualBodySystem.cs

@@ -17,6 +17,7 @@ public sealed class VisualBodySystem : SharedVisualBodySystem
     [Dependency] private readonly IConfigurationManager _cfg = default!;
     [Dependency] private readonly IPrototypeManager _prototype = default!;
     [Dependency] private readonly DisplacementMapSystem _displacement = default!;
+    [Dependency] private readonly Content.Client.ADT.Humanoid.MarkingLayerHiderSystem _markingHider = default!; // ADT-Tweak
     [Dependency] private readonly MarkingManager _marking = default!;
     [Dependency] private readonly SpriteSystem _sprite = default!;
 
@@ -221,13 +222,21 @@ private void ApplyMarkings(Entity<VisualOrganMarkingsComponent> ent, Entity<Spri
             applied.Add(marking);
         }
         ent.Comp.AppliedMarkings = applied;
+
+        // ADT-Tweak-Start
+        _markingHider.SetHiddenByOrgan(target.Owner, ent.Owner, applied);
+        // ADT-Tweak-End
     }
 
     private void RemoveMarkings(Entity<VisualOrganMarkingsComponent> ent, Entity<SpriteComponent?> target)
     {
         if (!Resolve(target, ref target.Comp))
             return;
 
+        // ADT-Tweak-Start
+        _markingHider.SetHiddenByOrgan(target.Owner, ent.Owner, new());
+        // ADT-Tweak-End
+
         foreach (var marking in ent.Comp.AppliedMarkings)
         {
             if (!_marking.TryGetMarking(marking, out var proto))

Content.Shared/Humanoid/Markings/MarkingPrototype.cs

@@ -49,9 +49,12 @@ public Marking AsMarking()
             return new Marking(ID, Sprites.Count);
         }
 
-        //ADT tweak - allow markings to support shaders
-        [DataField("shader")]
+        //ADT-Tweak-Start
+        [DataField]
         public string? Shader { get; private set; } = null;
-        //ADT tweak impstation edit
+
+        [DataField]
+        public List<HumanoidVisualLayers>? HidesLayers;
+        // ADT-Tweak-End
     }
 }

Resources/Audio/ADT/Effects/Footsteps/attributions.yml

@@ -6,3 +6,9 @@
   license: "CC-BY-SA-4.0"
   copyright: "Recorded and modified by https://github.com/MilenVolf"
   source: "https://git.arumoon.ru/Workbench-Team/space-station-14/-/merge_requests/123"
+
+- files:
+  - celecern_step1.ogg
+  license: "CC-BY-SA-3.0"
+  copyright: "ИСТОЧНИК НЕ УКАЗАН - уточнить автора звуков перед мержем"
+  source: "ИСТОЧНИК НЕ УКАЗАН - уточнить автора звуков перед мержем"

Resources/Audio/ADT/Voice/Celecern/attributions.yml

@@ -0,0 +1,4 @@
+- files: ["sigh-1.ogg", "sigh-2.ogg", "sigh-3.ogg", "snort-1.ogg", "snort-2.ogg", "snort-3.ogg"]
+  license: "CC-BY-SA-3.0"
+  copyright: "ИСТОЧНИК НЕ УКАЗАН - уточнить автора звуков перед мержем"
+  source: "ИСТОЧНИК НЕ УКАЗАН - уточнить автора звуков перед мержем"

Resources/Locale/ru-RU/ADT/Chat/emotes.ftl

@@ -42,3 +42,7 @@ chat-emote-name-flap-wings = Хлопать крыльями
 # Novakid
 chat-emote-msg-fiery-sounds = издаёт пламенные звуки
 chat-emote-name-fiery-sounds = Издать пламенные звуки
+# Celecern
+chat-emote-name-adt-celecern-snort = фыркнуть
+chat-emote-name-adt-celecern-clop = цокнуть копытом
+chat-emote-name-adt-celecern-ear-flick = шевельнуть ушами