Апстрим.

Content.Client/Chat/UI/EmotesMenu.xaml

@@ -17,6 +17,10 @@
         <ui:RadialMenuTextureButton StyleClasses="RadialMenuButton" SetSize="64 64" ToolTip="{Loc 'emote-menu-category-hands'}" TargetLayer="Hands" Visible="False">
             <TextureRect VerticalAlignment="Center" HorizontalAlignment="Center" TextureScale="2 2" TexturePath="/Textures/Clothing/Hands/Gloves/latex.rsi/icon.png"/>
         </ui:RadialMenuTextureButton>
+        <!-- Goobstation - Fart Category -->
+        <ui:RadialMenuTextureButton StyleClasses="RadialMenuButton" SetSize="64 64" ToolTip="{Loc 'emote-menu-category-farts'}" TargetLayer="Farts" Visible="False">
+            <TextureRect VerticalAlignment="Center" HorizontalAlignment="Center" TextureScale="2 2" TexturePath="/Textures/_Goobstation/Interface/Emotes/fart.png"/>
+        </ui:RadialMenuTextureButton>
     </ui:RadialContainer>
 
     <!-- General -->
@@ -28,4 +32,7 @@
     <!-- Hands -->
     <ui:RadialContainer Name="Hands"  VerticalExpand="True" HorizontalExpand="True" Radius="64"/>
 
+    <!-- Goobstation - Farts -->
+    <ui:RadialContainer Name="Farts"  VerticalExpand="True" HorizontalExpand="True" Radius="64"/>
+
 </ui:RadialMenu>

Content.Client/DoAfter/DoAfterOverlay.cs

@@ -109,7 +109,8 @@ protected override void Draw(in OverlayDrawArgs args)
                 var alpha = 1f;
                 if (doAfter.Args.Hidden || isInContainer)
                 {
-                    if (uid != localEnt)
+                    // Goobstation - Show doAfter progress bar to another entity
+                    if (uid != localEnt && localEnt != doAfter.Args.ShowTo)
                         continue;
 
                     // Hints to the local player that this do-after is not visible to other players.

Content.Client/Gameplay/GameplayStateBase.cs

@@ -3,6 +3,7 @@
 using Content.Client.Clickable;
 using Content.Client.UserInterface;
 using Content.Client.Viewport;
+using Content.Shared.Damage;
 using Content.Shared.Input;
 using Robust.Client.ComponentTrees;
 using Robust.Client.GameObjects;
@@ -103,6 +104,13 @@ private bool HandleInspect(ICommonSession? session, EntityCoordinates coords, En
             return GetClickedEntity(coordinates, _eyeManager.CurrentEye);
         }
 
+        public EntityUid? GetDamageableClickedEntity(MapCoordinates coordinates) // Goobstation
+        {
+            var first = GetClickableEntities(coordinates, _eyeManager.CurrentEye)
+                .FirstOrDefault(e => _entityManager.HasComponent<DamageableComponent>(e));
+            return first.IsValid() ? first : null;
+        }
+
         public EntityUid? GetClickedEntity(MapCoordinates coordinates, IEye? eye)
         {
             if (eye == null)

Content.Client/Weapons/Melee/MeleeWeaponSystem.cs

@@ -127,7 +127,7 @@ public override void Update(float frameTime)
 
                 if (_stateManager.CurrentState is GameplayStateBase screen)
                 {
-                    target = screen.GetClickedEntity(mousePos);
+                    target = screen.GetDamageableClickedEntity(mousePos); // Goob edit
                 }
 
                 EntityManager.RaisePredictiveEvent(new DisarmAttackEvent(GetNetEntity(target), GetNetCoordinates(coordinates)));
@@ -153,7 +153,7 @@ public override void Update(float frameTime)
 
             if (_stateManager.CurrentState is GameplayStateBase screen)
             {
-                target = screen.GetClickedEntity(mousePos);
+                target = screen.GetDamageableClickedEntity(mousePos); // Goob edit
             }
 
             // Don't light-attack if interaction will be handling this instead

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

@@ -192,7 +192,7 @@ public override void Update(float frameTime)
 
         NetEntity? target = null;
         if (_state.CurrentState is GameplayStateBase screen)
-            target = GetNetEntity(screen.GetClickedEntity(mousePos));
+            target = GetNetEntity(screen.GetDamageableClickedEntity(mousePos)); // Goob edit
 
         Log.Debug($"Sending shoot request tick {Timing.CurTick} / {Timing.CurTime}");
 

Content.Client/_EstacaoPirata/Cards/Card/CardSystem.cs

@@ -39,7 +39,7 @@ private void OnComponentStartupEvent(EntityUid uid, CardComponent comp, Componen
         }
 
         comp.BackSprite ??= comp.FrontSprite;
-        Dirty(uid, comp);
+        DirtyEntity(uid);
         UpdateSprite(uid, comp);
     }
 

Content.Client/_EstacaoPirata/Cards/Deck/CardDeckSystem.cs

@@ -132,7 +132,14 @@ private void OnAppearanceChanged(EntityUid uid, CardDeckComponent comp, Appearan
     }
     private void OnComponentStartupEvent(EntityUid uid, CardDeckComponent comp, ComponentStartup args)
     {
+        if (!TryComp(uid, out CardStackComponent? stack))
+        {
+            _notInitialized[(uid, comp)] = 0;
+            return;
+        }
 
+        if(stack.Cards.Count <= 0)
+            _notInitialized[(uid, comp)] = 0;
         UpdateSprite(uid, comp);
     }
 

Content.Client/_EstacaoPirata/Cards/Hand/CardHandSystem.cs

@@ -142,7 +142,13 @@ private void OnStackStart(CardStackInitiatedEvent args)
     }
     private void OnComponentStartupEvent(EntityUid uid, CardHandComponent comp, ComponentStartup args)
     {
-
+        if (!TryComp(uid, out CardStackComponent? stack))
+        {
+            _notInit[(uid, comp)] = 0;
+            return;
+        }
+        if(stack.Cards.Count <= 0)
+            _notInit[(uid, comp)] = 0;
         UpdateSprite(uid, comp);
     }
 

Content.Client/_Goobstation/Changeling/ChangelingSystem.cs

@@ -6,7 +6,7 @@
 
 namespace Content.Client.Changeling;
 
-public sealed partial class ChangelingSystem : EntitySystem
+public sealed class ChangelingSystem : SharedChangelingSystem
 {
 
     [Dependency] private readonly IPrototypeManager _prototype = default!;

Content.Client/_Goobstation/Clothing/Components/SealableClothingVisualsComponent.cs

@@ -0,0 +1,11 @@
+namespace Content.Client._Goobstation.Clothing.Components;
+
+[RegisterComponent]
+public sealed partial class SealableClothingVisualsComponent : Component
+{
+    [DataField]
+    public string SpriteLayer = "sealed";
+
+    [DataField]
+    public Dictionary<string, List<PrototypeLayerData>> VisualLayers = new();
+}

Content.Client/_Goobstation/Clothing/EntitySystems/PoweredSealableClothingSystem.cs

@@ -0,0 +1,7 @@
+using Content.Shared._Goobstation.Clothing.Systems;
+
+namespace Content.Client._Goobstation.Clothing.EntitySystems;
+
+public sealed class PoweredSealableClothingSystem : SharedPoweredSealableClothingSystem
+{
+}

Content.Client/_Goobstation/Clothing/EntitySystems/SealableClothingSystem.cs

@@ -0,0 +1,7 @@
+using Content.Shared._Goobstation.Clothing.Systems;
+
+namespace Content.Client._Goobstation.Clothing.EntitySystems;
+
+public sealed partial class SealableClothingSystem : SharedSealableClothingSystem
+{
+}

Content.Client/_Goobstation/Clothing/EntitySystems/SealableClothingVisualizerSystem.cs

@@ -0,0 +1,59 @@
+using Content.Client._Goobstation.Clothing.Components;
+using Content.Client.Clothing;
+using Content.Shared._Goobstation.Clothing;
+using Content.Shared.Clothing;
+using Content.Shared.Item;
+using Robust.Client.GameObjects;
+using System.Linq;
+
+namespace Content.Client._Goobstation.Clothing.EntitySystems;
+
+public sealed class SealableClothingVisualizerSystem : VisualizerSystem<SealableClothingVisualsComponent>
+{
+    [Dependency] private readonly SharedItemSystem _itemSystem = default!;
+
+    public override void Initialize()
+    {
+        base.Initialize();
+        SubscribeLocalEvent<SealableClothingVisualsComponent, GetEquipmentVisualsEvent>(OnGetEquipmentVisuals, after: new[] { typeof(ClientClothingSystem) });
+    }
+
+    protected override void OnAppearanceChange(EntityUid uid, SealableClothingVisualsComponent component, ref AppearanceChangeEvent args)
+    {
+        if (!AppearanceSystem.TryGetData<bool>(uid, SealableClothingVisuals.Sealed, out var isSealed, args.Component))
+            return;
+
+        if (args.Sprite != null && component.SpriteLayer != null && args.Sprite.LayerMapTryGet(component.SpriteLayer, out var layer))
+        {
+            args.Sprite.LayerSetVisible(layer, isSealed);
+        }
+
+        _itemSystem.VisualsChanged(uid);
+    }
+
+    private void OnGetEquipmentVisuals(Entity<SealableClothingVisualsComponent> sealable, ref GetEquipmentVisualsEvent args)
+    {
+        var (uid, comp) = sealable;
+
+        if (!TryComp(uid, out AppearanceComponent? appearance)
+            || !AppearanceSystem.TryGetData<bool>(uid, SealableClothingVisuals.Sealed, out var isSealed, appearance)
+            || !isSealed)
+            return;
+
+        if (!comp.VisualLayers.TryGetValue(args.Slot, out var layers))
+            return;
+
+        var i = 0;
+        foreach (var layer in layers)
+        {
+            var key = layer.MapKeys?.FirstOrDefault();
+            if (key == null)
+            {
+                key = i == 0 ? $"{args.Slot}-sealed" : $"{args.Slot}-sealed-{i}";
+                i++;
+            }
+
+            args.Layers.Add((key, layer));
+        }
+    }
+}

Content.Client/_Goobstation/Clothing/ToggleableClothingBoundUserInterface.cs

@@ -0,0 +1,39 @@
+using Content.Shared.Clothing.Components;
+using Robust.Client.Graphics;
+using Robust.Client.Input;
+using Robust.Client.UserInterface;
+
+namespace Content.Client._Goobstation.Clothing;
+
+public sealed class ToggleableClothingBoundUserInterface : BoundUserInterface
+{
+    [Dependency] private readonly IClyde _displayManager = default!;
+    [Dependency] private readonly IInputManager _inputManager = default!;
+
+    private IEntityManager _entityManager;
+    private ToggleableClothingRadialMenu? _menu;
+
+    public ToggleableClothingBoundUserInterface(EntityUid owner, Enum uiKey) : base(owner, uiKey)
+    {
+        IoCManager.InjectDependencies(this);
+        _entityManager = IoCManager.Resolve<IEntityManager>();
+    }
+
+    protected override void Open()
+    {
+        base.Open();
+
+        _menu = this.CreateWindow<ToggleableClothingRadialMenu>();
+        _menu.SetEntity(Owner);
+        _menu.SendToggleClothingMessageAction += SendToggleableClothingMessage;
+
+        var vpSize = _displayManager.ScreenSize;
+        _menu.OpenCenteredAt(_inputManager.MouseScreenPosition.Position / vpSize);
+    }
+
+    private void SendToggleableClothingMessage(EntityUid uid)
+    {
+        var message = new ToggleableClothingUiMessage(_entityManager.GetNetEntity(uid));
+        SendPredictedMessage(message);
+    }
+}

Content.Client/_Goobstation/Clothing/ToggleableClothingRadialMenu.xaml

@@ -0,0 +1,13 @@
+<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">
+
+    <!-- Main -->
+    <ui:RadialContainer Name="Main" VerticalExpand="True" HorizontalExpand="True" Radius="64" ReserveSpaceForHiddenChildren="False">
+    </ui:RadialContainer>
+
+</ui:RadialMenu>

Content.Client/_Goobstation/Clothing/ToggleableClothingRadialMenu.xaml.cs

@@ -0,0 +1,103 @@
+using Content.Client.UserInterface.Controls;
+using Content.Shared.Clothing.Components;
+using Robust.Client.UserInterface;
+using Robust.Client.UserInterface.Controls;
+using Robust.Client.UserInterface.XAML;
+using Robust.Shared.Prototypes;
+using System.Numerics;
+
+namespace Content.Client._Goobstation.Clothing;
+
+public sealed partial class ToggleableClothingRadialMenu : RadialMenu
+{
+    [Dependency] private readonly EntityManager _entityManager = default!;
+
+    public event Action<EntityUid>? SendToggleClothingMessageAction;
+
+    public EntityUid Entity { get; set; }
+
+    public ToggleableClothingRadialMenu()
+    {
+        IoCManager.InjectDependencies(this);
+        RobustXamlLoader.Load(this);
+    }
+
+    public void SetEntity(EntityUid uid)
+    {
+        Entity = uid;
+        RefreshUI();
+    }
+
+    public void RefreshUI()
+    {
+        var main = FindControl<RadialContainer>("Main");
+
+        if (!_entityManager.TryGetComponent<ToggleableClothingComponent>(Entity, out var clothing))
+            return;
+
+        var clothingContainer = clothing.Container;
+
+        if (clothingContainer == null)
+            return;
+
+        foreach (var attached in clothing.ClothingUids)
+        {
+            // Change tooltip text if attached clothing is toggle/untoggled
+            var tooltipText = Loc.GetString("toggleable-clothing-unattach-tooltip");
+
+            if (clothingContainer.Contains(attached.Key))
+                tooltipText = Loc.GetString("toggleable-clothing-attach-tooltip");
+
+            var button = new ToggleableClothingRadialMenuButton()
+            {
+                StyleClasses = { "RadialMenuButton" },
+                SetSize = new Vector2(64, 64),
+                ToolTip = tooltipText,
+                AttachedClothingId = attached.Key
+            };
+
+            var spriteView = new SpriteView()
+            {
+                SetSize = new Vector2(48, 48),
+                VerticalAlignment = VAlignment.Center,
+                HorizontalAlignment = HAlignment.Center,
+                Stretch = SpriteView.StretchMode.Fill
+            };
+
+            spriteView.SetEntity(attached.Key);
+
+            button.AddChild(spriteView);
+            main.AddChild(button);
+        }
+
+        AddToggleableClothingMenuButtonOnClickAction(main);
+    }
+
+    private void AddToggleableClothingMenuButtonOnClickAction(Control control)
+    {
+        var mainControl = control as RadialContainer;
+
+        if (mainControl == null)
+            return;
+
+        foreach (var child in mainControl.Children)
+        {
+            var castChild = child as ToggleableClothingRadialMenuButton;
+
+            if (castChild == null)
+                return;
+
+            castChild.OnButtonDown += _ =>
+            {
+                SendToggleClothingMessageAction?.Invoke(castChild.AttachedClothingId);
+                mainControl.DisposeAllChildren();
+                RefreshUI();
+            };
+        }
+    }
+}
+
+public sealed class ToggleableClothingRadialMenuButton : RadialMenuTextureButton
+{
+    public EntityUid AttachedClothingId { get; set; }
+}