Merge branch 'master' into Thanos

.github/dependabot.yml

@@ -0,0 +1,11 @@
+# https://docs.github.com/code-security/dependabot/dependabot-version-updates/configuration-options-for-the-dependabot.yml-file
+version: 2
+updates:
+  - package-ecosystem: github-actions
+    directory: /
+    target-branch: master
+    schedule:
+      interval: daily
+    labels:
+      - GitHub
+    open-pull-requests-limit: 10

.github/workflows/ci_suite.yml

@@ -19,9 +19,17 @@ concurrency:
   cancel-in-progress: true
 
 jobs:
-  run_linters:
+  start_gate:
     if: ( !contains(github.event.head_commit.message, '[ci skip]') )
+    name: Start Gate
+    runs-on: ubuntu-latest
+    steps:
+      - name: Mandatory Empty Step
+        run: exit 0
+
+  run_linters:
     name: Run Linters
+    needs: start_gate
     runs-on: ubuntu-22.04
     timeout-minutes: 5
 
@@ -122,9 +130,8 @@ jobs:
         run: tools/build/build --ci lint tgui-test
 
   compile_all_maps:
-    if: ( !contains(github.event.head_commit.message, '[ci skip]') )
     name: Compile Maps
-    needs: [collect_data]
+    needs: collect_data
     runs-on: ubuntu-22.04
     timeout-minutes: 5
 
@@ -147,8 +154,8 @@ jobs:
           max-required-client-version: ${{needs.collect_data.outputs.max_required_byond_client}}
 
   collect_data:
-    if: ( !contains(github.event.head_commit.message, '[ci skip]') )
     name: Collect data for other tasks
+    needs: start_gate
     runs-on: ubuntu-22.04
     timeout-minutes: 5
     outputs:
@@ -177,9 +184,8 @@ jobs:
           echo "max_required_byond_client=$(grep -Ev '^[[:blank:]]{0,}#{1,}|^[[:blank:]]{0,}$' .github/max_required_byond_client.txt | tail -n1)" >> $GITHUB_OUTPUT
 
   run_all_tests:
-    if: ( !contains(github.event.head_commit.message, '[ci skip]') )
     name: Integration Tests
-    needs: [collect_data]
+    needs: collect_data
 
     strategy:
       fail-fast: false
@@ -192,9 +198,9 @@ jobs:
       max_required_byond_client: ${{needs.collect_data.outputs.max_required_byond_client}}
 
   run_alternate_tests:
-    if: ( !contains(github.event.head_commit.message, '[ci skip]') && needs.collect_data.outputs.alternate_tests != '[]' )
+    if: needs.collect_data.outputs.alternate_tests != '[]'
     name: Alternate Tests
-    needs: [collect_data]
+    needs: collect_data
     strategy:
       fail-fast: false
       matrix:
@@ -207,18 +213,9 @@ jobs:
       minor: ${{ matrix.setup.minor }}
       max_required_byond_client: ${{needs.collect_data.outputs.max_required_byond_client}}
 
-  check_alternate_tests:
-    if: ( !contains(github.event.head_commit.message, '[ci skip]') && needs.collect_data.outputs.alternate_tests != '[]' )
-    name: Check Alternate Tests
-    needs: [run_alternate_tests]
-    runs-on: ubuntu-22.04
-    timeout-minutes: 5
-    steps:
-      - run: echo Alternate tests passed.
-
   compare_screenshots:
-    if: ( !contains(github.event.head_commit.message, '[ci skip]') && (success() || failure()) )
-    needs: [run_all_tests, run_alternate_tests]
+    if: needs.collect_data.outputs.alternate_tests == '[]' || needs.run_alternate_tests.result == 'success'
+    needs: [ collect_data, run_all_tests, run_alternate_tests ]
     name: Compare Screenshot Tests
     timeout-minutes: 15
     runs-on: ubuntu-22.04
@@ -255,7 +252,6 @@ jobs:
           path: artifacts/screenshot_comparisons
 
   test_windows:
-    if: ( !contains(github.event.head_commit.message, '[ci skip]') )
     name: Windows Build
     needs: [collect_data]
     runs-on: windows-latest
@@ -279,3 +275,14 @@ jobs:
         with:
           dmb-location: tgstation.dmb
           max-required-client-version: ${{needs.collect_data.outputs.max_required_byond_client}}
+
+  completion_gate: # Serves as a non-moving target for branch rulesets
+    if: always() && !cancelled()
+    name: Completion Gate
+    needs: [ test_windows, compare_screenshots, compile_all_maps, run_linters ]
+    runs-on: ubuntu-latest
+    steps:
+      - name: Decide whether the needed jobs succeeded or failed
+        uses: re-actors/alls-green@release/v1
+        with:
+          jobs: ${{ toJSON(needs) }}

.github/workflows/update_tgs_dmapi.yml

@@ -21,6 +21,7 @@ jobs:
 
     - name: Apply DMAPI update
       uses: tgstation/tgs-dmapi-updater@v2
+      id: dmapi-update
       with:
         header-path: 'code/__DEFINES/tgs.dm'
         library-path: 'code/modules/tgs'
@@ -41,7 +42,7 @@ jobs:
         source_branch: "tgs-dmapi-update"
         destination_branch: "master"
         pr_title: "Automatic TGS DMAPI Update"
-        pr_body: "This pull request updates the TGS DMAPI to the latest version. Please note any changes that may be breaking or unimplemented in your codebase by checking what changes are in the definitions file: code/__DEFINES/tgs.dm before merging."
+        pr_body: "This pull request updates the TGS DMAPI to the latest version. Please note any changes that may be breaking or unimplemented in your codebase by checking what changes are in the definitions file: code/__DEFINES/tgs.dm before merging.\n\n${{ steps.dmapi-update.outputs.release-notes }}"
         pr_label: "Tools"
         pr_allow_empty: false
         github_token: ${{ secrets.COMFY_ORANGE_PAT || secrets.GITHUB_TOKEN }}

_maps/RandomRuins/LavaRuins/lavaland_surface_seed_vault.dmm

@@ -452,7 +452,7 @@
 	dir = 8
 	},
 /obj/structure/table/reinforced,
-/obj/item/botanical_lexicon,
+/obj/item/book/manual/botanical_lexicon,
 /turf/open/floor/mineral/plastitanium,
 /area/ruin/powered/seedvault)
 "bj" = (