Merge branch 'master' into auxmos-update

Signed-off-by: Mark Suckerberg <[email protected]>
shiptest-ss13 · Dec 13, 2023 · fc3a341 · fc3a341
2 parents 23d95b8 + 59d2a08
commit fc3a341
Show file tree

Hide file tree

Showing 207 changed files with 6,131 additions and 8,781 deletions.
diff --git a/.github/workflows/ci_suite.yml b/.github/workflows/ci_suite.yml
@@ -105,7 +105,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
@@ -79,8 +83,7 @@ jobs:
       - name: Compile Tests
         run: |
           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/RandomRuins/JungleRuins/jungle_bombed_starport.dmm b/_maps/RandomRuins/JungleRuins/jungle_bombed_starport.dmm
@@ -5624,8 +5624,8 @@
 /area/overmap_encounter/planetoid/jungle/explored)
 "LM" = (
 /obj/structure/closet,
-/obj/item/clothing/suit/aclf,
-/obj/item/clothing/under/syndicate/aclf,
+/obj/item/clothing/suit/gorlex,
+/obj/item/clothing/under/syndicate/officer,
 /obj/item/gun/ballistic/automatic/pistol,
 /obj/item/ammo_box/magazine/m10mm,
 /obj/item/ammo_box/magazine/m10mm,
@@ -7308,8 +7308,8 @@
 "XC" = (
 /obj/effect/decal/remains/human,
 /obj/effect/decal/cleanable/vomit/old,
-/obj/item/clothing/under/syndicate/aclf,
-/obj/item/clothing/suit/aclf,
+/obj/item/clothing/under/syndicate/officer,
+/obj/item/clothing/suit/gorlex,
 /obj/item/clothing/shoes/combat,
 /turf/open/floor/mineral/plastitanium,
 /area/ruin/jungle/starport/tower)