Merge commit 'f969fd2bfbf143583b87fb91e315ae187344fb4e' into jul24-up…

…stream-merge-228.0.0

Content.Client/Actions/UI/ActionAlertTooltip.cs

@@ -1,4 +1,4 @@
-using Content.Client.Stylesheets;
+using Content.Client.Stylesheets;
 using Robust.Client.UserInterface.Controls;
 using Robust.Shared.Timing;
 using Robust.Shared.Utility;
@@ -77,9 +77,12 @@ public ActionAlertTooltip(FormattedMessage name, FormattedMessage? desc, string?
                     MaxWidth = TooltipTextMaxWidth,
                     StyleClasses = {StyleNano.StyleClassTooltipActionRequirements}
                 };
-                requiresLabel.SetMessage(FormattedMessage.FromMarkup("[color=#635c5c]" +
-                                                                     requires +
-                                                                     "[/color]"));
+
+                if (!FormattedMessage.TryFromMarkup("[color=#635c5c]" + requires + "[/color]", out var markup))
+                    return;
+
+                requiresLabel.SetMessage(markup);
+
                 vbox.AddChild(requiresLabel);
             }
         }
@@ -97,8 +100,11 @@ protected override void FrameUpdate(FrameEventArgs args)
             if (timeLeft > TimeSpan.Zero)
             {
                 var duration = Cooldown.Value.End - Cooldown.Value.Start;
-                _cooldownLabel.SetMessage(FormattedMessage.FromMarkup(
-                    $"[color=#a10505]{(int) duration.TotalSeconds} sec cooldown ({(int) timeLeft.TotalSeconds + 1} sec remaining)[/color]"));
+
+                if (!FormattedMessage.TryFromMarkup($"[color=#a10505]{(int) duration.TotalSeconds} sec cooldown ({(int) timeLeft.TotalSeconds + 1} sec remaining)[/color]", out var markup))
+                    return;
+
+                _cooldownLabel.SetMessage(markup);
                 _cooldownLabel.Visible = true;
             }
             else

Content.Client/Administration/UI/Notes/AdminNotesLinePopup.xaml

@@ -1,10 +1,10 @@
 <Popup xmlns="https://spacestation14.io"
        xmlns:gfx="clr-namespace:Robust.Client.Graphics;assembly=Robust.Client">
-    <PanelContainer StyleClasses="BackgroundDark">
+    <PanelContainer>
         <PanelContainer.PanelOverride>
-            <gfx:StyleBoxFlat BorderThickness="1" BorderColor="#18181B"/>
+            <gfx:StyleBoxFlat BorderThickness="2" BorderColor="#18181B" BackgroundColor="#25252a"/>
         </PanelContainer.PanelOverride>
-        <BoxContainer Orientation="Vertical">
+        <BoxContainer Orientation="Vertical" Margin="4 4 4 4">
             <Label Name="PlayerNameLabel"/>
             <Label Name="IdLabel"/>
             <Label Name="TypeLabel"/>

Content.Client/Chat/TypingIndicator/TypingIndicatorVisualizerSystem.cs

@@ -2,21 +2,36 @@
 using Robust.Client.GameObjects;
 using Robust.Client.Graphics;
 using Robust.Shared.Prototypes;
+using Content.Shared.Inventory;
 
 namespace Content.Client.Chat.TypingIndicator;
 
 public sealed class TypingIndicatorVisualizerSystem : VisualizerSystem<TypingIndicatorComponent>
 {
     [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
+    [Dependency] private readonly InventorySystem _inventory = default!;
+
 
     protected override void OnAppearanceChange(EntityUid uid, TypingIndicatorComponent component, ref AppearanceChangeEvent args)
     {
         if (args.Sprite == null)
             return;
 
-        if (!_prototypeManager.TryIndex<TypingIndicatorPrototype>(component.Prototype, out var proto))
+        var currentTypingIndicator = component.TypingIndicatorPrototype;
+
+        var evt = new BeforeShowTypingIndicatorEvent();
+
+        if (TryComp<InventoryComponent>(uid, out var inventoryComp))
+            _inventory.RelayEvent((uid, inventoryComp), ref evt);
+
+        var overrideIndicator = evt.GetMostRecentIndicator();
+
+        if (overrideIndicator != null)
+            currentTypingIndicator = overrideIndicator.Value;
+
+        if (!_prototypeManager.TryIndex(currentTypingIndicator, out var proto))
         {
-            Log.Error($"Unknown typing indicator id: {component.Prototype}");
+            Log.Error($"Unknown typing indicator id: {component.TypingIndicatorPrototype}");
             return;
         }
 

Content.Client/Clickable/ClickableComponent.cs

@@ -48,7 +48,7 @@ public bool CheckClick(SpriteComponent sprite, TransformComponent transform, Ent
             Angle cardinalSnapping = sprite.SnapCardinals ? relativeRotation.GetCardinalDir().ToAngle() : Angle.Zero;
 
             // First we get `localPos`, the clicked location in the sprite-coordinate frame.
-            var entityXform = Matrix3Helpers.CreateInverseTransform(transform.WorldPosition, sprite.NoRotation ? -eye.Rotation : spriteRot - cardinalSnapping);
+            var entityXform = Matrix3Helpers.CreateInverseTransform(spritePos, sprite.NoRotation ? -eye.Rotation : spriteRot - cardinalSnapping);
             var localPos = Vector2.Transform(Vector2.Transform(worldPos, entityXform), invSpriteMatrix);
 
             // Check explicitly defined click-able bounds
@@ -58,8 +58,11 @@ public bool CheckClick(SpriteComponent sprite, TransformComponent transform, Ent
             // Next check each individual sprite layer using automatically computed click maps.
             foreach (var spriteLayer in sprite.AllLayers)
             {
-                if (!spriteLayer.Visible || spriteLayer is not Layer layer)
+                // TODO: Move this to a system and also use SpriteSystem.IsVisible instead.
+                if (!spriteLayer.Visible || spriteLayer is not Layer layer || layer.CopyToShaderParameters != null)
+                {
                     continue;
+                }
 
                 // Check the layer's texture, if it has one
                 if (layer.Texture != null)

Content.Client/Commands/ZoomCommand.cs

@@ -20,7 +20,7 @@ public sealed class ZoomCommand : LocalizedCommands
     public override void Execute(IConsoleShell shell, string argStr, string[] args)
     {
         Vector2 zoom;
-        if (args.Length is not (1 or 2))
+        if (args.Length is not (1 or 2 or 3))
         {
             shell.WriteLine(Help);
             return;
@@ -57,11 +57,18 @@ public override void Execute(IConsoleShell shell, string argStr, string[] args)
             }
         }
 
+        var scalePvs = true;
+        if (args.Length == 3 && !bool.TryParse(args[2], out scalePvs))
+        {
+            shell.WriteError(LocalizationManager.GetString("cmd-parse-failure-bool", ("arg", args[2])));
+            return;
+        }
+
         var player = _playerManager.LocalSession?.AttachedEntity;
 
         if (_entityManager.TryGetComponent<ContentEyeComponent>(player, out var content))
         {
-            _entityManager.System<ContentEyeSystem>().RequestZoom(player.Value, zoom, true, content);
+            _entityManager.System<ContentEyeSystem>().RequestZoom(player.Value, zoom, true, scalePvs, content);
             return;
         }
 

Content.Client/Communications/UI/CommunicationsConsoleMenu.xaml.cs

@@ -113,7 +113,9 @@ public void UpdateCountdown()
             }
 
             EmergencyShuttleButton.Text = Loc.GetString("comms-console-menu-recall-shuttle");
-            CountdownLabel.SetMessage($"Time remaining\n{Owner.Countdown.ToString()}s");
+            var infoText = Loc.GetString($"comms-console-menu-time-remaining",
+            ("time", Owner.Countdown.ToString()));
+            CountdownLabel.SetMessage(infoText);
         }
 
         public override void Close()

Content.Client/Fax/AdminUI/AdminFaxEui.cs

@@ -16,7 +16,7 @@ public AdminFaxEui()
         _window.OnClose += () => SendMessage(new AdminFaxEuiMsg.Close());
         _window.OnFollowFax += entity => SendMessage(new AdminFaxEuiMsg.Follow(entity));
         _window.OnMessageSend += args => SendMessage(new AdminFaxEuiMsg.Send(args.entity, args.title,
-                    args.stampedBy, args.message, args.stampSprite, args.stampColor));
+                    args.stampedBy, args.message, args.stampSprite, args.stampColor, args.locked));
     }
 
     public override void Opened()

Content.Client/Fax/AdminUI/AdminFaxWindow.xaml

@@ -23,7 +23,7 @@
         </BoxContainer>
         <Label Text="{Loc admin-fax-stamp-color}" />
         <ColorSelectorSliders Margin="12 0 0 0" Name="StampColorSelector" Color="#BB3232"/>
-        <Control MinHeight="10" />
-        <Button Name="SendButton" Text="{Loc admin-fax-send}"></Button>
+        <CheckBox Name="LockPageCheckbox" Text="{Loc admin-fax-lock-page}" ToolTip="{Loc admin-fax-lock-page-tooltip}"/>
+        <Button Name="SendButton" Text="{Loc admin-fax-send}" Margin="0 10 0 0" />
     </BoxContainer>
 </DefaultWindow>

Content.Client/Fax/AdminUI/AdminFaxWindow.xaml.cs

@@ -14,7 +14,7 @@ public sealed partial class AdminFaxWindow : DefaultWindow
 {
     private const string StampsRsiPath = "/Textures/Objects/Misc/bureaucracy.rsi";
 
-    public Action<(NetEntity entity, string title, string stampedBy, string message, string stampSprite, Color stampColor)>? OnMessageSend;
+    public Action<(NetEntity entity, string title, string stampedBy, string message, string stampSprite, Color stampColor, bool locked)>? OnMessageSend;
     public Action<NetEntity>? OnFollowFax;
 
     [Dependency] private readonly IResourceCache _resCache = default!;
@@ -98,6 +98,7 @@ private void SendMessage(BaseButton.ButtonEventArgs obj)
 
         var from = FromEdit.Text;
         var stampColor = StampColorSelector.Color;
-        OnMessageSend?.Invoke((faxEntity.Value, title, from, message, stamp, stampColor));
+        var locked = LockPageCheckbox.Pressed;
+        OnMessageSend?.Invoke((faxEntity.Value, title, from, message, stamp, stampColor, locked));
     }
 }

Content.Client/Jittering/JitteringSystem.cs

@@ -48,6 +48,9 @@ private void OnAnimationCompleted(EntityUid uid, JitteringComponent jittering, A
             if(args.Key != _jitterAnimationKey)
                 return;
 
+            if (!args.Finished)
+                return;
+
             if (TryComp(uid, out AnimationPlayerComponent? animationPlayer)
                 && TryComp(uid, out SpriteComponent? sprite))
                 _animationPlayer.Play(uid, animationPlayer, GetAnimation(jittering, sprite), _jitterAnimationKey);

Content.Client/Launcher/LauncherConnectingGui.xaml.cs

@@ -116,7 +116,7 @@ private void HandleDisconnectReason(INetStructuredReason? reason)
         private void ChangeLoginTip()
         {
             var tipsDataset = _cfg.GetCVar(CCVars.LoginTipsDataset);
-            var loginTipsEnabled = _prototype.TryIndex<DatasetPrototype>(tipsDataset, out var tips);
+            var loginTipsEnabled = _prototype.TryIndex<LocalizedDatasetPrototype>(tipsDataset, out var tips);
 
             LoginTips.Visible = loginTipsEnabled;
             if (!loginTipsEnabled)
@@ -131,7 +131,7 @@ private void ChangeLoginTip()
 
             var randomIndex = _random.Next(tipList.Count);
             var tip = tipList[randomIndex];
-            LoginTip.SetMessage(tip);
+            LoginTip.SetMessage(Loc.GetString(tip));
 
             LoginTipTitle.Text = Loc.GetString("connecting-window-tip", ("numberTip", randomIndex));
         }

Content.Client/Light/EntitySystems/LightBehaviorSystem.cs

@@ -19,6 +19,9 @@ public override void Initialize()
 
     private void OnBehaviorAnimationCompleted(EntityUid uid, LightBehaviourComponent component, AnimationCompletedEvent args)
     {
+        if (!args.Finished)
+            return;
+
         var container = component.Animations.FirstOrDefault(x => x.FullKey == args.Key);
 
         if (container == null)

Content.Client/Light/EntitySystems/RotatingLightSystem.cs

@@ -69,6 +69,9 @@ private void OnAfterAutoHandleState(EntityUid uid, RotatingLightComponent comp,
 
     private void OnAnimationComplete(EntityUid uid, RotatingLightComponent comp, AnimationCompletedEvent args)
     {
+        if (!args.Finished)
+            return;
+
         PlayAnimation(uid, comp);
     }
 

Content.Client/Lobby/LobbyUIController.cs

@@ -46,6 +46,7 @@ public sealed class LobbyUIController : UIController, IOnStateEntered<LobbyState
 
     private CharacterSetupGui? _characterSetup;
     private HumanoidProfileEditor? _profileEditor;
+    private CharacterSetupGuiSavePanel? _savePanel;
 
     /// <summary>
     /// This is the characher preview panel in the chat. This should only update if their character updates.
@@ -216,6 +217,46 @@ private void SaveProfile()
         ReloadCharacterSetup();
     }
 
+    private void CloseProfileEditor()
+    {
+        if (_profileEditor == null)
+            return;
+
+        _profileEditor.SetProfile(null, null);
+        _profileEditor.Visible = false;
+
+        if (_stateManager.CurrentState is LobbyState lobbyGui)
+        {
+            lobbyGui.SwitchState(LobbyGui.LobbyGuiState.Default);
+        }
+    }
+
+    private void OpenSavePanel()
+    {
+        if (_savePanel is { IsOpen: true })
+            return;
+
+        _savePanel = new CharacterSetupGuiSavePanel();
+
+        _savePanel.SaveButton.OnPressed += _ =>
+        {
+            SaveProfile();
+
+            _savePanel.Close();
+
+            CloseProfileEditor();
+        };
+
+        _savePanel.NoSaveButton.OnPressed += _ =>
+        {
+            _savePanel.Close();
+
+            CloseProfileEditor();
+        };
+
+        _savePanel.OpenCentered();
+    }
+
     private (CharacterSetupGui, HumanoidProfileEditor) EnsureGui()
     {
         if (_characterSetup != null && _profileEditor != null)
@@ -242,14 +283,16 @@ private void SaveProfile()
 
         _characterSetup.CloseButton.OnPressed += _ =>
         {
-            // Reset sliders etc.
-            _profileEditor.SetProfile(null, null);
-            _profileEditor.Visible = false;
-
-            if (_stateManager.CurrentState is LobbyState lobbyGui)
+            // Open the save panel if we have unsaved changes.
+            if (_profileEditor.Profile != null && _profileEditor.IsDirty)
             {
-                lobbyGui.SwitchState(LobbyGui.LobbyGuiState.Default);
+                OpenSavePanel();
+
+                return;
             }
+
+            // Reset sliders etc.
+            CloseProfileEditor();
         };
 
         _profileEditor.Save += SaveProfile;

Content.Client/Lobby/UI/CharacterSetupGuiSavePanel.xaml

@@ -0,0 +1,10 @@
+<DefaultWindow xmlns="https://spacestation14.io"
+            Title="{Loc 'character-setup-gui-save-panel-title'}"
+            Resizable="False">
+
+    <BoxContainer Orientation="Horizontal" SeparationOverride="4" MinSize="200 40">
+        <Button Name="SaveButton" Access="Public" Text="{Loc 'character-setup-gui-save-panel-save'}" StyleClasses="ButtonBig"/>
+        <Button Name="NoSaveButton" Access="Public" Text="{Loc 'character-setup-gui-save-panel-nosave'}" StyleClasses="ButtonBig"/>
+        <Button Name="CancelButton" Access="Public" Text="{Loc 'character-setup-gui-save-panel-cancel'}" StyleClasses="ButtonBig"/>
+    </BoxContainer>
+</DefaultWindow>

Content.Client/Lobby/UI/CharacterSetupGuiSavePanel.xaml.cs

@@ -0,0 +1,21 @@
+using Robust.Client.AutoGenerated;
+using Robust.Client.UserInterface.CustomControls;
+using Robust.Client.UserInterface.XAML;
+
+namespace Content.Client.Lobby.UI;
+
+[GenerateTypedNameReferences]
+public sealed partial class CharacterSetupGuiSavePanel : DefaultWindow
+{
+    public CharacterSetupGuiSavePanel()
+    {
+        RobustXamlLoader.Load(this);
+
+        CancelButton.OnPressed += _ =>
+        {
+            Close();
+        };
+
+        CloseButton.Visible = false;
+    }
+}

Content.Client/Lobby/UI/HumanoidProfileEditor.xaml.cs

@@ -1195,7 +1195,7 @@ private void SetSpawnPriority(SpawnPriorityPreference newSpawnPriority)
             SetDirty();
         }
 
-        private bool IsDirty
+        public bool IsDirty
         {
             get => _isDirty;
             set