Merge branch 'master' into lexi's-branch

PolarisSS13 · Oct 17, 2023 · 9125bed · 9125bed
2 parents 46084ce + 7bde482
commit 9125bed
Show file tree

Hide file tree

Showing 103 changed files with 491 additions and 12,672 deletions.
diff --git a/.github/workflows/autochangelog.yml b/.github/workflows/autochangelog.yml
@@ -36,7 +36,7 @@ jobs:
           python tools/GenerateChangelog/ss13_genchangelog.py \
             html/changelog.html \
             html/changelogs
-      - uses: stefanzweifel/git-auto-commit-action@v4
+      - uses: stefanzweifel/git-auto-commit-action@v5
         with:
           commit_message: Automatic changelog generation for ${{ github.events.pull_request.number }}
           branch: ${{ github.events.pull_request.base }}

diff --git a/bot/CORE_DATA.py b/bot/CORE_DATA.py
diff --git a/bot/C_eightball.py b/bot/C_eightball.py
diff --git a/bot/C_heaortai.py b/bot/C_heaortai.py
diff --git a/bot/C_makequote.py b/bot/C_makequote.py
diff --git a/bot/C_maths.py b/bot/C_maths.py
diff --git a/bot/C_rot13.py b/bot/C_rot13.py
diff --git a/bot/C_rtd.py b/bot/C_rtd.py
diff --git a/bot/C_sarcasticball.py b/bot/C_sarcasticball.py
diff --git a/bot/C_srtd.py b/bot/C_srtd.py