Merge remote-tracking branch 'upstream/master'

Rhials · Oct 11, 2024 · 532bdc1 · 532bdc1
2 parents ccfa269 + 6fa6722
commit 532bdc1
Show file tree

Hide file tree

Showing 342 changed files with 16,042 additions and 5,724 deletions.
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
@@ -22,6 +22,7 @@ balance: rebalanced something
 fix: fixed a few things
 sound: added/modified/removed audio or sound effects
 image: added/modified/removed some icons or images
+map: added/modified/removed map content
 spellcheck: fixed a few typos
 code: changed some code
 refactor: refactored some code

diff --git a/.github/workflows/generate_documentation.yml b/.github/workflows/generate_documentation.yml
@@ -27,7 +27,7 @@ jobs:
           touch dmdoc/.nojekyll
           echo codedocs.tgstation13.org > dmdoc/CNAME
       - name: Deploy
-        uses: JamesIves/[email protected].4
+        uses: JamesIves/[email protected].8
         with:
           branch: gh-pages
           clean: true