Avoid redundant updates to GitHub credits

.github/CODEOWNERS

@@ -19,7 +19,7 @@
 /Content.IntegrationTests/Tests/PostMapInitTest.cs @DeltaV-Station/maptainers
 
 # Server rules
-/Resources/ServerInfo/Guidebook/_DV/Rules/ @DeltaV-Station/head-administrators
+/Resources/ServerInfo/Guidebook/DeltaV/Rules/ @DeltaV-Station/head-administrators
 
 # Wiki
 /.wiki/ @DeltaV-Station/direction

.github/workflows/build-test-debug.yml

@@ -32,7 +32,6 @@ jobs:
       run: |
         cd RobustToolbox/
         git submodule update --init --recursive
-        rm Robust.Shared.Tests/Networking/NetEncryptionDoSTest.cs # DeltaV - work around bug in the backport
 
     - name: Setup .NET Core
       uses: actions/setup-dotnet@v4.1.0

.github/workflows/publish.yml

@@ -29,7 +29,6 @@ jobs:
       run: |
         cd RobustToolbox
         git fetch --depth=1
-        rm Robust.Shared.Tests/Networking/NetEncryptionDoSTest.cs # DeltaV - work around bug in the backport
 
     - name: Install dependencies
       run: dotnet restore

.github/workflows/yaml-linter.yml

@@ -23,7 +23,6 @@ jobs:
         run: |
           cd RobustToolbox/
           git submodule update --init --recursive
-          rm Robust.Shared.Tests/Networking/NetEncryptionDoSTest.cs # DeltaV - work around bug in the backport
       - name: Setup .NET Core
         uses: actions/setup-dotnet@v4.1.0
         with:

.wiki/_DV/Laws/AlertProcedure.txt

@@ -289,33 +289,4 @@ Emergency alert status. ''Central Command has ordered the Epsilon security level
 | style="border: 1px solid #000000;" | Martial Law is in effect. Do not engage with Central Command Personnel. Await orders from Central Command Personnel.
 |}
 
-== <span style="color:#ff8119;>Orange Alert</span> ==
-Emergency alert status. ''There is a critical station-wide structural or atmospheric threat and recovery is unlikely. Engineering staff are advised to minimize hazards and secure the Evacuation Dock. Crewmembers are advised to stay away from hazardous areas, and prepare for Evacuation.''
-
-{| class="wikitable" style="width: 80%; border: 1px solid #000000;"
-!style="text-align:left; width:25%; padding:5px; padding-left:10px; background-color:#FF8119BF; border: 1px solid #000000;" | '''Condition'''
-!style="text-align:left; width:75%; padding:5px; padding-left:10px; background-color:#FF8119BF; border: 1px solid #000000;" | '''Description'''
-|-
-| style="border: 1px solid #000000;" | Chain of Command
-| style="border: 1px solid #000000;" | [[Standard_Operating_Procedure#Captain’s_Authority|CO]] > [[Chief Engineer]] > Engineering Personnel > Department Heads > Supervisory Roles
-|-
-| style="border: 1px solid #000000;" | Armoury Policy
-| style="border: 1px solid #000000;" | Issuing of lethal weapons disadvised. EVA protection heavily advised for all personnel.
-|-
-| style="border: 1px solid #000000;" | Discipline
-| style="border: 1px solid #000000;" | Report to supervisor for orders. Non-engineering personnel advised to evacuate affected areas. Security should seek to aid engineering staff where possible.
-|-
-| style="border: 1px solid #000000;" | Secure Areas
-| style="border: 1px solid #000000;" | Secure areas unbolted. [[Standard_Operating_Procedure#High_Security_Areas|HSAs]] and areas with an expectation of privacy, such as bedrooms, dorms, or medical treatment facilities, may be bolted as needed.
-|-
-| style="border: 1px solid #000000;" | Medical
-| style="border: 1px solid #000000;" | Full suit sensors heavily advised. EVA suits and functioning internals recommended for emergency responders.
-|-
-| style="border: 1px solid #000000;" | Engineering
-| style="border: 1px solid #000000;" | EVA suits heavily advised for engineers. Distribute emergency internals to crew. Ensure evacuation as soon as possible.
-|-
-| style="border: 1px solid #000000;" | Rules of Engagement
-| style="border: 1px solid #000000;" | Engage with minimal force required; prioritize de-escalation whenever possible.
-|}
-
 {{Guides Menu}}

.wiki/_DV/Laws/SpaceLaw.txt

@@ -269,7 +269,7 @@ Sentencing modifiers are to be applied by the sentencing officer, judge, or arbi
 | style="border: 1px solid black;" | [[File:SL_BreakingAndEntering.png]]
 ! style="border: 1px solid black;" | {{anchor|Breaking and Entering}}Breaking and Entering
 | style="border: 1px solid black;" | 5 minutes
-| style="border: 1px solid black;" | To break and enter into an area where one is not authorised nor invited.
+| style="border: 1px solid black;" | To break and enter into a high security area where one is not authorised nor invited, with intent to commit a crime within.
 |-
 | style="border: 1px solid black;" | 203
 | style="border: 1px solid black;" | [[File:SL_Rioting.png]]

.wiki/_DV/Laws/StandardOperatingProcedure.txt

@@ -269,6 +269,7 @@ Prisoners have certain rights that must be upheld by law enforcement and Station
 * Standard prisoner clothing must always be available for prisoners.
 * Confiscated clothing should be returned upon request, except in the case of Extended Confinement or if the clothing in question poses a clear risk to prisoner or crew safety.
 * Food and water for organic prisoners must be available and given on request.
+* Power for silicon prisoners such as IPCs and cyborgs, at minimum a cyborg recharging station must be provided.
 * Should the holding cells or Permabrig become uninhabitable, prisoners must be securely and safely relocated to another area for confinement, until the holding cells or Permabrig are returned to a serviceable state.
 * Prisoners should be granted freedom of movement within their holding area unless there is an undue risk to life and limb.
 

CONTRIBUTING.md

@@ -73,88 +73,28 @@ If you are adding a lot of C# code, then take advantage of partial classes. Put
 
 Otherwise, **add comments on or around any changed lines.**
 
-### Single-Line Changes
-Format should look like this.
+A comment on a new imported namespace:
 ```cs
-/* Importing Namespaces - Include optional comment if its not obvious what its being used for. */
-using Content.Server._DV.Psionics.Glimmer; // DeltaV 
-using Content.Shared.Damage.Systems; // DeltaV - Addition of HandHeldArmor
-
-/* Changing an upstream line - Same line as the change */
-if (!TryComp<EyeComponent>(ent, out var eye) || _disabled) // DeltaV - check if disabled
-
-/* Adding - Either same line or above the line. */
-  EnsureComp<PotentialPsionicComponent>(entity); // Deltav - Psionics
-
-/* "Deleting" - Don't actually delete, just comment out and say why. This only applies to upstream code. */
-// args.StatusIcons.Add(_prototype.Index(component.Icon)); // DeltaV - commented out. status icon now added above
+using Content.Server.Psionics.Glimmer; // DeltaV
 ```
 
-> * Its pretty obvious in the example above that importing `Content.Server._DV.Psionics.Glimmer` means we'll be interacting with glimmer so putting `// DeltaV - Add Glimmer` is needlessly redundant.
-> * It's not as obvious what the `Content.Shared.Damage.Systems` namespace is used for, since its so broad, so adding a comment what feature is using it helps.
-> * Actual code changes should almost always include the comment after ``// DeltaV`.
-
-### Multi-Line Changes
-Depending on how much you are editing, putting a comment on EACH line may be excessive, so if you have a larger block of code you are changing, denote it like so:
+A pair of comments enclosing a block of added code:
 ```cs
-// BEGIN DeltaV - Remove innate radio and radios from pockets
-for (var i = 1; i <= 4; i++) // Arachnids have 4 pockets
+private EntityUid Slice(...)
 {
-    if (_inventory.TryGetSlotEntity(target, $"pocket{i}", out var headset) && HasComp<HeadsetComponent>(headset))
-        _inventory.TryUnequip(target, $"pocket{i}", true, true);
+    ...
+
+    _transform.SetLocalRotation(sliceUid, 0);
+
+    // DeltaV - start of deep frier stuff
+    var slicedEv = new FoodSlicedEvent(user, uid, sliceUid);
+    RaiseLocalEvent(uid, ref slicedEv);
+    // DeltaV - end of deep frier stuff
+
+    ...
 }
-
-RemComp<ActiveRadioComponent>(target); // If the zombie has an innate radio, get rid of it.
-// END DeltaV
 ```
 
-> * Denoting these with a BEGIN and END clearly shows they are block of code without having to read the entire comment. This makes it easier to tell when you're dealing with single-line comments versus a block with merging in conflicts.
->   * Case and order of the first two words is less of a concern. `// DeltaV Begin` or `// Begin DeltaV` will work fine too. 
-> * Try to make your blocks as small as possible, but use your discretion.
-> * If you deleting multiple lines, use line comments (``//``) if its a few lines but if its a larger block (like commenting out an entire function), it is preferable to use block comments (`/* */`). 
-
-#### Soft Exceptions to the Multi-Line "Rules"
-Some multi-line changes can use a single-line comment in certain scenarios. But if you are UNSURE, just use `// BEGIN DeltaV` and `// END DeltaV` comments like the previous section does and it'll be fine.
-
-I'll give some examples.
-```cs
-/* This change comments out 3 lines but only needs a single line comment because commenting out the if statement implies that its logic will be commented out too. */
-// if (obj.WasModified<TraitPrototype>()) // DeltaV - Refreshed in TraitsTab
-// {
-//     _profileEditor.RefreshTraits();
-// }
-
-/* Same principle here. This adds two lines but the if statement implies the next line so commenting both lines isn't really needed. */
-if (_flight.IsFlying(entity.Owner)) // DeltaV - Harpy Flight
-    return true;
-```
-### New Methods or Component Variables
-Sometimes, you'll need to implement a whole new method or component variable and instead of wrapping it in `// BEGIN DeltaV` and `// END DeltaV`, you can just denote that it's a DeltaV function in the summary block before the function. This denotes the WHOLE function as a DeltaV addition.
-
-```cs
-/* New Method Example */
-/// <summary>
-/// DeltaV - Handle revealing ninja if cloaked when attacked by a hitscan attack.
-/// </summary>
-private void OnNinjaAttacked(Entity<SpaceNinjaComponent> ent, ref DamageChangedEvent args)
-{
-  ...
-}
-
-/* New Component Variable Example */
-/// <summary>
-/// DeltaV - If disabled the action will not disable when no charges remain. Use if you want to handle no charges differently.
-/// </summary>
-[DataField]
-public bool DisableWhenEmpty = true;
-```
-
-In short:
-* Use `// BEGIN DeltaV` and `// END Delta` to denote a *block* of changes.
-  * Keep blocks as small as possible.
-* Use `// DeltaV` on or before the line if its not a block of changes.
-* Use exceptions when they make sense.
-
 ### Changing Upstream Localization Fluent .ftl files
 
 **Move all changed locale strings to a new DeltaV file** - use a `.ftl` file in the `_DV` folder. Comment out the old strings in the upstream file, and explain that they were moved.
@@ -164,10 +104,10 @@ Example:
 Commented out old string in `Resources\Locale\en-US\xenoarchaeology\artifact-analyzer.ftl`
 ```
 # DeltaV - moved to _DV file
-# analysis-console-info-effect-value = [font="Monospace" size=11][color=gray]{ $state ->
-#     [true] {$info}
-#     *[false] Unlock nodes to gain info
-# }[/color][/font]
+#analysis-console-info-effect-value = [font="Monospace" size=11][color=gray]{ $state ->
+#    [true] {$info}
+#    *[false] Unlock nodes to gain info
+#}[/color][/font]
 ```
 
 The new version of the string in `Resources\Locale\en-US\_DV\xenoarchaeology\artifact-analyzer.ftl`

Content.Client/Administration/AdminNameOverlay.cs

@@ -8,14 +8,12 @@ using Content.Shared.CCVar;
 using Content.Shared.Ghost;
 using Content.Shared.Mind;
 using Content.Shared.Roles;
-using Content.Shared.SSDIndicator; // DeltaV - SSD time indicator
 using Robust.Client.Graphics;
 using Robust.Client.ResourceManagement;
 using Robust.Client.UserInterface;
 using Robust.Shared.Configuration;
 using Robust.Shared.Enums;
 using Robust.Shared.Prototypes;
-using Robust.Shared.Timing; // DeltaV - SSD time indicator
 
 namespace Content.Client.Administration;
 
@@ -28,7 +26,6 @@ internal sealed class AdminNameOverlay : Overlay
     private readonly IUserInterfaceManager _userInterfaceManager;
     private readonly SharedRoleSystem _roles;
     private readonly IPrototypeManager _prototypeManager;
-    private readonly IGameTiming _timing; // DeltaV - Add timing
     private readonly Font _font;
     private readonly Font _fontBold;
     private AdminOverlayAntagFormat _overlayFormat;
@@ -56,8 +53,7 @@ internal sealed class AdminNameOverlay : Overlay
         IUserInterfaceManager userInterfaceManager,
         IConfigurationManager config,
         SharedRoleSystem roles,
-        IPrototypeManager prototypeManager,
-        IGameTiming timing) // DeltaV - Add timing
+        IPrototypeManager prototypeManager)
     {
         _system = system;
         _entityManager = entityManager;
@@ -66,7 +62,6 @@ internal sealed class AdminNameOverlay : Overlay
         _userInterfaceManager = userInterfaceManager;
         _roles = roles;
         _prototypeManager = prototypeManager;
-        _timing = timing; // DeltaV - Add timing
         ZIndex = 200;
         // Setting these to a specific ttf would break the antag symbols
         _font = resourceCache.NotoStack();
@@ -236,18 +231,6 @@ internal sealed class AdminNameOverlay : Overlay
                 currentOffset += lineoffset;
             }
 
-            // DeltaV - SSD Time START
-            if (_entityManager.TryGetComponent<SSDIndicatorComponent>(entity, out var ssdIndicator)
-                && ssdIndicator.SsdSince is {} ssdSince)
-            {
-                color = Color.MediumPurple;
-                color.A = alpha;
-                var ssdText = Loc.GetString("admin-overlay-ssd-time", ("time", (_timing.CurTime - ssdSince).ToString("%hh':'mm':'ss")));
-                args.ScreenHandle.DrawString(_font, screenCoordinates + currentOffset, ssdText, uiScale, color);
-                currentOffset += lineoffset;
-            }
-            // DeltaV END
-
             // Determine antag symbol
             string? symbol;
             switch (_overlaySymbolStyle)

Content.Client/Administration/Systems/AdminSystem.Overlay.cs

@@ -5,7 +5,6 @@ using Robust.Client.ResourceManagement;
 using Robust.Client.UserInterface;
 using Robust.Shared.Configuration;
 using Robust.Shared.Prototypes;
-using Robust.Shared.Timing; // DeltaV - SSD time indicator
 
 namespace Content.Client.Administration.Systems
 {
@@ -20,7 +19,6 @@ namespace Content.Client.Administration.Systems
         [Dependency] private readonly IConfigurationManager _configurationManager = default!;
         [Dependency] private readonly SharedRoleSystem _roles = default!;
         [Dependency] private readonly IPrototypeManager _proto = default!;
-        [Dependency] private readonly IGameTiming _timing = default!; // DeltaV - added for SSD time indicator
 
         private AdminNameOverlay _adminNameOverlay = default!;
 
@@ -38,8 +36,7 @@ namespace Content.Client.Administration.Systems
                 _userInterfaceManager,
                 _configurationManager,
                 _roles,
-                _proto,
-                _timing); // DeltaV - Add timing
+                _proto);
             _adminManager.AdminStatusUpdated += OnAdminStatusUpdated;
         }
 

Content.Client/Body/Systems/BodySystem.cs

@@ -1,7 +1,76 @@
 using Content.Shared.Body.Systems;
+// Shitmed Change Start
+using Content.Shared._Shitmed.Body.Part;
+using Content.Shared.Humanoid;
+using Content.Shared.Humanoid.Markings;
+using Robust.Client.GameObjects;
+using Robust.Shared.Utility;
+using Content.Shared.Body.Components;
+// Shitmed Change End
 
 namespace Content.Client.Body.Systems;
 
 public sealed class BodySystem : SharedBodySystem
 {
+    // Shitmed Change Start
+    [Dependency] private readonly MarkingManager _markingManager = default!;
+
+    private void ApplyMarkingToPart(MarkingPrototype markingPrototype,
+        IReadOnlyList<Color>? colors,
+        bool visible,
+        SpriteComponent sprite)
+    {
+        for (var j = 0; j < markingPrototype.Sprites.Count; j++)
+        {
+            var markingSprite = markingPrototype.Sprites[j];
+
+            if (markingSprite is not SpriteSpecifier.Rsi rsi)
+                continue;
+
+            var layerId = $"{markingPrototype.ID}-{rsi.RsiState}";
+
+            if (!sprite.LayerMapTryGet(layerId, out _))
+            {
+                var layer = sprite.AddLayer(markingSprite, j + 1);
+                sprite.LayerMapSet(layerId, layer);
+                sprite.LayerSetSprite(layerId, rsi);
+            }
+
+            sprite.LayerSetVisible(layerId, visible);
+
+            if (!visible)
+                continue;
+
+            // Okay so if the marking prototype is modified but we load old marking data this may no longer be valid
+            // and we need to check the index is correct. So if that happens just default to white?
+            if (colors != null && j < colors.Count)
+                sprite.LayerSetColor(layerId, colors[j]);
+            else
+                sprite.LayerSetColor(layerId, Color.White);
+        }
+    }
+
+    protected override void ApplyPartMarkings(EntityUid target, BodyPartAppearanceComponent component)
+    {
+        if (!TryComp(target, out SpriteComponent? sprite))
+            return;
+
+        if (component.Color != null)
+            sprite.Color = component.Color.Value;
+
+        foreach (var (visualLayer, markingList) in component.Markings)
+            foreach (var marking in markingList)
+            {
+                if (!_markingManager.TryGetMarking(marking, out var markingPrototype))
+                    continue;
+
+                ApplyMarkingToPart(markingPrototype, marking.MarkingColors, marking.Visible, sprite);
+            }
+    }
+
+    protected override void RemoveBodyMarkings(EntityUid target, BodyPartAppearanceComponent partAppearance, HumanoidAppearanceComponent bodyAppearance)
+    {
+        return;
+    }
+    // Shitmed Change End
 }

Content.Client/Clothing/ClientClothingSystem.cs

@@ -2,6 +2,7 @@ using System.Diagnostics.CodeAnalysis;
 using System.Linq;
 using Content.Client.DisplacementMap;
 using Content.Client.Inventory;
+using Content.Shared._DV.Silicon.IPC; // DeltaV - IPC Snouts
 using Content.Shared.Clothing;
 using Content.Shared.Clothing.Components;
 using Content.Shared.Clothing.EntitySystems;
@@ -102,8 +103,12 @@ public sealed class ClientClothingSystem : ClothingSystem
 
         List<PrototypeLayerData>? layers = null;
 
+        // Begin DeltaV Additions - IPC snouts
         var speciesId = inventory.SpeciesId;
 
+        if (TryComp(args.Equipee, out SnoutHelmetComponent? helmetComponent) && helmetComponent.EnableAlternateHelmet)
+            speciesId = helmetComponent.ReplacementRace;
+
         // first attempt to get species specific data.
         if (speciesId != null)
             item.ClothingVisuals.TryGetValue($"{args.Slot}-{speciesId}", out layers);
@@ -115,6 +120,7 @@ public sealed class ClientClothingSystem : ClothingSystem
             if (!TryGetDefaultVisuals(uid, item, args.Slot, speciesId, out layers))
                 return;
         }
+        // End DeltaV Additions
 
         // add each layer to the visuals
         var i = 0;

Content.Client/Doors/DoorSystem.cs

@@ -18,36 +18,8 @@ public sealed class DoorSystem : SharedDoorSystem
     {
         base.Initialize();
         SubscribeLocalEvent<DoorComponent, AppearanceChangeEvent>(OnAppearanceChange);
-        // ES START
-        // handle open/close state change on client after animation end, not when server says door is open
-        SubscribeLocalEvent<DoorComponent, AnimationCompletedEvent>(OnAnimationCompleted);
     }
 
-    private void OnAnimationCompleted(Entity<DoorComponent> entity, ref AnimationCompletedEvent args)
-    {
-        if (!TryComp<SpriteComponent>(entity, out var sprite) || args.Key != DoorComponent.OpenCloseKey)
-            return;
-
-        switch (entity.Comp.State)
-        {
-            case DoorState.Open:
-                foreach (var (layer, layerState) in entity.Comp.OpenSpriteStates)
-                {
-                    _sprite.LayerSetRsiState((entity.Owner, sprite), layer, layerState);
-                }
-
-                break;
-            case DoorState.Closed:
-                foreach (var (layer, layerState) in entity.Comp.ClosedSpriteStates)
-                {
-                    _sprite.LayerSetRsiState((entity.Owner, sprite), layer, layerState);
-                }
-
-                break;
-        }
-    }
-    // ES END
-
     protected override void OnComponentInit(Entity<DoorComponent> ent, ref ComponentInit args)
     {
         var comp = ent.Comp;
@@ -115,13 +87,10 @@ public sealed class DoorSystem : SharedDoorSystem
             state = DoorState.Closed;
 
         if (AppearanceSystem.TryGetData<string>(entity, PaintableVisuals.Prototype, out var prototype, args.Component))
-             UpdateSpriteLayers((entity.Owner, args.Sprite), prototype);
+            UpdateSpriteLayers((entity.Owner, args.Sprite), prototype);
 
-        // ES START
-        // dont stop all animations for no reason
-        //if (_animationSystem.HasRunningAnimation(entity, DoorComponent.AnimationKey))
-        //    _animationSystem.Stop(entity.Owner, DoorComponent.AnimationKey);
-        // ES END
+        if (_animationSystem.HasRunningAnimation(entity, DoorComponent.AnimationKey))
+            _animationSystem.Stop(entity.Owner, DoorComponent.AnimationKey);
 
         // We are checking beforehand since some doors may not have an emagging visual layer, and we don't want LayerSetVisible to throw an error.
         if (_sprite.TryGetLayer(entity.Owner, DoorVisualLayers.BaseEmagging, out var _, false))
@@ -137,12 +106,6 @@ public sealed class DoorSystem : SharedDoorSystem
         switch (state)
         {
             case DoorState.Open:
-                // ES START
-                // If we are already animating the close just let that do its job
-                if (_animationSystem.HasRunningAnimation(entity, DoorComponent.OpenCloseKey))
-                    return;
-                // ES END
-
                 foreach (var (layer, layerState) in entity.Comp.OpenSpriteStates)
                 {
                     _sprite.LayerSetRsiState((entity.Owner, sprite), layer, layerState);
@@ -150,12 +113,6 @@ public sealed class DoorSystem : SharedDoorSystem
 
                 return;
             case DoorState.Closed:
-                // ES START
-                // If we are already animating the close just let that do its job
-                if (_animationSystem.HasRunningAnimation(entity, DoorComponent.OpenCloseKey))
-                    return;
-                // ES END
-
                 foreach (var (layer, layerState) in entity.Comp.ClosedSpriteStates)
                 {
                     _sprite.LayerSetRsiState((entity.Owner, sprite), layer, layerState);
@@ -166,47 +123,24 @@ public sealed class DoorSystem : SharedDoorSystem
                 if (entity.Comp.OpeningAnimationTime == TimeSpan.Zero)
                     return;
 
-                // ES START
-                // since we dont stop them earlier we check here
-                if (_animationSystem.HasRunningAnimation(entity, DoorComponent.OpenCloseKey))
-                    return;
-                // ES END
-
-                _animationSystem.Play(entity, (Animation)entity.Comp.OpeningAnimation, DoorComponent.OpenCloseKey);
+                _animationSystem.Play(entity, (Animation)entity.Comp.OpeningAnimation, DoorComponent.AnimationKey);
 
                 return;
             case DoorState.Closing:
                 if (entity.Comp.ClosingAnimationTime == TimeSpan.Zero || entity.Comp.CurrentlyCrushing.Count != 0)
                     return;
 
-                // ES START
-                // since we dont stop them earlier we check here
-                if (_animationSystem.HasRunningAnimation(entity, DoorComponent.OpenCloseKey))
-                    return;
-                // ES END
-
-                _animationSystem.Play(entity, (Animation)entity.Comp.ClosingAnimation, DoorComponent.OpenCloseKey);
+                _animationSystem.Play(entity, (Animation)entity.Comp.ClosingAnimation, DoorComponent.AnimationKey);
 
                 return;
             case DoorState.Denying:
-                // ES START
-                // AnimationKey -> DenyKey
-                if (_animationSystem.HasRunningAnimation(entity, DoorComponent.DenyKey))
-                    return;
-
-                _animationSystem.Play(entity, (Animation)entity.Comp.DenyingAnimation, DoorComponent.DenyKey);
-                // ES END
+                _animationSystem.Play(entity, (Animation)entity.Comp.DenyingAnimation, DoorComponent.AnimationKey);
 
                 return;
             case DoorState.Emagging:
-                // ES START
-                // AnimationKey -> DenyKey
-                if (_animationSystem.HasRunningAnimation(entity, DoorComponent.EmagKey))
-                    return;
-
+                // We are checking beforehand since some doors may not have an emagging visual layer.
                 if (_sprite.TryGetLayer(entity.Owner, DoorVisualLayers.BaseEmagging, out var _, false))
-                    _animationSystem.Play(entity, (Animation)entity.Comp.EmaggingAnimation, DoorComponent.EmagKey);
-                // ES END
+                    _animationSystem.Play(entity, (Animation)entity.Comp.EmaggingAnimation, DoorComponent.AnimationKey);
 
                 return;
         }

Content.Client/Examine/ExamineSystem.cs

@@ -7,7 +7,6 @@ using Content.Shared.IdentityManagement;
 using Content.Shared.Input;
 using Content.Shared.Interaction.Events;
 using Content.Shared.Item;
-using Content.Shared.Radio.Components; // DeltaV - Client-side Radio Colors
 using Content.Shared.Verbs;
 using JetBrains.Annotations;
 using Robust.Client.GameObjects;
@@ -159,15 +158,6 @@ namespace Content.Client.Examine
             // since there's probably one open already if it's coming in from the server.
             var entity = GetEntity(ev.EntityUid);
 
-
-            // BEGIN DeltaV - Client-Side Radio Colors
-            // This *seems* a bit hacky, but we basically don't want to overwrite what's been pushed on the client-side,
-            // because the server will send us the server-side colors (default). I've yet to find a scenario where the
-            // server and client don't match, so until then, this is probably fine, if a little hacky.
-            if (HasComp<EncryptionKeyHolderComponent>(entity) || HasComp<EncryptionKeyComponent>(entity))
-                return;
-            // END DeltaV
-
             OpenTooltip(player.Value, entity, ev.CenterAtCursor, ev.OpenAtOldTooltip, ev.KnowTarget);
             UpdateTooltipInfo(player.Value, entity, ev.Message, ev.Verbs, getVerbs: false);
         }

Content.Client/Eye/EyeLerpingSystem.cs

@@ -36,9 +36,6 @@ public sealed class EyeLerpingSystem : EntitySystem
         UpdatesAfter.Add(typeof(TransformSystem));
         UpdatesAfter.Add(typeof(Robust.Client.Physics.PhysicsSystem));
         UpdatesBefore.Add(typeof(SharedEyeSystem));
-        // ES START
-        UpdatesBefore.Add(typeof(EyeSystem));
-        // ES END
         UpdatesOutsidePrediction = true;
     }
 
@@ -71,11 +68,6 @@ public sealed class EyeLerpingSystem : EntitySystem
         {
             _eye.SetRotation(uid, lerpInfo.TargetRotation, component);
             _eye.SetZoom(uid, lerpInfo.TargetZoom, component);
-
-            // Starlight begin - fix ES Screenshake triggering on spawn
-            if (TryComp<ContentEyeComponent>(uid, out var contentEye))
-                contentEye.BaseRotation = lerpInfo.TargetRotation;
-            // Starlight end
         }
     }
 
@@ -183,15 +175,9 @@ public sealed class EyeLerpingSystem : EntitySystem
     {
         var tickFraction = (float) _gameTiming.TickFraction / ushort.MaxValue;
         const double lerpMinimum = 0.00001;
-        // ES START
-        // add contenteye bc we only want to modify the fuckin base rotation
-        var query = AllEntityQuery<LerpingEyeComponent, EyeComponent, ContentEyeComponent, TransformComponent>();
-        // ES END
+        var query = AllEntityQuery<LerpingEyeComponent, EyeComponent, TransformComponent>();
 
-        // ES START
-        // contenteye
-        while (query.MoveNext(out var entity, out var lerpInfo, out var eye, out var contentEye, out var xform))
-        // ES END
+        while (query.MoveNext(out var entity, out var lerpInfo, out var eye, out var xform))
         {
             // Handle zoom
             var zoomDiff = Vector2.Lerp(lerpInfo.LastZoom, lerpInfo.TargetZoom, tickFraction);
@@ -205,14 +191,6 @@ public sealed class EyeLerpingSystem : EntitySystem
                 _eye.SetZoom(entity, zoomDiff, eye);
             }
 
-            // ES START
-            // UHHHHHHHHHHHh
-            // shit is fucked idk
-            // we need to alter baserotation not regular eye rotation and also i added baserotation because uhh
-            // there was no good way to separate 'how the eye should be oriented because of the grid/turning/etc' and 'the eye rotating on top of that'
-            // had to add it
-            // ES END
-
             // Handle Rotation
             TryComp<InputMoverComponent>(entity, out var mover);
 
@@ -221,10 +199,7 @@ public sealed class EyeLerpingSystem : EntitySystem
 
             if (!NeedsLerp(mover))
             {
-                // ES START
-                // contenteye
-                contentEye.BaseRotation = lerpInfo.TargetRotation;
-                // ES END
+                _eye.SetRotation(entity, lerpInfo.TargetRotation, eye);
                 continue;
             }
 
@@ -232,17 +207,11 @@ public sealed class EyeLerpingSystem : EntitySystem
 
             if (Math.Abs(shortest.Theta) < lerpMinimum)
             {
-                // ES START
-                // contenteye
-                contentEye.BaseRotation = lerpInfo.TargetRotation;
-                // ES END
+                _eye.SetRotation(entity, lerpInfo.TargetRotation, eye);
                 continue;
             }
 
-            // ES START
-            // contenteye
-            contentEye.BaseRotation = shortest * tickFraction + lerpInfo.LastRotation;
-            // ES END
+            _eye.SetRotation(entity, shortest * tickFraction + lerpInfo.LastRotation, eye);
         }
     }
 }

Content.Client/Hands/Systems/HandsSystem.cs

@@ -1,9 +1,11 @@
 using System.Diagnostics.CodeAnalysis;
 using System.Linq;
+using Content.Shared._Shitmed.Body.Events; // Shitmed Change
 using Content.Client.DisplacementMap;
 using Content.Client.Examine;
 using Content.Client.Strip;
 using Content.Client.Verbs.UI;
+using Content.Shared.Body.Part; // Shitmed Change
 using Content.Shared.Hands;
 using Content.Shared.Hands.Components;
 using Content.Shared.Hands.EntitySystems;
@@ -49,6 +51,8 @@ namespace Content.Client.Hands.Systems
             SubscribeLocalEvent<HandsComponent, ComponentShutdown>(OnHandsShutdown);
             SubscribeLocalEvent<HandsComponent, ComponentHandleState>(HandleComponentState);
             SubscribeLocalEvent<HandsComponent, VisualsChangedEvent>(OnVisualsChanged);
+            SubscribeLocalEvent<HandsComponent, BodyPartRemovedEvent>(HandleBodyPartRemoved); // Shitmed Change
+            SubscribeLocalEvent<HandsComponent, BodyPartDisabledEvent>(HandleBodyPartDisabled); // Shitmed Change
 
             OnHandSetActive += OnHandActivated;
         }
@@ -202,6 +206,35 @@ namespace Content.Client.Hands.Systems
 
         #region visuals
 
+        // Shitmed Change Start
+        private void HideLayers(EntityUid uid, HandsComponent component, Entity<BodyPartComponent> part, SpriteComponent? sprite = null)
+        {
+            if (part.Comp.PartType != BodyPartType.Hand || !Resolve(uid, ref sprite, logMissing: false))
+                return;
+
+            var location = part.Comp.Symmetry switch
+            {
+                BodyPartSymmetry.None => HandLocation.Middle,
+                BodyPartSymmetry.Left => HandLocation.Left,
+                BodyPartSymmetry.Right => HandLocation.Right,
+                _ => throw new ArgumentOutOfRangeException(nameof(part.Comp.Symmetry))
+            };
+
+            if (component.RevealedLayers.TryGetValue(location, out var revealedLayers))
+            {
+                foreach (var key in revealedLayers)
+                    sprite.RemoveLayer(key);
+
+                revealedLayers.Clear();
+            }
+        }
+
+        private void HandleBodyPartRemoved(EntityUid uid, HandsComponent component, ref BodyPartRemovedEvent args) => HideLayers(uid, component, args.Part);
+
+        private void HandleBodyPartDisabled(EntityUid uid, HandsComponent component, ref BodyPartDisabledEvent args) => HideLayers(uid, component, args.Part);
+
+        // Shitmed Change End
+
         protected override void HandleEntityInserted(EntityUid uid, HandsComponent hands, EntInsertedIntoContainerMessage args)
         {
             base.HandleEntityInserted(uid, hands, args);

Content.Client/HealthAnalyzer/UI/HealthAnalyzerBoundUserInterface.cs

@@ -1,6 +1,7 @@
 using Content.Shared.MedicalScanner;
-using Content.Shared._DV.MedicalRecords;
-using JetBrains.Annotations; // DeltaV - Medical Records
+using Content.Shared._Shitmed.Targeting; // Shitmed Change
+using Content.Shared._DV.MedicalRecords; // DeltaV - Medical Records
+using JetBrains.Annotations;
 using Robust.Client.UserInterface;
 
 namespace Content.Client.HealthAnalyzer.UI
@@ -20,11 +21,13 @@ namespace Content.Client.HealthAnalyzer.UI
             base.Open();
 
             _window = this.CreateWindow<HealthAnalyzerWindow>();
+            _window.HealthAnalyzer.OnBodyPartSelected += SendBodyPartMessage; // Shitmed Change
             _window.HealthAnalyzer.OnTriageStatusChanged += SendTriageStatusMessage; // DeltaV - Medical Records
             _window.HealthAnalyzer.OnClaimPatient += SendTriageClaimMessage; // DeltaV - Medical Records
             _window.Title = EntMan.GetComponent<MetaDataComponent>(Owner).EntityName;
         }
 
+
         protected override void ReceiveMessage(BoundUserInterfaceMessage message)
         {
             if (_window == null)
@@ -36,6 +39,22 @@ namespace Content.Client.HealthAnalyzer.UI
             _window.Populate(cast);
         }
 
+        // Shitmed Change Start
+        private void SendBodyPartMessage(TargetBodyPart? part, EntityUid target) => SendMessage(new HealthAnalyzerPartMessage(EntMan.GetNetEntity(target), part ?? null));
+        protected override void Dispose(bool disposing)
+        {
+            base.Dispose(disposing);
+            if (!disposing)
+                return;
+
+            if (_window != null)
+                _window.HealthAnalyzer.OnBodyPartSelected -= SendBodyPartMessage;
+
+            _window?.Dispose();
+        }
+
+        // Shitmed Change End
+
         // Begin DeltaV - Medical Records
         private void SendTriageStatusMessage(TriageStatus status)
             => SendMessage(new HealthAnalyzerTriageStatusMessage(status));

Content.Client/HealthAnalyzer/UI/HealthAnalyzerControl.xaml

@@ -6,12 +6,160 @@
         Name="NoPatientDataText"
         Text="{Loc health-analyzer-window-no-patient-data-text}" />
 
+    <!-- Shitmed Change Start -->
+    <Button Name="ReturnButton"
+            Text="{Loc 'health-analyzer-window-return-button-text'}"
+            Margin="0 0 0 10"
+            HorizontalExpand="False"/>
+    <!-- Shitmed Change End -->
+
     <BoxContainer
         Name="PatientDataContainer"
         Margin="0 0 0 5"
         Orientation="Vertical">
         <BoxContainer Orientation="Horizontal" Margin="0 0 0 5">
-            <TextureRect Name="NoDataTex" Access="Public" SetSize="96 96" Visible="false" Stretch="KeepAspectCentered" TexturePath="/Textures/Interface/Misc/health_analyzer_out_of_range.png"/> <!-- DeltaV - Size changed to 96-->
+            <PanelContainer>
+            <!-- Shitmed Change Start -->
+            <SpriteView OverrideDirection="South" Name="SpriteView" Access="Public" SetSize="96 96" />
+            <PanelContainer
+                    Name="PartView"
+                    SetSize="57 96"
+                    Margin="18 0 0 0"
+                    VerticalAlignment="Center"
+                    HorizontalAlignment="Left">
+                    <PanelContainer
+                        SetSize="15 33"
+                        Margin="4 0 0 0"
+                        HorizontalAlignment="Left">
+                        <TextureButton
+                            Name="RightArmButton"
+                            MinSize="15 25"
+                            StyleClasses="TargetDollButtonRightArm"
+                            VerticalAlignment="Top">
+                        </TextureButton>
+                        <TextureButton
+                            Name="RightHandButton"
+                            MinSize="15 15"
+                            VerticalAlignment="Bottom"
+                            StyleClasses="TargetDollButtonRightHand">
+                        </TextureButton>
+                    </PanelContainer>
+                    <PanelContainer
+                        SetSize="43 75"
+                        Margin="0 0 0 0"
+                        VerticalAlignment="Center"
+                        HorizontalAlignment="Center">
+                        <TextureButton
+                            Name="HeadButton"
+                            MinSize="28 23"
+                            VerticalAlignment="Top"
+                            HorizontalAlignment="Center"
+                            StyleClasses="TargetDollButtonHead">
+                            <!--<PanelContainer
+                    SetSize="14 15"
+                    Margin="-1 9 0 0"
+                    HorizontalAlignment="Center">
+                    <TextureButton
+                        Name="EyesButton"
+                        MinSize="14 9"
+                        VerticalAlignment="Top"
+                        StyleClasses="TargetDollButtonEyes">
+                        <TextureRect
+                            TexturePath="/Textures/Interface/Targeting/Doll/eyes.png"
+                            Stretch="KeepAspectCentered"
+                            SetSize="14 9"/>
+                    </TextureButton>
+                    <TextureButton
+                        Name="MouthButton"
+                        SetSize="8 6"
+                        VerticalAlignment="Bottom"
+                        StyleClasses="TargetDollButtonMouth">
+                        <TextureRect
+                            TexturePath="/Textures/Interface/Targeting/Doll/mouth.png"
+                            Stretch="KeepAspectCentered"
+                            SetSize="8 6"/>
+                    </TextureButton>
+                </PanelContainer>-->
+                        </TextureButton>
+                        <TextureButton
+                            Name="ChestButton"
+                            SetSize="28 30"
+                            Margin="0 18 0 0"
+                            VerticalAlignment="Top"
+                            HorizontalAlignment="Center"
+                            StyleClasses="TargetDollButtonChest">
+                        </TextureButton>
+                        <PanelContainer
+                            MinSize="38 35"
+                            VerticalAlignment="Bottom"
+                            HorizontalAlignment="Center">
+                            <TextureButton
+                                Name="GroinButton"
+                                MinSize="28 15"
+                                VerticalAlignment="Top"
+                                HorizontalAlignment="Center"
+                                StyleClasses="TargetDollButtonGroin">
+                            </TextureButton>
+                            <PanelContainer
+                                MinSize="20 30"
+                                VerticalAlignment="Bottom"
+                                HorizontalAlignment="Right">
+                                <TextureButton
+                                    Name="LeftLegButton"
+                                    MinSize="15 28"
+                                    VerticalAlignment="Top"
+                                    HorizontalAlignment="Left"
+                                    StyleClasses="TargetDollButtonLeftLeg">
+                                </TextureButton>
+                                <TextureButton
+                                    Name="LeftFootButton"
+                                    MinSize="20 10"
+                                    VerticalAlignment="Bottom"
+                                    StyleClasses="TargetDollButtonLeftFoot">
+                                </TextureButton>
+                            </PanelContainer>
+                            <PanelContainer
+                                MinSize="20 30"
+                                VerticalAlignment="Bottom"
+                                HorizontalAlignment="Left">
+                                <TextureButton
+                                    Name="RightLegButton"
+                                    MinSize="15 28"
+                                    VerticalAlignment="Top"
+                                    HorizontalAlignment="Right"
+                                    StyleClasses="TargetDollButtonRightLeg">
+                                </TextureButton>
+                                <TextureButton
+                                    Name="RightFootButton"
+                                    MinSize="20 10"
+                                    VerticalAlignment="Bottom"
+                                    HorizontalAlignment="Center"
+                                    StyleClasses="TargetDollButtonRightFoot">
+                                </TextureButton>
+                            </PanelContainer>
+                        </PanelContainer>
+                    </PanelContainer>
+                    <PanelContainer
+                        SetSize="15 33"
+                        Margin="0 0 4 0"
+                        HorizontalAlignment="Right">
+                        <TextureButton
+                            Name="LeftArmButton"
+                            MinSize="15 25"
+                            StyleClasses="TargetDollButtonLeftArm"
+                            VerticalAlignment="Top">
+                        </TextureButton>
+                        <TextureButton
+                            Name="LeftHandButton"
+                            MinSize="15 15"
+                            VerticalAlignment="Bottom"
+                            StyleClasses="TargetDollButtonLeftHand">
+                        </TextureButton>
+                    </PanelContainer>
+                </PanelContainer>
+            </PanelContainer>
+            <!-- Shitmed Change Start -->
+            <TextureRect Name="NoDataTex" Access="Public" SetSize="96 96" Visible="false" Stretch="KeepAspectCentered" TexturePath="/Textures/Interface/Misc/health_analyzer_out_of_range.png"/> <!-- DeltaV - Size changed to 96 96 to be consistent with shitmed -->
             <BoxContainer Margin="5 0 0 0" Orientation="Vertical" VerticalAlignment="Top">
                 <RichTextLabel Name="NameLabel" SetWidth="150" />
                 <Label Name="SpeciesLabel" VerticalAlignment="Top" StyleClasses="LabelSubText" />

Content.Client/HealthAnalyzer/UI/HealthAnalyzerControl.xaml.cs

@@ -24,6 +24,7 @@ using Content.Client._DV.Traits.Assorted; // DeltaV
 using Content.Shared._DV.Traits.Assorted; // DeltaV
 using Content.Shared._DV.Medical; // DeltaV - Uncloneable
 using Content.Shared._DV.MedicalRecords; // DeltaV - Medical Records
+using Content.Shared._Shitmed.Targeting; // Shitmed
 
 // Health analyzer UI is split from its window because it's used by both the
 // health analyzer item and the cryo pod UI.
@@ -40,6 +41,16 @@ public sealed partial class HealthAnalyzerControl : BoxContainer
     private readonly RedshirtSystem _redshirt; // DeltaV
     private readonly UncloneableSystem _uncloneable; // DeltaV
 
+    // Shitmed Change Start
+    public event Action<TargetBodyPart?, EntityUid>? OnBodyPartSelected;
+    private EntityUid _spriteViewEntity;
+
+    private readonly EntProtoId _bodyView = "AlertSpriteView";
+
+    private readonly Dictionary<TargetBodyPart, TextureButton> _bodyPartControls;
+    private EntityUid? _target;
+    // Shitmed Change End
+
     // Begin DeltaV - Medical Records
     private readonly ButtonGroup _triageStatusGroup = new();
     private readonly Dictionary<TriageStatus, Button> _triageControls = new();
@@ -61,6 +72,29 @@ public sealed partial class HealthAnalyzerControl : BoxContainer
         _unborgable = _entityManager.System<UnborgableSystem>(); // DeltaV
         _redshirt = _entityManager.System<RedshirtSystem>(); // DeltaV
         _uncloneable = _entityManager.System<UncloneableSystem>(); // DeltaV
+        // Shitmed Change Start
+        _bodyPartControls = new Dictionary<TargetBodyPart, TextureButton>
+        {
+            { TargetBodyPart.Head, HeadButton },
+            { TargetBodyPart.Torso, ChestButton },
+            { TargetBodyPart.Groin, GroinButton },
+            { TargetBodyPart.LeftArm, LeftArmButton },
+            { TargetBodyPart.LeftHand, LeftHandButton },
+            { TargetBodyPart.RightArm, RightArmButton },
+            { TargetBodyPart.RightHand, RightHandButton },
+            { TargetBodyPart.LeftLeg, LeftLegButton },
+            { TargetBodyPart.LeftFoot, LeftFootButton },
+            { TargetBodyPart.RightLeg, RightLegButton },
+            { TargetBodyPart.RightFoot, RightFootButton },
+        };
+
+        foreach (var bodyPartButton in _bodyPartControls)
+        {
+            bodyPartButton.Value.MouseFilter = MouseFilterMode.Stop;
+            bodyPartButton.Value.OnPressed += _ => SetActiveBodyPart(bodyPartButton.Key, bodyPartButton.Value);
+        }
+        ReturnButton.OnPressed += _ => ResetBodyPart();
+        // Shitmed Change End
 
         // Begin DeltaV - Medical Records
         foreach (var item in Enum.GetValues<TriageStatus>())
@@ -86,14 +120,29 @@ public sealed partial class HealthAnalyzerControl : BoxContainer
     public void Populate(HealthAnalyzerUiState state)
     {
         var target = _entityManager.GetEntity(state.TargetEntity);
+        // Begin Shitmed
+        _target = target;
+        EntityUid? part = state.Part != null ? _entityManager.GetEntity(state.Part.Value) : null;
+        var isPart = part != null;
+        // End Shitmed
 
         if (target == null
-            || !_entityManager.TryGetComponent<DamageableComponent>(target, out var damageable))
+            || !_entityManager.TryGetComponent<DamageableComponent>(isPart ? part : target, out var damageable)) // Shitmed
         {
             NoPatientDataText.Visible = true;
             return;
         }
 
+        // Begin Shitmed
+        ReturnButton.Visible = isPart;
+        PartNameLabel.Visible = isPart;
+
+        if (part != null)
+            PartNameLabel.Text = _entityManager.HasComponent<MetaDataComponent>(part)
+                ? Identity.Name(part.Value, _entityManager)
+                : Loc.GetString("health-analyzer-window-entity-unknown-value-text");
+        // End Shitmed
+
         NoPatientDataText.Visible = false;
 
         // Scan Mode
@@ -108,6 +157,11 @@ public sealed partial class HealthAnalyzerControl : BoxContainer
 
         // Patient Information
 
+        SpriteView.SetEntity(SetupIcon(state.Body) ?? target.Value); // Shitmed Change
+        SpriteView.Visible = state.ScanMode.HasValue && state.ScanMode.Value;
+        PartView.Visible = SpriteView.Visible; // Shitmed Change
+        NoDataTex.Visible = !SpriteView.Visible;
+
         var name = new FormattedMessage();
         name.PushColor(Color.White);
         name.AddText(_entityManager.HasComponent<MetaDataComponent>(target.Value)
@@ -284,6 +338,65 @@ public sealed partial class HealthAnalyzerControl : BoxContainer
         }
     }
 
+    // Shitmed Change Start
+    public void SetActiveBodyPart(TargetBodyPart part, TextureButton button)
+    {
+        if (_target == null)
+            return;
+
+        // Bit of the ole shitcode until we have Groins in the prototypes.
+        OnBodyPartSelected?.Invoke(part == TargetBodyPart.Groin ? TargetBodyPart.Torso : part, _target.Value);
+    }
+
+    public void ResetBodyPart()
+    {
+        if (_target == null)
+            return;
+
+        OnBodyPartSelected?.Invoke(null, _target.Value);
+    }
+
+    public void SetActiveButtons(bool isHumanoid)
+    {
+        foreach (var button in _bodyPartControls)
+            button.Value.Visible = isHumanoid;
+    }
+
+    /// <summary>
+    /// Sets up the Body Doll using Alert Entity to use in Health Analyzer.
+    /// </summary>
+    private EntityUid? SetupIcon(Dictionary<TargetBodyPart, TargetIntegrity>? body)
+    {
+        if (body is null)
+            return null;
+
+        if (!_entityManager.Deleted(_spriteViewEntity))
+            _entityManager.QueueDeleteEntity(_spriteViewEntity);
+
+        _spriteViewEntity = _entityManager.Spawn(_bodyView);
+
+        if (!_entityManager.TryGetComponent<SpriteComponent>(_spriteViewEntity, out var sprite))
+            return null;
+
+        int layer = 0;
+        foreach (var (bodyPart, integrity) in body)
+        {
+            // TODO: PartStatusUIController and make it use layers instead of TextureRects when EE refactors alerts.
+            string enumName = Enum.GetName(typeof(TargetBodyPart), bodyPart) ?? "Unknown";
+            int enumValue = (int) integrity;
+            var rsi = new SpriteSpecifier.Rsi(new ResPath($"/Textures/_Shitmed/Interface/Targeting/Status/{enumName.ToLowerInvariant()}.rsi"), $"{enumName.ToLowerInvariant()}_{enumValue}");
+            // Shitcode with love from Russia :)
+            if (!_spriteSystem.TryGetLayer(_spriteViewEntity, layer, out _, false))
+                _spriteSystem.AddTextureLayer(_spriteViewEntity, _spriteSystem.Frame0(rsi));
+            else
+                _spriteSystem.LayerSetTexture(_spriteViewEntity, layer, _spriteSystem.Frame0(rsi));
+            _spriteSystem.LayerSetScale(_spriteViewEntity, layer, new Vector2(3f, 3f));
+            layer++;
+        }
+        return _spriteViewEntity;
+    }
+    // Shitmed Change End
+
     private Texture GetTexture(string texture)
     {
         var rsiPath = new ResPath("/Textures/Objects/Devices/health_analyzer.rsi");

Content.Client/HealthAnalyzer/UI/HealthAnalyzerWindow.xaml

@@ -3,7 +3,7 @@
     xmlns:controls="clr-namespace:Content.Client.UserInterface.Controls"
     xmlns:ui="clr-namespace:Content.Client.HealthAnalyzer.UI"
     MaxHeight="525"
-    MinWidth="300">
+    MinWidth="350"> <!-- Shitmed Change -->
     <ScrollContainer
         Margin="5 5 5 5"
         ReturnMeasure="True"
@@ -11,6 +11,6 @@
 
         <ui:HealthAnalyzerControl
             Name="HealthAnalyzer"
-            Access="Public" /> <!-- DeltaV -->
+            Access="Public" /> <!-- DeltaV / Shitmed Change - Make Public-->
     </ScrollContainer>
 </controls:FancyWindow>

Content.Client/Humanoid/HumanoidAppearanceSystem.cs

@@ -88,7 +88,8 @@ public sealed class HumanoidAppearanceSystem : SharedHumanoidAppearanceSystem
         foreach (var (key, info) in component.CustomBaseLayers)
         {
             oldLayers.Remove(key);
-            SetLayerData(entity, key, info.Id, sexMorph: false, color: info.Color);
+            // Shitmed Change: For whatever reason these weren't actually ignoring the skin color as advertised.
+            SetLayerData(entity, key, info.Id, sexMorph: false, color: info.Color, overrideSkin: true);
         }
 
         // hide old layers
@@ -105,7 +106,8 @@ public sealed class HumanoidAppearanceSystem : SharedHumanoidAppearanceSystem
         HumanoidVisualLayers key,
         string? protoId,
         bool sexMorph = false,
-        Color? color = null)
+        Color? color = null,
+        bool overrideSkin = false) // Shitmed Change
     {
         var component = entity.Comp1;
         var sprite = entity.Comp2;
@@ -126,7 +128,7 @@ public sealed class HumanoidAppearanceSystem : SharedHumanoidAppearanceSystem
         var proto = _prototypeManager.Index<HumanoidSpeciesSpriteLayer>(protoId);
         component.BaseLayers[key] = proto;
 
-        if (proto.MatchSkin)
+        if (proto.MatchSkin && !overrideSkin) // Shitmed Change
             layer.Color = component.SkinColor.WithAlpha(proto.LayerAlpha);
 
         if (proto.BaseSprite != null)

Content.Client/Input/ContentContexts.cs

@@ -98,6 +98,18 @@ namespace Content.Client.Input
             human.AddFunction(ContentKeyFunctions.Arcade1);
             human.AddFunction(ContentKeyFunctions.Arcade2);
             human.AddFunction(ContentKeyFunctions.Arcade3);
+            // Shitmed Change Start - TODO: Add hands, feet and groin targeting.
+            human.AddFunction(ContentKeyFunctions.TargetHead);
+            human.AddFunction(ContentKeyFunctions.TargetTorso);
+            human.AddFunction(ContentKeyFunctions.TargetLeftArm);
+            human.AddFunction(ContentKeyFunctions.TargetLeftHand);
+            human.AddFunction(ContentKeyFunctions.TargetRightArm);
+            human.AddFunction(ContentKeyFunctions.TargetRightHand);
+            human.AddFunction(ContentKeyFunctions.TargetLeftLeg);
+            human.AddFunction(ContentKeyFunctions.TargetLeftFoot);
+            human.AddFunction(ContentKeyFunctions.TargetRightLeg);
+            human.AddFunction(ContentKeyFunctions.TargetRightFoot);
+            // Shitmed Change End
 
             // actions should be common (for ghosts, mobs, etc)
             common.AddFunction(ContentKeyFunctions.OpenActionsMenu);

Content.Client/Inventory/ClientInventorySystem.cs

@@ -6,6 +6,7 @@ using Content.Shared.Interaction;
 using Content.Shared.Inventory;
 using Content.Shared.Inventory.Events;
 using Content.Shared.Storage;
+using Content.Shared._Shitmed.Targeting.Events; // Shitmed
 using JetBrains.Annotations;
 using Robust.Client.Player;
 using Robust.Client.UserInterface;

Content.Client/Medical/CrewMonitoring/CrewMonitoringNavMapControl.cs

@@ -1,6 +1,5 @@
 using Content.Client.Pinpointer.UI;
 using Robust.Client.Graphics;
-using Robust.Client.Player; // DeltaV
 using Robust.Client.UserInterface.Controls;
 using Robust.Shared.Timing;
 
@@ -8,9 +7,6 @@ namespace Content.Client.Medical.CrewMonitoring;
 
 public sealed partial class CrewMonitoringNavMapControl : NavMapControl
 {
-    [Dependency] private IPlayerManager _playerManager = default!; // DeltaV
-    private readonly SharedTransformSystem _xform; // DeltaV
-
     public NetEntity? Focus;
     public Dictionary<NetEntity, string> LocalizedNames = new();
 
@@ -19,9 +15,6 @@ public sealed partial class CrewMonitoringNavMapControl : NavMapControl
 
     public CrewMonitoringNavMapControl() : base()
     {
-        IoCManager.InjectDependencies(this); // DeltaV - Gotta inject!
-        _xform = EntManager.System<SharedTransformSystem>(); // DeltaV - Gotta inject!
-
         WallColor = new Color(192, 122, 196);
         TileColor = new(71, 42, 72);
         BackgroundColor = Color.FromSrgb(TileColor.WithAlpha(BackgroundOpacity));
@@ -84,27 +77,4 @@ public sealed partial class CrewMonitoringNavMapControl : NavMapControl
         _trackedEntityLabel.Text = string.Empty;
         _trackedEntityPanel.Visible = false;
     }
-
-    /// <summary>
-    /// DeltaV - Do some things before the base NavMap Draw and also force the redraw of the map
-    /// after if the MapUid was null when the CrewMonitor UI was opened.
-    /// </summary>
-    /// <param name="handle"></param>
-    protected override void Draw(DrawingHandleScreen handle)
-    {
-        // MapUid will not have a value if the crew monitor UI was activated off-grid.
-        var forceMapUpdate = false;
-        if (!MapUid.HasValue && _playerManager.LocalEntity is { } player)
-        {
-            MapUid = _xform.GetGrid(player);
-            forceMapUpdate = true;
-        }
-
-        base.Draw(handle);
-
-        // We need to call this after Draw() because UpdateNavMap has functions that uses variables
-        // set in Draw()
-        if (forceMapUpdate)
-            UpdateNavMap();
-    }
 }

Content.Client/Medical/CrewMonitoring/CrewMonitoringWindow.xaml

@@ -1,16 +1,13 @@
 <controls:FancyWindow xmlns="https://spacestation14.io"
                xmlns:ui="clr-namespace:Content.Client.Medical.CrewMonitoring"
                xmlns:controls="clr-namespace:Content.Client.UserInterface.Controls"
-               xmlns:crewMonitoring="clr-namespace:Content.Client._DV.CrewMonitoring"
                Title="{Loc crew-monitoring-ui-title}"
                Resizable="False"
                SetSize="1210 700"
                MinSize="1210 700">
     <BoxContainer Orientation="Vertical">
         <BoxContainer Orientation="Horizontal" VerticalExpand="True" HorizontalExpand="True">
-            <ui:CrewMonitoringNavMapControl Name="NavMap" HorizontalExpand="True" VerticalExpand="True" Margin="5 20" Visible="False" />
-            <crewMonitoring:CrewMonitoringShuttleControl Name="ShuttleMap" HorizontalExpand="True" VerticalExpand="True" Margin="5 20" Visible="False" />
-
+            <ui:CrewMonitoringNavMapControl Name="NavMap" HorizontalExpand="True" VerticalExpand="True" Margin="5 20"/>
             <BoxContainer Orientation="Vertical" Margin="0 0 10 0">
                 <controls:StripeBack>
                     <PanelContainer>

Content.Client/Medical/CrewMonitoring/CrewMonitoringWindow.xaml.cs

@@ -5,7 +5,6 @@ using Content.Client.Pinpointer.UI;
 using Content.Client.Stylesheets;
 using Content.Client.UserInterface.Controls;
 using Content.Shared.Medical.SuitSensor;
-using Content.Shared.Station; // DeltaV - crew monitoring radar
 using Content.Shared.StatusIcon;
 using Robust.Client.AutoGenerated;
 using Robust.Client.GameObjects;
@@ -28,7 +27,6 @@ public sealed partial class CrewMonitoringWindow : FancyWindow
     [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
     private readonly SharedTransformSystem _transformSystem;
     private readonly SpriteSystem _spriteSystem;
-    private readonly SharedStationSystem _station; // DeltaV - crew monitoring radar
 
     private NetEntity? _trackedEntity;
     private bool _tryToScrollToListFocus;
@@ -41,10 +39,8 @@ public sealed partial class CrewMonitoringWindow : FancyWindow
 
         _transformSystem = _entManager.System<SharedTransformSystem>();
         _spriteSystem = _entManager.System<SpriteSystem>();
-        _station = _entManager.System<SharedStationSystem>(); // DeltaV - crew monitoring radar
 
         NavMap.TrackedEntitySelectedAction += SetTrackedEntityFromNavMap;
-        ShuttleMap.NavMap = NavMap; // DeltaV - crew monitoring radar
     }
 
     public void Set(string stationName, EntityUid? mapUid)
@@ -54,10 +50,8 @@ public sealed partial class CrewMonitoringWindow : FancyWindow
         if (_entManager.TryGetComponent<TransformComponent>(mapUid, out var xform))
             NavMap.MapUid = xform.GridUid;
 
-        // Begin DeltaV - handle navmap visibility based on current position
-        // else
-        //    NavMap.Visible = false;
-        // End DeltaV - handle navmap visibility based on current position
+        else
+            NavMap.Visible = false;
 
         StationName.AddStyleClass("LabelBig");
         StationName.Text = stationName;
@@ -68,28 +62,6 @@ public sealed partial class CrewMonitoringWindow : FancyWindow
     {
         base.FrameUpdate(args);
 
-        // Begin DeltaV - handle navmap visibility based on current position
-        var ent = ShuttleMap.Owner;
-
-        // If an entity is being tracked, use them as the focus, since they may be off-station
-        // and we want to use the nav map if they are.
-        if (_trackedEntity is { } trackedEntity)
-            ent = _entManager.GetEntity(trackedEntity);
-
-        // We need to make sure the entity is valid because for some reason, it *could* be an 
-        // invalid entity and GetOwningStation will throw an exception.
-        if (ent.HasValue && ent.Value.IsValid() && _station.GetOwningStation(ent) is not null)
-        {
-            NavMap.Visible = true;
-            ShuttleMap.Visible = false;
-        }
-        else
-        {
-            NavMap.Visible = false;
-            ShuttleMap.Visible = true;
-        }
-        // End DeltaV - handle navmap visibility based on current position
-
         if (_tryToScrollToListFocus)
             TryToScrollToFocus();
     }
@@ -97,7 +69,6 @@ public sealed partial class CrewMonitoringWindow : FancyWindow
     public void ShowSensors(List<SuitSensorStatus> sensors, EntityUid monitor, EntityCoordinates? monitorCoords)
     {
         ClearOutDatedData();
-        ShuttleMap.Owner = monitor; // DeltaV - crew monitoring radar
 
         // No server label
         if (sensors.Count == 0)
@@ -333,7 +304,7 @@ public sealed partial class CrewMonitoringWindow : FancyWindow
             jobContainer.AddChild(jobLabel);
 
             // Add user coordinates to the navmap
-            if (coordinates != null && _blipTexture != null) // DeltaV - don't filter the navmap visibility
+            if (coordinates != null && NavMap.Visible && _blipTexture != null)
             {
                 NavMap.TrackedEntities.TryAdd(sensor.SuitSensorUid,
                     new NavMapBlip
@@ -352,14 +323,6 @@ public sealed partial class CrewMonitoringWindow : FancyWindow
                     if (_trackedEntity == sensor.SuitSensorUid)
                     {
                         _trackedEntity = null;
-                        // BEGIN DeltaV - center on crew monitor user if deselecting
-                        // This fixes some weird bug where if you deselect a tracked entity, it will
-                        // just not draw the map at all in some cases.
-                        if (ShuttleMap.Owner is { } handheld &&
-                            _transformSystem.TryGetMapOrGridCoordinates(handheld, out var userCoords) &&
-                            userCoords is { } coords)
-                            NavMap.CenterToCoordinates(coords);
-                        // END DeltaV
                     }
 
                     else

Content.Client/Movement/Systems/ContentEyeSystem.cs

@@ -60,9 +60,6 @@ public sealed class ContentEyeSystem : SharedContentEyeSystem
         while (eyeEntities.MoveNext(out var entity, out ContentEyeComponent? contentComponent, out EyeComponent? eyeComponent))
         {
             UpdateEyeOffset((entity, eyeComponent));
-            // ES START
-            UpdateEyeRotation((entity, eyeComponent));
-            // ES END
         }
     }
 
@@ -74,9 +71,6 @@ public sealed class ContentEyeSystem : SharedContentEyeSystem
         while (eyeEntities.MoveNext(out var entity, out ContentEyeComponent? contentComponent, out EyeComponent? eyeComponent))
         {
             UpdateEyeOffset((entity, eyeComponent));
-            // ES START
-            UpdateEyeRotation((entity, eyeComponent));
-            // ES END
         }
     }
 }

Content.Client/Options/UI/OptionsMenu.xaml

@@ -10,7 +10,6 @@
         <tabs:AudioTab Name="AudioTab" />
         <tabs:AccessibilityTab Name="AccessibilityTab" />
         <tabs:AdminOptionsTab Name="AdminOptionsTab" />
-        <dtabs:RadioTab Name="RadioTab" /> <!-- DeltaV - Client-side Radio Options -->
         <dtabs:DeltaTab Name="DeltaTab" /> <!-- DeltaV -->
     </TabContainer>
 </DefaultWindow>

Content.Client/Options/UI/OptionsMenu.xaml.cs

@@ -21,8 +21,7 @@ namespace Content.Client.Options.UI
             Tabs.SetTabTitle(3, Loc.GetString("ui-options-tab-audio"));
             Tabs.SetTabTitle(4, Loc.GetString("ui-options-tab-accessibility"));
             Tabs.SetTabTitle(5, Loc.GetString("ui-options-tab-admin"));
-            Tabs.SetTabTitle(6, Loc.GetString("ui-options-tab-radio")); // DeltaV - Radio Channel Colors
-            Tabs.SetTabTitle(7, Loc.GetString("ui-options-tab-deltav")); // DeltaV specific settings
+            Tabs.SetTabTitle(6, Loc.GetString("ui-options-tab-deltav")); // DeltaV specific settings
 
             UpdateTabs();
         }
@@ -37,7 +36,6 @@ namespace Content.Client.Options.UI
             AccessibilityTab.Control.ReloadValues();
             AudioTab.Control.ReloadValues();
             AdminOptionsTab.Control.ReloadValues();
-            RadioTab.Control.ReloadValues(); // DeltaV - Radio Channel Colors
             DeltaTab.Control.ReloadValues(); // DeltaV
         }
     }

Content.Client/Options/UI/Tabs/AccessibilityTab.xaml

@@ -7,7 +7,6 @@
                 <Label Text="{Loc 'ui-options-accessability-header-visuals'}"
                        StyleClasses="LabelKeyText"/>
                 <CheckBox Name="ReducedMotionCheckBox" Text="{Loc 'ui-options-reduced-motion'}" />
-                <CheckBox Name="DisableScreenshakeCheckBox" Text="{Loc 'ui-options-es-screen-shake-toggle'}" /> <!-- DeltaV - ES Screenshake Port -->
                 <CheckBox Name="EnableColorNameCheckBox" Text="{Loc 'ui-options-enable-color-name'}" />
                 <CheckBox Name="ColorblindFriendlyCheckBox" Text="{Loc 'ui-options-colorblind-friendly'}" />
                 <ui:OptionSlider Name="ScreenShakeIntensitySlider" Title="{Loc 'ui-options-screen-shake-intensity'}" />

Content.Client/Options/UI/Tabs/AccessibilityTab.xaml.cs

@@ -1,4 +1,3 @@
-using Content.Shared._DV.CCVars; // DeltaV - ES Screenshake Port
 using Content.Shared.CCVar;
 using Robust.Client.AutoGenerated;
 using Robust.Client.UserInterface;
@@ -16,7 +15,6 @@ public sealed partial class AccessibilityTab : Control
         Control.AddOptionCheckBox(CCVars.ChatEnableColorName, EnableColorNameCheckBox);
         Control.AddOptionCheckBox(CCVars.AccessibilityColorblindFriendly, ColorblindFriendlyCheckBox);
         Control.AddOptionCheckBox(CCVars.ReducedMotion, ReducedMotionCheckBox);
-        Control.AddOptionCheckBox(DCCVars.EsScreenshakeDisabled, DisableScreenshakeCheckBox); // DeltaV - ES Screenshake Port
         Control.AddOptionPercentSlider(CCVars.ScreenShakeIntensity, ScreenShakeIntensitySlider);
         Control.AddOptionPercentSlider(CCVars.ChatWindowOpacity, ChatWindowOpacitySlider);
         Control.AddOptionPercentSlider(CCVars.SpeechBubbleTextOpacity, SpeechBubbleTextOpacitySlider);

Content.Client/Options/UI/Tabs/KeyRebindTab.xaml.cs

@@ -1,5 +1,6 @@
 using System.Numerics;
 using Content.Client.Stylesheets;
+using Content.Shared._Goobstation.CCVar; // GoobStation
 using Content.Shared.CCVar;
 using Content.Shared.Input;
 using Robust.Client.AutoGenerated;
@@ -243,6 +244,20 @@ namespace Content.Client.Options.UI.Tabs
             AddButton(ContentKeyFunctions.NanoChatNavigateDownUnread);
             // DeltaV - End NanoChat keybinds
 
+            // Shitmed Change Start - TODO: Add hands, feet and groin targeting.
+            AddHeader("ui-options-header-targeting");
+            AddButton(ContentKeyFunctions.TargetHead);
+            AddButton(ContentKeyFunctions.TargetTorso);
+            AddButton(ContentKeyFunctions.TargetLeftArm);
+            AddButton(ContentKeyFunctions.TargetLeftHand);
+            AddButton(ContentKeyFunctions.TargetRightArm);
+            AddButton(ContentKeyFunctions.TargetRightHand);
+            AddButton(ContentKeyFunctions.TargetLeftLeg);
+            AddButton(ContentKeyFunctions.TargetLeftFoot);
+            AddButton(ContentKeyFunctions.TargetRightLeg);
+            AddButton(ContentKeyFunctions.TargetRightFoot);
+            // Shitmed Change End
+
             AddHeader("ui-options-header-misc");
             AddButton(ContentKeyFunctions.TakeScreenshot);
             AddButton(ContentKeyFunctions.TakeScreenshotNoUI);

Content.Client/Options/UI/Tabs/MiscTab.xaml

@@ -20,7 +20,6 @@
                 <CheckBox Name="ShowLoocAboveHeadCheckBox" Text="{Loc 'ui-options-show-looc-on-head'}" />
                 <CheckBox Name="FancySpeechBubblesCheckBox" Text="{Loc 'ui-options-fancy-speech'}" />
                 <CheckBox Name="FancyNameBackgroundsCheckBox" Text="{Loc 'ui-options-fancy-name-background'}" />
-                <CheckBox Name="ChatFollowButton" Text="{Loc 'ui-options-chat-follow-button'}" />
                 <Label Text="{Loc 'ui-options-general-cursor'}"
                        StyleClasses="LabelKeyText"/>
                 <CheckBox Name="ShowHeldItemCheckBox" Text="{Loc 'ui-options-show-held-item'}" />

Content.Client/Options/UI/Tabs/MiscTab.xaml.cs

@@ -63,7 +63,6 @@ public sealed partial class MiscTab : Control
         Control.AddOptionCheckBox(CCVars.ChatEnableFancyBubbles, FancySpeechBubblesCheckBox);
         Control.AddOptionCheckBox(CCVars.ChatFancyNameBackground, FancyNameBackgroundsCheckBox);
         Control.AddOptionCheckBox(CCVars.StaticStorageUI, StaticStorageUI);
-        Control.AddOptionCheckBox(CCVars.InterfaceChatFollowButton, ChatFollowButton);
 
         Control.Initialize();
     }

Content.Client/PDA/PdaBoundUserInterface.cs

@@ -1,5 +1,4 @@
 using Content.Client.CartridgeLoader;
-using Content.Shared._DV.Pager; // DeltaV - pagers
 using Content.Shared.CartridgeLoader;
 using Content.Shared.Containers.ItemSlots;
 using Content.Shared.PDA;
@@ -73,13 +72,6 @@ namespace Content.Client.PDA
                 SendMessage(new PdaLockUplinkMessage());
             };
 
-            // Begin DeltaV - pagers
-            _menu.OnUnlinkDevicePressed += address =>
-            {
-                SendMessage(new PagerRemoveAddressMessage(address));
-            };
-            // End DeltaV - pagers
-
             _menu.OnProgramItemPressed += ActivateCartridge;
             _menu.OnInstallButtonPressed += InstallCartridge;
             _menu.OnUninstallButtonPressed += UninstallCartridge;
@@ -108,7 +100,6 @@ namespace Content.Client.PDA
             }
 
             _menu.UpdateState(updateState);
-            UpdateLinkedDevices(); // DeltaV - pagers
         }
 
         protected override void AttachCartridgeUI(Control cartridgeUIFragment, string? title)
@@ -136,13 +127,5 @@ namespace Content.Client.PDA
         {
             return EntMan.GetComponentOrNull<PdaBorderColorComponent>(Owner);
         }
-
-        // Begin DeltaV - pagers
-        public void UpdateLinkedDevices()
-        {
-            if (EntMan.TryGetComponent<PagerComponent>(Owner, out var receiver))
-                _menu?.UpdateLinkedDevices(receiver.Devices);
-        }
-        // End DeltaV - pagers
     }
 }

Content.Client/PDA/PdaMenu.xaml

@@ -70,12 +70,6 @@
                                        Access="Public"
                                        Text="{Loc 'comp-pda-ui-ringtone-button'}"
                                        Description="{Loc 'comp-pda-ui-ringtone-button-description'}"/>
-                <!-- Begin DeltaV Additions: Pagers -->
-                <pda:PdaSettingsButton Name="LinkedDevicesButton"
-                                       Access="Public"
-                                       Text="{Loc 'comp-pda-ui-linked-devices-button'}"
-                                       Description="{Loc 'comp-pda-ui-linked-devices-description'}"/>
-                <!-- End DeltaV Additions: Pagers -->
                 <pda:PdaSettingsButton Name="ActivateMusicButton"
                                        Access="Public"
                                        Visible="False"
@@ -98,13 +92,6 @@
                       HorizontalExpand="True"
                       Name="ProgramView"
                       Access="Public">
-            <!-- Begin DeltaV Additions: Pagers -->
-            <BoxContainer Orientation="Vertical"
-                          VerticalExpand="True"
-                          HorizontalExpand="True"
-                          Name="LinkedDeviceList"
-                          Visible="False"/>
-            <!-- End DeltaV Additions: Pagers -->
         </BoxContainer>
     </BoxContainer>
     <BoxContainer Name="ContentFooter" HorizontalExpand="True" SetHeight="28" Margin="1 0 2 1">

Content.Client/PDA/PdaMenu.xaml.cs

@@ -131,12 +131,6 @@ namespace Content.Client.PDA
             {
                 _clipboard.SetText(_currentDate);
             };
-
-            LinkedDevicesButton.OnPressed += _ =>
-            {
-                LinkedDeviceList.Visible = true;
-                ToProgramView(Loc.GetString("comp-pda-ui-linked-devices-title"));
-            };
             // End DeltaV additions
 
             
@@ -306,7 +300,6 @@ namespace Content.Client.PDA
             ProgramCloseButton.Visible = false;
             ProgramListButton.Visible = true;
             SettingsButton.Visible = true;
-            LinkedDeviceList.Visible = false; // DeltaV - pagers
         }
 
         /// <summary>

Content.Client/Pinpointer/UI/NavMapControl.cs

@@ -56,8 +56,8 @@ public partial class NavMapControl : MapGridControl
 
     // Constants
     protected float UpdateTime = 1.0f;
-    public float MaxSelectableDistance = 10f; // DeltaV - accessible to CrewMonitoringShuttleControl
-    public float MinDragDistance = 5f; // DeltaV - accessible to CrewMonitoringShuttleControl
+    protected float MaxSelectableDistance = 10f;
+    protected float MinDragDistance = 5f;
     protected static float MinDisplayedRange = 8f;
     protected static float MaxDisplayedRange = 128f;
     protected static float DefaultDisplayedRange = 48f;
@@ -193,13 +193,6 @@ public partial class NavMapControl : MapGridControl
         _recenter.Disabled = false;
     }
 
-    // Begin DeltaV - we need access to that from outside
-    public void TrackEntity(NetEntity? entity)
-    {
-        TrackedEntitySelectedAction?.Invoke(entity);
-    }
-    // End DeltaV - we need access to that from outside
-
     protected override void KeyBindUp(GUIBoundKeyEventArgs args)
     {
         base.KeyBindUp(args);

Content.Client/SSDIndicator/SSDIndicatorSystem.cs

@@ -19,7 +19,6 @@ public sealed class SSDIndicatorSystem : EntitySystem
     [Dependency] private readonly IPrototypeManager _prototype = default!;
     [Dependency] private readonly IConfigurationManager _cfg = default!;
     [Dependency] private readonly MobStateSystem _mobState = default!;
-    [Dependency] private readonly Shared.SSDIndicator.SSDIndicatorSystem _shared = default!; // DeltaV - SSD Recency, don't want to rename the upstream class
 
     public override void Initialize()
     {
@@ -36,26 +35,13 @@ public sealed class SSDIndicatorSystem : EntitySystem
             !HasComp<ActiveNPCComponent>(uid) &&
             HasComp<MindExaminableComponent>(uid))
         {
-            // Begin DeltaV Additions
+            // Begin DeltaV Addition
             var ev = new ShowSSDIndicatorEvent();
             RaiseLocalEvent(uid, ref ev);
             if (ev.Hidden)
                 return;
-
-            // SSD Recency Indicator
-            var stage = _shared.GetStage(new Entity<SSDIndicatorComponent>(uid, component));
-            var icon = stage switch
-            {
-                SsdStage.VeryRecent => component.VeryRecentIcon,
-                SsdStage.Recent => component.RecentIcon,
-                SsdStage.Cryoable => component.Icon,
-                _ => throw new InvalidOperationException($"{ToPrettyString(uid)} has an invalid SSD stage {stage}."),
-            };
-
-            args.StatusIcons.Add(_prototype.Index(icon));
-            // End DeltaV Additions
-
-            // args.StatusIcons.Add(_prototype.Index(component.Icon)); // DeltaV - commented out. status icon now added above
+            // End DeltaV Addition
+            args.StatusIcons.Add(_prototype.Index(component.Icon));
         }
     }
 }

Content.Client/Stunnable/StunSystem.cs

@@ -1,12 +1,10 @@
 using System.Numerics;
-using Content.Shared._DV.CCVars; // DeltaV - Enable Stars via CVar.
 using Content.Shared.CombatMode;
 using Content.Shared.Interaction;
 using Content.Shared.Stunnable;
 using Robust.Client.Animations;
 using Robust.Client.GameObjects;
 using Robust.Shared.Animations;
-using Robust.Shared.Configuration; // DeltaV - Enable Stars via CVar.
 using Robust.Shared.Input;
 using Robust.Shared.Input.Binding;
 using Robust.Shared.Random;
@@ -15,7 +13,6 @@ namespace Content.Client.Stunnable;
 
 public sealed class StunSystem : SharedStunSystem
 {
-    [Dependency] private readonly IConfigurationManager _cfg = default!; // DeltaV - Enable Stars via CVar.
     [Dependency] private readonly SharedCombatModeSystem _combat = default!;
     [Dependency] private readonly IRobustRandom _random = default!;
     [Dependency] private readonly SpriteSystem _spriteSystem = default!;
@@ -81,9 +78,6 @@ public sealed class StunSystem : SharedStunSystem
 
         var visible = Appearance.TryGetData<bool>(entity, StunVisuals.SeeingStars, out var stars) && stars;
 
-        if (visible && !_cfg.GetCVar(DCCVars.ShowStunVisuals)) // DeltaV - Enable Stars via CVar.
-            visible = false;
-
         _spriteSystem.LayerSetVisible((entity, entity.Comp), index, visible);
         _spriteSystem.LayerSetRsiState((entity, entity.Comp), index, state);
     }

Content.Client/Stylesheets/StyleNano.cs

@@ -159,6 +159,35 @@ namespace Content.Client.Stylesheets
 
         public static readonly Color ChatBackgroundColor = Color.FromHex("#25252ADD");
 
+        // DeltaV - AAC button variables
+        public static readonly string CommandButtonClass = "CommandButton";
+        public static readonly string EngineeringButtonClass = "EngineeringButton";
+        public static readonly string EpistemicsButtonClass = "EpistemicsButton";
+        public static readonly string JusticeButtonClass = "JusticeButton";
+        public static readonly string LogisticsButtonClass = "LogisticsButton";
+        public static readonly string MedicalButtonClass = "MedicalButton";
+        public static readonly string SecurityButtonClass = "SecurityButton";
+        public static readonly string ServiceButtonClass = "ServiceButton";
+
+        // DeltaV - AAC button colors
+        public static readonly Color CommandButtonColorDefault = Color.FromHex("#404A58");
+        public static readonly Color CommandColorHovered = Color.FromHex("#4F587B");
+        public static readonly Color EngineeringButtonColorDefault = Color.FromHex("#77684B");
+        public static readonly Color EngineeringColorHovered = Color.FromHex("#776D71");
+        public static readonly Color EpistemicsButtonColorDefault = Color.FromHex("#6F5973");
+        public static readonly Color EpistemicsColorHovered = Color.FromHex("#71638E");
+        public static readonly Color LogisticsButtonColorDefault = Color.FromHex("#61503A");
+        public static readonly Color LogisticsColorHovered = Color.FromHex("#675C64");
+        public static readonly Color JusticeButtonColorDefault = Color.FromHex("#4F3D4C");
+        public static readonly Color JusticeColorHovered = Color.FromHex("#5C4B5A");
+        public static readonly Color MedicalButtonColorDefault = Color.FromHex("#49687D");
+        public static readonly Color MedicalColorHovered = Color.FromHex("#556E95");
+        public static readonly Color SecurityButtonColorDefault = Color.FromHex("#724449");
+        public static readonly Color SecurityColorHovered = Color.FromHex("#745370");
+        public static readonly Color ServiceButtonColorDefault = Color.FromHex("#607952");
+        public static readonly Color ServiceColorHovered = Color.FromHex("#667A76");
+        // End DeltaV
+
         public const string StyleClassCrewManifestGender = "CrewManifestGender"; //Delta-V - Manifest pronouns
 
         // i'm not sure what the missing symbols were referencing, and this is getting obseleted anyway so:
@@ -1648,6 +1677,142 @@ namespace Content.Client.Stylesheets
                         BackgroundColor = FancyTreeSelectedRowColor,
                     }),
 
+                // DeltaV - AAC button styles
+                Element<ContainerButton>()
+                    .Class(CommandButtonClass)
+                    .Pseudo(ContainerButton.StylePseudoClassNormal)
+                    .Prop(Control.StylePropertyModulateSelf, CommandButtonColorDefault),
+
+                Element<ContainerButton>()
+                    .Class(CommandButtonClass)
+                    .Pseudo(ContainerButton.StylePseudoClassHover)
+                    .Prop(Control.StylePropertyModulateSelf, CommandColorHovered),
+
+                Element<ContainerButton>()
+                    .Class(EngineeringButtonClass)
+                    .Pseudo(ContainerButton.StylePseudoClassNormal)
+                    .Prop(Control.StylePropertyModulateSelf, EngineeringButtonColorDefault),
+
+                Element<ContainerButton>()
+                    .Class(EngineeringButtonClass)
+                    .Pseudo(ContainerButton.StylePseudoClassHover)
+                    .Prop(Control.StylePropertyModulateSelf, EngineeringColorHovered),
+
+                Element<ContainerButton>()
+                    .Class(EpistemicsButtonClass)
+                    .Pseudo(ContainerButton.StylePseudoClassNormal)
+                    .Prop(Control.StylePropertyModulateSelf, EpistemicsButtonColorDefault),
+
+                Element<ContainerButton>()
+                    .Class(EpistemicsButtonClass)
+                    .Pseudo(ContainerButton.StylePseudoClassHover)
+                    .Prop(Control.StylePropertyModulateSelf, EpistemicsColorHovered),
+
+                Element<ContainerButton>()
+                    .Class(LogisticsButtonClass)
+                    .Pseudo(ContainerButton.StylePseudoClassNormal)
+                    .Prop(Control.StylePropertyModulateSelf, LogisticsButtonColorDefault),
+
+                Element<ContainerButton>()
+                    .Class(LogisticsButtonClass)
+                    .Pseudo(ContainerButton.StylePseudoClassHover)
+                    .Prop(Control.StylePropertyModulateSelf, LogisticsColorHovered),
+
+                Element<ContainerButton>()
+                    .Class(MedicalButtonClass)
+                    .Pseudo(ContainerButton.StylePseudoClassNormal)
+                    .Prop(Control.StylePropertyModulateSelf, MedicalButtonColorDefault),
+
+                Element<ContainerButton>()
+                    .Class(MedicalButtonClass)
+                    .Pseudo(ContainerButton.StylePseudoClassHover)
+                    .Prop(Control.StylePropertyModulateSelf, MedicalColorHovered),
+
+                Element<ContainerButton>()
+                    .Class(SecurityButtonClass)
+                    .Pseudo(ContainerButton.StylePseudoClassNormal)
+                    .Prop(Control.StylePropertyModulateSelf, SecurityButtonColorDefault),
+
+                Element<ContainerButton>()
+                    .Class(SecurityButtonClass)
+                    .Pseudo(ContainerButton.StylePseudoClassHover)
+                    .Prop(Control.StylePropertyModulateSelf, SecurityColorHovered),
+
+                Element<ContainerButton>()
+                    .Class(ServiceButtonClass)
+                    .Pseudo(ContainerButton.StylePseudoClassNormal)
+                    .Prop(Control.StylePropertyModulateSelf, ServiceButtonColorDefault),
+
+                Element<ContainerButton>()
+                    .Class(ServiceButtonClass)
+                    .Pseudo(ContainerButton.StylePseudoClassHover)
+                    .Prop(Control.StylePropertyModulateSelf, ServiceColorHovered),
+
+                Element<ContainerButton>()
+                    .Class(JusticeButtonClass)
+                    .Pseudo(ContainerButton.StylePseudoClassNormal)
+                    .Prop(Control.StylePropertyModulateSelf, JusticeButtonColorDefault),
+
+                Element<ContainerButton>()
+                    .Class(JusticeButtonClass)
+                    .Pseudo(ContainerButton.StylePseudoClassHover)
+                    .Prop(Control.StylePropertyModulateSelf, JusticeColorHovered),
+                // End DeltaV
+
+                // Shitmed Change Start
+                Element<TextureButton>().Class("TargetDollButtonHead")
+                    .Pseudo(TextureButton.StylePseudoClassHover)
+                    .Prop(TextureButton.StylePropertyTexture, resCache.GetTexture("/Textures/_Shitmed/Interface/Targeting/Doll/head_hover.png")),
+
+                Element<TextureButton>().Class("TargetDollButtonChest")
+                    .Pseudo(TextureButton.StylePseudoClassHover)
+                    .Prop(TextureButton.StylePropertyTexture, resCache.GetTexture("/Textures/_Shitmed/Interface/Targeting/Doll/torso_hover.png")),
+
+                Element<TextureButton>().Class("TargetDollButtonGroin")
+                    .Pseudo(TextureButton.StylePseudoClassHover)
+                    .Prop(TextureButton.StylePropertyTexture, resCache.GetTexture("/Textures/_Shitmed/Interface/Targeting/Doll/groin_hover.png")),
+
+                Element<TextureButton>().Class("TargetDollButtonLeftArm")
+                    .Pseudo(TextureButton.StylePseudoClassHover)
+                    .Prop(TextureButton.StylePropertyTexture, resCache.GetTexture("/Textures/_Shitmed/Interface/Targeting/Doll/leftarm_hover.png")),
+
+                Element<TextureButton>().Class("TargetDollButtonLeftHand")
+                    .Pseudo(TextureButton.StylePseudoClassHover)
+                    .Prop(TextureButton.StylePropertyTexture, resCache.GetTexture("/Textures/_Shitmed/Interface/Targeting/Doll/lefthand_hover.png")),
+
+                Element<TextureButton>().Class("TargetDollButtonRightArm")
+                    .Pseudo(TextureButton.StylePseudoClassHover)
+                    .Prop(TextureButton.StylePropertyTexture, resCache.GetTexture("/Textures/_Shitmed/Interface/Targeting/Doll/rightarm_hover.png")),
+
+                Element<TextureButton>().Class("TargetDollButtonRightHand")
+                    .Pseudo(TextureButton.StylePseudoClassHover)
+                    .Prop(TextureButton.StylePropertyTexture, resCache.GetTexture("/Textures/_Shitmed/Interface/Targeting/Doll/righthand_hover.png")),
+
+                Element<TextureButton>().Class("TargetDollButtonLeftLeg")
+                    .Pseudo(TextureButton.StylePseudoClassHover)
+                    .Prop(TextureButton.StylePropertyTexture, resCache.GetTexture("/Textures/_Shitmed/Interface/Targeting/Doll/leftleg_hover.png")),
+
+                Element<TextureButton>().Class("TargetDollButtonLeftFoot")
+                    .Pseudo(TextureButton.StylePseudoClassHover)
+                    .Prop(TextureButton.StylePropertyTexture, resCache.GetTexture("/Textures/_Shitmed/Interface/Targeting/Doll/leftfoot_hover.png")),
+
+                Element<TextureButton>().Class("TargetDollButtonRightLeg")
+                    .Pseudo(TextureButton.StylePseudoClassHover)
+                    .Prop(TextureButton.StylePropertyTexture, resCache.GetTexture("/Textures/_Shitmed/Interface/Targeting/Doll/rightleg_hover.png")),
+
+                Element<TextureButton>().Class("TargetDollButtonRightFoot")
+                    .Pseudo(TextureButton.StylePseudoClassHover)
+                    .Prop(TextureButton.StylePropertyTexture, resCache.GetTexture("/Textures/_Shitmed/Interface/Targeting/Doll/rightfoot_hover.png")),
+
+                Element<TextureButton>().Class("TargetDollButtonEyes")
+                    .Pseudo(TextureButton.StylePseudoClassHover)
+                    .Prop(TextureButton.StylePropertyTexture, resCache.GetTexture("/Textures/_Shitmed/Interface/Targeting/Doll/eyes_hover.png")),
+
+                Element<TextureButton>().Class("TargetDollButtonMouth")
+                    .Pseudo(TextureButton.StylePseudoClassHover)
+                    .Prop(TextureButton.StylePropertyTexture, resCache.GetTexture("/Textures/_Shitmed/Interface/Targeting/Doll/mouth_hover.png")),
+                // Shitmed Change End
+
                 // Silicon law edit ui
                 Element<Label>().Class(SiliconLawContainer.StyleClassSiliconLawPositionLabel)
                     .Prop(Label.StylePropertyFontColor, NanoGold),

Content.Client/SubFloor/SubFloorHideSystem.cs

@@ -32,21 +32,6 @@ public sealed class SubFloorHideSystem : SharedSubFloorHideSystem
         }
     }
 
-    // Begin DeltaV - node crawling
-    private Type[] _types = new Type[] { };
-
-    [ViewVariables]
-    public Type[] Types
-    {
-        get => _types;
-        set
-        {
-            _types = value;
-            UpdateAll();
-        }
-    }
-    // End DeltaV - node crawling
-
     public override void Initialize()
     {
         base.Initialize();
@@ -80,17 +65,6 @@ public sealed class SubFloorHideSystem : SharedSubFloorHideSystem
 
         var revealed = !covered || ShowAll || scannerRevealed;
 
-        // Begin DeltaV - node crawling
-        foreach (var type in _types)
-        {
-            if (!HasComp(uid, type))
-                continue;
-
-            revealed = true;
-            break;
-        }
-        // End DeltaV - node crawling
-
         // set visibility & color of each layer
         foreach (var layer in args.Sprite.AllLayers)
         {

Content.Client/UserInterface/Screens/DefaultGameScreen.xaml

@@ -9,6 +9,7 @@
     xmlns:hotbar="clr-namespace:Content.Client.UserInterface.Systems.Hotbar.Widgets"
     xmlns:controls="clr-namespace:Content.Client.UserInterface.Controls"
     xmlns:inventory="clr-namespace:Content.Client.UserInterface.Systems.Inventory.Widgets"
+    xmlns:targeting="clr-namespace:Content.Client._Shitmed.UserInterface.Systems.Targeting.Widgets"
     Name="DefaultHud"
     VerticalExpand="False"
     VerticalAlignment="Bottom"
@@ -28,6 +29,7 @@
     <widgets:GhostGui Name="Ghost" Access="Protected" />
     <inventory:InventoryGui Name="Inventory" Access="Protected" />
     <hotbar:HotbarGui Name="Hotbar" Access="Protected" />
+    <targeting:TargetingControl Name="Targeting" Access="Protected"/> <!-- Shitmed Change -->
     <chat:ResizableChatBox Name="Chat" Access="Protected" />
     <alerts:AlertsUI Name="Alerts" Access="Protected" />
 </screens:DefaultGameScreen>

Content.Client/UserInterface/Screens/DefaultGameScreen.xaml.cs

@@ -22,11 +22,12 @@ public sealed partial class DefaultGameScreen : InGameScreen
         SetAnchorAndMarginPreset(Hotbar, LayoutPreset.BottomWide, margin: 5);
         SetAnchorAndMarginPreset(Chat, LayoutPreset.TopRight, margin: 10);
         SetAnchorAndMarginPreset(Alerts, LayoutPreset.TopRight, margin: 10);
+        SetAnchorAndMarginPreset(Targeting, LayoutPreset.BottomRight, margin: 5); // Shitmed Change
 
         Chat.OnResized += ChatOnResized;
         Chat.OnChatResizeFinish += ChatOnResizeFinish;
-
         MainViewport.OnResized += ResizeActionContainer;
+        MainViewport.OnResized += ResizeAlertsContainer;
         Inventory.OnResized += ResizeActionContainer;
     }
 
@@ -36,6 +37,12 @@ public sealed partial class DefaultGameScreen : InGameScreen
         Actions.ActionsContainer.MaxGridHeight = MainViewport.Size.Y - indent;
     }
 
+    private void ResizeAlertsContainer()
+    {
+        float indent = Chat.Size.Y + Targeting.Size.Y + 120;
+        Alerts.AlertContainer.MaxGridHeight = Math.Max(MainViewport.Size.Y - indent, 1);
+    }
+
     private void ChatOnResizeFinish(Vector2 _)
     {
         var marginBottom = Chat.GetValue<float>(MarginBottomProperty);

Content.Client/UserInterface/Screens/SeparatedChatGameScreen.xaml

@@ -10,6 +10,7 @@
     xmlns:controls="clr-namespace:Content.Client.UserInterface.Controls"
     xmlns:graphics="clr-namespace:Robust.Client.Graphics;assembly=Robust.Client"
     xmlns:inventory="clr-namespace:Content.Client.UserInterface.Systems.Inventory.Widgets"
+    xmlns:targeting="clr-namespace:Content.Client._Shitmed.UserInterface.Systems.Targeting.Widgets"
     Name="SeparatedChatHud"
     VerticalExpand="False"
     VerticalAlignment="Bottom"
@@ -20,8 +21,9 @@
             <widgets:GhostGui Name="Ghost" Access="Protected" />
             <inventory:InventoryGui Name="Inventory" Access="Protected"/>
             <hotbar:HotbarGui Name="Hotbar" Access="Protected"/>
-            <BoxContainer Name="TopLeftContainer" Orientation="Vertical">
-                <actions:ActionsBar Name="Actions" Access="Protected" />
+            <targeting:TargetingControl Name="Targeting" Access="Protected"/> <!-- Shitmed Change -->
+            <BoxContainer Name="TopLeftContainer" Orientation="Horizontal"> <!--goobstation-->
+                <actions:ActionsBar Name="Actions" Access="Protected" /> 
                 <BoxContainer Name="VoteMenu" Access="Public" Orientation="Vertical"/>
             </BoxContainer>
             <alerts:AlertsUI Name="Alerts" Access="Protected" />

Content.Client/UserInterface/Screens/SeparatedChatGameScreen.xaml.cs

@@ -27,7 +27,8 @@ public sealed partial class SeparatedChatGameScreen : InGameScreen
         SetAnchorAndMarginPreset(Ghost, LayoutPreset.BottomWide, margin: 80);
         SetAnchorAndMarginPreset(Hotbar, LayoutPreset.BottomWide, margin: 5);
         SetAnchorAndMarginPreset(Alerts, LayoutPreset.CenterRight, margin: 10);
-
+        SetAnchorAndMarginPreset(Targeting, LayoutPreset.BottomRight, margin: 5);
+        
         ScreenContainer.OnSplitResizeFinished += () =>
             OnChatResized?.Invoke(new Vector2(ScreenContainer.SplitFraction, 0));
 

Content.Client/UserInterface/Systems/Alerts/Widgets/AlertsUI.xaml

@@ -1,7 +1,13 @@
 <widgets:AlertsUI xmlns="https://spacestation14.io"
                   xmlns:widgets="clr-namespace:Content.Client.UserInterface.Systems.Alerts.Widgets"
+                  xmlns:partStatus="clr-namespace:Content.Client._Shitmed.UserInterface.Systems.PartStatus.Widgets"
                   MinSize="64 64">
-    <PanelContainer HorizontalAlignment="Right" VerticalAlignment="Top">
-        <BoxContainer Name="AlertContainer" Access="Public" Orientation="Vertical" />
-    </PanelContainer>
+    <!-- Shitmed Change Start - TODO: Refactor this godforsaken abomination -->
+    <GridContainer Columns="1" HorizontalAlignment="Right" VerticalAlignment="Top">
+        <PanelContainer >
+            <GridContainer Name="AlertContainer" Columns="1" HorizontalAlignment="Right" VerticalAlignment="Center" Access="Public" />
+        </PanelContainer>
+        <partStatus:PartStatusControl Name="PartStatus" Access="Protected"/>
+    </GridContainer>
+    <!-- Shitmed Change End -->
 </widgets:AlertsUI>

Content.Client/UserInterface/Systems/Chat/ChatUIController.cs

@@ -1,7 +1,6 @@
 using System.Globalization;
 using System.Linq;
 using System.Numerics;
-using System.Text.RegularExpressions; // DeltaV - Client-Side Radio Channel Colors
 using Content.Client.Administration.Managers;
 using Content.Client.Chat;
 using Content.Client.Chat.Managers;
@@ -840,38 +839,8 @@ public sealed partial class ChatUIController : UIController
         }
     }
 
-    /// <summary>
-    /// DeltaV - Regex expression to match on the chat message text in order to replace it with another color. 
-    /// </summary>
-    private static readonly Regex RadioChatColorRegex = new(@"color=#?([a-fA-F0-9]{8})", RegexOptions.Compiled);
-
-    /// <summary>
-    /// DeltaV - Replaces the channel color hex code in a message with the client-side hex color 
-    /// overridden by <see cref="Content.Client._DV.Radio.RadioChannelColorSystem"/> .
-    /// </summary>
-    /// <param name="message">The message to find and replace the color hex code in.</param>
-    /// <param name="channelProtoId">The proto ID of the channel. Basically the replacement color.</param>
-    /// <returns>The message with the color hex code replaced, if it exists.</returns>
-    private string ReplaceRadioChannelColorFromServer(string message, string channelProtoId)
-    {
-        if (_prototypeManager.Resolve<RadioChannelPrototype>(channelProtoId, out var channel))
-        {
-            return RadioChatColorRegex.Replace(message, $"color={channel.Color.ToHex()}");
-        }
-
-        return message;
-    }
-
     public void ProcessChatMessage(ChatMessage msg, bool speechBubble = true)
     {
-        // BEGIN DeltaV
-        // Needs to happen before ANY other color or pattern matching so that we don't screw up the other colors in the message.
-        if (msg.Channel == ChatChannel.Radio && msg.RadioChannelProtoId is { } channel)
-        {
-            msg.WrappedMessage = ReplaceRadioChannelColorFromServer(msg.WrappedMessage, channel);
-        }
-        // END DeltaV
-
         // color the name unless it's something like "the old man"
         if ((msg.Channel == ChatChannel.Local || msg.Channel == ChatChannel.Whisper) && _chatNameColorsEnabled)
         {

Content.Client/Weapons/Ranged/Systems/GunSystem.cs

@@ -280,10 +280,7 @@ public sealed partial class GunSystem : SharedGunSystem
         if (!Timing.IsFirstTimePredicted || user == null || recoil == Vector2.Zero || recoilScalar == 0)
             return;
 
-        // ES START
-        // reduce recoil even further
-        _recoil.KickCamera(user.Value, recoil.Normalized() * 0.13f * recoilScalar);
-        // ES END
+        _recoil.KickCamera(user.Value, recoil.Normalized() * 0.5f * recoilScalar);
     }
 
     protected override void Popup(string message, EntityUid? uid, EntityUid? user)

Content.Client/_DV/AACTablet/UI/AACBoundUserInterface.cs

@@ -23,20 +23,16 @@ public sealed class AACBoundUserInterface : BoundUserInterface
     protected override void Open()
     {
         base.Open();
-
-        if (_window is { Disposed: false })
-            _window.Close();
-
+        _window?.Close();
         _window = this.CreateWindow<AACWindow>();
-        _window.OnClose += Close;
         _window.PhraseButtonPressed += OnPhraseButtonPressed;
         _window.Typing += OnTyping;
         _window.SubmitPressed += OnSubmit;
     }
 
-    private void OnPhraseButtonPressed(List<ProtoId<QuickPhrasePrototype>> phraseId, string prefix)
+    private void OnPhraseButtonPressed(List<ProtoId<QuickPhrasePrototype>> phraseId)
     {
-        SendMessage(new AACTabletSendPhraseMessage(phraseId, prefix));
+        SendMessage(new AACTabletSendPhraseMessage(phraseId));
     }
 
     private void OnTyping()
@@ -50,14 +46,4 @@ public sealed class AACBoundUserInterface : BoundUserInterface
         _typing ??= EntMan.System<TypingIndicatorSystem>();
         _typing?.ClientSubmittedChatText();
     }
-
-    protected override void UpdateState(BoundUserInterfaceState state)
-    {
-        base.UpdateState(state);
-
-        if (state is not AACTabletBuiState msg)
-            return;
-
-        _window?.Update(msg);
-    }
 }

Content.Client/_DV/AACTablet/UI/AACSheetlet.cs

@@ -12,19 +12,6 @@ namespace Content.Client._DV.AACTablet.UI;
 [CommonSheetlet]
 public sealed class AACSheetlet<T> : Sheetlet<T> where T : PalettedStylesheet, IButtonConfig
 {
-    private static readonly (string StyleClass, Color Normal, Color Hover)[] SubjectButtonColors =
-    [
-        // Department colors
-        ("CommandButton", Color.FromHex("#404A58"), Color.FromHex("#4F587B")),
-        ("EngineeringButton", Color.FromHex("#77684B"), Color.FromHex("#776D71")),
-        ("EpistemicsButton", Color.FromHex("#6F5973"), Color.FromHex("#71638E")),
-        ("JusticeButton", Color.FromHex("#4F3D4C"), Color.FromHex("#5C4B5A")),
-        ("LogisticsButton", Color.FromHex("#61503A"), Color.FromHex("#675C64")),
-        ("MedicalButton", Color.FromHex("#49687D"), Color.FromHex("#556E95")),
-        ("SecurityButton", Color.FromHex("#724449"), Color.FromHex("#745370")),
-        ("ServiceButton", Color.FromHex("#607952"), Color.FromHex("#667A76")),
-    ];
-
     public override StyleRule[] GetRules(T sheet, object config)
     {
         // Create style boxes
@@ -94,21 +81,6 @@ public sealed class AACSheetlet<T> : Sheetlet<T> where T : PalettedStylesheet, I
                 .Prop(Control.StylePropertyModulateSelf, Color.DarkRed),
         ]);
 
-        SubjectColorRules(rules);
-
         return rules.ToArray();
     }
-    // AAC - Makes sure colors are applied to subject buttons
-    private static void SubjectColorRules(List<StyleRule> rules)
-    {
-        foreach (var (styleClass, normal, hover) in SubjectButtonColors)
-        {
-            rules.AddRange([
-                E<ContainerButton>().Class(ContainerButton.StyleClassButton).Class(styleClass)
-                    .PseudoNormal().Prop(Control.StylePropertyModulateSelf, normal),
-                E<ContainerButton>().Class(ContainerButton.StyleClassButton).Class(styleClass)
-                    .PseudoHovered().Prop(Control.StylePropertyModulateSelf, hover),
-            ]);
-        }
-    }
 }

Content.Client/_DV/AACTablet/UI/AACWindow.xaml

@@ -18,14 +18,7 @@
                                   StyleClasses="AacCheckbox"
                                   Margin="0 0 8 0"/>
                         <Control HorizontalExpand="True"/>
-
-                        <Control SetWidth="170" Margin="8 0 0 0"/>
-
-                        <OptionButton Name="RadioChannels"
-                                      StyleClasses="OpenBoth"
-                                      SetWidth="120"
-                                      Margin="8 0 0 0"/>
-                        </BoxContainer>
+                    </BoxContainer>
 
                     <!-- Buffer Display and Controls -->
                     <BoxContainer Orientation="Horizontal">
@@ -36,6 +29,7 @@
                                       StyleClasses="AacBufferText"
                                       Margin="8 4"/>
                         </PanelContainer>
+
                         <Button Name="ClearButton"
                                 Text="{Loc 'aac-tablet-backspace'}"
                                 TextAlign="Center"

Content.Client/_DV/AACTablet/UI/AACWindow.xaml.cs

@@ -2,9 +2,6 @@ using System.Linq;
 using System.Numerics;
 using Content.Client.UserInterface.Controls;
 using Content.Shared._DV.QuickPhrase;
-using Content.Shared._DV.AACTablet;
-using Content.Shared.Chat;
-using Content.Shared.Radio;
 using Robust.Client.AutoGenerated;
 using Robust.Client.UserInterface;
 using Robust.Client.UserInterface.Controls;
@@ -19,7 +16,7 @@ public sealed partial class AACWindow : FancyWindow
     [Dependency] private readonly IPrototypeManager _prototype = default!;
     private readonly List<QuickPhrasePrototype> _phrases;
     private readonly Dictionary<string, List<QuickPhrasePrototype>> _filteredPhrases = new();
-    public event Action<List<ProtoId<QuickPhrasePrototype>>, string>? PhraseButtonPressed;
+    public event Action<List<ProtoId<QuickPhrasePrototype>>>? PhraseButtonPressed;
     public event Action? Typing;
     public event Action? SubmitPressed;
 
@@ -45,16 +42,10 @@ public sealed partial class AACWindow : FancyWindow
         SearchBar.OnTextChanged += FilterSearch;
         SendButton.OnPressed += SendBuffer;
         ClearButton.OnPressed += BackspaceBuffer;
-        RadioChannels.OnItemSelected += OnChannelSelected;
         PopulateGui();
         FilterSearch(null);
     }
 
-    private void OnChannelSelected(OptionButton.ItemSelectedEventArgs args)
-    {
-        RadioChannels.SelectId(args.Id);
-    }
-
     private void BackspaceBuffer(BaseButton.ButtonEventArgs obj)
     {
         if (_phraseBuffer.Count == 0)
@@ -77,14 +68,12 @@ public sealed partial class AACWindow : FancyWindow
 
     private void SendBuffer(BaseButton.ButtonEventArgs obj)
     {
-        PhraseButtonPressed?.Invoke(_phraseBuffer, Prefix);
+        PhraseButtonPressed?.Invoke(_phraseBuffer);
         _phraseBuffer.Clear();
         BufferedString.Text = string.Empty;
         SubmitPressed?.Invoke();
     }
 
-    private string Prefix => (string?)RadioChannels.SelectedMetadata ?? SharedChatSystem.LocalPrefix.ToString();
-
     private void FilterSearch(LineEdit.LineEditEventArgs? obj)
     {
         SearchResults.RemoveAllChildren();
@@ -93,8 +82,7 @@ public sealed partial class AACWindow : FancyWindow
         var emptySearch = string.IsNullOrEmpty(SearchBar.Text);
         foreach (var phrase in _phrases)
         {
-            if (!emptySearch && !Loc.GetString(phrase.Text)
-                    .Contains(SearchBar.Text, StringComparison.CurrentCultureIgnoreCase))
+            if (!emptySearch && !Loc.GetString(phrase.Text).Contains(SearchBar.Text, StringComparison.CurrentCultureIgnoreCase))
             {
                 continue;
             }
@@ -218,7 +206,7 @@ public sealed partial class AACWindow : FancyWindow
             MaxSize = new Vector2(ButtonWidth, ButtonWidth),
             ClipText = false,
             HorizontalExpand = true,
-            StyleClasses = { ContainerButton.StyleClassButton, styleClass }
+            StyleClasses = { styleClass }
         };
 
         var buttonLabel = new RichTextLabel
@@ -248,24 +236,8 @@ public sealed partial class AACWindow : FancyWindow
         {
             _phraseSingle.Clear();
             _phraseSingle.Add(phraseId);
-            PhraseButtonPressed?.Invoke(_phraseSingle, Prefix);
+            PhraseButtonPressed?.Invoke(_phraseSingle);
             SubmitPressed?.Invoke();
         }
     }
-
-    internal void Update(AACTabletBuiState msg)
-    {
-        RadioChannels.Clear();
-
-        var id = 0;
-        RadioChannels.AddItem("Local", id);
-        RadioChannels.SetItemMetadata(RadioChannels.GetIdx(id), SharedChatSystem.LocalPrefix.ToString());
-
-        foreach (var channel in msg.RadioChannels)
-        {
-            var channelProto = _prototype.Index<RadioChannelPrototype>(channel);
-            RadioChannels.AddItem(channelProto.LocalizedName, ++id);
-            RadioChannels.SetItemMetadata(RadioChannels.GetIdx(id), string.Concat(SharedChatSystem.RadioChannelPrefix, channelProto.KeyCode));
-        }
-    }
 }

Content.Client/_DV/Access/Systems/SubdermalIdCardSystem.cs

@@ -1,8 +0,0 @@
-using Content.Shared._DV.Access.Systems;
-
-namespace Content.Client._DV.Access.Systems;
-
-/// <summary>
-/// Client side handling of the subdermal ID system.
-/// </summary>
-public sealed class SubdermalIdCardSystem : SharedSubdermalIdCardSystem;

Content.Client/_DV/Augments/AugmentToolPanelMenu.xaml

@@ -0,0 +1,10 @@
+<ui:RadialMenu xmlns="https://spacestation14.io"
+                xmlns:ui="clr-namespace:Content.Client.UserInterface.Controls"
+                BackButtonStyleClass="RadialMenuBackButton"
+                CloseButtonStyleClass="RadialMenuCloseButton"
+                VerticalExpand="True"
+                HorizontalExpand="True"
+                MinSize="450 450">
+
+    <ui:RadialContainer Name="Main" VerticalExpand="True" HorizontalExpand="True" InitialRadius="100" ReserveSpaceForHiddenChildren="False"/>
+</ui:RadialMenu>

Content.Client/_DV/Augments/AugmentToolPanelMenu.xaml.cs

@@ -0,0 +1,72 @@
+using Content.Client.UserInterface.Controls;
+using JetBrains.Annotations;
+using Robust.Client.AutoGenerated;
+using Robust.Client.UserInterface.Controls;
+using Robust.Client.UserInterface.XAML;
+using Robust.Client.UserInterface;
+using Content.Shared.Storage;
+using System.Numerics;
+using Robust.Shared.GameObjects;
+
+namespace Content.Client._DV.Augments;
+
+[GenerateTypedNameReferences]
+public sealed partial class AugmentToolPanelMenu : RadialMenu
+{
+    [Dependency] private readonly EntityManager _entManager = default!;
+
+    public event Action<EntityUid?>? SendAugmentToolPanelSystemMessageAction;
+
+    private EntityUid _owner;
+
+    public AugmentToolPanelMenu()
+    {
+        IoCManager.InjectDependencies(this);
+        RobustXamlLoader.Load(this);
+    }
+
+    public void SetEntity(EntityUid uid)
+    {
+        _owner = uid;
+        Refresh();
+    }
+
+    public void Refresh()
+    {
+        if (!_entManager.TryGetComponent<StorageComponent>(_owner, out var storage))
+            return;
+
+        foreach (var (entity, _) in storage.StoredItems)
+        {
+            var button = new RadialMenuButtonWithSector()
+            {
+                SetSize = new Vector2(64f, 64f),
+            };
+
+            button.AddChild(new SpriteView(entity, _entManager)
+            {
+                Scale = new Vector2(3f, 3f),
+            });
+            Main.AddChild(button);
+
+            button.OnButtonUp += _ =>
+            {
+                SendAugmentToolPanelSystemMessageAction?.Invoke(entity);
+                Close();
+            };
+        }
+
+        var nilButton = new RadialMenuButtonWithSector()
+        {
+            SetSize = new Vector2(64f, 64f),
+        };
+
+        Main.AddChild(nilButton);
+
+        nilButton.OnButtonUp += _ =>
+        {
+            SendAugmentToolPanelSystemMessageAction?.Invoke(null);
+            Close();
+        };
+    }
+}

Content.Client/_DV/Augments/AugmentToolPanelMenuBoundUserInterface.cs

@@ -0,0 +1,39 @@
+using Robust.Client.Graphics;
+using Robust.Client.Input;
+using Robust.Client.UserInterface;
+using Robust.Shared.Prototypes;
+using Content.Shared._DV.Augments;
+
+namespace Content.Client._DV.Augments;
+
+public sealed class AugmentToolPanelMenuBoundUserInterface : BoundUserInterface
+{
+    [Dependency] private readonly IClyde _displayManager = default!;
+    [Dependency] private readonly IInputManager _inputManager = default!;
+    [Dependency] private readonly IEntityManager _entMan = default!;
+
+    private AugmentToolPanelMenu? _menu;
+
+    public AugmentToolPanelMenuBoundUserInterface(EntityUid owner, Enum uiKey) : base(owner, uiKey)
+    {
+        IoCManager.InjectDependencies(this);
+    }
+
+    protected override void Open()
+    {
+        base.Open();
+
+        _menu = this.CreateWindow<AugmentToolPanelMenu>();
+        _menu.SetEntity(Owner);
+        _menu.SendAugmentToolPanelSystemMessageAction += SendAugmentToolPanelSystemMessage;
+
+        // Open the menu, centered on the mouse
+        var vpSize = _displayManager.ScreenSize;
+        _menu.OpenCenteredAt(_inputManager.MouseScreenPosition.Position / vpSize);
+    }
+
+    public void SendAugmentToolPanelSystemMessage(EntityUid? desiredTool)
+    {
+        SendMessage(new AugmentToolPanelSystemMessage(_entMan.GetNetEntity(desiredTool)));
+    }
+}

Content.Client/_DV/Body/FeatherVisualizer.cs

@@ -1,41 +0,0 @@
-using Content.Shared._DV.Body.Components;
-using Content.Shared.Clothing.Components;
-using Content.Shared.Clothing.EntitySystems;
-using Robust.Client.GameObjects;
-
-namespace Content.Client._DV.Body;
-
-/// <summary>
-/// Colors feathers.
-/// </summary>
-public sealed class FeatherVisualizer : VisualizerSystem<FeatherComponent>
-{
-    [Dependency] private readonly ClothingSystem _clothing = default!;
-
-    protected override void OnAppearanceChange(EntityUid uid, FeatherComponent component, ref AppearanceChangeEvent args)
-    {
-        if (!AppearanceSystem.TryGetData<Color>(uid, FeatherVisuals.FeatherColor, out var featherColor, args.Component))
-            return;
-
-        SpriteSystem.LayerSetColor(uid, FeatherVisualLayers.Feather, featherColor);
-
-        if (TryComp<ClothingComponent>(uid, out var clothing))
-        {
-            foreach (var slotPair in clothing.ClothingVisuals)
-            {
-                _clothing.SetLayerColor(clothing, slotPair.Key, "feather", featherColor);
-            }
-        }
-
-        if (!AppearanceSystem.TryGetData<Color>(uid, FeatherVisuals.BloodColor, out var bloodColor, args.Component))
-            return;
-
-        SpriteSystem.LayerSetColor(uid, FeatherVisualLayers.Blood, bloodColor);
-    }
-}
-
-public enum FeatherVisualLayers : byte
-{
-    Feather,
-    Blood,
-}

Content.Client/_DV/CrewMonitoring/CrewMonitoringShuttleControl.cs

@@ -1,180 +0,0 @@
-using System.Numerics;
-using Content.Client.Pinpointer.UI;
-using Content.Client.Shuttles.UI;
-using Content.Shared.Shuttles.Components;
-using Content.Shared.Shuttles.Systems;
-using Robust.Client.Graphics;
-using Robust.Client.UserInterface;
-using Robust.Shared.Input;
-using Robust.Shared.Map;
-using Robust.Shared.Map.Components;
-using Robust.Shared.Physics;
-using Robust.Shared.Physics.Components;
-
-namespace Content.Client._DV.CrewMonitoring;
-
-public sealed class CrewMonitoringShuttleControl : BaseShuttleControl
-{
-    [Dependency] private readonly IMapManager _mapManager = default!;
-    private readonly SharedShuttleSystem _shuttles;
-    private readonly SharedTransformSystem _transform;
-
-    public EntityUid? Owner;
-    public NavMapControl? NavMap;
-
-    private List<Entity<MapGridComponent>> _grids = new();
-
-    public CrewMonitoringShuttleControl() : base(64f, 256f, 256f)
-    {
-        _shuttles = EntManager.System<SharedShuttleSystem>();
-        _transform = EntManager.System<SharedTransformSystem>();
-    }
-
-    protected override void Draw(DrawingHandleScreen handle)
-    {
-        base.Draw(handle);
-
-        DrawBacking(handle);
-        DrawCircles(handle);
-
-        if (Owner is not { } owner || NavMap is not { } navMap)
-            return;
-
-        var xformQuery = EntManager.GetEntityQuery<TransformComponent>();
-        var fixturesQuery = EntManager.GetEntityQuery<FixturesComponent>();
-        var bodyQuery = EntManager.GetEntityQuery<PhysicsComponent>();
-        var iffQuery = EntManager.GetEntityQuery<IFFComponent>();
-
-        if (!xformQuery.TryGetComponent(owner, out var xform)
-            || xform.MapID == MapId.Nullspace)
-        {
-            return;
-        }
-
-        var coordinates = new EntityCoordinates(owner, Vector2.Zero);
-
-        var mapPos = _transform.ToMapCoordinates(coordinates);
-        var ourEntRot = Angle.Zero;
-        var ourEntMatrix = Matrix3Helpers.CreateTransform(_transform.GetWorldPosition(xform), ourEntRot);
-        Matrix3x2.Invert(ourEntMatrix, out var worldToShuttle);
-        var shuttleToView = Matrix3x2.CreateScale(new Vector2(MinimapScale, -MinimapScale)) * Matrix3x2.CreateTranslation(MidPointVector);
-        var worldToView = worldToShuttle * shuttleToView;
-
-        var viewBounds = new Box2Rotated(new Box2(-WorldRange, -WorldRange, WorldRange, WorldRange).Translated(mapPos.Position), ourEntRot, mapPos.Position);
-        var viewAABB = viewBounds.CalcBoundingBox();
-
-        _grids.Clear();
-        _mapManager.FindGridsIntersecting(xform.MapID, new Box2(mapPos.Position - MaxRadarRangeVector, mapPos.Position + MaxRadarRangeVector), ref _grids, approx: true, includeMap: false);
-
-        foreach (var grid in _grids)
-        {
-            if (!fixturesQuery.HasComponent(grid))
-                continue;
-
-            var body = bodyQuery.GetComponent(grid);
-            iffQuery.TryComp(grid, out var iff);
-
-            if (!_shuttles.CanDraw(grid, body, iff))
-                continue;
-
-            var curGridToWorld = _transform.GetWorldMatrix(grid);
-            var curGridToView = curGridToWorld * worldToShuttle * shuttleToView;
-
-            var gridAABB = curGridToWorld.TransformBox(grid.Comp.LocalAABB);
-            if (!gridAABB.Intersects(viewAABB))
-                continue;
-
-            var labelColor = _shuttles.GetIFFColor(grid, self: false, iff);
-            DrawGrid(handle, curGridToView, grid, labelColor);
-        }
-
-        var curTime = Timing.RealTime;
-        var blinkFrequency = 1f / 1f;
-        var lit = curTime.TotalSeconds % blinkFrequency > blinkFrequency / 2f;
-        var box = SizeBox;
-
-        foreach (var (coord, value) in navMap.TrackedCoordinates)
-        {
-            if (!lit || !value.Visible)
-                continue;
-
-            var blipPos = _transform.ToMapCoordinates(coord);
-
-            if (mapPos.MapId == MapId.Nullspace)
-                continue;
-
-            handle.DrawCircle(Vector2.Clamp(Vector2.Transform(blipPos.Position, worldToView), box.TopLeft, box.BottomRight), float.Sqrt(MinimapScale) * 2f, value.Color);
-        }
-
-        foreach (var blip in navMap.TrackedEntities.Values)
-        {
-            if (blip.Blinks && !lit)
-                continue;
-
-            var blipPos = _transform.ToMapCoordinates(blip.Coordinates);
-
-            if (mapPos.MapId == MapId.Nullspace)
-                continue;
-
-            handle.DrawCircle(Vector2.Clamp(Vector2.Transform(blipPos.Position, worldToView), box.TopLeft, box.BottomRight), float.Sqrt(MinimapScale) * 2f, blip.Color);
-        }
-    }
-
-    protected override void KeyBindUp(GUIBoundKeyEventArgs args)
-    {
-        base.KeyBindUp(args);
-
-        if (Owner is not { } owner || NavMap is null)
-            return;
-
-        if (!EntManager.TryGetComponent<TransformComponent>(owner, out var xform) || xform.MapID == MapId.Nullspace)
-        {
-            return;
-        }
-
-        var ourEntRot = Angle.Zero;
-        var ourEntMatrix = Matrix3Helpers.CreateTransform(_transform.GetWorldPosition(xform), ourEntRot);
-        Matrix3x2.Invert(ourEntMatrix, out var worldToShuttle);
-        var shuttleToView = Matrix3x2.CreateScale(new Vector2(MinimapScale, -MinimapScale)) * Matrix3x2.CreateTranslation(MidPointVector);
-        var worldToView = worldToShuttle * shuttleToView;
-        Matrix3x2.Invert(worldToView, out var viewToWorld);
-
-        if (args.Function == EngineKeyFunctions.UIClick)
-        {
-            if (NavMap.TrackedEntities.Count == 0)
-                return;
-
-            if ((StartDragPosition - args.PointerLocation.Position).Length() > NavMap.MinDragDistance)
-                return;
-
-            var localPosition = args.PointerLocation.Position - GlobalPixelPosition;
-            var worldPosition = Vector2.Transform(localPosition, viewToWorld);
-
-            var closestEntity = NetEntity.Invalid;
-            var closestDistance = float.PositiveInfinity;
-
-            foreach (var (currentEntity, blip) in NavMap.TrackedEntities)
-            {
-                if (!blip.Selectable)
-                    continue;
-
-                var currentDistance = (_transform.ToMapCoordinates(blip.Coordinates).Position - worldPosition).Length();
-
-                if (closestDistance < currentDistance || currentDistance * MinimapScale > NavMap.MaxSelectableDistance)
-                    continue;
-
-                closestEntity = currentEntity;
-                closestDistance = currentDistance;
-            }
-
-            if (closestDistance > NavMap.MaxSelectableDistance || !closestEntity.IsValid())
-                return;
-
-            NavMap.TrackEntity(closestEntity);
-        }
-        else if (args.Function == EngineKeyFunctions.UIRightClick)
-        {
-            NavMap.TrackEntity(null);
-        }
-    }
-}

Content.Client/_DV/NodeCrawl/NodeCrawlSystem.cs

@@ -1,43 +0,0 @@
-using Content.Client.SubFloor;
-using Content.Shared._DV.NodeCrawl;
-using Robust.Client.Player;
-using Robust.Shared.Player;
-
-namespace Content.Client._DV.NodeCrawl;
-
-public sealed class NodeCrawlSystem : SharedNodeCrawlSystem
-{
-    [Dependency] private readonly IPlayerManager _player = default!;
-    [Dependency] private readonly SubFloorHideSystem _subfloor = default!;
-
-    public override void Initialize()
-    {
-        base.Initialize();
-
-        SubscribeLocalEvent<NodeCrawlerComponent, LocalPlayerAttachedEvent>(OnAttached);
-        SubscribeLocalEvent<NodeCrawlerComponent, LocalPlayerDetachedEvent>(OnDetached);
-        SubscribeLocalEvent<NodeCrawlerComponent, AfterAutoHandleStateEvent>(OnAfterAutoHandleState);
-    }
-
-    private void OnAttached(Entity<NodeCrawlerComponent> ent, ref LocalPlayerAttachedEvent args)
-    {
-        if (ent.Comp.Mover is not null)
-            _subfloor.Types = ent.Comp.RevealedComponents;
-    }
-
-    private void OnDetached(Entity<NodeCrawlerComponent> ent, ref LocalPlayerDetachedEvent args)
-    {
-        _subfloor.Types = new Type[] { };
-    }
-
-    private void OnAfterAutoHandleState(Entity<NodeCrawlerComponent> ent, ref AfterAutoHandleStateEvent args)
-    {
-        if (_player.LocalEntity != ent)
-            return;
-
-        if (ent.Comp.Mover is not null)
-            _subfloor.Types = ent.Comp.RevealedComponents;
-        else
-            _subfloor.Types = new Type[] { };
-    }
-}

Content.Client/_DV/Options/UI/Tabs/DeltaTab.xaml

@@ -9,7 +9,6 @@
                    StyleClasses="LabelKeyText"/>
             <CheckBox Name="DisableFiltersCheckBox" Text="{Loc 'ui-options-no-filters'}" />
             <CheckBox Name="DisableGlimmerEffectCheckBox" Text="{Loc 'ui-options-disable-glimmer-effect'}" />
-            <CheckBox Name="EnableStunVisualsCheckBox" Text="{Loc 'ui-options-enable-stun-visuals'}" />
             <Label Text="{Loc 'ui-options-delta-tips'}"
                    StyleClasses="LabelKeyText"/>
             <CheckBox Name="DisableTipsCheckBox" Text="{Loc 'ui-options-delta-disable-tips'}" />

Content.Client/_DV/Options/UI/Tabs/DeltaTab.xaml.cs

@@ -18,7 +18,6 @@ public sealed partial class DeltaTab : Control
 
         Control.AddOptionCheckBox(DCCVars.NoVisionFilters, DisableFiltersCheckBox);
         Control.AddOptionCheckBox(DCCVars.DisableGlimmerShader, DisableGlimmerEffectCheckBox);
-        Control.AddOptionCheckBox(DCCVars.ShowStunVisuals, EnableStunVisualsCheckBox);
         Control.AddOptionCheckBox(DCCVars.DisableTips, DisableTipsCheckBox);
 
         ResetTipsButton.OnPressed += _ => OnResetTipsPressed();

Content.Client/_DV/Options/UI/Tabs/RadioTab.xaml

@@ -1,87 +0,0 @@
-<tabs:RadioTab xmlns="https://spacestation14.io"
-               xmlns:tabs="clr-namespace:Content.Client._DV.Options.UI.Tabs"
-               xmlns:ui="clr-namespace:Content.Client.Options.UI">
-    <BoxContainer Orientation="Vertical">
-       <ScrollContainer VerticalExpand="True" HScrollEnabled="False">
-              <BoxContainer Orientation="Vertical" Margin="8">
-              <!-- Common -->
-              <Label Text="{Loc 'ui-options-radio-header-common'}"
-                     StyleClasses="LabelKeyText"/>
-              <ui:OptionColorSlider Name="RadioCommonColorSlider"
-              Example="{Loc 'ui-options-radio-example-common'}"/>
-              <Button Name="ResetCommonColorButton" Text="{Loc 'ui-options-radio-reset-common'}" MaxWidth="300" Margin="0 4 0 0" />
-
-              <!-- Command -->
-              <Label Text="{Loc 'ui-options-radio-header-command'}"
-                     StyleClasses="LabelKeyText"/>
-              <ui:OptionColorSlider Name="RadioCommandColorSlider"
-              Example="{Loc 'ui-options-radio-example-command'}"/>
-              <Button Name="ResetCommandColorButton" Text="{Loc 'ui-options-radio-reset-command'}" MaxWidth="300" Margin="0 4 0 0" />
-
-              <!-- Security -->
-              <Label Text="{Loc 'ui-options-radio-header-security'}"
-                     StyleClasses="LabelKeyText"/>
-              <ui:OptionColorSlider Name="RadioSecurityColorSlider"
-              Example="{Loc 'ui-options-radio-example-security'}"/>
-              <Button Name="ResetSecurityColorButton" Text="{Loc 'ui-options-radio-reset-security'}" MaxWidth="300" Margin="0 4 0 0" />
-
-              <!-- Medical -->
-              <Label Text="{Loc 'ui-options-radio-header-medical'}"
-                     StyleClasses="LabelKeyText"/>
-              <ui:OptionColorSlider Name="RadioMedicalColorSlider"
-              Example="{Loc 'ui-options-radio-example-medical'}"/>
-              <Button Name="ResetMedicalColorButton" Text="{Loc 'ui-options-radio-reset-medical'}" MaxWidth="300" Margin="0 4 0 0" />
-
-              <!-- Engineering -->
-              <Label Text="{Loc 'ui-options-radio-header-engineering'}"
-                     StyleClasses="LabelKeyText"/>
-              <ui:OptionColorSlider Name="RadioEngineeringColorSlider"
-              Example="{Loc 'ui-options-radio-example-engineering'}"/>
-              <Button Name="ResetEngineeringColorButton" Text="{Loc 'ui-options-radio-reset-engineering'}" MaxWidth="300" Margin="0 4 0 0" />
-
-              <!-- Science -->
-              <Label Text="{Loc 'ui-options-radio-header-science'}"
-                     StyleClasses="LabelKeyText"/>
-              <ui:OptionColorSlider Name="RadioScienceColorSlider"
-              Example="{Loc 'ui-options-radio-example-science'}"/>
-              <Button Name="ResetScienceColorButton" Text="{Loc 'ui-options-radio-reset-science'}" MaxWidth="300" Margin="0 4 0 0" />
-
-              <!-- Cargo -->
-              <Label Text="{Loc 'ui-options-radio-header-cargo'}"
-                     StyleClasses="LabelKeyText"/>
-              <ui:OptionColorSlider Name="RadioCargoColorSlider"
-              Example="{Loc 'ui-options-radio-example-cargo'}"/>
-              <Button Name="ResetCargoColorButton" Text="{Loc 'ui-options-radio-reset-cargo'}" MaxWidth="300" Margin="0 4 0 0" />
-
-              <!-- Service -->
-              <Label Text="{Loc 'ui-options-radio-header-service'}"
-                     StyleClasses="LabelKeyText"/>
-              <ui:OptionColorSlider Name="RadioServiceColorSlider"
-              Example="{Loc 'ui-options-radio-example-service'}"/>
-              <Button Name="ResetServiceColorButton" Text="{Loc 'ui-options-radio-reset-service'}" MaxWidth="300" Margin="0 4 0 0" />
-
-              <!-- Binary -->
-              <Label Text="{Loc 'ui-options-radio-header-binary'}"
-                     StyleClasses="LabelKeyText"/>
-              <ui:OptionColorSlider Name="RadioBinaryColorSlider"
-              Example="{Loc 'ui-options-radio-example-binary'}"/>
-              <Button Name="ResetBinaryColorButton" Text="{Loc 'ui-options-radio-reset-binary'}" MaxWidth="300" Margin="0 4 0 0" />
-
-              <!-- DeltaV - Justice -->
-              <Label Text="{Loc 'ui-options-radio-header-justice'}"
-                     StyleClasses="LabelKeyText"/>
-              <ui:OptionColorSlider Name="RadioJusticeColorSlider"
-              Example="{Loc 'ui-options-radio-example-justice'}"/>
-              <Button Name="ResetJusticeColorButton" Text="{Loc 'ui-options-radio-reset-justice'}" MaxWidth="300" Margin="0 4 0 0" />
-
-              <!-- DeltaV - Prison -->
-              <Label Text="{Loc 'ui-options-radio-header-prison'}"
-                     StyleClasses="LabelKeyText"/>
-              <ui:OptionColorSlider Name="RadioPrisonColorSlider"
-              Example="{Loc 'ui-options-radio-example-prison'}"/>
-              <Button Name="ResetPrisonColorButton" Text="{Loc 'ui-options-radio-reset-prison'}" MaxWidth="300" Margin="0 4 0 0" />
-              </BoxContainer>
-        </ScrollContainer>
-        <ui:OptionsTabControlRow Name="Control" Access="Public" />
-    </BoxContainer>
-</tabs:RadioTab>

Content.Client/_DV/Options/UI/Tabs/RadioTab.xaml.cs

@@ -1,55 +0,0 @@
-using Content.Client.Options.UI;
-using Content.Shared._DV.CCVars;
-using Robust.Client.AutoGenerated;
-using Robust.Client.UserInterface;
-using Robust.Client.UserInterface.XAML;
-using Robust.Shared.Configuration;
-using Robust.Shared.Prototypes;
-
-namespace Content.Client._DV.Options.UI.Tabs;
-
-[GenerateTypedNameReferences]
-public sealed partial class RadioTab : Control
-{
-    [Dependency] private readonly IConfigurationManager _config = default!; // DeltaV
-
-    public RadioTab()
-    {
-        RobustXamlLoader.Load(this);
-        IoCManager.InjectDependencies(this);
-
-        // Having so many color sliders on one page is a lot. We should only really try
-        // to have common/departmental channels here, or it just becomes WAAAAY too much.
-        Control.AddOptionColorSlider(DCCVars.RadioColorCommon, RadioCommonColorSlider);
-        Control.AddOptionColorSlider(DCCVars.RadioColorCommand, RadioCommandColorSlider);
-        Control.AddOptionColorSlider(DCCVars.RadioColorSecurity, RadioSecurityColorSlider);
-        Control.AddOptionColorSlider(DCCVars.RadioColorMedical, RadioMedicalColorSlider);
-        Control.AddOptionColorSlider(DCCVars.RadioColorEngineering, RadioEngineeringColorSlider);
-        Control.AddOptionColorSlider(DCCVars.RadioColorScience, RadioScienceColorSlider);
-        Control.AddOptionColorSlider(DCCVars.RadioColorCargo, RadioCargoColorSlider);
-        Control.AddOptionColorSlider(DCCVars.RadioColorService, RadioServiceColorSlider);
-        Control.AddOptionColorSlider(DCCVars.RadioColorBinary, RadioBinaryColorSlider);
-        Control.AddOptionColorSlider(DCCVars.RadioColorJustice, RadioJusticeColorSlider);
-        Control.AddOptionColorSlider(DCCVars.RadioColorPrison, RadioPrisonColorSlider);
-
-        ResetCommonColorButton.OnPressed += _ => OnResetColorButton(DCCVars.RadioColorCommon);
-        ResetCommandColorButton.OnPressed += _ => OnResetColorButton(DCCVars.RadioColorCommand);
-        ResetSecurityColorButton.OnPressed += _ => OnResetColorButton(DCCVars.RadioColorSecurity);
-        ResetMedicalColorButton.OnPressed += _ => OnResetColorButton(DCCVars.RadioColorMedical);
-        ResetEngineeringColorButton.OnPressed += _ => OnResetColorButton(DCCVars.RadioColorEngineering);
-        ResetScienceColorButton.OnPressed += _ => OnResetColorButton(DCCVars.RadioColorScience);
-        ResetCargoColorButton.OnPressed += _ => OnResetColorButton(DCCVars.RadioColorCargo);
-        ResetServiceColorButton.OnPressed += _ => OnResetColorButton(DCCVars.RadioColorService);
-        ResetBinaryColorButton.OnPressed += _ => OnResetColorButton(DCCVars.RadioColorBinary);
-        ResetJusticeColorButton.OnPressed += _ => OnResetColorButton(DCCVars.RadioColorJustice);
-        ResetPrisonColorButton.OnPressed += _ => OnResetColorButton(DCCVars.RadioColorPrison);
-
-        Control.Initialize();
-    }
-
-    private void OnResetColorButton(CVarDef<string> cvar)
-    {
-        _config.SetCVar(cvar, cvar.DefaultValue);
-        Control.ReloadValues();
-    }
-}

Content.Client/_DV/PDA/ClientEventNotificationReceiverSystem.cs

@@ -1,25 +0,0 @@
-using Content.Client.PDA;
-using Content.Shared._DV.Pager;
-using Content.Shared.PDA;
-
-namespace Content.Client._DV.PDA;
-
-public sealed class ClientEventNotificationReceiverSystem : EntitySystem
-{
-    [Dependency] private readonly SharedUserInterfaceSystem _userInterface = default!;
-
-    public override void Initialize()
-    {
-        base.Initialize();
-
-        SubscribeLocalEvent<PagerComponent, AfterAutoHandleStateEvent>(OnAfterAutoHandleState);
-    }
-
-    private void OnAfterAutoHandleState(Entity<PagerComponent> ent, ref AfterAutoHandleStateEvent args)
-    {
-        if (!_userInterface.TryGetOpenUi<PdaBoundUserInterface>(ent.Owner, PdaUiKey.Key, out var bui))
-            return;
-
-        bui.UpdateLinkedDevices();
-    }
-}

Content.Client/_DV/PDA/LinkedDeviceItem.xaml

@@ -1,6 +0,0 @@
-<PanelContainer HorizontalExpand="True" xmlns="https://spacestation14.io">
-    <BoxContainer Orientation="Horizontal" HorizontalExpand="True" Margin="4">
-        <Label Name="DeviceName" Access="Public" HorizontalExpand="True" />
-        <Button Name="Unlink" Access="Public" StyleClasses="ButtonSmall" Text="{Loc 'comp-pda-ui-linked-devices-unlink'}"/>
-    </BoxContainer>
-</PanelContainer>

Content.Client/_DV/PDA/LinkedDeviceItem.xaml.cs

@@ -1,14 +0,0 @@
-using Robust.Client.AutoGenerated;
-using Robust.Client.UserInterface.Controls;
-using Robust.Client.UserInterface.XAML;
-
-namespace Content.Client._DV.PDA;
-
-[GenerateTypedNameReferences]
-public sealed partial class LinkedDeviceItem : PanelContainer
-{
-    public LinkedDeviceItem()
-    {
-        RobustXamlLoader.Load(this);
-    }
-}

Content.Client/_DV/PDA/PdaMenu.xaml.cs

@@ -1,28 +0,0 @@
-using Content.Client._DV.PDA;
-using Content.Client.Stylesheets;
-using System.Linq;
-
-namespace Content.Client.PDA;
-
-public sealed partial class PdaMenu
-{
-    public event Action<string>? OnUnlinkDevicePressed;
-
-    public void UpdateLinkedDevices(Dictionary<string, string> devices)
-    {
-        LinkedDeviceList.RemoveAllChildren();
-
-        var even = false;
-        foreach (var (address, name) in devices.OrderBy(kvp => kvp.Value))
-        {
-            var item = new LinkedDeviceItem()
-            {
-                DeviceName = { Text = name },
-            };
-            item.Unlink.OnPressed += _ => OnUnlinkDevicePressed?.Invoke(address);
-            LinkedDeviceList.AddChild(item);
-            LinkedDeviceList.StyleClasses.Add(even ? StyleClass.PanelDark : StyleClass.PanelLight);
-            even = !even;
-        }
-    }
-}

Content.Client/_DV/Pager/PagerButtonSystem.cs

@@ -1,41 +0,0 @@
-using Content.Shared._DV.Pager;
-using Robust.Client.Animations;
-using Robust.Client.GameObjects;
-
-namespace Content.Client._DV.Pager;
-
-public sealed class PagerButtonSystem : SharedPagerButtonSystem
-{
-    [Dependency] private readonly AnimationPlayerSystem _animationPlayer = default!;
-
-    private const string AnimateKey = "pager-press";
-
-    protected override void AfterActivated(Entity<PagerButtonComponent> ent)
-    {
-        if (!_animationPlayer.HasRunningAnimation(ent.Owner, AnimateKey))
-            _animationPlayer.Play(ent.Owner, GetAnimation(ent), AnimateKey);
-    }
-
-    private Animation GetAnimation(Entity<PagerButtonComponent> ent)
-    {
-        const float flickDuration = 20f / 60f;
-
-        return new Animation()
-        {
-            Length = TimeSpan.FromSeconds(flickDuration),
-
-            AnimationTracks =
-            {
-                new AnimationTrackSpriteFlick()
-                {
-                    LayerKey = PagerButtonVisualLayers.Base,
-                    KeyFrames =
-                    {
-                        new AnimationTrackSpriteFlick.KeyFrame(ent.Comp.PressState, 0f),
-                        new AnimationTrackSpriteFlick.KeyFrame(ent.Comp.UnpressedState, flickDuration),
-                    },
-                },
-            },
-        };
-    }
-}

Content.Client/_DV/Psionics/Systems/PsionicPowers/FracturedFormPowerSystem.cs

@@ -0,0 +1,6 @@
+using Content.Shared._DV.Psionics.Systems.PsionicPowers;
+
+namespace Content.Client._DV.Psionics.Systems.PsionicPowers;
+
+// This does nothing here. The code is all in the shared/server version.
+public sealed class FracturedFormPowerSystem : SharedFracturedFormPowerSystem;

Content.Client/_DV/Radio/RadioChannelColorSystem.cs

@@ -1,49 +0,0 @@
-using Content.Shared._DV.CCVars;
-using Content.Shared.Radio;
-using Robust.Shared.Configuration;
-using Robust.Shared.Prototypes;
-
-namespace Content.Client._DV.Radio;
-
-public sealed partial class RadioChannelColorSystem : EntitySystem
-{
-    [Dependency] private readonly IConfigurationManager _config = default!;
-    [Dependency] private readonly IPrototypeManager _proto = default!;
-
-    // Feels like there should be a better way to do this but I'd rather not add a client-side cvar ID or reference
-    // to a prototype in Content.Shared, since I don't want people thinking they can ever use it on the server-side.
-    private static readonly ProtoId<RadioChannelPrototype> CommonChannelProto = "Common";
-    private static readonly ProtoId<RadioChannelPrototype> CommandChannelProto = "Command";
-    private static readonly ProtoId<RadioChannelPrototype> SecurityChannelProto = "Security";
-    private static readonly ProtoId<RadioChannelPrototype> MedicalChannelProto = "Medical";
-    private static readonly ProtoId<RadioChannelPrototype> EngineeringChannelProto = "Engineering";
-    private static readonly ProtoId<RadioChannelPrototype> ScienceChannelProto = "Science";
-    private static readonly ProtoId<RadioChannelPrototype> CargoChannelProto = "Supply";
-    private static readonly ProtoId<RadioChannelPrototype> ServiceChannelProto = "Service";
-    private static readonly ProtoId<RadioChannelPrototype> BinaryChannelProto = "Binary";
-    private static readonly ProtoId<RadioChannelPrototype> JusticeChannelProto = "Justice";
-    private static readonly ProtoId<RadioChannelPrototype> PrisonChannelProto = "Prison";
-
-    public override void Initialize()
-    {
-        base.Initialize();
-
-        _config.OnValueChanged(DCCVars.RadioColorCommon, (value) => { SetChannelColor(CommonChannelProto, value); }, true);
-        _config.OnValueChanged(DCCVars.RadioColorCommand, (value) => { SetChannelColor(CommandChannelProto, value); }, true);
-        _config.OnValueChanged(DCCVars.RadioColorSecurity, (value) => { SetChannelColor(SecurityChannelProto, value); }, true);
-        _config.OnValueChanged(DCCVars.RadioColorMedical, (value) => { SetChannelColor(MedicalChannelProto, value); }, true);
-        _config.OnValueChanged(DCCVars.RadioColorEngineering, (value) => { SetChannelColor(EngineeringChannelProto, value); }, true);
-        _config.OnValueChanged(DCCVars.RadioColorScience, (value) => { SetChannelColor(ScienceChannelProto, value); }, true);
-        _config.OnValueChanged(DCCVars.RadioColorCargo, (value) => { SetChannelColor(CargoChannelProto, value); }, true);
-        _config.OnValueChanged(DCCVars.RadioColorService, (value) => { SetChannelColor(ServiceChannelProto, value); }, true);
-        _config.OnValueChanged(DCCVars.RadioColorBinary, (value) => { SetChannelColor(BinaryChannelProto, value); }, true);
-        _config.OnValueChanged(DCCVars.RadioColorJustice, (value) => { SetChannelColor(JusticeChannelProto, value); }, true);
-        _config.OnValueChanged(DCCVars.RadioColorPrison, (value) => { SetChannelColor(PrisonChannelProto, value); }, true);
-    }
-
-    private void SetChannelColor(ProtoId<RadioChannelPrototype> channel, string newColor)
-    {
-        if (Color.TryParse(newColor, out var color))
-            _proto.Index(channel).Color = color;
-    }
-}

Content.Client/_DV/Silicon/IPC/SnoutHelmetSystem.cs

@@ -0,0 +1,28 @@
+using Content.Shared._DV.Silicon.IPC;
+using Content.Shared.Humanoid;
+using Content.Shared.Humanoid.Markings;
+
+namespace Content.Client._DV.Silicon.IPC;
+
+public sealed class SnoutHelmetSystem : EntitySystem
+{
+    private const MarkingCategories MarkingToQuery = MarkingCategories.Snout;
+    private const int MaximumMarkingCount = 0;
+
+    public override void Initialize()
+    {
+        base.Initialize();
+
+        SubscribeLocalEvent<SnoutHelmetComponent, ComponentStartup>(OnComponentStartup);
+    }
+
+    private void OnComponentStartup(EntityUid uid, SnoutHelmetComponent component, ComponentStartup args)
+    {
+        if (TryComp(uid, out HumanoidAppearanceComponent? humanoidAppearanceComponent) &&
+            humanoidAppearanceComponent.ClientOldMarkings.Markings.TryGetValue(MarkingToQuery, out var markings) &&
+            markings.Count > MaximumMarkingCount)
+        {
+            component.EnableAlternateHelmet = true;
+        }
+    }
+}

Content.Client/_DV/Silicons/Charge/SiliconChargeSystem.cs

@@ -0,0 +1,31 @@
+using Content.Client.Alerts;
+using Content.Shared._EE.Silicon.Components;
+using Content.Shared._EE.Silicon.Systems;
+
+namespace Content.Client._DV.Silicon.Charge;
+
+public sealed class SiliconChargeSystem : SharedSiliconChargeSystem
+{
+    [Dependency] private readonly ClientAlertsSystem _alerts = default!;
+
+    public override void Initialize()
+    {
+        base.Initialize();
+
+        SubscribeLocalEvent<SiliconComponent, ComponentInit>(OnSiliconInit);
+        SubscribeLocalEvent<SiliconComponent, SiliconChargeStateUpdateEvent>(OnSiliconChargeStateUpdate);
+    }
+
+    private void OnSiliconInit(EntityUid uid, SiliconComponent component, ComponentInit args)
+    {
+        if (!component.BatteryPowered)
+            return;
+
+        _alerts.ShowAlert(uid, component.BatteryAlert, component.ChargeState);
+    }
+
+    private void OnSiliconChargeStateUpdate(EntityUid uid, SiliconComponent component, SiliconChargeStateUpdateEvent ev)
+    {
+        _alerts.ShowAlert(uid, component.BatteryAlert, ev.ChargePercent);
+    }
+}

Content.Client/_DV/Silicons/Charge/SiliconDrainSystem.cs

@@ -0,0 +1,29 @@
+using Content.Client.Alerts;
+using Content.Shared._EE.Silicon.Components;
+using Content.Shared._DV.Silicons.Charge;
+
+namespace Content.Client._DV.Silicon.Charge;
+
+public sealed class SiliconDrainSystem : SharedSiliconDrainSystem
+{
+    [Dependency] private readonly ClientAlertsSystem _alerts = default!;
+
+    protected override void UpdateChargeIcon(Entity<SiliconComponent> ent, short chargePercent)
+    {
+        // If you can't find a battery, set the indicator and skip it.
+        if (!TryGetSiliconBattery(ent, out _))
+        {
+            if (_alerts.IsShowingAlert(ent.Owner, ent.Comp.BatteryAlert))
+            {
+                _alerts.ClearAlert(ent.Owner, ent.Comp.BatteryAlert);
+                _alerts.ShowAlert(ent.Owner, ent.Comp.NoBatteryAlert);
+            }
+        }
+        // If the battery was replaced and the no battery indicator is showing, replace the indicator
+        else if (_alerts.IsShowingAlert(ent.Owner, ent.Comp.NoBatteryAlert))
+        {
+            _alerts.ClearAlert(ent.Owner, ent.Comp.NoBatteryAlert);
+            _alerts.ShowAlert(ent.Owner, ent.Comp.BatteryAlert, chargePercent);
+        }
+    }
+}

Content.Client/_DV/Silicons/NameHelpers.cs

@@ -1,17 +0,0 @@
-using Content.Shared.Labels.Components;
-
-namespace Content.Client._DV.Silicons;
-
-public static class NameHelpers
-{
-    extension(IEntityManager self)
-    {
-        public string PaperName(EntityUid paper)
-        {
-            if (self.TryGetComponent<LabelComponent>(paper, out var label) && label.CurrentLabel is { } labelText)
-                return labelText;
-
-            return self.GetComponent<MetaDataComponent>(paper).EntityName;
-        }
-    }
-}

Content.Client/_DV/Silicons/StationAiFaxBoundUserInterface.cs

@@ -1,144 +0,0 @@
-using System.IO;
-using Content.Shared._DV.Silicons;
-using Content.Shared.Fax;
-using JetBrains.Annotations;
-using Robust.Client.UserInterface;
-using Robust.Shared.Containers;
-
-namespace Content.Client._DV.Silicons;
-
-[UsedImplicitly]
-public sealed class StationAiFaxBoundUserInterface(EntityUid owner, Enum uiKey) : BoundUserInterface(owner, uiKey)
-{
-    [Dependency] private readonly IFileDialogManager _fileDialogManager = default!;
-
-    private StationAiFaxWindow? _window;
-    private List<StationAiFaxPageWindow> _windows = new();
-
-    private bool _dialogIsOpen;
-
-    protected override void Open()
-    {
-        base.Open();
-
-        _window = this.CreateWindow<StationAiFaxWindow>();
-        _window.FileButtonPressed += OnFileButtonPressed;
-        _window.BlankButtonPressed += OnBlankButtonPressed;
-        _window.OpenSendWindowPressed += OnOpenSendWindowPressed;
-        _window.ExaminePressed += OnExaminePressed;
-        _window.ShredPressed += OnShredPressed;
-        _window.DuplicatePressed += OnDuplicatePressed;
-
-        UpdateFaxes(EntMan.System<SharedContainerSystem>().EnsureContainer<Container>(Owner, StationAiFaxComponent.Container, out _));
-    }
-
-    private async void OnFileButtonPressed()
-    {
-        if (_dialogIsOpen)
-            return;
-
-        _dialogIsOpen = true;
-        var filters = new FileDialogFilters(new FileDialogFilters.Group("txt"));
-        await using var file = await _fileDialogManager.OpenFile(filters, FileAccess.Read);
-        _dialogIsOpen = false;
-
-        if (_window == null || _window.Disposed || file == null)
-        {
-            return;
-        }
-
-        using var reader = new StreamReader(file);
-
-        var firstLine = await reader.ReadLineAsync();
-        string? label = null;
-        var content = await reader.ReadToEndAsync();
-
-        if (firstLine is { })
-        {
-            if (firstLine.StartsWith('#'))
-            {
-                label = firstLine[1..].Trim();
-            }
-            else
-            {
-                content = firstLine + "\n" + content;
-            }
-        }
-
-        SendMessage(new FaxFileMessage(
-            label?[..Math.Min(label.Length, FaxFileMessageValidation.MaxLabelSize)],
-            content[..Math.Min(content.Length, FaxFileMessageValidation.MaxContentSize)],
-            false));
-    }
-
-    private void OnBlankButtonPressed()
-    {
-        SendMessage(new FaxFileMessage(null, string.Empty, false));
-    }
-
-    private void OnOpenSendWindowPressed(EntityUid entity)
-    {
-        var window = new StationAiFaxPageWindow(entity, EntMan);
-        _windows.Add(window);
-
-        window.RefreshButtonPressed += OnRefreshButtonPressed;
-        window.PeerSelected += OnPeerSelected;
-        window.SendButtonPressed += OnSendDocument;
-
-        if (UiSystem.TryGetUiState<FaxUiState>(Owner, UiKey, out var state))
-        {
-            window.UpdateState(state);
-        }
-
-        window.OpenCentered();
-    }
-
-    private void OnSendDocument(EntityUid entity)
-    {
-        SendMessage(new StationAiFaxSendMessage(EntMan.GetNetEntity(entity)));
-    }
-
-    private void OnExaminePressed(EntityUid entity)
-    {
-        SendPredictedMessage(new StationAiFaxExamineMessage(EntMan.GetNetEntity(entity)));
-    }
-
-    private void OnShredPressed(EntityUid entity)
-    {
-        SendPredictedMessage(new StationAiFaxShredMessage(EntMan.GetNetEntity(entity)));
-    }
-
-    private void OnDuplicatePressed(EntityUid entity)
-    {
-        SendPredictedMessage(new StationAiFaxDuplicateMessage(EntMan.GetNetEntity(entity)));
-    }
-
-    private void OnRefreshButtonPressed()
-    {
-        SendMessage(new FaxRefreshMessage());
-    }
-
-    private void OnPeerSelected(string address)
-    {
-        SendMessage(new FaxDestinationMessage(address));
-    }
-
-    protected override void UpdateState(BoundUserInterfaceState state)
-    {
-        base.UpdateState(state);
-
-        if (state is not FaxUiState cast)
-            return;
-
-        _window?.UpdateState(cast);
-        foreach (var window in _windows)
-        {
-            window.UpdateState(cast);
-        }
-    }
-
-    public void UpdateFaxes(Container container)
-    {
-        _window?.UpdateFaxes(container);
-    }
-}

Content.Client/_DV/Silicons/StationAiFaxItem.xaml

@@ -1,14 +0,0 @@
-<PanelContainer xmlns="https://spacestation14.io"
-                xmlns:ui="clr-namespace:Content.Client._DV.UserInterfaces"
-                xmlns:xe="clr-namespace:Content.Client.UserInterface.XamlExtensions"
-                StyleClasses="PanelLight"
-                HorizontalExpand="True">
-    <BoxContainer Orientation="Horizontal" HorizontalExpand="True" Margin="8">
-        <Label Name="PaperName" HorizontalExpand="True" />
-
-        <ui:IconButton Name="Shred" StyleClasses="OpenRight" Icon="{xe:Tex '/Textures/Interface/shredder.svg.192dpi.png'}" />
-        <ui:IconButton Name="Duplicate" StyleClasses="OpenBoth" Icon="{xe:Tex '/Textures/Interface/files.svg.192dpi.png'}" />
-        <ui:IconButton Name="Examine" StyleClasses="OpenBoth" Icon="{xe:Tex '/Textures/Interface/eye.svg.192dpi.png'}" />
-        <ui:IconButton Name="Send" StyleClasses="OpenLeft" Icon="{xe:Tex '/Textures/Interface/send.svg.192dpi.png'}" />
-    </BoxContainer>
-</PanelContainer>

Content.Client/_DV/Silicons/StationAiFaxItem.xaml.cs

@@ -1,27 +0,0 @@
-using Robust.Client.AutoGenerated;
-using Robust.Client.UserInterface.Controls;
-using Robust.Client.UserInterface.XAML;
-
-namespace Content.Client._DV.Silicons;
-
-[GenerateTypedNameReferences]
-public sealed partial class StationAiFaxItem : PanelContainer
-{
-    public string? Text { get => PaperName.Text; set => PaperName.Text = value; }
-    public bool CanSend { get => !Duplicate.Disabled; set => Duplicate.Disabled = !value; }
-
-    public event Action? ShredPressed;
-    public event Action? DuplicatePressed;
-    public event Action? ExaminePressed;
-    public event Action? SendPressed;
-
-    public StationAiFaxItem()
-    {
-        RobustXamlLoader.Load(this);
-
-        Shred.OnPressed += _ => ShredPressed?.Invoke();
-        Duplicate.OnPressed += _ => DuplicatePressed?.Invoke();
-        Examine.OnPressed += _ => ExaminePressed?.Invoke();
-        Send.OnPressed += _ => SendPressed?.Invoke();
-    }
-}

Content.Client/_DV/Silicons/StationAiFaxPageWindow.xaml

@@ -1,64 +0,0 @@
-<controls:FancyWindow
-    xmlns="https://spacestation14.io"
-    xmlns:controls="clr-namespace:Content.Client.UserInterface.Controls"
-    Title="{Loc 'fax-machine-ui-page-window'}"
-    MinSize="380 220">
-
-    <BoxContainer Orientation="Vertical" HorizontalExpand="True" VerticalExpand="True">
-        <PanelContainer StyleClasses="PanelDark" HorizontalExpand="True" VerticalExpand="True">
-            <BoxContainer Orientation="Vertical" Margin="8">
-                <BoxContainer Orientation="Horizontal">
-                    <Label Text="{Loc 'fax-machine-ui-sending'}"
-                           VerticalAlignment="Bottom"
-                           HorizontalExpand="True" />
-
-                    <Label Name="SendingLabel"
-                           HorizontalAlignment="Right"
-                           VerticalAlignment="Center"
-                           Align="Right"/>
-                </BoxContainer>
-
-                <BoxContainer Orientation="Horizontal">
-                    <Label Text="{Loc 'fax-machine-ui-from'}"
-                           VerticalAlignment="Bottom"
-                           HorizontalExpand="True" />
-
-                    <Label Name="FromLabel"
-                           HorizontalAlignment="Right"
-                           VerticalAlignment="Center"
-                           Align="Right"/>
-                </BoxContainer>
-
-                <BoxContainer
-                    Orientation="Horizontal">
-
-                    <Label Text="{Loc 'fax-machine-ui-to'}"
-                           VerticalAlignment="Bottom"
-                           HorizontalExpand="True"/>
-
-                    <BoxContainer Orientation="Horizontal">
-                        <OptionButton Name="PeerSelector"
-                                      StyleClasses="OpenRight" />
-
-                        <Button StyleClasses="OpenLeft"
-                                Name="RefreshButton"
-                                ToolTip="{Loc 'fax-machine-ui-refresh-button'}">
-                            <TextureButton
-                                MouseFilter="Ignore"
-                                HorizontalAlignment="Center"
-                                VerticalAlignment="Center"
-                                Scale="0.9 0.9"
-                                StyleClasses="RefreshButton" />
-                        </Button>
-                    </BoxContainer>
-                </BoxContainer>
-            </BoxContainer>
-        </PanelContainer>
-        <BoxContainer Orientation="Horizontal" SeparationOverride="8" Margin="8">
-            <Button Name="SendButton"
-                    Text="{Loc 'fax-machine-ui-send-button'}"
-                    HorizontalExpand="True"
-                    Disabled="True" />
-        </BoxContainer>
-    </BoxContainer>
-</controls:FancyWindow>

Content.Client/_DV/Silicons/StationAiFaxPageWindow.xaml.cs

@@ -1,70 +0,0 @@
-using System.Linq;
-using Content.Client.UserInterface.Controls;
-using Content.Shared.Fax;
-using Robust.Client.AutoGenerated;
-using Robust.Client.UserInterface.XAML;
-
-namespace Content.Client._DV.Silicons;
-
-[GenerateTypedNameReferences]
-public sealed partial class StationAiFaxPageWindow : FancyWindow
-{
-    public event Action? RefreshButtonPressed;
-    public event Action<string>? PeerSelected;
-    public event Action<EntityUid>? SendButtonPressed;
-
-    public StationAiFaxPageWindow(EntityUid uid, IEntityManager entityManager)
-    {
-        RobustXamlLoader.Load(this);
-        SendingLabel.Text = entityManager.PaperName(uid);
-
-        RefreshButton.OnPressed += _ => RefreshButtonPressed?.Invoke();
-        SendButton.OnPressed += _ => SendButtonPressed?.Invoke(uid);
-        PeerSelector.OnItemSelected += args =>
-            PeerSelected?.Invoke((string) args.Button.GetItemMetadata(args.Id)!);
-    }
-
-    public void UpdateState(FaxUiState state)
-    {
-        SendButton.Disabled = !state.CanSendCooldown;
-        FromLabel.Text = state.DeviceName;
-
-        if (state.AvailablePeers.Count == 0)
-        {
-            PeerSelector.AddItem(Loc.GetString("fax-machine-ui-no-peers"));
-            PeerSelector.Disabled = true;
-        }
-
-        if (PeerSelector.Disabled && state.AvailablePeers.Count != 0)
-        {
-            PeerSelector.Clear();
-            PeerSelector.Disabled = false;
-        }
-
-        // always must be selected destination
-        if (string.IsNullOrEmpty(state.DestinationAddress) && state.AvailablePeers.Count != 0)
-        {
-            PeerSelected?.Invoke(state.AvailablePeers.First().Key);
-            return;
-        }
-
-        if (state.AvailablePeers.Count != 0)
-        {
-            PeerSelector.Clear();
-
-            foreach (var (address, name) in state.AvailablePeers)
-            {
-                var id = AddPeerSelect(name, address);
-                if (address == state.DestinationAddress)
-                    PeerSelector.Select(id);
-            }
-        }
-    }
-
-    private int AddPeerSelect(string name, string address)
-    {
-        PeerSelector.AddItem(name);
-        PeerSelector.SetItemMetadata(PeerSelector.ItemCount - 1, address);
-        return PeerSelector.ItemCount - 1;
-    }
-}

Content.Client/_DV/Silicons/StationAiFaxSystem.cs

@@ -1,37 +0,0 @@
-using Content.Shared._DV.Silicons;
-using Content.Shared.Fax;
-using Robust.Client.GameObjects;
-using Robust.Shared.Containers;
-
-namespace Content.Client._DV.Silicons;
-
-public sealed class StationAiFaxSystem : SharedStationAiFaxSystem
-{
-    [Dependency] private readonly UserInterfaceSystem _userInterface = default!;
-    [Dependency] private readonly SharedContainerSystem _container = default!;
-
-    public override void Initialize()
-    {
-        base.Initialize();
-
-        SubscribeLocalEvent<StationAiFaxComponent, EntRemovedFromContainerMessage>(OnRemoved);
-    }
-
-    protected override void OnInserted(Entity<StationAiFaxComponent> ent, ref EntInsertedIntoContainerMessage args)
-    {
-        base.OnInserted(ent, ref args);
-
-        if (!_userInterface.TryGetOpenUi<StationAiFaxBoundUserInterface>(ent.Owner, FaxUiKey.Key, out var bui))
-            return;
-
-        bui.UpdateFaxes(_container.EnsureContainer<Container>(ent, StationAiFaxComponent.Container, out _));
-    }
-
-    private void OnRemoved(Entity<StationAiFaxComponent> ent, ref EntRemovedFromContainerMessage args)
-    {
-        if (!_userInterface.TryGetOpenUi<StationAiFaxBoundUserInterface>(ent.Owner, FaxUiKey.Key, out var bui))
-            return;
-
-        bui.UpdateFaxes(_container.EnsureContainer<Container>(ent, StationAiFaxComponent.Container, out _));
-    }
-}

Content.Client/_DV/Silicons/StationAiFaxWindow.xaml

@@ -1,29 +0,0 @@
-<controls:FancyWindow
-    xmlns="https://spacestation14.io"
-    xmlns:controls="clr-namespace:Content.Client.UserInterface.Controls"
-    Title="{Loc 'fax-machine-ui-window'}"
-    MinSize="500 600">
-
-    <BoxContainer Orientation="Vertical" Name="NoFaxes" HorizontalAlignment="Center" VerticalAlignment="Center" SeparationOverride="8">
-        <Label StyleClasses="PlaceholderText" Text="{Loc 'fax-machine-ui-no-faxes'}" Align="Center" />
-
-        <BoxContainer Orientation="Vertical" HorizontalAlignment="Center">
-            <Button Name="NoFaxesBlank" Text="{Loc 'fax-machine-ui-add-blank-file'}" HorizontalExpand="True" StyleClasses="OpenLeft" />
-            <Button Name="NoFaxesUpload" Text="{Loc 'fax-machine-ui-upload-file'}" HorizontalExpand="True" StyleClasses="OpenRight" />
-        </BoxContainer>
-
-    </BoxContainer>
-
-    <BoxContainer Orientation="Vertical" Name="YesFaxes" HorizontalExpand="True" VerticalExpand="True">
-        <PanelContainer StyleClasses="PanelDark" VerticalExpand="True" HorizontalExpand="True">
-            <ScrollContainer VerticalExpand="True" HorizontalExpand="True">
-                <BoxContainer Name="FaxList" Margin="8" VerticalAlignment="Top" HorizontalExpand="True" SeparationOverride="8" Orientation="Vertical" />
-            </ScrollContainer>
-        </PanelContainer>
-
-        <BoxContainer Orientation="Horizontal" SeparationOverride="8" Margin="8">
-            <Button Name="YesFaxesBlank" Text="{Loc 'fax-machine-ui-add-blank-file'}" HorizontalAlignment="Center" />
-            <Button Name="YesFaxesUpload" Text="{Loc 'fax-machine-ui-upload-file'}" HorizontalAlignment="Center" />
-        </BoxContainer>
-    </BoxContainer>
-</controls:FancyWindow>

Content.Client/_DV/Silicons/StationAiFaxWindow.xaml.cs

@@ -1,92 +0,0 @@
-using Content.Client.UserInterface.Controls;
-using Content.Shared.Fax;
-using Content.Shared.Labels.Components;
-using Robust.Client.AutoGenerated;
-using Robust.Client.UserInterface.XAML;
-
-namespace Content.Client._DV.Silicons;
-
-[GenerateTypedNameReferences]
-public sealed partial class StationAiFaxWindow : FancyWindow
-{
-    [Dependency] private readonly IEntityManager _entityManager = default!;
-
-    public event Action? BlankButtonPressed;
-    public event Action? FileButtonPressed;
-    public event Action<EntityUid>? OpenSendWindowPressed;
-    public event Action<EntityUid>? ExaminePressed;
-    public event Action<EntityUid>? ShredPressed;
-    public event Action<EntityUid>? DuplicatePressed;
-
-    public bool CanSend
-    {
-        get;
-        set
-        {
-            if (field == value)
-                return;
-
-            field = value;
-            foreach (var item in FaxList.Children)
-            {
-                var castItem = (StationAiFaxItem)item;
-                castItem.CanSend = value;
-            }
-
-            NoFaxesBlank.Disabled = !value;
-            NoFaxesUpload.Disabled = !value;
-            YesFaxesBlank.Disabled = !value;
-            YesFaxesUpload.Disabled = !value;
-        }
-    }
-
-    public StationAiFaxWindow()
-    {
-        RobustXamlLoader.Load(this);
-        IoCManager.InjectDependencies(this);
-
-        NoFaxesBlank.OnPressed += _ => BlankButtonPressed?.Invoke();
-        NoFaxesUpload.OnPressed +=  _ => FileButtonPressed?.Invoke();
-
-        YesFaxesBlank.OnPressed += _ => BlankButtonPressed?.Invoke();
-        YesFaxesUpload.OnPressed +=  _ => FileButtonPressed?.Invoke();
-    }
-
-    public void UpdateFaxes(Robust.Shared.Containers.Container container)
-    {
-        FaxList.RemoveAllChildren();
-        foreach (var item in container.ContainedEntities)
-        {
-            var page = new StationAiFaxItem
-            {
-                Text = _entityManager.TryGetComponent<LabelComponent>(item, out var label) &&
-                       label.CurrentLabel is { } labelText
-                    ? labelText
-                    : _entityManager.GetComponent<MetaDataComponent>(item).EntityName,
-                CanSend = CanSend,
-            };
-            FaxList.AddChild(page);
-
-            page.ExaminePressed += () => ExaminePressed?.Invoke(item);
-            page.ShredPressed += () => ShredPressed?.Invoke(item);
-            page.DuplicatePressed += () => DuplicatePressed?.Invoke(item);
-            page.SendPressed += () => OpenSendWindowPressed?.Invoke(item);
-        }
-
-        if (container.ContainedEntities.Count == 0)
-        {
-            YesFaxes.Visible = false;
-            NoFaxes.Visible = true;
-        }
-        else
-        {
-            YesFaxes.Visible = true;
-            NoFaxes.Visible = false;
-        }
-    }
-
-    public void UpdateState(FaxUiState state)
-    {
-        CanSend = state.CanSendCooldown;
-    }
-}

Content.Client/_DV/Surgery/SurgeryCleanStatusSystem.cs

@@ -0,0 +1,22 @@
+using Content.Client.Items;
+using Content.Shared._DV.Surgery;
+using Content.Shared.Inventory;
+using Robust.Shared.Containers;
+
+namespace Content.Client._DV.Surgery;
+
+/// <summary>
+/// This shows the item status for dirty surgery tools.
+/// </summary>
+public sealed class SurgeryCleanStatusSystem : EntitySystem
+{
+    [Dependency] private readonly InventorySystem _inventory = default!;
+    [Dependency] private readonly SharedContainerSystem _container = default!;
+
+    public override void Initialize()
+    {
+        base.Initialize();
+
+        Subs.ItemStatus<SurgeryDirtinessComponent>(ent => new SurgeryDirtinessItemStatus(ent, EntityManager, _inventory, _container));
+    }
+}

Content.Client/_DV/Surgery/SurgeryDirtinessItemStatus.cs

@@ -0,0 +1,99 @@
+using System.Numerics;
+using Content.Client.UserInterface.Controls;
+using Content.Shared._DV.Surgery;
+using Content.Shared._Shitmed.Medical.Surgery.Tools;
+using Content.Shared.FixedPoint;
+using Content.Shared.Inventory;
+using Robust.Shared.Containers;
+using Robust.Shared.Timing;
+
+namespace Content.Client._DV.Surgery;
+
+public sealed class SurgeryDirtinessItemStatus : SplitBar
+{
+    private readonly IEntityManager _entMan;
+    private readonly EntityUid _uid;
+    private readonly InventorySystem _inventory;
+    private readonly SharedContainerSystem _container;
+    private FixedPoint2? _dirtiness = null;
+    private FixedPoint2? _gloveDirtiness = null;
+
+    private static readonly Color SelfCleanColor = new Color(0xD1, 0xD5, 0xD9);
+    private static readonly Color SelfDirtyColor = new Color(0xE9, 0x3D, 0x58);
+    private static readonly Color GloveCleanColor = new Color(0xAB, 0xE9, 0xFB);
+    private static readonly Color GloveDirtyColor = new Color(0xE9, 0x64, 0x3A);
+
+    public SurgeryDirtinessItemStatus(EntityUid uid, IEntityManager entMan, InventorySystem inventory, SharedContainerSystem container)
+    {
+        _uid = uid;
+        _entMan = entMan;
+        _inventory = inventory;
+        _container = container;
+        MinBarSize = new Vector2(10, 0);
+        Margin = new Thickness(4);
+        MinHeight = 16;
+        MaxHeight = 16;
+    }
+
+    protected override void FrameUpdate(FrameEventArgs args)
+    {
+        base.FrameUpdate(args);
+
+        if (!_entMan.TryGetComponent<SurgeryDirtinessComponent>(_uid, out var comp))
+            return;
+
+        var isTool = _entMan.HasComponent<SurgeryToolComponent>(_uid);
+
+        if (_dirtiness == comp.Dirtiness && !isTool)
+            return;
+        _dirtiness = comp.Dirtiness;
+
+        if (isTool && _container.TryGetContainingContainer((_uid, null, null), out var container))
+        {
+            var user = container.Owner;
+
+            FixedPoint2? glovesDirtiness =
+                _inventory.TryGetSlotEntity(user, "gloves", out var gloves)
+                    ? _entMan.TryGetComponent<SurgeryDirtinessComponent>(_uid, out var glovesComp)
+                        ? glovesComp.Dirtiness
+                        : FixedPoint2.Zero
+                    : null;
+
+            if (glovesDirtiness is not null && _gloveDirtiness == glovesDirtiness)
+                return;
+            _gloveDirtiness = glovesDirtiness;
+
+            Clear();
+
+            var toolAmount = FixedPoint2.Min(_dirtiness.Value / 100, 1);
+            var gloveAmount = FixedPoint2.Min((_gloveDirtiness ?? 0) / 100, 1);
+            var remaining = 1 - toolAmount - gloveAmount;
+
+            var clean = (_dirtiness + (_gloveDirtiness ?? 0)) < 50;
+            var maskOn = _inventory.TryGetSlotEntity(user, "mask", out var _);
+            var isFine = clean && maskOn && _gloveDirtiness is not null;
+
+            if (toolAmount != FixedPoint2.Zero)
+                AddEntry(toolAmount.Float() * 100, isFine ? SelfCleanColor : SelfDirtyColor);
+
+            if (gloveAmount != FixedPoint2.Zero)
+                AddEntry(gloveAmount.Float() * 100, isFine ? GloveCleanColor : GloveDirtyColor);
+
+            if (remaining > FixedPoint2.Zero)
+                AddEntry(remaining.Float() * 100, Color.SlateGray);
+        }
+        else
+        {
+            Clear();
+
+            var amount = FixedPoint2.Min(_dirtiness.Value / 100, 1);
+            var remaining = 1 - amount;
+
+            if (amount != FixedPoint2.Zero)
+                AddEntry(amount.Float(), amount < 0.5 ? SelfCleanColor : SelfDirtyColor);
+
+            if (remaining != FixedPoint2.Zero)
+                AddEntry(remaining.Float(), Color.SlateGray);
+        }
+    }
+}

Content.Client/_DV/Traits/UI/TraitCategory.xaml.cs

@@ -108,70 +108,6 @@ public sealed partial class TraitCategory : BoxContainer
         {
             CategoryPointsLabel.Visible = false;
         }
-
-        // Lock unselected entries whenever the category cap is reached so the
-        // player gets a clear visual cue instead of silently failing to equip.
-        UpdateCategoryFullState();
-    }
-
-    /// <summary>
-    /// Propagates category-cap lock state to every entry.
-    /// <para>
-    /// Selected entries are never locked - they are the traits filling the cap
-    /// and must stay interactive so the player can deselect them.
-    /// </para>
-    /// <para>
-    /// Unselected entries are locked when:
-    /// <list type="bullet">
-    ///   <item><see cref="TraitCategoryPrototype.MaxTraits"/> is defined and already reached, OR</item>
-    ///   <item><see cref="TraitCategoryPrototype.MaxPoints"/> is defined and this specific
-    ///         trait's cost would push spending over the limit.</item>
-    /// </list>
-    /// </para>
-    /// </summary>
-    private void UpdateCategoryFullState()
-    {
-        var traitCapReached = _category.MaxTraits.HasValue && SelectedCount >= _category.MaxTraits.Value;
-
-        foreach (var (_, entry) in _traitEntries)
-        {
-            if (entry.IsSelected)
-            {
-                // Selected traits are never locked by category state.
-                entry.SetLockedByCategory(false);
-                continue;
-            }
-
-            var locked = traitCapReached;
-
-            // Even when the trait count cap hasn't been hit, lock this specific entry
-            // if adding its cost would exceed the category's point budget.
-            if (!locked && _category.MaxPoints.HasValue)
-                locked = PointsSpent + entry.TraitCost > _category.MaxPoints.Value;
-
-            entry.SetLockedByCategory(locked);
-        }
-    }
-
-    /// <summary>
-    /// Called by <see cref="TraitsTab"/> whenever the player's global point budget changes.
-    /// Locks any unselected entry whose cost the player can no longer afford.
-    /// <para>
-    /// Free (0-cost) and negative-cost traits are never locked - they cost nothing or
-    /// actually give points back.  Selected traits are also never locked here; they
-    /// were affordable when picked and must stay interactive to be deselected.
-    /// </para>
-    /// </summary>
-    public void UpdateGlobalPointsLock(int remainingPoints)
-    {
-        foreach (var (_, entry) in _traitEntries)
-        {
-            // A selected trait is always unlocked here - same reasoning as category cap:
-            // it was paid for at selection time and must stay interactive.
-            // Traits that cost nothing or give points back are never locked by budget.
-            var shouldLock = !entry.IsSelected && entry.TraitCost > remainingPoints;
-            entry.SetLockedByPoints(shouldLock);
-        }
     }
 
     public void SetTraitSelected(ProtoId<TraitPrototype> traitId, bool selected)
@@ -235,11 +171,11 @@ public sealed partial class TraitCategory : BoxContainer
     /// Updates condition states for all trait entries based on current job/species.
     /// Traits that don't meet conditions are disabled but still visible.
     /// </summary>
-    public void UpdateConditions(ProtoId<JobPrototype>? jobId, ProtoId<SpeciesPrototype>? speciesId, IReadOnlySet<ProtoId<AntagPrototype>>? antagPreferences, IReadOnlySet<ProtoId<TraitPrototype>>? selectedTraits)
+    public void UpdateConditions(ProtoId<JobPrototype>? jobId, ProtoId<SpeciesPrototype>? speciesId, IReadOnlySet<ProtoId<AntagPrototype>>? antagPreferences)
     {
         foreach (var (_, entry) in _traitEntries)
         {
-            entry.UpdateConditionsMet(jobId, speciesId, antagPreferences, selectedTraits);
+            entry.UpdateConditionsMet(jobId, speciesId, antagPreferences);
         }
 
         // Update stats since some traits may have been deselected

Content.Client/_DV/Traits/UI/TraitEntry.xaml.cs

@@ -27,9 +27,6 @@ public sealed partial class TraitEntry : PanelContainer
     private bool _isUpdating;
     private readonly List<string> _failedConditionTooltips = new();
 
-    private bool _isLockedByCategory;
-    private bool _isLockedByPoints;
-
     public TraitEntry(TraitPrototype trait)
     {
         RobustXamlLoader.Load(this);
@@ -62,17 +59,9 @@ public sealed partial class TraitEntry : PanelContainer
 
         foreach (var condition in _trait.Conditions)
         {
-            if (condition is TraitDependencyCondition depCond)
-            {
-                // Use GetTooltips() to get individual lines without duplication
-                tooltips.AddRange(depCond.GetTooltips(_prototype, _loc));
-            }
-            else
-            {
-                var tooltip = condition.GetTooltip(_prototype, _loc);
-                if (!string.IsNullOrEmpty(tooltip))
-                    tooltips.Add(tooltip);
-            }
+            var tooltip = condition.GetTooltip(_prototype, _loc);
+            if (!string.IsNullOrEmpty(tooltip))
+                tooltips.Add(tooltip);
         }
 
         if (tooltips.Count > 0)
@@ -102,92 +91,39 @@ public sealed partial class TraitEntry : PanelContainer
     /// <summary>
     /// Updates whether conditions are met based on current job/species.
     /// </summary>
-    public void UpdateConditionsMet(
-        ProtoId<JobPrototype>? jobId,
-        ProtoId<SpeciesPrototype>? speciesId,
-        IReadOnlySet<ProtoId<AntagPrototype>>? antagPreferences,
-        IReadOnlySet<ProtoId<TraitPrototype>>? selectedTraits)
+    public void UpdateConditionsMet(ProtoId<JobPrototype>? jobId, ProtoId<SpeciesPrototype>? speciesId, IReadOnlySet<ProtoId<AntagPrototype>>? antagPreferences)
     {
         _failedConditionTooltips.Clear();
         MeetsConditions = true;
 
         foreach (var condition in _trait.Conditions)
         {
-            bool result;
-
-            if (condition is TraitDependencyCondition depCond)
+            var result = condition switch
             {
-                result = CheckDependencyCondition(depCond, selectedTraits);
-                // CheckDependencyCondition adds its own tooltips directly
-            }
-            else
-            {
-                result = condition switch
-                {
-                    IsSpeciesCondition speciesCond => CheckSpeciesCondition(speciesCond, speciesId),
-                    HasJobCondition jobCond => CheckJobCondition(jobCond, jobId),
-                    InDepartmentCondition deptCond => CheckDepartmentCondition(deptCond, jobId),
-                    HasCompCondition compCond => !compCond.Invert, // can't check in lobby
-                    IsAntagEligibleCondition antagEligibleCond => CheckAntagEligibleCondition(antagEligibleCond, antagPreferences),
-                    AnyOfCondition anyOfCond => CheckAnyOfCondition(anyOfCond, jobId, speciesId, antagPreferences, selectedTraits),
-                    _ => true,
-                };
+                IsSpeciesCondition speciesCond => CheckSpeciesCondition(speciesCond, speciesId),
+                HasJobCondition jobCond => CheckJobCondition(jobCond, jobId),
+                InDepartmentCondition deptCond => CheckDepartmentCondition(deptCond, jobId),
+                HasCompCondition compCond => !compCond.Invert, // can't check in lobby but screws with the inversion logic
+                IsAntagEligibleCondition antagEligibleCond => CheckAntagEligibleCondition(antagEligibleCond, antagPreferences),
+                AnyOfCondition anyOfCond => CheckAnyOfCondition(anyOfCond, jobId, speciesId, antagPreferences),
+                _ => true,
+            };
 
-                // Apply inversion for non-dependency conditions
-                result ^= condition.Invert;
-
-                if (!result)
-                {
-                    var tooltip = condition.GetTooltip(_prototype, _loc);
-                    if (!string.IsNullOrEmpty(tooltip))
-                        _failedConditionTooltips.Add(tooltip);
-                }
-            }
+            // Apply inversion
+            result ^= condition.Invert;
 
             if (!result)
+            {
                 MeetsConditions = false;
+                var tooltip = condition.GetTooltip(_prototype, _loc);
+                if (!string.IsNullOrEmpty(tooltip))
+                    _failedConditionTooltips.Add(tooltip);
+            }
         }
 
         UpdateDisabledState();
     }
 
-    /// <summary>
-    /// Checks a TraitDependencyCondition and adds failure tooltips directly.
-    /// Returns true if the condition passes.
-    /// </summary>
-    private bool CheckDependencyCondition(TraitDependencyCondition condition, IReadOnlySet<ProtoId<TraitPrototype>>? selectedTraits)
-    {
-        var passed = true;
-
-        foreach (var conflict in condition.Conflicts)
-        {
-            if (selectedTraits == null || !selectedTraits.Contains(conflict))
-                continue;
-
-            if (_prototype.TryIndex(conflict, out var conflictProto))
-            {
-                _failedConditionTooltips.Add(_loc.GetString("trait-condition-trait-conflict",
-                    ("trait", _loc.GetString(conflictProto.Name))));
-            }
-            passed = false;
-        }
-
-        foreach (var required in condition.Requires)
-        {
-            if (selectedTraits != null && selectedTraits.Contains(required))
-                continue;
-
-            if (_prototype.TryIndex(required, out var requiredProto))
-            {
-                _failedConditionTooltips.Add(_loc.GetString("trait-condition-trait-required",
-                    ("trait", _loc.GetString(requiredProto.Name))));
-            }
-            passed = false;
-        }
-
-        return passed;
-    }
-
     private bool CheckSpeciesCondition(IsSpeciesCondition condition, ProtoId<SpeciesPrototype>? speciesId)
     {
         if (!_prototype.TryIndex(speciesId, out var species))
@@ -223,12 +159,7 @@ public sealed partial class TraitEntry : PanelContainer
         return antagPreferences.Contains(condition.Antag);
     }
 
-    private bool CheckAnyOfCondition(
-        AnyOfCondition condition,
-        ProtoId<JobPrototype>? jobId,
-        ProtoId<SpeciesPrototype>? speciesId,
-        IReadOnlySet<ProtoId<AntagPrototype>>? antagPreferences,
-        IReadOnlySet<ProtoId<TraitPrototype>>? selectedTraits)
+    private bool CheckAnyOfCondition(AnyOfCondition condition, ProtoId<JobPrototype>? jobId, ProtoId<SpeciesPrototype>? speciesId, IReadOnlySet<ProtoId<AntagPrototype>>? antagPreferences)
     {
         if (condition.Conditions.Count == 0)
             return false;
@@ -236,27 +167,19 @@ public sealed partial class TraitEntry : PanelContainer
         // Return true if ANY child condition evaluates to true
         foreach (var childCondition in condition.Conditions)
         {
-            bool result;
-
-            if (childCondition is TraitDependencyCondition depCond)
+            var result = childCondition switch
             {
-                result = CheckDependencyCondition(depCond, selectedTraits);
-            }
-            else
-            {
-                result = childCondition switch
-                {
-                    IsSpeciesCondition speciesCond => CheckSpeciesCondition(speciesCond, speciesId),
-                    HasJobCondition jobCond => CheckJobCondition(jobCond, jobId),
-                    InDepartmentCondition deptCond => CheckDepartmentCondition(deptCond, jobId),
-                    HasCompCondition compCond => !compCond.Invert, // can't check in lobby
-                    IsAntagEligibleCondition antagEligibleCond => CheckAntagEligibleCondition(antagEligibleCond, antagPreferences),
-                    AnyOfCondition nestedAnyOf => CheckAnyOfCondition(nestedAnyOf, jobId, speciesId, antagPreferences, selectedTraits),
-                    _ => true,
-                };
+                IsSpeciesCondition speciesCond => CheckSpeciesCondition(speciesCond, speciesId),
+                HasJobCondition jobCond => CheckJobCondition(jobCond, jobId),
+                InDepartmentCondition deptCond => CheckDepartmentCondition(deptCond, jobId),
+                HasCompCondition compCond => !compCond.Invert, // can't check in lobby
+                AnyOfCondition nestedAnyOf => CheckAnyOfCondition(nestedAnyOf, jobId, speciesId, antagPreferences), // Recursive!
+                IsAntagEligibleCondition antagEligibleCond => CheckAntagEligibleCondition(antagEligibleCond, antagPreferences),
+                _ => true,
+            };
 
-                result ^= childCondition.Invert;
-            }
+            // Apply child's inversion
+            result ^= childCondition.Invert;
 
             // If any child passes, the AnyOf passes
             if (result)
@@ -267,50 +190,16 @@ public sealed partial class TraitEntry : PanelContainer
         return false;
     }
 
-    /// <summary>
-    /// Called by <see cref="TraitCategory"/> whenever the category's trait or
-    /// points-cap state changes. Locking only applies to <em>unselected</em>
-    /// entries - the selected traits are the ones filling the cap and must
-    /// remain interactive so the player can deselect them.
-    /// </summary>
-    public void SetLockedByCategory(bool locked)
-    {
-        if (_isLockedByCategory == locked)
-            return;
-
-        _isLockedByCategory = locked;
-        UpdateDisabledState();
-    }
-
-    /// <summary>
-    /// Called by <see cref="TraitCategory"/> whenever the player's global point budget
-    /// changes.  Locks unselected entries whose cost the player can no longer afford.
-    /// Free (0-cost) and negative-cost traits are never locked by this.
-    /// </summary>
-    public void SetLockedByPoints(bool locked)
-    {
-        if (_isLockedByPoints == locked)
-            return;
-
-        _isLockedByPoints = locked;
-        UpdateDisabledState();
-    }
-
     private void UpdateDisabledState()
     {
-        var isSelected = TraitCheckbox.Pressed;
-        var conditionLocked = !MeetsConditions;
-        var categoryLocked = _isLockedByCategory && !isSelected;
-        var pointsLocked = _isLockedByPoints && !isSelected;
-        var isDisabled = conditionLocked || categoryLocked || pointsLocked;
-
-        if (isDisabled)
+        if (!MeetsConditions)
         {
             // Hide checkbox, show lock icon
             TraitCheckbox.Visible = false;
             LockIcon.Visible = true;
 
-            if (isSelected && conditionLocked)
+            // Deselect if conditions no longer met
+            if (TraitCheckbox.Pressed)
             {
                 _isUpdating = true;
                 TraitCheckbox.Pressed = false;
@@ -322,24 +211,14 @@ public sealed partial class TraitEntry : PanelContainer
             // Add disabled styling
             AddStyleClass("TraitsEntryDisabled");
 
-            // Tooltip priority for conditions: condition failures > category full > insufficient points.
-            if (conditionLocked && _failedConditionTooltips.Count > 0)
+            // Update tooltip to show failed conditions
+            if (_failedConditionTooltips.Count > 0)
             {
                 var tooltipText = Loc.GetString("trait-conditions-not-met-tooltip",
                     ("requirements", string.Join("\n", _failedConditionTooltips)));
 
                 TooltipSupplier = _ => CreateMarkupTooltip(tooltipText);
             }
-            else if (categoryLocked)
-            {
-                var tooltipText = Loc.GetString("trait-category-full-tooltip");
-                TooltipSupplier = _ => CreateMarkupTooltip(tooltipText);
-            }
-            else if (pointsLocked)
-            {
-                var tooltipText = Loc.GetString("trait-insufficient-points-tooltip");
-                TooltipSupplier = _ => CreateMarkupTooltip(tooltipText);
-            }
         }
         else
         {

Content.Client/_DV/Traits/UI/TraitsTab.xaml.cs

@@ -154,18 +154,14 @@ public sealed partial class TraitsTab : BoxContainer
                 }
             }
 
-            // Check conflicts via TraitDependencyCondition
-            var depCondition = trait.Conditions.OfType<Content.Shared._DV.Traits.Conditions.TraitDependencyCondition>().FirstOrDefault();
-            if (depCondition != null)
+            // Check conflicts
+            foreach (var conflict in trait.Conflicts)
             {
-                foreach (var conflict in depCondition.Conflicts)
-                {
-                    if (!_selectedTraits.Contains(conflict))
-                        continue;
+                if (!_selectedTraits.Contains(conflict))
+                    continue;
 
-                    RevertTraitToggle(traitId);
-                    return;
-                }
+                RevertTraitToggle(traitId);
+                return;
             }
 
             _selectedTraits.Add(traitId);
@@ -180,7 +176,6 @@ public sealed partial class TraitsTab : BoxContainer
         }
 
         UpdateGlobalStats();
-        UpdateAllConditions();
         UpdateCategoryStats(trait.Category);
         OnTraitsChanged?.Invoke(_selectedTraits);
     }
@@ -216,7 +211,7 @@ public sealed partial class TraitsTab : BoxContainer
             // If parent width is 0 (not laid out yet), defer until layout happens
             if (parentWidth > 0)
             {
-                GlobalPointsBar.SetWidth = (int)((parentWidth - 2) * percentage);
+                GlobalPointsBar.SetWidth = (int)((parentWidth - 2 ) * percentage);
                 _awaitingLayoutUpdate = false;
             }
             else if (!_awaitingLayoutUpdate)
@@ -240,11 +235,6 @@ public sealed partial class TraitsTab : BoxContainer
             > 0f => "TraitsProgressBarLow",
             _ => "TraitsProgressBarEmpty"
         });
-
-        foreach (var (_, categoryUi) in _categoryUis)
-        {
-            categoryUi.UpdateGlobalPointsLock(remainingPoints);
-        }
     }
 
     private void OnProgressBarParentResized()
@@ -291,7 +281,7 @@ public sealed partial class TraitsTab : BoxContainer
         foreach (var (_, categoryUi) in _categoryUis)
         {
             // If some fork wants to use the top selected job as well, just add that to the UpdateConditions method in the editor
-            categoryUi.UpdateConditions(null, _profile?.Species, _profile?.AntagPreferences, _selectedTraits);
+            categoryUi.UpdateConditions(null, _profile?.Species, _profile?.AntagPreferences);
         }
 
         RecalculateStats();

Content.Client/_DV/UserInterfaces/IconButton.xaml

@@ -1,7 +0,0 @@
-<Button xmlns="https://spacestation14.io">
-    <TextureRect Name="TextureRect"
-                 TextureScale="0.5 0.5"
-                 HorizontalAlignment="Center"
-                 VerticalAlignment="Center"
-                 Stretch="KeepCentered"/>
-</Button>

Content.Client/_DV/UserInterfaces/IconButton.xaml.cs

@@ -1,17 +0,0 @@
-using Robust.Client.AutoGenerated;
-using Robust.Client.Graphics;
-using Robust.Client.UserInterface.Controls;
-using Robust.Client.UserInterface.XAML;
-
-namespace Content.Client._DV.UserInterfaces;
-
-[GenerateTypedNameReferences]
-public sealed partial class IconButton : Button
-{
-    public Texture? Icon { get => TextureRect.Texture; set => TextureRect.Texture = value; }
-
-    public IconButton()
-    {
-        RobustXamlLoader.Load(this);
-    }
-}

Content.Client/_ES/ESScreenshakeSystem.cs

@@ -1,99 +0,0 @@
-using System.Numerics;
-using Content.Shared._DV.CCVars;
-using Content.Shared._ES.Camera;
-using Content.Shared.Camera;
-using Robust.Shared.Configuration;
-using Robust.Shared.Noise;
-using Robust.Shared.Timing;
-
-namespace Content.Client._ES;
-
-// DeltaV - Anything not marked DeltaV is Ephemeral Space code moved from SharedESScreenshakeSystem
-public sealed class ESScreenshakeSystem : EntitySystem
-{
-    [Dependency] private readonly IConfigurationManager _config = default!; // DeltaV
-    [Dependency] private readonly IGameTiming _timing = default!;
-    [Dependency] private readonly SharedESScreenshakeSystem _shared = default!;
-
-    private bool _disabled; // DeltaV
-
-    public override void Initialize()
-    {
-        base.Initialize();
-        SubscribeLocalEvent<ESScreenshakeComponent, GetEyeOffsetEvent>(OnGetEyeOffset);
-        SubscribeLocalEvent<ESScreenshakeComponent, ESGetEyeRotationEvent>(OnGetEyeRotation);
-
-        _config.OnValueChanged(DCCVars.EsScreenshakeDisabled, OnDisabledChanged, true); // DeltaV
-    }
-    private void OnDisabledChanged(bool obj)
-    {
-        _disabled = obj;
-    }
-
-    private void OnGetEyeOffset(Entity<ESScreenshakeComponent> ent, ref GetEyeOffsetEvent args)
-    {
-        if (!TryComp<EyeComponent>(ent, out var eye) || _disabled) // DeltaV - check if disabled
-            return;
-
-        var noise = new FastNoiseLite(67);
-        noise.SetNoiseType(FastNoiseLite.NoiseType.OpenSimplex2);
-
-        var accumulatedOffset = Vector2.Zero;
-        var maxOffset = new Vector2(0.15f, 0.15f);
-        foreach (var command in ent.Comp.Commands)
-        {
-            if (command.Translational == null)
-                continue;
-
-            var trauma =
-                _shared.CalculateTraumaValueForCurrentTime(command.Translational, command.Start);
-            if (trauma <= 0)
-                continue;
-
-            noise.SetFrequency(command.Translational.Frequency);
-
-            // using the starst c ommand for y pos kinda doesnt work in the case where multiple shakes get sent at the same time
-            // and the shakes are identical otherwise. but like dont do that or something idk
-            var offsetX = (maxOffset.X * trauma) * noise.GetNoise((float)_timing.RealTime.TotalMilliseconds,
-                (float)command.Start.TotalMilliseconds);
-            noise.SetSeed(68);
-            var offsetY = (maxOffset.Y * trauma) * noise.GetNoise((float)_timing.RealTime.TotalMilliseconds,
-                (float)command.Start.TotalMilliseconds);
-            noise.SetSeed(67);
-            accumulatedOffset += new Vector2(offsetX, offsetY);
-        }
-
-        args.Offset += accumulatedOffset;
-    }
-
-    private void OnGetEyeRotation(Entity<ESScreenshakeComponent> ent, ref ESGetEyeRotationEvent args)
-    {
-        if (!TryComp<EyeComponent>(ent, out var eye) || _disabled) // DeltaV - check if disabled
-            return;
-
-        var noise = new FastNoiseLite(67 + 420); // Epic bacon
-        noise.SetNoiseType(FastNoiseLite.NoiseType.OpenSimplex2);
-
-        // 20deg max
-        var accumulatedAngle = Angle.Zero;
-        var maxAngleDegrees = 20f;
-        foreach (var command in ent.Comp.Commands)
-        {
-            if (command.Rotational == null)
-                continue;
-
-            var trauma =
-                _shared.CalculateTraumaValueForCurrentTime(command.Rotational, command.Start);
-            if (trauma <= 0)
-                continue;
-
-            noise.SetFrequency(command.Rotational.Frequency);
-
-            var angle = (maxAngleDegrees * trauma) * noise.GetNoise((float)_timing.RealTime.TotalMilliseconds, (float)command.Start.TotalMilliseconds);
-            accumulatedAngle += Angle.FromDegrees(angle);
-        }
-
-        // TODO ughhh this shit breaks with something idk
-        args.Rotation += accumulatedAngle;
-    }
-}

Content.Client/_ES/Lighting/Components/ESTimedDespawnLightFadeComponent.cs

@@ -1,14 +0,0 @@
-using Content.Shared._ES.Core.Timer.Components;
-
-namespace Content.Client._ES.Lighting.Components;
-
-/// <summary>
-/// Handles a point light that fades out while synced to a <see cref="ESTimedDespawnComponent"/>
-/// </summary>
-[RegisterComponent]
-[Access(typeof(ESTimedDespawnLightFadeSystem))]
-public sealed partial class ESTimedDespawnLightFadeComponent : Component
-{
-    [DataField]
-    public TimeSpan FadeTime = TimeSpan.FromSeconds(1);
-}

Content.Client/_ES/Lighting/ESTimedDespawnLightFadeSystem.cs

@@ -1,52 +0,0 @@
-using Content.Client._ES.Lighting.Components;
-using Content.Shared._ES.Core.Timer.Components;
-using Robust.Client.Animations;
-using Robust.Client.GameObjects;
-using Robust.Shared.Animations;
-using Robust.Shared.Timing;
-
-namespace Content.Client._ES.Lighting;
-
-public sealed class ESTimedDespawnLightFadeSystem : VisualizerSystem<ESTimedDespawnLightFadeComponent>
-{
-    [Dependency] private readonly IGameTiming _timing = default!;
-    [Dependency] private readonly AnimationPlayerSystem _animationPlayer = default!;
-
-    private const string FadeTrack = "light-fade";
-
-    protected override void OnAppearanceChange(EntityUid uid, ESTimedDespawnLightFadeComponent component, ref AppearanceChangeEvent args)
-    {
-        base.OnAppearanceChange(uid, component, ref args);
-
-        if (_animationPlayer.HasRunningAnimation(uid, FadeTrack))
-            return;
-
-        if (!AppearanceSystem.TryGetData<TimeSpan>(uid, ESTimedDespawnVisuals.DespawnTime, out var time, args.Component) ||
-            !TryComp<PointLightComponent>(uid, out var light))
-            return;
-
-        var duration = time - _timing.CurTime;
-
-        var animation = new Animation
-        {
-            Length = duration,
-            AnimationTracks =
-            {
-                new AnimationTrackComponentProperty
-                {
-                    Property = nameof(PointLightComponent.Energy),
-                    ComponentType = typeof(PointLightComponent),
-                    InterpolationMode = AnimationInterpolationMode.Linear,
-                    KeyFrames =
-                    {
-                        new AnimationTrackProperty.KeyFrame(light.Energy, 0f),
-                        new AnimationTrackProperty.KeyFrame(light.Energy, (float) (duration - component.FadeTime).TotalSeconds),
-                        new AnimationTrackProperty.KeyFrame(0f, (float) component.FadeTime.TotalSeconds, Easings.OutSine),
-                    }
-                }
-            }
-        };
-
-        _animationPlayer.Play(uid, animation, FadeTrack);
-    }
-}

Content.Client/_ES/Sprite/Components/ESTimedDespawnSpriteFadeComponent.cs

@@ -1,14 +0,0 @@
-using Content.Shared._ES.Core.Timer.Components;
-
-namespace Content.Client._ES.Sprite.Components;
-
-/// <summary>
-/// Handles a sprite that fades out while synced to a <see cref="ESTimedDespawnComponent"/>
-/// </summary>
-[RegisterComponent]
-[Access(typeof(ESTimedDespawnSpriteFadeSystem))]
-public sealed partial class ESTimedDespawnSpriteFadeComponent : Component
-{
-    [DataField]
-    public TimeSpan FadeTime = TimeSpan.FromSeconds(1);
-}

Content.Client/_ES/Sprite/ESTimedDespawnSpriteFadeSystem.cs

@@ -1,57 +0,0 @@
-using Content.Client._ES.Sprite.Components;
-using Content.Shared._ES.Core.Timer.Components;
-using Robust.Client.Animations;
-using Robust.Client.GameObjects;
-using Robust.Shared.Animations;
-using Robust.Shared.Timing;
-
-namespace Content.Client._ES.Sprite;
-
-/// <summary>
-/// This handles <see cref="ESTimedDespawnSpriteFadeComponent"/>
-/// </summary>
-public sealed class ESTimedDespawnSpriteFadeSystem : VisualizerSystem<ESTimedDespawnSpriteFadeComponent>
-{
-    [Dependency] private readonly IGameTiming _timing = default!;
-    [Dependency] private readonly AnimationPlayerSystem _animationPlayer = default!;
-
-    private const string FadeTrack = "es-sprite-fade";
-
-    protected override void OnAppearanceChange(EntityUid uid, ESTimedDespawnSpriteFadeComponent component, ref AppearanceChangeEvent args)
-    {
-        base.OnAppearanceChange(uid, component, ref args);
-
-        if (args.Sprite is not { } sprite)
-            return;
-
-        if (_animationPlayer.HasRunningAnimation(uid, FadeTrack))
-            return;
-
-        if (!AppearanceSystem.TryGetData<TimeSpan>(uid, ESTimedDespawnVisuals.DespawnTime, out var time, args.Component))
-            return;
-
-        var duration = time - _timing.CurTime;
-
-        var animation = new Animation
-        {
-            Length = duration,
-            AnimationTracks =
-            {
-                new AnimationTrackComponentProperty
-                {
-                    Property = nameof(SpriteComponent.Color),
-                    ComponentType = typeof(SpriteComponent),
-                    InterpolationMode = AnimationInterpolationMode.Linear,
-                    KeyFrames =
-                    {
-                        new AnimationTrackProperty.KeyFrame(sprite.Color, 0f),
-                        new AnimationTrackProperty.KeyFrame(sprite.Color, MathF.Max((float) (duration - component.FadeTime).TotalSeconds, 0f)),
-                        new AnimationTrackProperty.KeyFrame(sprite.Color.WithAlpha(0f), (float) component.FadeTime.TotalSeconds, Easings.OutSine),
-                    },
-                },
-            },
-        };
-
-        _animationPlayer.Play(uid, animation, FadeTrack);
-    }
-}

Content.Client/_ST/Interaction/StellarInteractionParticleSystem.cs

@@ -1,184 +0,0 @@
-// SPDX-FileCopyrightText: 2026 Janet Blackquill <uhhadd@gmail.com>
-//
-// SPDX-License-Identifier: MIT
-
-using System.Numerics;
-using Content.Shared._ST.Interaction;
-using Robust.Client.Animations;
-using Robust.Client.GameObjects;
-using Robust.Shared.Map;
-using Robust.Shared.Prototypes;
-using Robust.Shared.Random;
-
-namespace Content.Client._ST.Interaction;
-
-public sealed class StellarInteractionParticleSystem : EntitySystem
-{
-    [Dependency] private readonly IRobustRandom _random = default!;
-    [Dependency] private readonly SpriteSystem _sprite = default!;
-    [Dependency] private readonly AnimationPlayerSystem _animation = default!;
-
-    private const string AnimateKey = "particle-animation";
-
-    private static readonly Dictionary<StellarInteractionParticleType, EntProtoId> InteractionParticleIds = new ()
-    {
-        { StellarInteractionParticleType.Use, "StellarInteractionParticleUse" },
-        { StellarInteractionParticleType.Pull, "StellarInteractionParticlePull" },
-    };
-
-    public override void Initialize()
-    {
-        base.Initialize();
-
-        SubscribeAllEvent<StellarInteractionParticleEvent>(OnInteractionParticle);
-    }
-
-    private void OnInteractionParticle(StellarInteractionParticleEvent ev)
-    {
-        var performer = GetEntity(ev.Performer);
-        var used = GetEntity(ev.Used);
-        var target = GetEntity(ev.Target);
-
-        if (!Exists(performer) || !Exists(target))
-            return;
-
-        if (ev.Type == StellarInteractionParticleType.Pull)
-        {
-            (performer, target) = (target, performer);
-        }
-
-        var performerXform = Transform(performer);
-        var targetXform = Transform(target);
-        if (performerXform.MapID == MapId.Nullspace || targetXform.MapID == MapId.Nullspace)
-            return;
-
-        if (performerXform.ParentUid != targetXform.ParentUid)
-            return;
-
-        var performerTargetDelta = targetXform.LocalPosition - performerXform.LocalPosition;
-        var particle = Spawn(InteractionParticleIds[ev.Type], performerXform.Coordinates);
-
-        if (used is { } usedEntity && Exists(usedEntity) && TryComp<SpriteComponent>(usedEntity, out var usedSprite))
-        {
-            _sprite.CopySprite((usedEntity, usedSprite), particle);
-            // ES START
-            _sprite.SetDrawDepth(particle, (int) Shared.DrawDepth.DrawDepth.Effects);
-            // ES END
-        }
-
-        var spriteColor = Comp<SpriteComponent>(particle).Color;
-        var animation = ev.Type switch
-        {
-            StellarInteractionParticleType.Use => GetUseAnimation(performerTargetDelta, spriteColor),
-            StellarInteractionParticleType.Pull => GetPullAnimation(performerTargetDelta, spriteColor),
-            _ => throw new ArgumentOutOfRangeException(nameof(ev), $"Interaction particle event has unknown particle type {ev.Type}"),
-        };
-        _animation.Play(particle, animation, AnimateKey);
-    }
-
-    private Animation GetUseAnimation(Vector2 endOffset, Color color)
-    {
-        var startRotation = _random.NextAngle(Angle.FromDegrees(-40), Angle.FromDegrees(40));
-        var endRotation = Angle.Zero;
-        var startScale = new Vector2(0.3f, 0.3f);
-        var endScale = new Vector2(1f, 1f);
-        var rotationLength = TimeSpan.FromMilliseconds(600);
-
-        var startOffset = new Vector2();
-        var offsetLength = TimeSpan.FromMilliseconds(250);
-
-        var startColor = color.WithAlpha(color.A * 0.7f);
-        var endColor = color.WithAlpha(0f);
-        var colorLength = rotationLength + offsetLength;
-
-        return new Animation()
-        {
-            Length = colorLength,
-
-            AnimationTracks =
-            {
-                new AnimationTrackComponentProperty()
-                {
-                    ComponentType = typeof(SpriteComponent),
-                    Property = nameof(SpriteComponent.Rotation),
-                    KeyFrames =
-                    {
-                        new AnimationTrackProperty.KeyFrame(startRotation, 0f),
-                        new AnimationTrackProperty.KeyFrame(endRotation, (float)rotationLength.TotalSeconds, Easings.OutBack),
-                    },
-                },
-                new AnimationTrackComponentProperty()
-                {
-                    ComponentType = typeof(SpriteComponent),
-                    Property = nameof(SpriteComponent.Scale),
-                    KeyFrames =
-                    {
-                        new AnimationTrackProperty.KeyFrame(startScale, 0f),
-                        new AnimationTrackProperty.KeyFrame(endScale, (float)rotationLength.TotalSeconds, Easings.OutBack),
-                    },
-                },
-                new AnimationTrackComponentProperty()
-                {
-                    ComponentType = typeof(SpriteComponent),
-                    Property = nameof(SpriteComponent.Offset),
-                    KeyFrames =
-                    {
-                        new AnimationTrackProperty.KeyFrame(startOffset, 0f),
-                        new AnimationTrackProperty.KeyFrame(endOffset, (float)offsetLength.TotalSeconds, Easings.OutBack),
-                    },
-                },
-                new AnimationTrackComponentProperty()
-                {
-                    ComponentType = typeof(SpriteComponent),
-                    Property = nameof(SpriteComponent.Color),
-                    KeyFrames =
-                    {
-                        new AnimationTrackProperty.KeyFrame(startColor, 0f),
-                        new AnimationTrackProperty.KeyFrame(startColor, (float)rotationLength.TotalSeconds),
-                        new AnimationTrackProperty.KeyFrame(endColor, (float)offsetLength.TotalSeconds, Easings.InOutCirc),
-                    },
-                },
-            },
-        };
-    }
-
-    private Animation GetPullAnimation(Vector2 endOffset, Color color)
-    {
-        var rotationLength = TimeSpan.FromMilliseconds(8f * (1000f / 12f));
-
-        var startOffset = new Vector2();
-        var offsetLength = TimeSpan.FromMilliseconds(4f * (1000f / 12f));
-
-        var endColor = color.WithAlpha(0f);
-
-        return new Animation
-        {
-            Length = rotationLength,
-
-            AnimationTracks =
-            {
-                new AnimationTrackComponentProperty()
-                {
-                    ComponentType = typeof(SpriteComponent),
-                    Property = nameof(SpriteComponent.Offset),
-                    KeyFrames =
-                    {
-                        new AnimationTrackProperty.KeyFrame(startOffset, 0f),
-                        new AnimationTrackProperty.KeyFrame(endOffset, (float)rotationLength.TotalSeconds, Easings.InOutCirc),
-                    },
-                },
-                new AnimationTrackComponentProperty()
-                {
-                    ComponentType = typeof(SpriteComponent),
-                    Property = nameof(SpriteComponent.Color),
-                    KeyFrames =
-                    {
-                        new AnimationTrackProperty.KeyFrame(color, 0f),
-                        new AnimationTrackProperty.KeyFrame(color, (float)offsetLength.TotalSeconds),
-                        new AnimationTrackProperty.KeyFrame(endColor, (float)rotationLength.TotalSeconds, Easings.InOutCirc),
-                    },
-                },
-            },
-        };
-    }
-}

Content.Client/_Shitmed/Autodoc/AddStepWindow.xaml

@@ -0,0 +1,14 @@
+<controls:FancyWindow
+        xmlns="https://spacestation14.io"
+        xmlns:controls="clr-namespace:Content.Client.UserInterface.Controls"
+        Title="{Loc 'autodoc-add-step'}">
+    <BoxContainer Orientation="Vertical">
+        <Button Name="SurgeryButton" Text="{Loc 'autodoc-add-step-surgery'}"/>
+        <Button Name="GrabItemButton" Text="{Loc 'autodoc-add-step-grab-item'}"/>
+        <Button Name="GrabOrganButton" Text="{Loc 'autodoc-add-step-grab-organ'}"/>
+        <Button Name="GrabPartButton" Text="{Loc 'autodoc-add-step-grab-part'}"/>
+        <Button Name="StoreItemButton" Text="{Loc 'autodoc-add-step-store-item'}"/>
+        <Button Name="SetLabelButton" Text="{Loc 'autodoc-add-step-set-label'}"/>
+        <Button Name="WaitButton" Text="{Loc 'autodoc-add-step-wait'}"/>
+    </BoxContainer>
+</controls:FancyWindow>

Content.Client/_Shitmed/Autodoc/AddStepWindow.xaml.cs

@@ -0,0 +1,138 @@
+using Content.Client.UserInterface.Controls;
+using Content.Shared.Administration;
+using Content.Shared._Shitmed.Autodoc;
+using Robust.Client.AutoGenerated;
+using Robust.Client.UserInterface.CustomControls;
+using Robust.Client.UserInterface.XAML;
+
+namespace Content.Client._Shitmed.Autodoc;
+
+[GenerateTypedNameReferences]
+public sealed partial class AddStepWindow : FancyWindow
+{
+    public event Action<IAutodocStep>? OnAddStep;
+
+    private PickSurgeryWindow? _surgery;
+    private DialogWindow? _grab;
+    private DialogWindow? _label;
+    private DialogWindow? _wait;
+
+    public AddStepWindow()
+    {
+        RobustXamlLoader.Load(this);
+
+        // close the window once any step is added
+        OnAddStep += _ => Close();
+
+        OnClose += () =>
+        {
+            _surgery?.Close();
+            _grab?.Close();
+            _label?.Close();
+            _wait?.Close();
+        };
+
+        // dedicated ui to pick the enum values and surgery type
+        SurgeryButton.OnPressed += _ =>
+        {
+            if (_surgery is {} window)
+            {
+                window.MoveToFront();
+                return;
+            }
+
+            _surgery = new PickSurgeryWindow();
+            _surgery.OnAddStep += step => OnAddStep?.Invoke(step);
+            _surgery.OnClose += () => _surgery = null;
+            _surgery.OpenCentered();
+        };
+
+        // just picking a string, use a dialog
+        GrabItemButton.OnPressed += _ =>
+        {
+            if (_grab is {} dialog)
+            {
+                dialog.MoveToFront();
+                return;
+            }
+
+            var field = "name";
+            var prompt = Loc.GetString("autodoc-add-step-grab-item-prompt");
+            var placeholder = Loc.GetString("autodoc-add-step-grab-item-placeholder");
+            var entry = new QuickDialogEntry(field, QuickDialogEntryType.ShortText, prompt, placeholder);
+            var entries = new List<QuickDialogEntry> { entry };
+            _grab = new DialogWindow(GrabItemButton.Text!, entries);
+            _grab.OnConfirmed += responses =>
+            {
+                var name = responses[field].Trim();
+                if (name.Length < 1 || name.Length > 100)
+                    return;
+
+                OnAddStep?.Invoke(new GrabItemAutodocStep()
+                {
+                    Name = name
+                });
+            };
+            _grab.OnClose += () => _grab = null;
+        };
+
+        // no arguments so these are trivial
+        GrabOrganButton.OnPressed += _ => OnAddStep?.Invoke(new GrabAnyOrganAutodocStep());
+        GrabPartButton.OnPressed += _ => OnAddStep?.Invoke(new GrabAnyBodyPartAutodocStep());
+        StoreItemButton.OnPressed += _ => OnAddStep?.Invoke(new StoreItemAutodocStep());
+
+        SetLabelButton.OnPressed += _ =>
+        {
+            if (_label is {} dialog)
+            {
+                dialog.MoveToFront();
+                return;
+            }
+
+            var field = "label";
+            var prompt = Loc.GetString("autodoc-add-step-set-label-prompt");
+            var entry = new QuickDialogEntry(field, QuickDialogEntryType.ShortText, prompt);
+            var entries = new List<QuickDialogEntry> { entry };
+            _label = new DialogWindow(SetLabelButton.Text!, entries);
+            _label.OnConfirmed += responses =>
+            {
+                var label = responses[field].Trim();
+                if (label.Length < 1 || label.Length > 20)
+                    return;
+
+                OnAddStep?.Invoke(new SetLabelAutodocStep()
+                {
+                    Label = label
+                });
+            };
+            _label.OnClose += () => _label = null;
+        };
+
+        WaitButton.OnPressed += _ =>
+        {
+            if (_wait is {} dialog)
+            {
+                dialog.MoveToFront();
+                return;
+            }
+
+            var field = "length";
+            var prompt = Loc.GetString("autodoc-add-step-wait-prompt");
+            var entry = new QuickDialogEntry(field, QuickDialogEntryType.Integer, prompt);
+            var entries = new List<QuickDialogEntry> { entry };
+            _wait = new DialogWindow(WaitButton.Text!, entries);
+            _wait.OnConfirmed += responses =>
+            {
+                var length = int.Parse(responses[field].Trim());
+                if (length < 1 || length > 30)
+                    return;
+
+                OnAddStep?.Invoke(new WaitAutodocStep()
+                {
+                    Length = length
+                });
+            };
+            _wait.OnClose += () => _wait = null;
+        };
+    }
+}

Content.Client/_Shitmed/Autodoc/AutodocBoundUserInterface.cs

@@ -0,0 +1,42 @@
+using Content.Shared._Shitmed.Autodoc;
+using Robust.Client.GameObjects;
+using Robust.Client.Player;
+
+namespace Content.Client._Shitmed.Autodoc;
+
+public sealed class AutodocBoundUserInterface : BoundUserInterface
+{
+    [Dependency] private readonly IEntityManager _entMan = default!;
+    [Dependency] private readonly IPlayerManager _player = default!;
+
+    [ViewVariables]
+    private AutodocWindow? _window;
+
+    public AutodocBoundUserInterface(EntityUid owner, Enum uiKey) : base(owner, uiKey)
+    {
+        _window = new AutodocWindow(owner, _entMan, _player);
+
+        _window.OnCreateProgram += title => SendMessage(new AutodocCreateProgramMessage(title));
+        _window.OnToggleProgramSafety += program => SendMessage(new AutodocToggleProgramSafetyMessage(program));
+        _window.OnRemoveProgram += program => SendMessage(new AutodocRemoveProgramMessage(program));
+
+        _window.OnAddStep += (program, step, index) => SendMessage(new AutodocAddStepMessage(program, step, index));
+        _window.OnRemoveStep += (program, stepIndex) => SendMessage(new AutodocRemoveStepMessage(program, stepIndex));
+
+        _window.OnImportProgram += (program) => SendMessage(new AutodocImportProgramMessage(program));
+
+        _window.OnStart += program => SendMessage(new AutodocStartMessage(program));
+        _window.OnStop += () => SendMessage(new AutodocStopMessage());
+
+        _window.OnClose += () => Close();
+
+        _window.OpenCentered();
+    }
+
+    protected override void Dispose(bool disposing)
+    {
+        base.Dispose(disposing);
+        if (disposing)
+            _window?.Dispose();
+    }
+}

Content.Client/_Shitmed/Autodoc/AutodocProgramWindow.xaml

@@ -0,0 +1,20 @@
+<controls:FancyWindow
+        xmlns="https://spacestation14.io"
+        xmlns:controls="clr-namespace:Content.Client.UserInterface.Controls"
+        Title="{Loc 'autodoc-view-program-title'}"
+        SetSize="600 500">
+    <BoxContainer Orientation="Horizontal">
+        <BoxContainer Orientation="Vertical" Margin="5 5 5 5">
+            <Label Name="ProgramTitle"/> <!-- Set to Program.Title -->
+            <Button Name="SafetyButton" Text="{Loc 'autodoc-safety-enabled'}"/>
+            <Button Name="RemoveButton" StyleClasses="Caution" Text="{Loc 'autodoc-remove-program'}"/>
+            <Button Name="AddStepButton" Text="{Loc 'autodoc-add-step'}"/>
+            <Button Name="RemoveStepButton" StyleClasses="Caution" Text="{Loc 'autodoc-remove-step'}" Disabled="True"/>
+            <Button Name="StartButton" StyleClasses="Caution" Text="{Loc 'autodoc-start-program'}"/>
+            <Button Name="ExportProgramButton" Text="{Loc 'autodoc-export-program'}"/>
+        </BoxContainer>
+        <ScrollContainer HorizontalExpand="True" VerticalExpand="True">
+              <ItemList Name="Steps"/> <!-- Set to Program.Steps -->
+        </ScrollContainer>
+    </BoxContainer>
+</controls:FancyWindow>