Merge pull request #374 from deathride58/upstreammergenov2023

Maintenance - Brings fork up to date as of November 25, 2023, at 5:05 PM (EST)

.editorconfig

@@ -196,7 +196,7 @@ csharp_preserve_single_line_blocks = true
 #dotnet_naming_style.begins_with_i.word_separator =
 #dotnet_naming_style.begins_with_i.capitalization = pascal_case
 
-dotnet_diagnostic.IDE0055.severity = warning
+dotnet_diagnostic.ide0055.severity = warning
 
 dotnet_naming_rule.constants_rule.severity = warning
 dotnet_naming_rule.constants_rule.style = upper_camel_case_style
@@ -336,6 +336,10 @@ dotnet_naming_symbols.type_parameters_symbols.applicable_kinds = type_parameter
 
 # ReSharper properties
 resharper_braces_for_ifelse = required_for_multiline
+resharper_keep_existing_attribute_arrangement = true
 
-[*.{csproj,xml,yml,dll.config,msbuildproj,targets}]
+[*.{csproj,xml,yml,yaml,dll.config,msbuildproj,targets}]
 indent_size = 2
+
+[{*.yaml,*.yml}]
+ij_yaml_indent_sequence_value = false

.github/CODEOWNERS

@@ -1,34 +1,30 @@
 # Last match in file takes precedence.
 
 # Sorting by path instead of by who added it one day :(
+# this isn't how codeowners rules work pls read the first comment instead of trying to force a sorting order
 /Resources/ConfigPresets/WizardsDen/  @Chief-Engineer
 
 # Moony's Gargantuan List Of Things She Cares About, or MGLOTSCA for short.
 # You need to add your name to these entries, not make a new one, if you care about them.
 /Content.*/Toolshed/ @moonheart08
 **/Toolshed/** @moonheart08
 *Command.cs @moonheart08
-/Content.*/Administration/ @moonheart08 @PaulRitter @DrSmugleaf @Chief-Engineer
+/Content.*/Administration/ @moonheart08 @DrSmugleaf @Chief-Engineer
 /Content.*/Station/ @moonheart08
 /Content.*/Maps/ @moonheart08
 /Content.*/GameTicking/ @moonheart08 @EmoGarbage404
 /Resources/ServerInfo/ @moonheart08 @Chief-Engineer
 /Resources/ServerInfo/Guidebook/ @moonheart08 @EmoGarbage404
 /Resources/engineCommandPerms.yml @moonheart08 @Chief-Engineer
 /Resources/clientCommandPerms.yml @moonheart08 @Chief-Engineer
-/Resources/Prototypes/species.yml @moonheart08
-/Resources/Prototypes/Body/ @moonheart08 @mirrorcult @DrSmugleaf # suffering
-/Resources/Prototypes/Maps/ @moonheart08 @Emisse
-/Resources/Prototypes/Entities/Mobs/Player/ @moonheart08 @mirrorcult @DrSmugleaf
-/Resources/Prototypes/Entities/Mobs/Species/ @moonheart08 @mirrorcult @DrSmugleaf
 
-/Content.*/Body/ @mirrorcult @DrSmugleaf
-/Content.*/Chemistry/ @mirrorcult
-/Content.*/StatusEffect/ @mirrorcult
-/Content.*/Whitelist/ @mirrorcult
-/Resources/Prototypes/Reagents/ @mirrorcult
-/Resources/Prototypes/Recipes/Reactions @mirrorcult
-/Resources/Prototypes/Chemistry @mirrorcult
+/Resources/Prototypes/Maps/ @Emisse
+
+/Resources/Prototypes/Body/ @DrSmugleaf # suffering
+/Resources/Prototypes/Entities/Mobs/Player/ @DrSmugleaf
+/Resources/Prototypes/Entities/Mobs/Species/ @DrSmugleaf
+/Content.*/Body/ @DrSmugleaf
+/Content.YAMLLinter @DrSmugleaf
 
 /Content.*/Verbs/ @ElectroJr
 /Content.Client/ContextMenu/ @ElectroJr
@@ -54,21 +50,16 @@
 
 /Content.*/Forensics/ @ficcialfaint
 
-/Content.YAMLLinter @PaulRitter @DrSmugleaf
-/Content.*/Inventory @PaulRitter
-/Content.*/Arcade @PaulRitter
-/Content.*/Conveyor @PaulRitter
-/Content.*/Decals @PaulRitter
-/Content.*/Objectives @PaulRitter
-/Content.*/MachineLinking @PaulRitter
-/Content.*/Crayon @PaulRitter
-/Content.*/Clothing @PaulRitter
-
-# Be they Fluent translations or Freemarker templates, I know them both!
-*.ftl @RemieRichards
-
 # SKREEEE
 /Content.*.Database/ @PJB3005 @DrSmugleaf
 /Content.Shared.Database/Log*.cs @PJB3005 @DrSmugleaf @Chief-Engineer
 /Pow3r/ @PJB3005
 /Content.Server/Power/Pow3r/ @PJB3005
+
+# notafet
+/Content.*/Atmos/ @Partmedia
+/Content.*/Botany/ @Partmedia
+
+#Jezi
+/Content.*/Medical @Jezithyr
+/Content.*/Body @Jezithyr

.github/workflows/benchmarks.yml

@@ -11,7 +11,7 @@ jobs:
     name: Run Benchmarks
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3.6.0
       with:
         submodules: 'recursive'
     - name: Get Engine version

.github/workflows/build-docfx.yml

@@ -8,7 +8,7 @@ jobs:
   docfx:
    runs-on: ubuntu-latest
    steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3.6.0
     - name: Setup submodule
       run: |
         git submodule update --init --recursive
@@ -19,9 +19,9 @@ jobs:
         cd RobustToolbox/
         git submodule update --init --recursive
     - name: Setup .NET Core
-      uses: actions/setup-dotnet@v3
+      uses: actions/setup-dotnet@v3.2.0
       with:
-        dotnet-version: 6.0.x
+        dotnet-version: 7.0.x
 
     - name: Install dependencies
       run: dotnet restore

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

@@ -0,0 +1,57 @@
+name: Build & Test Map Renderer
+
+on:
+  push:
+    branches: [ master, staging, trying ]
+  merge_group:
+  pull_request:
+    types: [ opened, reopened, synchronize, ready_for_review ]
+    branches: [ master ]
+
+jobs:
+  build:
+    if: github.actor != 'PJBot' && github.event.pull_request.draft == false
+    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: 7.0.x
+
+      - name: Install dependencies
+        run: dotnet restore
+
+      - name: Build Project
+        run: dotnet build Content.MapRenderer --configuration Release --no-restore /p:WarningsAsErrors=nullable /m
+
+      - name: Run Map Renderer
+        run: dotnet run --project Content.MapRenderer Dev
+
+  ci-success:
+    name: Build & Test Debug
+    needs:
+      - build
+    runs-on: ubuntu-latest
+    steps:
+      - name: CI succeeded
+        run: exit 0

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

@@ -13,13 +13,13 @@ jobs:
     if: github.actor != 'PJBot' && github.event.pull_request.draft == false
     strategy:
       matrix:
-        os: [ubuntu-latest, windows-latest]
+        os: [ubuntu-latest]
 
     runs-on: ${{ matrix.os }}
 
     steps:
     - name: Checkout Master
-      uses: actions/checkout@v2
+      uses: actions/checkout@v3.6.0
 
     - name: Setup Submodule
       run: |
@@ -34,9 +34,9 @@ jobs:
         git submodule update --init --recursive
 
     - name: Setup .NET Core
-      uses: actions/setup-dotnet@v3
+      uses: actions/setup-dotnet@v3.2.0
       with:
-        dotnet-version: 6.0.x
+        dotnet-version: 7.0.x
 
     - name: Install dependencies
       run: dotnet restore

.github/workflows/publish.yml

@@ -16,23 +16,30 @@ jobs:
     - name: Install dependencies
       run: sudo apt-get install -y python3-paramiko
 
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3.6.0
       with:
         submodules: 'recursive'
     - name: Setup .NET Core
-      uses: actions/setup-dotnet@v3
+      uses: actions/setup-dotnet@v3.2.0
       with:
-        dotnet-version: 6.0.100
+        dotnet-version: 7.0.x
 
     - name: Get Engine Tag
       run: |
         cd RobustToolbox
         git fetch --depth=1
 
+    - name: Install dependencies
+      run: dotnet restore
+
+    - name: Build Packaging
+      run: dotnet build Content.Packaging --configuration Release --no-restore /m
+
+    - name: Package server
+      run: dotnet run --project Content.Packaging server --platform win-x64 --platform linux-x64 --platform osx-x64 --platform linux-arm64
+
     - name: Package client
-      run: |
-        Tools/package_server_build.py -p win-x64 linux-x64 osx-x64 linux-arm64
-        Tools/package_client_build.py
+      run: dotnet run --project Content.Packaging client --no-wipe-release
 
     - name: Update Build Info
       run: Tools/gen_build_info.py

.github/workflows/rsi-diff.yml

@@ -11,7 +11,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3.6.0
 
       - name: Get changed files
         id: files

.github/workflows/test-packaging.yml

@@ -34,7 +34,7 @@ jobs:
 
     steps:
       - name: Checkout Master
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3.6.0
 
       - name: Setup Submodule
         run: |
@@ -49,18 +49,22 @@ jobs:
           git submodule update --init --recursive
 
       - name: Setup .NET Core
-        uses: actions/setup-dotnet@v3
+        uses: actions/setup-dotnet@v3.2.0
         with:
-          dotnet-version: 6.0.x
+          dotnet-version: 7.0.x
 
       - name: Install dependencies
         run: dotnet restore
 
-      - name: Package client
-        run: |
-          Tools/package_server_build.py -p win-x64 linux-x64 osx-x64 linux-arm64
-          Tools/package_client_build.py
+      - name: Build Packaging
+        run: dotnet build Content.Packaging --configuration Release --no-restore /m
 
+      - name: Package server
+        run: dotnet run --project Content.Packaging server --platform win-x64 --platform linux-x64 --platform osx-x64 --platform linux-arm64
+
+      - name: Package client
+        run: dotnet run --project Content.Packaging client --no-wipe-release
+
       - name: Update Build Info
         run: Tools/gen_build_info.py
 

.github/workflows/update-credits.yml

@@ -0,0 +1,32 @@
+name: Update Contrib and Patreons in credits
+
+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'
+
+    steps:
+      - uses: actions/checkout@v3.6.0
+        with:
+          ref: master
+
+      - name: Get this week's Contributors
+        shell: pwsh
+        run: Tools/dump_github_contributors.ps1 > Resources/Credits/GitHub.txt
+
+      # TODO
+      #- name: Get this week's Patreons
+      #  run: Tools/script2dumppatreons > Resources/Credits/Patrons.yml        
+
+      - 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>