Merge remote-tracking branch 'origin/master'

Author: Marty

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

@@ -61,7 +61,7 @@ jobs:
         run: dotnet restore
 
       - name: Build Project
-        run: dotnet build Content.MapRenderer --configuration Release --no-restore /p:WarningsAsErrors=nullable /m
+        run: dotnet build Content.MapRenderer --configuration Release --no-restore /m
 
       - name: Run Map Renderer
         run: dotnet run --project Content.MapRenderer Dev

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

@@ -67,7 +67,7 @@ jobs:
       run: dotnet restore
 
     - name: Build Project
-      run: dotnet build --configuration DebugOpt --no-restore /p:WarningsAsErrors=nullable /m
+      run: dotnet build --configuration DebugOpt --no-restore /m
 
     - name: Run Content.Tests
       run: dotnet test --no-build --configuration DebugOpt Content.Tests/Content.Tests.csproj -- NUnit.ConsoleOut=0

.github/workflows/labeler-needsreview.yml

@@ -19,4 +19,4 @@ jobs:
         labels: "S: Needs Review"
     - uses: actions-ecosystem/action-remove-labels@v1
       with:
-        labels: "S: Awaiting Changes"
+        labels: "S: Needs Changes"

.github/workflows/labeler-review.yml

@@ -12,29 +12,79 @@ on:
     types: [submitted]
 
 jobs:
-  add_label:
-    # Change the repository name after you've made sure the team name is correct for your fork!
-    if: ${{ (github.repository == 'ProjectOmu/OmuStation') && (github.event.review.state == 'APPROVED') }}
+  label-on-approval:
     permissions:
       contents: read
+      issues: write
       pull-requests: write
     runs-on: ubuntu-latest
     steps:
-   # - uses: tspascoal/get-user-teams-membership@v3 #Omu, only maints can approve anyway, so this isnt needed.
-   #   id: checkUserMember
-   #   with:
-   #     username: ${{ github.actor }}
-   #     team: "maintainers"
-   #     GITHUB_TOKEN: ${{ secrets.BOT_TOKEN }}
-    # - if: "${{ contains(github.event.pull_request.labels.*.name, 'S: Needs Second Approval') }}"
-    #   uses: actions-ecosystem/action-add-labels@v1
-    #   with:
-    #     labels: "S: Approved"
-    - if: "${{ contains(github.event.pull_request.labels.*.name, 'S: Needs Second Approval') }}"
-      uses: actions-ecosystem/action-remove-labels@v1
-      with:
-        labels: "S: Needs Second Approval"
-    - if: "${{ false == contains(github.event.pull_request.labels.*.name, 'S: Needs Second Approval') }}"
-      uses: actions-ecosystem/action-add-labels@v1
-      with:
-        labels: "S: Needs Second Approval"
+      - name: Create JSON File
+        id: curling-reviews
+        run: |
+          PR_NUMBER=${{ github.event.pull_request.number }}
+          OWNER=${{ github.repository_owner }}
+          REPO=${{ github.event.repository.name }}
+          TOKEN=${{ secrets.GITHUB_TOKEN }}
+
+          # Fetch the reviews and place them into a json file.
+          curl -o reviews.json -L \
+                -H "Accept: application/vnd.github+json" \
+                -H "Authorization: Bearer $TOKEN" \
+                -H "X-GitHub-Api-Version: 2022-11-28" \
+                https://api.github.com/repos/$OWNER/$REPO/pulls/$PR_NUMBER/reviews
+
+      - name: Check for Approvals
+        id: check-approvals
+        run: |
+          # Count the number of approvals
+          APPROVALS=$(jq '[.[] | select(.state=="APPROVED")] | length' reviews.json)
+
+          echo "Number of approvals: $APPROVALS"
+          echo "::set-output name=approvals::$APPROVALS"
+
+      - name: Add Approved Label if Enough Approvals
+        if: steps.check-approvals.outputs.approvals >= 2  # Change the threshold here
+        uses: actions-ecosystem/action-add-labels@v1
+        env:
+          github_token: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          labels: "S: Approved"
+
+      - name: Remove Other Labels on Approved
+        if: steps.check-approvals.outputs.approval >= 2
+        uses: actions-ecosystem/action-remove-labels@v1
+        env:
+          github_token: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          labels: |
+            "S: Needs Review"
+            "S: Needs Second Approval"
+
+      - name: Add Second Approval Requirement on Approval
+        if: steps.check-approvals.outputs.approvals == 1
+        uses: actions-ecosystem/action-add-labels@v1
+        env:
+          github_token: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          labels: |
+            "S: Needs Second Approval"
+            "S: Needs Review"
+
+      - name: Remove Other Labels on Second Approval Requirement
+        if: steps.check-approvals.outputs.approvals == 1
+        uses: actions-ecosystem/action-remove-labels@v1
+        env:
+          github_token: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          labels: "S: Approved"
+
+      - name: Remove All Other Labels if No Approval
+        if: steps.check-approvals.outputs.approvals < 1
+        uses: actions-ecosystem/action-remove-labels@v1
+        env:
+          github_token: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          labels: |
+            "S: Approved"
+            "S: Needs Second Approval"

.github/workflows/publish.yml

@@ -29,6 +29,10 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
+    - name: Fail if we are attempting to run on the master branch
+      if: ${{GITHUB.REF_NAME == 'master' && github.repository == 'space-wizards/space-station-14'}}
+      run: exit 1
+
     - name: Install dependencies
       run: sudo apt-get install -y python3-paramiko python3-lxml
 

Content.Benchmarks/MapLoadBenchmark.cs

@@ -77,7 +77,7 @@ public async Task Cleanup()
         PoolManager.Shutdown();
     }
 
-    public static readonly string[] MapsSource = { "Empty", "Satlern", "Box", "Bagel", "Dev", "CentComm", "Atlas", "Core", "TestTeg", "Packed", "Origin", "Omega", "Cluster", "Reach", "Meta", "Marathon", "Europa", "MeteorArena", "Fland", "Oasis", "FlandHighPop", "OasisHighPop", "OriginHighPop", "Barratry", "Kettle", "Submarine", "Lambda", "Leonid", "Delta", "Amber", "Chloris", "Cog"}; //Goobstation, readds maps
+    public static readonly string[] MapsSource = { "Empty", "Satlern", "Box", "Bagel", "Dev", "CentComm", "Atlas", "Core", "TestTeg", "Packed", "Origin", "Omega", "Cluster", "Reach", "Meta", "Marathon", "Europa", "MeteorArena", "Fland", "Oasis", "FlandHighPop", "OasisHighPop", "OriginHighPop", "Barratry", "Kettle", "Submarine", "Lambda", "Leonid", "Delta", "Amber", "Chloris", "Cog", "Glacier", "Serpentcrest"}; //Goobstation, readds maps
 
     [ParamsSource(nameof(MapsSource))]
     public string Map;

Content.Client/Actions/ActionsSystem.cs

@@ -368,7 +368,7 @@ public void TriggerAction(Entity<ActionComponent> action)
             else
             {
                 var request = new RequestPerformActionEvent(GetNetEntity(action));
-                EntityManager.RaisePredictiveEvent(request);
+                RaisePredictiveEvent(request);
             }
         }
 

Content.Client/Administration/AdminNameOverlay.cs

@@ -102,6 +102,7 @@
 //
 // SPDX-License-Identifier: AGPL-3.0-or-later
 
+using System.Collections.Frozen;
 using System.Linq;
 using System.Numerics;
 using Content.Client.Administration.Systems;
@@ -129,6 +130,7 @@ internal sealed class AdminNameOverlay : Overlay
     private readonly EntityLookupSystem _entityLookup;
     private readonly IUserInterfaceManager _userInterfaceManager;
     private readonly SharedRoleSystem _roles;
+    private readonly IPrototypeManager _prototypeManager;
     private readonly Font _font;
     private readonly Font _fontBold;
     private AdminOverlayAntagFormat _overlayFormat;
@@ -145,9 +147,10 @@ internal sealed class AdminNameOverlay : Overlay
     private bool _showUserName;
     // Goobstation - End
 
-    //TODO make this adjustable via GUI
-    private readonly ProtoId<RoleTypePrototype>[] _filter =
-        ["SoloAntagonist", "TeamAntagonist", "SiliconAntagonist", "FreeAgent"];
+    //TODO make this adjustable via GUI?
+    private static readonly FrozenSet<ProtoId<RoleTypePrototype>> Filter =
+        new ProtoId<RoleTypePrototype>[] {"SoloAntagonist", "TeamAntagonist", "SiliconAntagonist", "FreeAgent"}
+        .ToFrozenSet();
 
     private readonly string _antagLabelClassic = Loc.GetString("admin-overlay-antag-classic");
 
@@ -159,14 +162,16 @@ public AdminNameOverlay(
         EntityLookupSystem entityLookup,
         IUserInterfaceManager userInterfaceManager,
         IConfigurationManager config,
-        SharedRoleSystem roles)
+        SharedRoleSystem roles,
+        IPrototypeManager prototypeManager)
     {
         _system = system;
         _entityManager = entityManager;
         _eyeManager = eyeManager;
         _entityLookup = entityLookup;
         _userInterfaceManager = userInterfaceManager;
         _roles = roles;
+        _prototypeManager = prototypeManager;
         ZIndex = 200;
         // Setting these to a specific ttf would break the antag symbols
         _font = resourceCache.NotoStack();
@@ -240,6 +245,14 @@ protected override void Draw(in OverlayDrawArgs args)
         foreach (var info in sortable.OrderBy(s => s.Item4.Y).ToList())
         {
             var playerInfo = info.Item1;
+            var rolePrototype = playerInfo.RoleProto == null
+                ? null
+                : _prototypeManager.Index(playerInfo.RoleProto.Value);
+
+            var roleName = Loc.GetString(rolePrototype?.Name ?? RoleTypePrototype.FallbackName);
+            var roleColor = rolePrototype?.Color ?? RoleTypePrototype.FallbackColor;
+            var roleSymbol = rolePrototype?.Symbol ?? RoleTypePrototype.FallbackSymbol;
+
             var aabb = info.Item2;
             var entity = info.Item3;
             var screenCoordinatesCenter = info.Item4;
@@ -330,7 +343,7 @@ protected override void Draw(in OverlayDrawArgs args)
             switch (_overlaySymbolStyle)
             {
                 case AdminOverlayAntagSymbolStyle.Specific:
-                    symbol = playerInfo.RoleProto.Symbol;
+                    symbol = roleSymbol;
                     break;
                 case AdminOverlayAntagSymbolStyle.Basic:
                     symbol = Loc.GetString("player-tab-antag-prefix");
@@ -346,21 +359,21 @@ protected override void Draw(in OverlayDrawArgs args)
             switch (_overlayFormat)
             {
                 case AdminOverlayAntagFormat.Roletype:
-                    color = playerInfo.RoleProto.Color;
-                    symbol = _filter.Contains(playerInfo.RoleProto) ? symbol : string.Empty;
-                    text = _filter.Contains(playerInfo.RoleProto)
-                        ? Loc.GetString(playerInfo.RoleProto.Name).ToUpper()
+                    color = roleColor;
+                    symbol = IsFiltered(playerInfo.RoleProto) ? symbol : string.Empty;
+                    text = IsFiltered(playerInfo.RoleProto)
+                        ? roleName.ToUpper()
                         : string.Empty;
                     break;
                 case AdminOverlayAntagFormat.Subtype:
-                    color = playerInfo.RoleProto.Color;
-                    symbol = _filter.Contains(playerInfo.RoleProto) ? symbol : string.Empty;
-                    text = _filter.Contains(playerInfo.RoleProto)
-                        ? _roles.GetRoleSubtypeLabel(playerInfo.RoleProto.Name, playerInfo.Subtype).ToUpper()
+                    color = roleColor;
+                    symbol = IsFiltered(playerInfo.RoleProto) ? symbol : string.Empty;
+                    text = IsFiltered(playerInfo.RoleProto)
+                        ? _roles.GetRoleSubtypeLabel(roleName, playerInfo.Subtype).ToUpper()
                         : string.Empty;
                     break;
                 case AdminOverlayAntagFormat.Off: // Goobstation
-                    color = playerInfo.RoleProto.Color;
+                    color = roleColor;
                     symbol = string.Empty;
                     text = string.Empty;
                     break;
@@ -384,4 +397,12 @@ protected override void Draw(in OverlayDrawArgs args)
             drawnOverlays.Add((screenCoordinatesCenter, currentOffset));
         }
     }
+
+    private static bool IsFiltered(ProtoId<RoleTypePrototype>? roleProtoId)
+    {
+        if (roleProtoId == null)
+            return false;
+
+        return Filter.Contains(roleProtoId.Value);
+    }
 }

Content.Client/Administration/Systems/AdminSystem.Overlay.cs

@@ -53,6 +53,7 @@
 using Robust.Client.ResourceManagement;
 using Robust.Client.UserInterface;
 using Robust.Shared.Configuration;
+using Robust.Shared.Prototypes;
 
 namespace Content.Client.Administration.Systems
 {
@@ -66,6 +67,7 @@ public sealed partial class AdminSystem
         [Dependency] private readonly IUserInterfaceManager _userInterfaceManager = default!;
         [Dependency] private readonly IConfigurationManager _configurationManager = default!;
         [Dependency] private readonly SharedRoleSystem _roles = default!;
+        [Dependency] private readonly IPrototypeManager _proto = default!;
 
         private AdminNameOverlay _adminNameOverlay = default!;
 
@@ -82,7 +84,8 @@ private void InitializeOverlay()
                 _entityLookup,
                 _userInterfaceManager,
                 _configurationManager,
-                _roles);
+                _roles,
+                _proto);
             _adminManager.AdminStatusUpdated += OnAdminStatusUpdated;
         }
 

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

@@ -11,7 +11,7 @@ SPDX-License-Identifier: MIT
 <DefaultWindow
     xmlns="https://spacestation14.io"
     xmlns:cc="clr-namespace:Content.Client.Administration.UI.CustomControls"
-    Title="{Loc ban-panel-title}" MinSize="350 500">
+    Title="{Loc ban-panel-title}" MinSize="410 500">
     <BoxContainer Orientation="Vertical">
         <TabContainer Name="Tabs" VerticalExpand="True">
             <!-- Basic info -->