Merge branch 'new-frontiers-14:master' into Cyborg-Advanced-Modules

.github/labeler.yml

@@ -1,53 +1,77 @@
 #"Map":
-# - "Resources/Maps/**/*.yml" # All .yml files in the Resources/Maps directory, recursive.
+# - changed-files:
+#   - any-glob-to-any-file: "Resources/Maps/**/*.yml" # All .yml files in the Resources/Maps directory, recursive.
 
 "Map-Admin":
- - "Resources/Maps/_NF/Admin/**/*.yml" # Grid Files
+- changed-files:
+  - any-glob-to-any-file: "Resources/Maps/_NF/Admin/**/*.yml" # Grid Files
 
 "Map-Bluespace":
- - "Resources/Maps/_NF/Bluespace/**/*.yml" # Grid Files
+- changed-files:
+  - any-glob-to-any-file: "Resources/Maps/_NF/Bluespace/**/*.yml" # Grid Files
 
 "Map-Dungeon":
- - "Resources/Maps/_NF/Dungeon/**/*.yml" # Grid Files
+- changed-files:
+  - any-glob-to-any-file: "Resources/Maps/_NF/Dungeon/**/*.yml" # Grid Files
 
 "Map-Outpost":
- - "Resources/Maps/_NF/Outpost/*.yml" # Map Files
- - "Resources/Prototypes/_MF/Maps/Outpost/*.yml" # Prototypes Files
+- changed-files:
+  - any-glob-to-any-file:
+    - "Resources/Maps/_NF/Outpost/*.yml" # Map Files
+    - "Resources/Prototypes/_MF/Maps/Outpost/*.yml" # Prototypes Files
 
 "Map-Shuttle":
- - "Resources/Maps/_NF/Shuttles/**/*.yml" # Grid Files
- - "Resources/Prototypes/_NF/Shipyard/**/*.yml" # Prototypes Files
+- changed-files:
+  - any-glob-to-any-file:
+    - "Resources/Maps/_NF/Shuttles/**/*.yml" # Grid Files
+    - "Resources/Prototypes/_NF/Shipyard/**/*.yml" # Prototypes Files
 
 "Map-POI":
- - "Resources/Maps/_NF/POI/**/*.yml" # Grid Files
- - "Resources/Prototypes/_MF/Maps/POI/**/*.yml" # Prototypes Files
+- changed-files:
+  - any-glob-to-any-file:
+    - "Resources/Maps/_NF/POI/**/*.yml" # Grid Files
+    - "Resources/Prototypes/_MF/Maps/POI/**/*.yml" # Prototypes Files
 
 "Sprites":
- - "**/*.rsi/*.png"
- - "**/*.rsi/*.json"
+- changed-files:
+  - any-glob-to-any-file:
+    - "**/*.rsi/*.png"
+    - "**/*.rsi/*.json"
 
 "UI":
- - "**/*.xaml*"
+- changed-files:
+  - any-glob-to-any-file: "**/*.xaml*"
 
 "C#":
-  - "**/*.cs"
+- changed-files:
+  - any-glob-to-any-file: "**/*.cs"
 
 "Shaders":
-  - '**/*.swsl'
+- changed-files:
+  - any-glob-to-any-file: '**/*.swsl'
 
 "No C#":
- - all: ["!**/*.cs"]
+- changed-files:
+  - all-globs-to-all-files: "!**/*.cs"
 
 "Docs":
-  - "**/*.xml"
-  - "**/*.md"
+- changed-files:
+  - any-glob-to-any-file:
+    - "**/*.xml"
+    - "**/*.md"
 
 "FTL":
- - "Resources/Locale/**/*.ftl"
+- changed-files:
+  - any-glob-to-any-file: "Resources/Locale/**/*.ftl"
 
 "YML":
-  - any: ["**/*.yml"]
-    all: ["!Resources/Maps/_NF/**/*.yml", "!Resources/Prototypes/Maps/_NF/**/*.yml"]
+- all:
+  - changed-files:
+    - any-glob-to-any-file: "**/*.yml"
+    - all-globs-to-all-files:
+      - "!Resources/Maps/_NF/**/*.yml"
+      - "!Resources/Prototypes/Maps/_NF/**/*.yml"
 
 "DB Migration":
-  - "Content.Server.Database/Migrations/**/*.cs"
+- changed-files:
+  - any-glob-to-any-file: "Content.Server.Database/Migrations/**/*.cs"

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

@@ -10,7 +10,7 @@ on:
 
 jobs:
   build:
-    if: github.actor != 'PJBot' && github.event.pull_request.draft == false
+    if: github.actor != 'PJBot' && github.event.pull_request.draft == false && github.actor != 'FrontierATC' # Frontier
     strategy:
       matrix:
         os: [ubuntu-latest]

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

@@ -7,10 +7,13 @@ on:
   pull_request:
     types: [ opened, reopened, synchronize, ready_for_review ]
     branches: [ master ]
+  pull_request_target: # Frontier: only run tests on C# changes
+    paths: # Frontier
+      - "**/*.cs" # Frontier
 
 jobs:
   build:
-    if: github.actor != 'PJBot' && github.event.pull_request.draft == false
+    if: github.actor != 'PJBot' && github.event.pull_request.draft == false && github.actor != 'FrontierATC' # Frontier
     strategy:
       matrix:
         os: [ubuntu-latest]
@@ -46,6 +49,12 @@ jobs:
 
     - name: Run Content.Tests
       run: dotnet test --no-build --configuration DebugOpt Content.Tests/Content.Tests.csproj -- NUnit.ConsoleOut=0
+
+#    - name: Run Content.IntegrationTests
+#      shell: pwsh
+#      run: |
+#        $env:DOTNET_gcServer=1
+#        dotnet test --no-build --configuration DebugOpt Content.IntegrationTests/Content.IntegrationTests.csproj -- NUnit.ConsoleOut=0 NUnit.MapWarningTo=Failed
   ci-success:
     name: Build & Test Debug
     needs:

.github/workflows/conflict-labeler.yml

@@ -10,7 +10,7 @@ on:
 
 jobs:
   Label:
-    if: ( github.event.pull_request.draft == false ) && ( github.actor != 'PJBot' )
+    if: ( github.event.pull_request.draft == false ) && ( github.actor != 'PJBot' ) && ( github.actor != 'FrontierATC' ) # Frontier
     runs-on: ubuntu-latest
     steps:
       - name: Check for Merge Conflicts

.github/workflows/labeler-pr.yml

@@ -0,0 +1,14 @@
+name: "Labels: PR"
+
+on:
+- pull_request_target
+
+jobs:
+  labeler:
+    if: github.actor != 'PJBot' && github.actor != 'FrontierATC' # Frontier
+    permissions:
+      contents: read
+      pull-requests: write
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/labeler@v5

.github/workflows/nf-shipyard-tests.yml

@@ -0,0 +1,59 @@
+name: Build & Run Shipyard Tests
+
+on:
+  pull_request:
+    branches: [ "master" ]
+    paths:
+      - "Resources/Maps/_NF/Shuttles/**/*.yml" # Ship grids
+      - "Resources/Prototypes/_NF/Shipyard/**/*.yml" # Shipyard prototypes
+      - "Content.IntegrationTests/Tests/_NF/ShipyardTests.cs" # Shipyard tests
+
+jobs:
+  build:
+    if: github.event.pull_request.draft == false && github.actor != 'FrontierATC'
+    strategy:
+      matrix:
+        os: [ubuntu-latest]
+
+    runs-on: ${{ matrix.os }}
+
+    steps:
+    - name: Checkout Master
+      uses: actions/checkout@v3.6.0
+
+    - name: Setup Submodule
+      run: |
+        git submodule update --init --recursive
+
+    - name: Pull engine updates
+      uses: space-wizards/submodule-dependency@v0.1.5
+
+    - name: Update Engine Submodules
+      run: |
+        cd RobustToolbox/
+        git submodule update --init --recursive
+
+    - name: Setup .NET Core
+      uses: actions/setup-dotnet@v3.2.0
+      with:
+        dotnet-version: 8.0.x
+
+    - name: Install Dependencies
+      run: dotnet restore
+
+    - name: Build Project
+      run: dotnet build --configuration DebugOpt --no-restore /p:WarningsAsErrors=nullable /m
+
+    - name: Run Shipyard Tests
+      shell: pwsh
+      run: |
+        $env:DOTNET_gcServer=1
+        dotnet test --no-build --configuration DebugOpt Content.IntegrationTests/Content.IntegrationTests.csproj --filter FullyQualifiedName~ShipyardTest -- NUnit.ConsoleOut=0 NUnit.MapWarningTo=Failed
+  ci-success:
+    name: Build & Run Shipyard Tests
+    needs:
+      - build
+    runs-on: ubuntu-latest
+    steps:
+      - name: CI succeeded
+        run: exit 0

.github/workflows/update-credits.yml

@@ -4,19 +4,19 @@ on:
   workflow_dispatch:
   schedule:
     - cron: 0 0 * * 0
-    
+
 jobs:
   get_credits:
     runs-on: ubuntu-latest
     # Hey there fork dev! If you like to include your own contributors in this then you can probably just change this to your own repo
     # Do this in dump_github_contributors.ps1 too into your own repo
-    if: github.repository == 'space-wizards/space-station-14'
-    
+    if: github.repository == 'new-frontiers-14/frontier-station-14' # Frontier: space-wizards/space-station-14<new-frontiers-14/frontier-station-14
+
     steps:
       - uses: actions/checkout@v3.6.0
         with:
           ref: master
-        
+
       - name: Get this week's Contributors
         shell: pwsh
         env:
@@ -25,30 +25,17 @@ jobs:
 
       # TODO
       #- name: Get this week's Patreons
-      #  run: Tools/script2dumppatreons > Resources/Credits/Patrons.yml        
-      
+      #  run: Tools/script2dumppatreons > Resources/Credits/Patrons.yml
+
       # MAKE SURE YOU ENABLED "Allow GitHub Actions to create and approve pull requests" IN YOUR ACTIONS, OTHERWISE IT WILL MOST LIKELY FAIL
 
 
-      # For this you can use a pat token of an account with direct push access to the repo if you have protected branches. 
+      # For this you can use a pat token of an account with direct push access to the repo if you have protected branches.
       # Uncomment this and comment the other line if you do this.
       # https://github.com/stefanzweifel/git-auto-commit-action#push-to-protected-branches
-
-      #- name: Commit new credit files
-      #  uses: stefanzweifel/git-auto-commit-action@v4
-      #  with:
-      #    commit_message: Update Credits
-      #    commit_author: PJBot <pieterjan.briers+bot@gmail.com>
-
-      # This will make a PR
-      - name: Set current date as env variable
-        run: echo "NOW=$(date +'%Y-%m-%dT%H-%M-%S')" >> $GITHUB_ENV
-
-      - name: Create Pull Request
-        uses: peter-evans/create-pull-request@v5
+
+      - name: Commit new credit files
+        uses: stefanzweifel/git-auto-commit-action@v4
         with:
-          commit-message: Update Credits
-          title: Update Credits
-          body: This is an automated Pull Request. This PR updates the github contributors in the credits section.
-          author: PJBot <pieterjan.briers+bot@gmail.com>
-          branch: automated/credits-${{env.NOW}}
+          commit_message: Update Credits
+          commit_author: FrontierATC <zuuswa@gmail.com>

.github/workflows/validate-rgas.yml

@@ -9,7 +9,7 @@ on:
 jobs:
   yaml-schema-validation:
     name: YAML RGA schema validator
-    if: github.actor != 'PJBot' && github.event.pull_request.draft == false
+    if: github.actor != 'PJBot' && github.event.pull_request.draft == false && github.actor != 'FrontierATC' # Frontier
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v3.6.0

.github/workflows/validate_mapfiles.yml

@@ -9,7 +9,7 @@ on:
 jobs:
   yaml-schema-validation:
     name: YAML map schema validator
-    if: github.actor != 'PJBot' && github.event.pull_request.draft == false
+    if: github.actor != 'PJBot' && github.event.pull_request.draft == false && github.actor != 'FrontierATC' # Frontier
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v3.6.0

.github/workflows/yaml-linter.yml

@@ -10,7 +10,7 @@ on:
 jobs:
   build:
     name: YAML Linter
-    if: github.actor != 'PJBot' && github.event.pull_request.draft == false
+    if: github.actor != 'PJBot' && github.event.pull_request.draft == false && github.actor != 'FrontierATC' # Frontier
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3.6.0

Content.Client/Administration/UI/CustomControls/HSeparator.cs

@@ -5,21 +5,53 @@
 
 namespace Content.Client.Administration.UI.CustomControls;
 
+/**
+ * FRONTIER CHANGE: Added SeparatorColor so it can be set in the UI.
+ */
 public sealed class HSeparator : Control
 {
-    private static readonly Color SeparatorColor = Color.FromHex("#3D4059");
+    private static readonly Color DefaultSeparatorColor = Color.FromHex("#3D4059");
+
+    private Color _separatorColor = DefaultSeparatorColor;
+    public Color SeparatorColor
+    {
+        get => _separatorColor;
+        set
+        {
+            _separatorColor = Color.FromHex(value.ToHex());
+            UpdateSeparatorColor();
+        }
+    }
+
+    private PanelContainer? _panelContainer = null;
 
     public HSeparator(Color color)
     {
-        AddChild(new PanelContainer
+        SeparatorColor = color;
+        Initialize();
+    }
+
+    public HSeparator() : this(DefaultSeparatorColor) { }
+
+    private void Initialize()
+    {
+        _panelContainer = new PanelContainer
         {
             PanelOverride = new StyleBoxFlat
             {
-                BackgroundColor = color,
-                ContentMarginBottomOverride = 2, ContentMarginLeftOverride = 2
+                BackgroundColor = SeparatorColor,
+                ContentMarginBottomOverride = 2,
+                ContentMarginLeftOverride = 2
             }
-        });
+        };
+        AddChild(_panelContainer);
     }
 
-    public HSeparator() : this(SeparatorColor) { }
+    private void UpdateSeparatorColor()
+    {
+        if (_panelContainer?.PanelOverride is StyleBoxFlat styleBox)
+        {
+            styleBox.BackgroundColor = SeparatorColor;
+        }
+    }
 }