Fixing shit I guess

.github/workflows/build-docfx.yml

@@ -21,7 +21,7 @@ jobs:
     - name: Setup .NET Core
       uses: actions/setup-dotnet@v3.2.0
       with:
-        dotnet-version: 8.0.100
+        dotnet-version: 9.0.x
 
     - name: Install dependencies
       run: dotnet restore

.github/workflows/build-map-renderer.yml

@@ -36,7 +36,7 @@ jobs:
       - name: Setup .NET Core
         uses: actions/setup-dotnet@v3.2.0
         with:
-          dotnet-version: 8.0.100
+          dotnet-version: 9.0.x
 
       - name: Install dependencies
         run: dotnet restore

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

@@ -36,7 +36,7 @@ jobs:
     - name: Setup .NET Core
       uses: actions/setup-dotnet@v3.2.0
       with:
-        dotnet-version: 8.0.100
+        dotnet-version: 9.0.x
 
     - name: Install dependencies
       run: dotnet restore

.github/workflows/publish.yml

@@ -22,7 +22,7 @@ jobs:
     - name: Setup .NET Core
       uses: actions/setup-dotnet@v3.2.0
       with:
-        dotnet-version: 8.0.100
+        dotnet-version: 9.0.x
 
     - name: Get Engine Tag
       run: |
@@ -49,11 +49,20 @@ jobs:
 
     - name: Publish changelog (Discord)
       run: Tools/actions_changelogs_since_last_run.py
+<<<<<<< HEAD
       env:
         PUBLISH_TOKEN: ${{ secrets.PUBLISH_TOKEN }}
         GITHUB_REPOSITORY: ${{ vars.GITHUB_REPOSITORY }}
 
     - name: Publish changelog (RSS)
       run: Tools/actions_changelog_rss.py
+=======
+>>>>>>> 6771ab1118b3e4bf7a702540245449e4125b0a38
       env:
-        CHANGELOG_RSS_KEY: ${{ secrets.CHANGELOG_RSS_KEY }}
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        DISCORD_WEBHOOK_URL: ${{ secrets.CHANGELOG_DISCORD_WEBHOOK }}
+
+#    - name: Publish changelog (RSS)
+#      run: Tools/actions_changelog_rss.py
+#      env:
+#        CHANGELOG_RSS_KEY: ${{ secrets.CHANGELOG_RSS_KEY }}

.github/workflows/test-packaging.yml

@@ -51,7 +51,7 @@ jobs:
       - name: Setup .NET Core
         uses: actions/setup-dotnet@v3.2.0
         with:
-          dotnet-version: 8.0.100
+          dotnet-version: 9.0.x
 
       - name: Install dependencies
         run: dotnet restore

.github/workflows/yaml-linter.yml

@@ -26,7 +26,7 @@ jobs:
       - name: Setup .NET Core
         uses: actions/setup-dotnet@v3.2.0
         with:
-          dotnet-version: 8.0.100
+          dotnet-version: 9.0.x
       - name: Install dependencies
         run: dotnet restore
       - name: Build

Content.Client/Administration/UI/BanPanel/BanPanel.xaml.cs

@@ -147,7 +147,7 @@ public BanPanel()
         var prototypeManager = IoCManager.Resolve<IPrototypeManager>();
         foreach (var proto in prototypeManager.EnumeratePrototypes<DepartmentPrototype>())
         {
-            CreateRoleGroup(proto.ID, proto.Roles, proto.Color);
+            CreateRoleGroup(proto.ID, proto.Roles.Select(p =>  p.Id), proto.Color);
         }
 
         CreateRoleGroup("Antagonist", prototypeManager.EnumeratePrototypes<AntagPrototype>().Select(p => p.ID), Color.Red);

Content.Client/Administration/UI/Tabs/AdminTab/AdminTab.xaml

@@ -16,6 +16,7 @@
             <cc:UICommandButton Command="callshuttle" Text="{Loc admin-player-actions-window-shuttle}" WindowType="{x:Type at:AdminShuttleWindow}"/>
             <cc:CommandButton Command="adminlogs" Text="{Loc admin-player-actions-window-admin-logs}"/>
             <cc:CommandButton Command="faxui" Text="{Loc admin-player-actions-window-admin-fax}"/>
+            <cc:CommandButton Command="timetransferpanel" Text="{Loc admin-player-actions-window-time-transfer}"/>
         </GridContainer>
     </BoxContainer>
 </Control>

Content.Client/Chat/UI/EmotesMenu.xaml.cs

@@ -19,18 +19,15 @@ public sealed partial class EmotesMenu : RadialMenu
     [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
     [Dependency] private readonly ISharedPlayerManager _playerManager = default!;
 
-    private readonly SpriteSystem _spriteSystem;
-    private readonly EntityWhitelistSystem _whitelistSystem;
-
     public event Action<ProtoId<EmotePrototype>>? OnPlayEmote;
 
     public EmotesMenu()
     {
         IoCManager.InjectDependencies(this);
         RobustXamlLoader.Load(this);
 
-        _spriteSystem = _entManager.System<SpriteSystem>();
-        _whitelistSystem = _entManager.System<EntityWhitelistSystem>();
+        var spriteSystem = _entManager.System<SpriteSystem>();
+        var whitelistSystem = _entManager.System<EntityWhitelistSystem>();
 
         var main = FindControl<RadialContainer>("Main");
 
@@ -40,8 +37,8 @@ public EmotesMenu()
             var player = _playerManager.LocalSession?.AttachedEntity;
             if (emote.Category == EmoteCategory.Invalid ||
                 emote.ChatTriggers.Count == 0 ||
-                !(player.HasValue && _whitelistSystem.IsWhitelistPassOrNull(emote.Whitelist, player.Value)) ||
-                _whitelistSystem.IsBlacklistPass(emote.Blacklist, player.Value))
+                !(player.HasValue && whitelistSystem.IsWhitelistPassOrNull(emote.Whitelist, player.Value)) ||
+                whitelistSystem.IsBlacklistPass(emote.Blacklist, player.Value))
                 continue;
 
             if (!emote.Available &&
@@ -63,7 +60,7 @@ public EmotesMenu()
             {
                 VerticalAlignment = VAlignment.Center,
                 HorizontalAlignment = HAlignment.Center,
-                Texture = _spriteSystem.Frame0(emote.Icon),
+                Texture = spriteSystem.Frame0(emote.Icon),
                 TextureScale = new Vector2(2f, 2f),
             };
 

Content.Client/Clothing/ClientClothingSystem.cs

@@ -264,10 +264,14 @@ private void RenderEquipment(EntityUid equipee, EntityUid equipment, string slot
             return;
         }
 
+        var displacementData = inventory.Displacements.GetValueOrDefault(slot);
+
+        if (clothingComponent.RenderLayer != null)
+            slot = clothingComponent.RenderLayer;
+
         // temporary, until layer draw depths get added. Basically: a layer with the key "slot" is being used as a
         // bookmark to determine where in the list of layers we should insert the clothing layers.
         bool slotLayerExists = sprite.LayerMapTryGet(slot, out var index);
-        var displacementData = inventory.Displacements.GetValueOrDefault(slot);
 
         // add the new layers
         foreach (var (key, layerData) in ev.Layers)

Content.Client/Commands/SetMenuVisibilityCommand.cs

@@ -1,4 +1,5 @@
 using Content.Client.Verbs;
+using Content.Shared.Verbs;
 using JetBrains.Annotations;
 using Robust.Shared.Console;
 

Content.Client/ContextMenu/UI/EntityMenuUIController.cs

@@ -9,6 +9,7 @@
 using Content.Shared.Examine;
 using Content.Shared.IdentityManagement;
 using Content.Shared.Input;
+using Content.Shared.Verbs;
 using Robust.Client.GameObjects;
 using Robust.Client.Graphics;
 using Robust.Client.Input;
@@ -194,8 +195,20 @@ public override void FrameUpdate(FrameEventArgs args)
                 return;
 
             // Do we need to do in-range unOccluded checks?
-            var ignoreFov = !_eyeManager.CurrentEye.DrawFov ||
-                (_verbSystem.Visibility & MenuVisibility.NoFov) == MenuVisibility.NoFov;
+            var visibility = _verbSystem.Visibility;
+
+            if (!_eyeManager.CurrentEye.DrawFov)
+            {
+                visibility &= ~MenuVisibility.NoFov;
+            }
+
+            var ev = new MenuVisibilityEvent()
+            {
+                Visibility = visibility,
+            };
+
+            _entityManager.EventBus.RaiseLocalEvent(player, ref ev);
+            visibility = ev.Visibility;
 
             _entityManager.TryGetComponent(player, out ExaminerComponent? examiner);
             var xformQuery = _entityManager.GetEntityQuery<TransformComponent>();
@@ -209,7 +222,7 @@ public override void FrameUpdate(FrameEventArgs args)
                     continue;
                 }
 
-                if (ignoreFov)
+                if ((visibility & MenuVisibility.NoFov) == MenuVisibility.NoFov)
                     continue;
 
                 var pos = new MapCoordinates(_xform.GetWorldPosition(xform, xformQuery), xform.MapID);

Content.Client/DeltaV/CartridgeLoader/Cartridges/EditChatPopup.xaml

@@ -1,5 +1,5 @@
 <DefaultWindow xmlns="https://spacestation14.io"
-               Title="{Loc nano-chat-new-title}"
+               Title="{Loc nano-chat-edit-title}"
                MinSize="300 200">
     <PanelContainer StyleClasses="AngleRect">
         <BoxContainer Orientation="Vertical" Margin="4">
@@ -42,8 +42,8 @@
                         Text="{Loc nano-chat-cancel}"
                         StyleClasses="OpenRight"
                         MinSize="80 0" />
-                <Button Name="CreateButton"
-                        Text="{Loc nano-chat-create}"
+                <Button Name="ConfirmButton"
+                        Text="{Loc nano-chat-confirm}"
                         StyleClasses="OpenLeft"
                         MinSize="80 0"
                         Disabled="True" />

Content.Client/DeltaV/CartridgeLoader/Cartridges/EditChatPopup.xaml.cs

@@ -1,5 +1,5 @@
 using System.Linq;
-using Content.Client.DeltaV.NanoChat;
+using Content.Shared.Access.Components;
 using Robust.Client.AutoGenerated;
 using Robust.Client.UserInterface.CustomControls;
 using Robust.Client.UserInterface.XAML;
@@ -9,9 +9,14 @@ namespace Content.Client.DeltaV.CartridgeLoader.Cartridges;
 [GenerateTypedNameReferences]
 public sealed partial class EditChatPopup : DefaultWindow
 {
-    private const int MaxInputLength = 16;
     private const int MaxNumberLength = 4;
 
+    // Used to see if the user input is different from the original data
+    // to check if the user can submit
+    private string _originalNumber = "";
+    private string _originalName = "";
+    private string _originalJob = "";
+
     public event Action<uint, string, string?>? OnContactEdited;
 
     public EditChatPopup()
@@ -23,22 +28,23 @@ public EditChatPopup()
 
         // Button handlers
         CancelButton.OnPressed += _ => Close();
-        CreateButton.OnPressed += _ => EditChat();
+        ConfirmButton.OnPressed += _ => EditChat();
 
         // Input validation
         NameInput.OnTextChanged += _ => ValidateInputs();
 
         NameInput.OnTextChanged += args =>
         {
-            if (args.Text.Length > MaxInputLength)
-                NameInput.Text = args.Text[..MaxInputLength];
+            if (args.Text.Length > IdCardConsoleComponent.MaxFullNameLength)
+                NameInput.Text = args.Text[..IdCardConsoleComponent.MaxFullNameLength];
             ValidateInputs();
         };
 
         JobInput.OnTextChanged += args =>
         {
-            if (args.Text.Length > MaxInputLength)
-                JobInput.Text = args.Text[..MaxInputLength];
+            if (args.Text.Length > IdCardConsoleComponent.MaxJobTitleLength)
+                JobInput.Text = args.Text[..IdCardConsoleComponent.MaxJobTitleLength];
+            ValidateInputs();
         };
 
         NumberInput.OnTextChanged += args =>
@@ -58,10 +64,15 @@ public EditChatPopup()
     private void ValidateInputs()
     {
         var isValid = !string.IsNullOrWhiteSpace(NumberInput.Text) &&
-            !string.IsNullOrWhiteSpace(NameInput.Text) &&
-            uint.TryParse(NumberInput.Text, out _);
-
-        CreateButton.Disabled = !isValid;
+                      !string.IsNullOrWhiteSpace(NameInput.Text) &&
+                      NumberInput.Text.Length == MaxNumberLength &&
+                      uint.TryParse(NumberInput.Text, out _) &&
+                      // Only valid if there are any changes
+                      (NumberInput.Text != _originalNumber ||
+                      NameInput.Text != _originalName ||
+                      JobInput.Text != _originalJob);
+
+        ConfirmButton.Disabled = !isValid;
     }
 
     private void EditChat()
@@ -83,7 +94,21 @@ public void ClearInputs()
         ValidateInputs();
     }
 
-    public void SetNumberInput(string newNumber) => NumberInput.Text = newNumber;
-    public void SetNameInput(string newName) => NameInput.Text = newName;
-    public void SetJobInput(string newJob) => JobInput.Text = newJob;
+    public void SetNumberInput(string newNumber)
+    {
+        NumberInput.Text = newNumber.PadLeft(MaxNumberLength, '0');
+        _originalNumber = newNumber;
+    }
+
+    public void SetNameInput(string newName)
+    {
+        NameInput.Text = newName;
+        _originalName = newName;
+    }
+
+    public void SetJobInput(string newJob)
+    {
+        JobInput.Text = newJob;
+        _originalJob = newJob;
+    }
 }

Content.Client/DeltaV/CartridgeLoader/Cartridges/NanoChatEntry.xaml.cs

@@ -8,6 +8,9 @@ namespace Content.Client.DeltaV.CartridgeLoader.Cartridges;
 [GenerateTypedNameReferences]
 public sealed partial class NanoChatEntry : BoxContainer
 {
+    private const int MaxNameLength = 14;
+    private const int MaxJobLength = 20;
+
     public event Action<uint>? OnPressed;
     private uint _number;
     private Action<EventArgs>? _pressHandler;
@@ -29,11 +32,19 @@ public void SetRecipient(NanoChatRecipient recipient, uint number, bool isSelect
         _pressHandler = _ => OnPressed?.Invoke(_number);
         ChatButton.OnPressed += _pressHandler;
 
-        NameLabel.Text = recipient.Name;
-        JobLabel.Text = recipient.JobTitle ?? "";
+        NameLabel.Text = Truncate(recipient.Name, MaxNameLength);
+        JobLabel.Text = Truncate(recipient.JobTitle ?? "", MaxJobLength);
         JobLabel.Visible = !string.IsNullOrEmpty(recipient.JobTitle);
         UnreadIndicator.Visible = recipient.HasUnread;
 
         ChatButton.ModulateSelfOverride = isSelected ? NanoChatMessageBubble.OwnMessageColor : null;
     }
+
+    /// <summary>
+    ///     Truncates a string to a maximum length.
+    /// </summary>
+    private static string Truncate(string text, int maxLength) =>
+        text.Length <= maxLength
+            ? text
+            : text[..(maxLength - 3)] + "...";
 }

Content.Client/DeltaV/CartridgeLoader/Cartridges/NanoChatUiFragment.xaml

@@ -35,12 +35,15 @@
                        VerticalAlignment="Center"
                        Margin="0 0 8 0" />
                 <Button Name="EditChatButton"
-                        Text="E"
                         MaxSize="32 32"
                         Visible="False"
                         StyleClasses="OpenBoth"
                         Margin="0 0 4 0"
                         ToolTip="{Loc nano-chat-edit}">
+                    <TextureRect StyleClasses="ButtonSquare"
+                                 TexturePath="/Textures/Interface/VerbIcons/edit.svg.png"
+                                 Stretch="KeepAspectCentered"
+                                 MinSize="18 18" />
                 </Button>
                 <Button Name="DeleteChatButton"
                         MaxSize="32 32"