Merge remote-tracking branch 'upstream/master' into upstream-sync-202…

…31212
Starfly-13 · Dec 13, 2023 · eac9af4 · eac9af4
2 parents 5ff3a49 + b917f4d
commit eac9af4
Show file tree

Hide file tree

Showing 109 changed files with 2,741 additions and 991 deletions.
diff --git a/.github/workflows/ci_suite.yml b/.github/workflows/ci_suite.yml
@@ -94,7 +94,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/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/_maps/configs/independent_rigger.json b/_maps/configs/independent_rigger.json
@@ -18,7 +18,7 @@
 	],
 	"map_path": "_maps/shuttles/independent/independent_rigger.dmm",
 	"roundstart": true,
-	"limit": 2,
+	"limit": 1,
 	"job_slots": {
 		"Captain": {
 			"outfit": "/datum/outfit/job/captain/western",