Merge branch 'master' into guncrafting

Signed-off-by: FalloutFalcon <[email protected]>
shiptest-ss13 · Feb 5, 2024 · 67db4f3 · 67db4f3
2 parents 422ddb1 + f77d063
commit 67db4f3
Show file tree

Hide file tree

Showing 789 changed files with 73,021 additions and 105,472 deletions.
diff --git a/.github/labeler.yml b/.github/labeler.yml
@@ -1,49 +1,67 @@
 Admin:
-  - "code/modules/admin/**"
+  - any-glob-to-any-file:
+    - "code/modules/admin/**"
 
 # Any file within the config subfolder
 Config:
-  - "config/**"
+- changed-files:
+  - any-glob-to-any-file:
+    - "config/**"
 
 Dependencies:
-  - "**/package.json"
-  - "**/package-lock.json"
-  - "**/yarn.lock"
+- changed-files:
+  - any-glob-to-any-file:
+    - "**/package.json"
+    - "**/package-lock.json"
+    - "**/yarn.lock"
 
 # When the .DME is changed
 DME Edit:
-  - "./*.dme"
-  - "**/*.dme"
+- changed-files:
+  - any-glob-to-any-file:
+    - "./*.dme"
+    - "**/*.dme"
 
 # Any .dmi changes
 Sprites:
-  - "**/*.dmi"
+- changed-files:
+  - any-glob-to-any-file:
+    - "**/*.dmi"
 
 # Changes to a .dm or anything in the code subfolder
 Code Change:
-  - "**/*.dm"
-  - "code/**"
+- changed-files:
+  - any-glob-to-any-file:
+    - "**/*.dm"
+    - "code/**"
 
 # Changes to a .dmm or anything in the _map subfolder
 Map Change:
-  - "**/*.dmm"
-  - "_maps/**"
+- changed-files:
+  - any-glob-to-any-file:
+    - "**/*.dmm"
+    - "_maps/**"
 
 # Any changes to .ogg files are marked as sound
 Sound:
-  - "**/*.ogg"
+- changed-files:
+  - any-glob-to-any-file:
+    - "**/*.ogg"
 
 # Changes to the SQL subfolder
 SQL:
-  - "SQL/**"
+- changed-files:
+  - any-glob-to-any-file:
+    - "SQL/**"
 
 # Changes to the tgui subfolder
 tgui:
-  - "tgui/**"
+- changed-files:
+  - any-glob-to-any-file:
+    - "tgui/**"
 
 # Changes to the .Github subfolder
 Github:
-  - ".github/**"
-
-Deprecated Modularization:
-  - "whitesands/**"
+- changed-files:
+  - any-glob-to-any-file:
+    - ".github/**"
diff --git a/.github/workflows/autowiki.yml b/.github/workflows/autowiki.yml
@@ -33,7 +33,7 @@ jobs:
       run: |
         sudo dpkg --add-architecture i386
         sudo apt update || true
-        sudo apt install -o APT::Immediate-Configure=false libssl1.1:i386
+        sudo apt install -o APT::Immediate-Configure=false libssl-dev:i386
         bash tools/ci/install_rust_g.sh
     - name: Install auxmos
       if: steps.secrets_set.outputs.SECRETS_ENABLED

diff --git a/.github/workflows/ci_suite.yml b/.github/workflows/ci_suite.yml
@@ -13,7 +13,7 @@ jobs:
   run_linters:
     if: "!contains(github.event.head_commit.message, '[ci skip]')"
     name: Run Linters
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     steps:
       - uses: actions/checkout@v3
         with:
@@ -39,9 +39,11 @@ jobs:
           bash tools/ci/install_node.sh
           bash tools/ci/install_byond.sh
           bash tools/ci/install_spaceman_dmm.sh dreamchecker
+          cargo install ripgrep --features pcre2
           tools/bootstrap/python -c ''
       - name: Run Linters
         run: |
+          tools/bootstrap/python -m tools.maplint.source --github
           tools/build/build --ci lint tgui-test
           bash tools/ci/check_filedirs.sh shiptest.dme
           bash tools/ci/check_changelogs.sh
@@ -94,7 +96,19 @@ jobs:
   run_all_tests:
     if: "!contains(github.event.head_commit.message, '[ci skip]')"
     name: Integration Tests
+    strategy:
+      fail-fast: true
+      matrix:
+        arg: [
+          "BASIC_TESTS",
+          "CREATE_AND_DESTROY_TEST",
+          "PLANET_GEN_TEST",
+          "RUIN_PLACEMENT_TEST",
+          "SHIP_PLACEMENT_TEST"
+        ]
     uses: ./.github/workflows/run_integration_tests.yml
+    with:
+      arg: ${{ matrix.arg }}
 
 #  run_alternate_tests:
 #    if: "!contains(github.event.head_commit.message, '[ci skip]')"

diff --git a/.github/workflows/labeler.yml b/.github/workflows/labeler.yml
@@ -18,7 +18,7 @@ jobs:
           commentOnDirty: "This pull request has conflicts, please resolve those before we can evaluate the pull request."
       - name: Apply labels based on changed files
         if: github.event_name != 'push'
-        uses: actions/labeler@main
+        uses: actions/labeler@v5
         with:
           repo-token: "${{ secrets.GITHUB_TOKEN }}"
           sync-labels: true

diff --git a/.github/workflows/run_integration_tests.yml b/.github/workflows/run_integration_tests.yml
@@ -10,6 +10,10 @@ on:
       minor:
         required: false
         type: string
+      arg:
+        required: false
+        default: ALL_TESTS
+        type: string
 jobs:
   run_integration_tests:
     runs-on: ubuntu-latest
@@ -54,7 +58,7 @@ jobs:
         run: |
           bash tools/ci/install_byond.sh
           source $HOME/BYOND/byond/bin/byondsetup
-          tools/build/build --ci dm -DCIBUILDING -DANSICOLORS
+          tools/build/build --ci dm -DCIBUILDING -DANSICOLORS -D${{ inputs.arg }}
       - name: Run Tests
         run: |
           source $HOME/BYOND/byond/bin/byondsetup

diff --git a/.github/workflows/tgs_test.yml b/.github/workflows/tgs_test.yml
@@ -35,7 +35,7 @@ env:
   PR_NUMBER: ${{ github.event.number }}
 jobs:
   test_tgs_docker:
-    if: "!contains(github.event.head_commit.message, '[ci skip]')"
+    if: ( !contains(github.event.head_commit.message, '[ci skip]') )
     name: Test TGS Docker
     runs-on: ubuntu-22.04
     concurrency:
@@ -47,7 +47,7 @@ jobs:
         env:
           Database__DatabaseType: Sqlite
           Database__ConnectionString: Data Source=TGS_TGTest.sqlite3;Mode=ReadWriteCreate
-          General__ConfigVersion: 4.1.0
+          General__ConfigVersion: 5.0.0
           General__ApiPort: ${{ env.TGS_API_PORT }}
           General__SetupWizardMode: Never
         ports:
@@ -56,7 +56,7 @@ jobs:
       - name: Setup dotnet
         uses: actions/setup-dotnet@v2
         with:
-          dotnet-version: 7.0.x
+          dotnet-version: 8.0.x
 
       - name: Checkout Repository
         uses: actions/checkout@v3

diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -17,14 +17,14 @@
 		"**/.pnp.*": true
 	},
 	"editor.codeActionsOnSave": {
-		"source.fixAll.eslint": true
+		"source.fixAll.eslint": "explicit"
 	},
 	"files.insertFinalNewline": true,
 	"gitlens.advanced.blame.customArguments": ["-w"],
 	"tgstationTestExplorer.project.resultsType": "json",
 	"[python]": {
 		"gitlens.codeLens.symbolScopes": ["!Module"],
-		"editor.wordBasedSuggestions": false,
+		"editor.wordBasedSuggestions": "off",
 		"editor.insertSpaces": true,
 		"editor.tabSize": 4
 	},

diff --git a/_maps/RandomRuins/BeachRuins/beach_ancient_ruin.dmm b/_maps/RandomRuins/BeachRuins/beach_ancient_ruin.dmm
@@ -2657,17 +2657,6 @@
 	light_range = 2
 	},
 /area/ruin/beach/complex)
-"Py" = (
-/obj/structure/window/reinforced/fulltile,
-/obj/structure/grille,
-/obj/structure/cable{
-	icon_state = "0-8"
-	},
-/obj/structure/cable{
-	icon_state = "0-8"
-	},
-/turf/open/floor/plating,
-/area/ruin/beach/complex/wall)
 "PD" = (
 /obj/structure/cable{
 	icon_state = "4-8"
@@ -4857,7 +4846,7 @@ lS
 lS
 lS
 Lt
-Py
+nt
 lS
 lS
 lS

diff --git a/_maps/RandomRuins/BeachRuins/beach_crashed_engineer.dmm b/_maps/RandomRuins/BeachRuins/beach_crashed_engineer.dmm
@@ -663,9 +663,6 @@
 /turf/open/water/beach,
 /area/overmap_encounter/planetoid/beachplanet/explored)
 "BF" = (
-/obj/structure/cable{
-	icon_state = "4-8"
-	},
 /obj/structure/cable{
 	icon_state = "4-8"
 	},

diff --git a/_maps/RandomRuins/BeachRuins/beach_ocean_town.dmm b/_maps/RandomRuins/BeachRuins/beach_ocean_town.dmm
@@ -2871,7 +2871,6 @@
 /area/overmap_encounter/planetoid/beachplanet/explored)
 "Ip" = (
 /obj/structure/table,
-/obj/structure/table,
 /obj/structure/window,
 /obj/structure/window{
 	dir = 4