Merge branch 'new-frontiers-14:master' into master

.github/PULL_REQUEST_TEMPLATE.md

@@ -1,48 +1,34 @@
-<!-- Please read these guidelines before opening your PR: https://docs.spacestation14.io/en/getting-started/pr-guideline -->
-<!-- The text between the arrows are comments - they will not be visible on your PR. -->
+<!-- Guidelines: https://docs.spacestation14.io/en/getting-started/pr-guideline -->
 
 ## About the PR
-<!-- What did you change in this PR? -->
+<!-- What did you change? -->
 <!-- If this is a code change, summarize at high level how your new code works. This makes it easier to review. -->
 
 ## Why / Balance
-<!-- Why was it changed? Link any discussions or issues here. Please discuss how this would affect game balance. -->
+<!-- Discuss how this would affect game balance or explain why it was changed. Link any relevant discussions or issues. -->
 
 ## How to test
 <!-- Describe the way it can be tested -->
 
 ## Media
-<!-- 
-PRs which make ingame changes (adding clothing, items, new features, etc) are required to have media attached that showcase the changes.
-Small fixes/refactors are exempt.
-Any media may be used in SS14 progress reports, with clear credit given.
-
-If you're unsure whether your PR will require media, ask a maintainer.
--->
+<!-- Attach media if the PR makes ingame changes (clothing, items, features, etc). 
+Small fixes/refactors are exempt. Media may be used in SS14 progress reports with credit. -->
 
 ## Requirements
-<!-- 
-Due to influx of PR's we require to ensure that PR's are following the correct guidelines.
-
-Please take a moment to read these if its your first time.
-
-Check the boxes below to confirm that you have in fact seen these (put an X in the brackets, like [X]):
--->
-- [ ] I have read and I am following the [Pull Request Guidelines](https://docs.spacestation14.com/en/general-development/codebase-info/pull-request-guidelines.html). I understand that not doing so may get my pr closed at maintainer’s discretion
-- [ ] I have added screenshots/videos to this PR showcasing its changes ingame, **or** this PR does not require an ingame showcase
+<!-- Confirm the following by placing an X in the brackets [X]: -->
+- [ ] I have read and am following the [Pull Request and Changelog Guidelines](https://docs.spacestation14.com/en/general-development/codebase-info/pull-request-guidelines.html).
+- [ ] I have added media to this PR or it does not require an ingame showcase.
+<!-- You should understand that not following the above may get your PR closed at maintainer’s discretion -->
 
 ## Breaking changes
-<!--
-List any breaking changes, including namespace, public class/method/field changes, prototype renames; and provide instructions for fixing them. This will be pasted in #codebase-changes.
--->
+<!-- List any breaking changes, including namespaces, public class/method/field changes, prototype renames; and provide instructions for fixing them.
+This will be posted in #codebase-changes. -->
 
 **Changelog**
+<!-- Add a Changelog entry to make players aware of new features or changes that could affect gameplay.
+Make sure to read the guidelines and take this Changelog template out of the comment block in order for it to show up.
+Changelog must have a :cl: symbol, so the bot recognizes the changes and adds them to the game's changelog. -->
 <!--
-Make players aware of new features and changes that could affect how they play the game by adding a Changelog entry. Please read the Changelog guidelines located at: https://docs.spacestation14.io/en/getting-started/pr-guideline#changelog
--->
-
-<!--
-Make sure to take this Changelog template out of the comment block in order for it to show up. Changelog must have a :cl: symbol, so the bot recognizes the changes and adds them to the game's changelog.
 :cl:
 - add: Added fun!
 - remove: Removed fun!

.github/labeler.yml

@@ -1,50 +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":
+- changed-files:
+  - any-glob-to-any-file: "Content.Server.Database/Migrations/**/*.cs"

.github/mapchecker/config.py

@@ -49,5 +49,8 @@
         "Plastitanium",  # And also on blackmarket ships cause syndicate.
         "ButtonFrameCautionSecurity",  # Decal.
         "ShuttleGun",
+    ],
+    "Sr": [
+        "ButtonFrameCautionSecurity",  # Decal.
     ]
 }

.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 --filter FullyQualifiedName!~ShipyardTest -- NUnit.ConsoleOut=0 NUnit.MapWarningTo=Failed
   ci-success:
     name: Build & Test Debug
     needs:

.github/workflows/changelog.yml

@@ -6,7 +6,7 @@ on:
 
 env:
   GITHUB_TOKEN: ${{ secrets.BOT_TOKEN }}
-  CHANGELOG_DIR: Resources/Changelog/Changelog.yml
+  CHANGELOG_DIR: Resources/Changelog/Frontier.yml # Frontier: Changelog.yml<Frontier.yml
   PR_NUMBER: ${{ github.event.number }}
 
 jobs:

.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/[email protected]
+
+    - name: Setup Submodule
+      run: |
+        git submodule update --init --recursive
+
+    - name: Pull engine updates
+      uses: space-wizards/[email protected]
+
+    - name: Update Engine Submodules
+      run: |
+        cd RobustToolbox/
+        git submodule update --init --recursive
+
+    - name: Setup .NET Core
+      uses: actions/[email protected]
+      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/publish.yml

@@ -41,21 +41,10 @@ jobs:
     - name: Package client
       run: dotnet run --project Content.Packaging client --no-wipe-release
 
-    - name: Upload build artifact
-      id: artifact-upload-step
-      uses: actions/upload-artifact@v4
-      with:
-        name: build
-        path: release/*.zip
-        compression-level: 0
-        retention-days: 0
-
     - name: Publish version
-      run: Tools/publish_github_artifact.py
+      run: Tools/publish_multi_request.py
       env:
-        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         PUBLISH_TOKEN: ${{ secrets.PUBLISH_TOKEN }}
-        ARTIFACT_ID: ${{ steps.artifact-upload-step.outputs.artifact-id }}
         GITHUB_REPOSITORY: ${{ vars.GITHUB_REPOSITORY }}
 
     #- name: Publish changelog (Discord)
@@ -68,8 +57,3 @@ jobs:
       run: Tools/actions_changelog_rss.py
       env:
         CHANGELOG_RSS_KEY: ${{ secrets.CHANGELOG_RSS_KEY }}
-
-    - uses: geekyeggo/delete-artifact@v5
-      if: always()
-      with:
-        name: build