Update 26.08

.github/workflows/map-diff.yml

@@ -0,0 +1,50 @@
+name: Map Diff Checker
+
+on:
+  pull_request:
+    paths:
+      - 'Resources/Maps/**/*.yml' 
+
+jobs:
+  check-map-diff:
+    runs-on: ubuntu-latest
+
+    steps:
+    - name: Checkout repository
+      uses: actions/checkout@v3
+
+    - name: Identify changed and deleted map files
+      id: map_diff
+      run: |
+        git fetch origin
+        git diff --name-status origin/${{ github.base_ref }} -- Resources/Maps/**/*.yml > map_changes.txt
+
+        if grep -qE '^[AMDR]\s+Resources/Maps/.*\.yml' map_changes.txt; then
+          echo "maps_changed=true" >> $GITHUB_ENV
+        else
+          echo "maps_changed=false" >> $GITHUB_ENV
+        fi
+
+    - name: Display map changes
+      if: env.maps_changed == 'true'
+      run: |
+        echo "### Измененные карты:" > map_changes_summary.txt
+        while IFS=$'\t' read -r status file_path; do
+          map_file=$(basename "$file_path")
+          author=$(git log -1 --pretty=format:'%an' "$file_path")
+
+          case "$status" in
+            A) change_type="Добавлена карта" ;;
+            M) change_type="Изменена карта" ;;
+            D) change_type="Удалена карта" ;;
+            R*) change_type="Переименована карта" ;;
+          esac
+
+          echo "- **$map_file** — $change_type, редактировал @${author}" >> map_changes_summary.txt
+        done < <(grep -E '^[AMDR]\s+Resources/Maps/.*\.yml' map_changes.txt)
+
+    - name: Create PR comment
+      if: env.maps_changed == 'true'
+      uses: marocchino/sticky-pull-request-comment@v2
+      with:
+        path: map_changes_summary.txt

Content.Benchmarks/MapLoadBenchmark.cs

@@ -46,7 +46,7 @@ public async Task Cleanup()
         PoolManager.Shutdown();
     }
 
-    public static readonly string[] MapsSource = { "Empty", "Box", "Bagel", "Dev", "CentComm", "Atlas", "Core", "TestTeg", "Saltern", "Packed", "Omega", "Cluster", "Reach", "Origin", "Meta", "Marathon", "Europa", "MeteorArena", "Fland", "Barratry", "Oasis" };
+    public static readonly string[] MapsSource = { "Empty", "Satlern", "Box", "Bagel", "Dev", "CentComm", "Core", "TestTeg", "Packed", "Omega", "Reach", "Meta", "Marathon", "MeteorArena", "Fland", "Oasis", "Cog" };
 
     [ParamsSource(nameof(MapsSource))]
     public string Map;

Content.Client/Access/UI/AgentIDCardBoundUserInterface.cs

@@ -38,7 +38,7 @@ private void OnJobChanged(string newJob)
             SendMessage(new AgentIDCardJobChangedMessage(newJob));
         }
 
-        public void OnJobIconChanged(ProtoId<StatusIconPrototype> newJobIconId)
+        public void OnJobIconChanged(ProtoId<JobIconPrototype> newJobIconId)
         {
             SendMessage(new AgentIDCardJobIconChangedMessage(newJobIconId));
         }
@@ -55,7 +55,7 @@ protected override void UpdateState(BoundUserInterfaceState state)
 
             _window.SetCurrentName(cast.CurrentName);
             _window.SetCurrentJob(cast.CurrentJob);
-            _window.SetAllowedIcons(cast.Icons, cast.CurrentJobIconId);
+            _window.SetAllowedIcons(cast.CurrentJobIconId);
         }
     }
 }

Content.Client/Access/UI/AgentIDCardWindow.xaml

@@ -6,12 +6,9 @@
         <LineEdit Name="NameLineEdit" />
         <Label Name="CurrentJob" Text="{Loc 'agent-id-card-current-job'}" />
         <LineEdit Name="JobLineEdit" />
-        <BoxContainer Orientation="Horizontal">
-            <Label Text="{Loc 'agent-id-card-job-icon-label'}"/>
-            <Control HorizontalExpand="True" MinSize="50 0"/>
-            <GridContainer Name="IconGrid" Columns="10">
-                <!-- Job icon buttons are generated in the code -->
-            </GridContainer>
-        </BoxContainer>
+        <Label Text="{Loc 'agent-id-card-job-icon-label'}"/>
+        <GridContainer Name="IconGrid" Columns="10">
+            <!-- Job icon buttons are generated in the code -->
+        </GridContainer>
     </BoxContainer>
 </DefaultWindow>

Content.Client/Access/UI/AgentIDCardWindow.xaml.cs

@@ -8,6 +8,7 @@
 using Robust.Client.UserInterface.XAML;
 using Robust.Shared.Prototypes;
 using System.Numerics;
+using System.Linq;
 
 namespace Content.Client.Access.UI
 {
@@ -23,7 +24,7 @@ public sealed partial class AgentIDCardWindow : DefaultWindow
         public event Action<string>? OnNameChanged;
         public event Action<string>? OnJobChanged;
 
-        public event Action<ProtoId<StatusIconPrototype>>? OnJobIconChanged;
+        public event Action<ProtoId<JobIconPrototype>>? OnJobIconChanged;
 
         public AgentIDCardWindow()
         {
@@ -38,17 +39,16 @@ public AgentIDCardWindow()
             JobLineEdit.OnFocusExit += e => OnJobChanged?.Invoke(e.Text);
         }
 
-        public void SetAllowedIcons(HashSet<ProtoId<StatusIconPrototype>> icons, string currentJobIconId)
+        public void SetAllowedIcons(string currentJobIconId)
         {
             IconGrid.DisposeAllChildren();
 
-            var jobIconGroup = new ButtonGroup();
+            var jobIconButtonGroup = new ButtonGroup();
             var i = 0;
-            foreach (var jobIconId in icons)
+            var icons = _prototypeManager.EnumeratePrototypes<JobIconPrototype>().Where(icon => icon.AllowSelection).ToList();
+            icons.Sort((x, y) => string.Compare(x.LocalizedJobName, y.LocalizedJobName, StringComparison.CurrentCulture));
+            foreach (var jobIcon in icons)
             {
-                if (!_prototypeManager.TryIndex(jobIconId, out var jobIcon))
-                    continue;
-
                 String styleBase = StyleBase.ButtonOpenBoth;
                 var modulo = i % JobIconColumnCount;
                 if (modulo == 0)
@@ -62,8 +62,9 @@ public void SetAllowedIcons(HashSet<ProtoId<StatusIconPrototype>> icons, string
                     Access = AccessLevel.Public,
                     StyleClasses = { styleBase },
                     MaxSize = new Vector2(42, 28),
-                    Group = jobIconGroup,
-                    Pressed = i == 0,
+                    Group = jobIconButtonGroup,
+                    Pressed = currentJobIconId == jobIcon.ID,
+                    ToolTip = jobIcon.LocalizedJobName
                 };
 
                 // Generate buttons textures
@@ -78,9 +79,6 @@ public void SetAllowedIcons(HashSet<ProtoId<StatusIconPrototype>> icons, string
                 jobIconButton.OnPressed += _ => OnJobIconChanged?.Invoke(jobIcon.ID);
                 IconGrid.AddChild(jobIconButton);
 
-                if (jobIconId.Equals(currentJobIconId))
-                    jobIconButton.Pressed = true;
-
                 i++;
             }
         }

Content.Client/Actions/ActionsSystem.cs

@@ -48,6 +48,7 @@ public override void Initialize()
             SubscribeLocalEvent<InstantActionComponent, ComponentHandleState>(OnInstantHandleState);
             SubscribeLocalEvent<EntityTargetActionComponent, ComponentHandleState>(OnEntityTargetHandleState);
             SubscribeLocalEvent<WorldTargetActionComponent, ComponentHandleState>(OnWorldTargetHandleState);
+            SubscribeLocalEvent<EntityWorldTargetActionComponent, ComponentHandleState>(OnEntityWorldTargetHandleState);
         }
 
         private void OnInstantHandleState(EntityUid uid, InstantActionComponent component, ref ComponentHandleState args)
@@ -76,6 +77,18 @@ private void OnWorldTargetHandleState(EntityUid uid, WorldTargetActionComponent
             BaseHandleState<WorldTargetActionComponent>(uid, component, state);
         }
 
+        private void OnEntityWorldTargetHandleState(EntityUid uid,
+            EntityWorldTargetActionComponent component,
+            ref ComponentHandleState args)
+        {
+            if (args.Current is not EntityWorldTargetActionComponentState state)
+                return;
+
+            component.Whitelist = state.Whitelist;
+            component.CanTargetSelf = state.CanTargetSelf;
+            BaseHandleState<EntityWorldTargetActionComponent>(uid, component, state);
+        }
+
         private void BaseHandleState<T>(EntityUid uid, BaseActionComponent component, BaseActionComponentState state) where T : BaseActionComponent
         {
             // TODO ACTIONS use auto comp states
@@ -293,7 +306,7 @@ public void LoadActionAssignments(string path, bool userData)
                     continue;
 
                 var action = _serialization.Read<BaseActionComponent>(actionNode, notNullableOverride: true);
-                var actionId = Spawn(null);
+                var actionId = Spawn();
                 AddComp(actionId, action);
                 AddActionDirect(user, actionId);
 

Content.Client/Administration/AdminNameOverlay.cs

@@ -7,67 +7,66 @@
 using Robust.Shared.IoC;
 using Robust.Shared.Maths;
 
-namespace Content.Client.Administration
+namespace Content.Client.Administration;
+
+internal sealed class AdminNameOverlay : Overlay
 {
-    internal sealed class AdminNameOverlay : Overlay
+    private readonly AdminSystem _system;
+    private readonly IEntityManager _entityManager;
+    private readonly IEyeManager _eyeManager;
+    private readonly EntityLookupSystem _entityLookup;
+    private readonly Font _font;
+
+    public AdminNameOverlay(AdminSystem system, IEntityManager entityManager, IEyeManager eyeManager, IResourceCache resourceCache, EntityLookupSystem entityLookup)
     {
-        private readonly AdminSystem _system;
-        private readonly IEntityManager _entityManager;
-        private readonly IEyeManager _eyeManager;
-        private readonly EntityLookupSystem _entityLookup;
-        private readonly Font _font;
+        _system = system;
+        _entityManager = entityManager;
+        _eyeManager = eyeManager;
+        _entityLookup = entityLookup;
+        ZIndex = 200;
+        _font = new VectorFont(resourceCache.GetResource<FontResource>("/Fonts/NotoSans/NotoSans-Regular.ttf"), 10);
+    }
 
-        public AdminNameOverlay(AdminSystem system, IEntityManager entityManager, IEyeManager eyeManager, IResourceCache resourceCache, EntityLookupSystem entityLookup)
-        {
-            _system = system;
-            _entityManager = entityManager;
-            _eyeManager = eyeManager;
-            _entityLookup = entityLookup;
-            ZIndex = 200;
-            _font = new VectorFont(resourceCache.GetResource<FontResource>("/Fonts/NotoSans/NotoSans-Regular.ttf"), 10);
-        }
+    public override OverlaySpace Space => OverlaySpace.ScreenSpace;
 
-        public override OverlaySpace Space => OverlaySpace.ScreenSpace;
+    protected override void Draw(in OverlayDrawArgs args)
+    {
+        var viewport = args.WorldAABB;
 
-        protected override void Draw(in OverlayDrawArgs args)
+        foreach (var playerInfo in _system.PlayerList)
         {
-            var viewport = args.WorldAABB;
+            var entity = _entityManager.GetEntity(playerInfo.NetEntity);
 
-            foreach (var playerInfo in _system.PlayerList)
+            // Otherwise the entity can not exist yet
+            if (entity == null || !_entityManager.EntityExists(entity))
             {
-                var entity = _entityManager.GetEntity(playerInfo.NetEntity);
-
-                // Otherwise the entity can not exist yet
-                if (entity == null || !_entityManager.EntityExists(entity))
-                {
-                    continue;
-                }
+                continue;
+            }
 
-                // if not on the same map, continue
-                if (_entityManager.GetComponent<TransformComponent>(entity.Value).MapID != _eyeManager.CurrentMap)
-                {
-                    continue;
-                }
+            // if not on the same map, continue
+            if (_entityManager.GetComponent<TransformComponent>(entity.Value).MapID != args.MapId)
+            {
+                continue;
+            }
 
-                var aabb = _entityLookup.GetWorldAABB(entity.Value);
+            var aabb = _entityLookup.GetWorldAABB(entity.Value);
 
-                // if not on screen, continue
-                if (!aabb.Intersects(in viewport))
-                {
-                    continue;
-                }
+            // if not on screen, continue
+            if (!aabb.Intersects(in viewport))
+            {
+                continue;
+            }
 
-                var lineoffset = new Vector2(0f, 11f);
-                var screenCoordinates = _eyeManager.WorldToScreen(aabb.Center +
-                                                                  new Angle(-_eyeManager.CurrentEye.Rotation).RotateVec(
-                                                                      aabb.TopRight - aabb.Center)) + new Vector2(1f, 7f);
-                if (playerInfo.Antag)
-                {
-                    args.ScreenHandle.DrawString(_font, screenCoordinates + (lineoffset * 2), "ANTAG", Color.OrangeRed);
-                }
-                args.ScreenHandle.DrawString(_font, screenCoordinates+lineoffset, playerInfo.Username, playerInfo.Connected ? Color.Yellow : Color.White);
-                args.ScreenHandle.DrawString(_font, screenCoordinates, playerInfo.CharacterName, playerInfo.Connected ? Color.Aquamarine : Color.White);
+            var lineoffset = new Vector2(0f, 11f);
+            var screenCoordinates = _eyeManager.WorldToScreen(aabb.Center +
+                                                              new Angle(-_eyeManager.CurrentEye.Rotation).RotateVec(
+                                                                  aabb.TopRight - aabb.Center)) + new Vector2(1f, 7f);
+            if (playerInfo.Antag)
+            {
+                args.ScreenHandle.DrawString(_font, screenCoordinates + (lineoffset * 2), "ANTAG", Color.OrangeRed);
             }
+            args.ScreenHandle.DrawString(_font, screenCoordinates+lineoffset, playerInfo.Username, playerInfo.Connected ? Color.Yellow : Color.White);
+            args.ScreenHandle.DrawString(_font, screenCoordinates, playerInfo.CharacterName, playerInfo.Connected ? Color.Aquamarine : Color.White);
         }
     }
 }

Content.Client/Administration/UI/Bwoink/BwoinkControl.xaml.cs

@@ -92,13 +92,18 @@ public BwoinkControl()
                 if (a.IsPinned != b.IsPinned)
                     return a.IsPinned ? -1 : 1;
 
-                // First, sort by unread. Any chat with unread messages appears first. We just sort based on unread
-                // status, not number of unread messages, so that more recent unread messages take priority.
+                // First, sort by unread. Any chat with unread messages appears first.
                 var aUnread = ach.Unread > 0;
                 var bUnread = bch.Unread > 0;
                 if (aUnread != bUnread)
                     return aUnread ? -1 : 1;
 
+                // Sort by recent messages during the current round.
+                var aRecent = a.ActiveThisRound && ach.LastMessage != DateTime.MinValue;
+                var bRecent = b.ActiveThisRound && bch.LastMessage != DateTime.MinValue;
+                if (aRecent != bRecent)
+                    return aRecent ? -1 : 1;
+
                 // Next, sort by connection status. Any disconnected players are grouped towards the end.
                 if (a.Connected != b.Connected)
                     return a.Connected ? -1 : 1;

Content.Client/Administration/UI/PlayerPanel/PlayerPanel.xaml

@@ -0,0 +1,36 @@
+<ui:FancyWindow
+    xmlns="https://spacestation14.io"
+    xmlns:controls="clr-namespace:Content.Client.UserInterface.Controls"
+    xmlns:ui="clr-namespace:Content.Client.UserInterface.Controls"
+    Title="{Loc ban-panel-title}" MinSize="300 300">
+    <BoxContainer Orientation="Vertical">
+        <BoxContainer Orientation="Horizontal">
+        <Label Name="PlayerName"/>
+        <Button Name="UsernameCopyButton" Text="{Loc player-panel-copy-username}"/>
+        </BoxContainer>
+       <BoxContainer Orientation="Horizontal">
+           <Label Name="Whitelisted"/>
+           <controls:ConfirmButton Name="WhitelistToggle" Text="{Loc 'player-panel-false'}" Visible="False"></controls:ConfirmButton>
+       </BoxContainer>
+       <Label Name="Playtime"/>
+       <Label Name="Notes"/>
+       <Label Name="Bans"/>
+       <Label Name="RoleBans"/>
+       <Label Name="SharedConnections"/>
+
+       <BoxContainer Align="Center">
+           <GridContainer Rows="5">
+            <Button Name="NotesButton" Text="{Loc player-panel-show-notes}" SetWidth="136" Disabled="True"/>
+            <Button Name="AhelpButton" Text="{Loc player-panel-help}" Disabled="True"/>
+            <Button Name="FreezeButton" Text = "{Loc player-panel-freeze}" Disabled="True"/>
+            <controls:ConfirmButton Name="KickButton" Text="{Loc player-panel-kick}" Disabled="True"/>
+            <controls:ConfirmButton Name="DeleteButton" Text="{Loc player-panel-delete}" Disabled="True"/>
+            <Button Name="ShowBansButton" Text="{Loc player-panel-show-bans}" SetWidth="136" Disabled="True"/>
+            <Button Name="LogsButton" Text="{Loc player-panel-logs}" Disabled="True"/>
+            <Button Name="FreezeAndMuteToggleButton" Text="{Loc player-panel-freeze-and-mute}" Disabled="True"/>
+            <Button Name="BanButton" Text="{Loc player-panel-ban}" Disabled="True"/>
+            <controls:ConfirmButton Name="RejuvenateButton" Text="{Loc player-panel-rejuvenate}" Disabled="True"/>
+           </GridContainer>
+       </BoxContainer>
+    </BoxContainer>
+</ui:FancyWindow>