Upstream sync

Content.Client/Antag/AntagStatusIconSystem.cs

@@ -29,6 +29,7 @@ public override void Initialize()
         SubscribeLocalEvent<Shared.Backmen.Blob.Components.BlobCarrierComponent, GetStatusIconsEvent>(GetIcon);
         SubscribeLocalEvent<Shared.Backmen.Blob.Components.ZombieBlobComponent, GetStatusIconsEvent>(GetIcon);
         SubscribeLocalEvent<Shared.Backmen.Vampiric.BkmVampireComponent, GetStatusIconsEvent>(GetIcon);
+        SubscribeLocalEvent<Shared.Backmen.ShipVsShip.SVSTeamMemberComponent, GetStatusIconsEvent>(GetIcon);
         //end-backmen: antag
         SubscribeLocalEvent<InitialInfectedComponent, GetStatusIconsEvent>(GetIcon);
     }

Content.Client/Chemistry/EntitySystems/HypospraySystem.cs

@@ -0,0 +1,15 @@
+using Content.Client.Chemistry.UI;
+using Content.Client.Items;
+using Content.Shared.Chemistry.Components;
+using Content.Shared.Chemistry.EntitySystems;
+
+namespace Content.Client.Chemistry.EntitySystems;
+
+public sealed class HypospraySystem : SharedHypospraySystem
+{
+    public override void Initialize()
+    {
+        base.Initialize();
+        Subs.ItemStatus<HyposprayComponent>(ent => new HyposprayStatusControl(ent, _solutionContainers));
+    }
+}

Content.Client/Chemistry/EntitySystems/InjectorSystem.cs

@@ -1,4 +1,3 @@
-using Content.Client.Chemistry.Components;
 using Content.Client.Chemistry.UI;
 using Content.Client.Items;
 using Content.Shared.Chemistry.Components;
@@ -13,17 +12,5 @@ public override void Initialize()
     {
         base.Initialize();
         Subs.ItemStatus<InjectorComponent>(ent => new InjectorStatusControl(ent, SolutionContainers));
-        SubscribeLocalEvent<HyposprayComponent, ComponentHandleState>(OnHandleHyposprayState);
-        Subs.ItemStatus<HyposprayComponent>(ent => new HyposprayStatusControl(ent));
-    }
-
-    private void OnHandleHyposprayState(EntityUid uid, HyposprayComponent component, ref ComponentHandleState args)
-    {
-        if (args.Current is not HyposprayComponentState cState)
-            return;
-
-        component.CurrentVolume = cState.CurVolume;
-        component.TotalVolume = cState.MaxVolume;
-        component.UiUpdateNeeded = true;
     }
 }

Content.Client/Chemistry/UI/HyposprayStatusControl.cs

@@ -1,6 +1,8 @@
-using Content.Client.Chemistry.Components;
 using Content.Client.Message;
 using Content.Client.Stylesheets;
+using Content.Shared.Chemistry.Components;
+using Content.Shared.Chemistry.EntitySystems;
+using Content.Shared.FixedPoint;
 using Robust.Client.UserInterface;
 using Robust.Client.UserInterface.Controls;
 using Robust.Shared.Timing;
@@ -9,34 +11,48 @@ namespace Content.Client.Chemistry.UI;
 
 public sealed class HyposprayStatusControl : Control
 {
-    private readonly HyposprayComponent _parent;
+    private readonly Entity<HyposprayComponent> _parent;
     private readonly RichTextLabel _label;
+    private readonly SharedSolutionContainerSystem _solutionContainers;
 
-    public HyposprayStatusControl(HyposprayComponent parent)
+    private FixedPoint2 PrevVolume;
+    private FixedPoint2 PrevMaxVolume;
+    private bool PrevOnlyAffectsMobs;
+
+    public HyposprayStatusControl(Entity<HyposprayComponent> parent, SharedSolutionContainerSystem solutionContainers)
     {
         _parent = parent;
-        _label = new RichTextLabel {StyleClasses = {StyleNano.StyleClassItemStatus}};
+        _solutionContainers = solutionContainers;
+        _label = new RichTextLabel { StyleClasses = { StyleNano.StyleClassItemStatus } };
         AddChild(_label);
-
-        Update();
     }
 
     protected override void FrameUpdate(FrameEventArgs args)
     {
         base.FrameUpdate(args);
-        if (!_parent.UiUpdateNeeded)
+
+        if (!_solutionContainers.TryGetSolution(_parent.Owner, _parent.Comp.SolutionName, out _, out var solution))
             return;
-        Update();
-    }
 
-    public void Update()
-    {
+        // only updates the UI if any of the details are different than they previously were
+        if (PrevVolume == solution.Volume
+            && PrevMaxVolume == solution.MaxVolume
+            && PrevOnlyAffectsMobs == _parent.Comp.OnlyAffectsMobs)
+            return;
+
+        PrevVolume = solution.Volume;
+        PrevMaxVolume = solution.MaxVolume;
+        PrevOnlyAffectsMobs = _parent.Comp.OnlyAffectsMobs;
 
-        _parent.UiUpdateNeeded = false;
+        var modeStringLocalized = Loc.GetString(_parent.Comp.OnlyAffectsMobs switch
+        {
+            false => "hypospray-all-mode-text",
+            true => "hypospray-mobs-only-mode-text",
+        });
 
-        _label.SetMarkup(Loc.GetString(
-            "hypospray-volume-text",
-            ("currentVolume", _parent.CurrentVolume),
-            ("totalVolume", _parent.TotalVolume)));
+        _label.SetMarkup(Loc.GetString("hypospray-volume-label",
+            ("currentVolume", solution.Volume),
+            ("totalVolume", solution.MaxVolume),
+            ("modeString", modeStringLocalized)));
     }
 }

Content.Client/Chemistry/UI/InjectorStatusControl.cs

@@ -17,6 +17,7 @@ public sealed class InjectorStatusControl : Control
 
     private FixedPoint2 PrevVolume;
     private FixedPoint2 PrevMaxVolume;
+    private FixedPoint2 PrevTransferAmount;
     private InjectorToggleMode PrevToggleState;
 
     public InjectorStatusControl(Entity<InjectorComponent> parent, SharedSolutionContainerSystem solutionContainers)
@@ -37,11 +38,13 @@ protected override void FrameUpdate(FrameEventArgs args)
         // only updates the UI if any of the details are different than they previously were
         if (PrevVolume == solution.Volume
             && PrevMaxVolume == solution.MaxVolume
+            && PrevTransferAmount == _parent.Comp.TransferAmount
             && PrevToggleState == _parent.Comp.ToggleState)
             return;
 
         PrevVolume = solution.Volume;
         PrevMaxVolume = solution.MaxVolume;
+        PrevTransferAmount = _parent.Comp.TransferAmount;
         PrevToggleState = _parent.Comp.ToggleState;
 
         // Update current volume and injector state

Content.Client/Disposal/Systems/DisposalUnitSystem.cs

@@ -96,24 +96,22 @@ private void OnAppearanceChange(EntityUid uid, SharedDisposalUnitComponent unit,
     private void UpdateState(EntityUid uid, SharedDisposalUnitComponent unit, SpriteComponent sprite, AppearanceComponent appearance)
     {
         if (!_appearanceSystem.TryGetData<VisualState>(uid, Visuals.VisualState, out var state, appearance))
-        {
             return;
-        }
 
         sprite.LayerSetVisible(DisposalUnitVisualLayers.Unanchored, state == VisualState.UnAnchored);
         sprite.LayerSetVisible(DisposalUnitVisualLayers.Base, state == VisualState.Anchored);
-        sprite.LayerSetVisible(DisposalUnitVisualLayers.BaseFlush, state is VisualState.Flushing or VisualState.Charging);
+        sprite.LayerSetVisible(DisposalUnitVisualLayers.OverlayFlush, state is VisualState.OverlayFlushing or VisualState.OverlayCharging);
 
         var chargingState = sprite.LayerMapTryGet(DisposalUnitVisualLayers.BaseCharging, out var chargingLayer)
             ? sprite.LayerGetState(chargingLayer)
             : new RSI.StateId(DefaultChargeState);
 
         // This is a transient state so not too worried about replaying in range.
-        if (state == VisualState.Flushing)
+        if (state == VisualState.OverlayFlushing)
         {
             if (!_animationSystem.HasRunningAnimation(uid, AnimationKey))
             {
-                var flushState = sprite.LayerMapTryGet(DisposalUnitVisualLayers.BaseFlush, out var flushLayer)
+                var flushState = sprite.LayerMapTryGet(DisposalUnitVisualLayers.OverlayFlush, out var flushLayer)
                     ? sprite.LayerGetState(flushLayer)
                     : new RSI.StateId(DefaultFlushState);
 
@@ -125,7 +123,7 @@ private void UpdateState(EntityUid uid, SharedDisposalUnitComponent unit, Sprite
                     {
                         new AnimationTrackSpriteFlick
                         {
-                            LayerKey = DisposalUnitVisualLayers.BaseFlush,
+                            LayerKey = DisposalUnitVisualLayers.OverlayFlush,
                             KeyFrames =
                             {
                                 // Play the flush animation
@@ -154,26 +152,18 @@ private void UpdateState(EntityUid uid, SharedDisposalUnitComponent unit, Sprite
                 _animationSystem.Play(uid, anim, AnimationKey);
             }
         }
-        else if (state == VisualState.Charging)
-        {
-            sprite.LayerSetState(DisposalUnitVisualLayers.BaseFlush, chargingState);
-        }
+        else if (state == VisualState.OverlayCharging)
+            sprite.LayerSetState(DisposalUnitVisualLayers.OverlayFlush, new RSI.StateId("disposal-charging"));
         else
-        {
             _animationSystem.Stop(uid, AnimationKey);
-        }
 
         if (!_appearanceSystem.TryGetData<HandleState>(uid, Visuals.Handle, out var handleState, appearance))
-        {
             handleState = HandleState.Normal;
-        }
 
         sprite.LayerSetVisible(DisposalUnitVisualLayers.OverlayEngaged, handleState != HandleState.Normal);
 
         if (!_appearanceSystem.TryGetData<LightStates>(uid, Visuals.Light, out var lightState, appearance))
-        {
             lightState = LightStates.Off;
-        }
 
         sprite.LayerSetVisible(DisposalUnitVisualLayers.OverlayCharging,
                 (lightState & LightStates.Charging) != 0);
@@ -189,7 +179,7 @@ public enum DisposalUnitVisualLayers : byte
     Unanchored,
     Base,
     BaseCharging,
-    BaseFlush,
+    OverlayFlush,
     OverlayCharging,
     OverlayReady,
     OverlayFull,

Content.Client/Input/ContentContexts.cs

@@ -45,6 +45,9 @@ public static void SetupContexts(IInputContextContainer contexts)
             // Not in engine because the engine doesn't understand what a flipped object is
             common.AddFunction(ContentKeyFunctions.EditorFlipObject);
 
+            // Not in engine so that the RCD can rotate objects
+            common.AddFunction(EngineKeyFunctions.EditorRotateObject);
+
             var human = contexts.GetContext("human");
             human.AddFunction(EngineKeyFunctions.MoveUp);
             human.AddFunction(EngineKeyFunctions.MoveDown);

Content.Client/Pinpointer/UI/NavMapControl.cs

@@ -114,9 +114,16 @@ public NavMapControl() : base(MinDisplayedRange, MaxDisplayedRange, DefaultDispl
             VerticalExpand = false,
             Children =
             {
-                _zoom,
-                _beacons,
-                _recenter,
+                new BoxContainer()
+                {
+                    Orientation = BoxContainer.LayoutOrientation.Horizontal,
+                    Children =
+                    {
+                        _zoom,
+                        _beacons,
+                        _recenter
+                    }
+                }
             }
         };
 

Content.Client/Popups/PopupSystem.cs

@@ -163,10 +163,13 @@ public override void PopupEntity(string? message, EntityUid uid, Filter filter,
             PopupEntity(message, uid, type);
         }
 
-        public override void PopupClient(string? message, EntityUid uid, EntityUid recipient, PopupType type = PopupType.Small)
+        public override void PopupClient(string? message, EntityUid uid, EntityUid? recipient, PopupType type = PopupType.Small)
         {
+            if (recipient == null)
+                return;
+
             if (_timing.IsFirstTimePredicted)
-                PopupEntity(message, uid, recipient, type);
+                PopupEntity(message, uid, recipient.Value, type);
         }
 
         public override void PopupEntity(string? message, EntityUid uid, PopupType type = PopupType.Small)