Merge remote-tracking branch 'upstream/master' into augmentation

.github/PULL_REQUEST_TEMPLATE.md

@@ -22,17 +22,20 @@
 ## Changelog
 
 :cl:
-add: Что-то добавил
-del: Что-то удалил
-tweak: Поменял что-то по мелочи
+add: Изменил геймплей или добавил новую механику
 fix: Что-то починил
-wip: Какие-либо наработки в процессе
-soundadd: Добавил новый звук
-sounddel: Удалил старый звук
-imageadd: Добавил новую картинку
-imagedel: Удалил старую картинку
-spellcheck: Исправил опечатку
-experiment: Добавил экспериментальную функцию
+del: Что-то удалил
+qol: Сделал что-то удобнее
+sound: Добавил, изменил или удалил звук
+image: Добавил, изменил или удалил картинку
+map: Добавил, изменил или удалил что-то на карте
+typo: Исправил опечатку
+code_imp: Незначительно улучшил качество кода
+refactor: Значительно улучшил качество кода
+balance: Сделал правки в балансе
+config: Изменил что-то в конфиге
+admin: Поменял кнопки админам
+server: Изменил что-то серверное, о чем должен знать хост
 /:cl:
 
 <!-- Оба :cl:'а должны быть на месте, что-бы чейнджлог работал! Вы можете написать свой ник справа от первого :cl:, если хотите. Иначе будет использован ваш ник на ГитХабе. -->

.github/alternate_byond_versions.txt

@@ -2,7 +2,11 @@
 # This is useful for making sure we maintain compatibility with both older and newer versions,
 # while still having our main tests run on a guaranteed pinned version.
 
-# Format is version: map
+# Format is "version: map" or "version: map;max_required_client_version"
 # Example:
 # 500.1337: runtimestation
+# 516.1638: runtimestation;516
+# Lowest supported version
 515.1627: runtimestation
+# Beta version
+516.1648: runtimestation;516

.github/guides/STANDARDS.md

@@ -68,8 +68,6 @@ var/path_type = "/obj/item/baseball_bat"
 
 * You are expected to help maintain the code that you add, meaning that if there is a problem then you are likely to be approached in order to fix any issues, runtimes, or bugs.
 
-* Do not divide when you can easily convert it to multiplication. (ie `4/2` should be done as `4*0.5`)
-
 * Separating single lines into more readable blocks is not banned, however you should use it only where it makes new information more accessible, or aids maintainability. We do not have a column limit, and mass conversions will not be received well.
 
 * If you used regex to replace code during development of your code, post the regex in your PR for the benefit of future developers and downstream users.

.github/workflows/auto_changelog.yml

@@ -11,7 +11,7 @@ permissions:
 jobs:
   auto_changelog:
     runs-on: ubuntu-latest
-    if: github.event.pull_request.merged == true
+    if: github.event.pull_request.merged == true && github.head_ref != 'merge-upstream'
     steps:
     - name: Checkout
       uses: actions/checkout@v4

.github/workflows/check_changelog.yml

@@ -0,0 +1,45 @@
+name: Changelog validation
+
+permissions:
+  contents: read
+  pull-requests: write
+  issues: write
+
+on:
+  pull_request_target:
+    types: [opened, reopened, edited, labeled, unlabeled, ready_for_review]
+
+jobs:
+  CheckCL:
+    runs-on: ubuntu-latest
+    if: github.base_ref == 'master' && github.event.pull_request.draft == false
+
+    steps:
+      - id: create_token
+        uses: actions/create-github-app-token@v1
+        with:
+          app-id: ${{ secrets.APP_ID }}
+          private-key: ${{ secrets.PRIVATE_KEY }}
+
+      - run: echo "GH_TOKEN=${{ steps.create_token.outputs.token }}" >> "$GITHUB_ENV"
+
+      - name: Downloading scripts
+        run: |
+          wget https://raw.githubusercontent.com/${{ github.repository }}/${{ github.base_ref }}/tools/changelog/changelog_utils.py
+          wget https://raw.githubusercontent.com/${{ github.repository }}/${{ github.base_ref }}/tools/changelog/check_changelog.py
+          wget https://raw.githubusercontent.com/${{ github.repository }}/${{ github.base_ref }}/tools/changelog/tags.yml
+
+      - name: Installing Python
+        uses: actions/setup-python@61a6322f88396a6271a6ee3565807d608ecaddd1
+        with:
+          python-version: '3.x'
+
+      - name: Installing deps
+        run: |
+          python -m pip install --upgrade pip
+          pip install ruamel.yaml PyGithub
+
+      - name: Changelog validation
+        env:
+          GITHUB_TOKEN: ${{ env.GH_TOKEN }}
+        run: python check_changelog.py

.github/workflows/ci_suite.yml

@@ -37,6 +37,12 @@ jobs:
     timeout-minutes: 5
 
     steps:
+      - uses: actions/checkout@v4
+      - name: Install required packages
+        run: |
+          sudo apt-get update
+          sudo apt-get install -y zlib1g
+      # Your existing steps
       - uses: actions/checkout@v4
       - name: Restore SpacemanDMM cache
         uses: actions/cache@v4
@@ -78,6 +84,10 @@ jobs:
         with:
           path: tools/icon_cutter/cache
           key: ${{ runner.os }}-cutter-${{ hashFiles('dependencies.sh') }}
+      - name: Setup .NET SDK
+        uses: actions/setup-dotnet@v4.2.0
+        with:
+          dotnet-version: 9.x
       - name: Install OpenDream
         uses: robinraju/release-downloader@v1.11
         with:
@@ -187,7 +197,7 @@ jobs:
       - name: Find Alternate Tests
         id: alternate_test_finder
         run: |
-          ALTERNATE_TESTS_JSON=$(jq -nRc '[inputs | capture("^(?<major>[0-9]+)\\.(?<minor>[0-9]+): (?<map>.+)$")]' .github/alternate_byond_versions.txt)
+          ALTERNATE_TESTS_JSON=$(jq -nRc '[inputs | capture("^(?<major>[0-9]+)\\.(?<minor>[0-9]+): (?<map>[^;]+);?(?<max_client_version>[0-9]+)?$")]' .github/alternate_byond_versions.txt)
           echo "alternate_tests=$ALTERNATE_TESTS_JSON" >> $GITHUB_OUTPUT
       - name: Collect byond client version configuration
         id: max_required_byond_client
@@ -223,7 +233,7 @@ jobs:
       map: ${{ matrix.setup.map }}
       major: ${{ matrix.setup.major }}
       minor: ${{ matrix.setup.minor }}
-      max_required_byond_client: ${{needs.collect_data.outputs.max_required_byond_client}}
+      max_required_byond_client: ${{ matrix.setup.max_client_version || needs.collect_data.outputs.max_required_byond_client }}
 
   compare_screenshots:
     if: needs.collect_data.outputs.alternate_tests == '[]' || needs.run_alternate_tests.result == 'success'

.github/workflows/merge_upstream.yml

@@ -0,0 +1,50 @@
+name: Merge Upstream
+
+on:
+  workflow_dispatch:
+
+jobs:
+  merge-upstream:
+    runs-on: ubuntu-latest
+
+    steps:
+      - id: create_token
+        uses: actions/create-github-app-token@v1
+        with:
+          app-id: ${{ secrets.APP_ID }}
+          private-key: ${{ secrets.PRIVATE_KEY }}
+
+      - run: echo "GH_TOKEN=${{ steps.create_token.outputs.token }}" >> "$GITHUB_ENV"
+
+      - name: Set up Python
+        uses: actions/setup-python@v4
+        with:
+          python-version: 3.x
+
+      - name: Install dependencies
+        run: |
+          python -m pip install --upgrade pip
+          pip install PyGithub openai
+
+      - name: Download the script
+        run: |
+          wget https://raw.githubusercontent.com/${{ github.repository }}/${{ github.ref_name }}/tools/changelog/changelog_utils.py
+          wget https://raw.githubusercontent.com/${{ github.repository }}/${{ github.ref_name }}/tools/merge-upstream/merge_upstream.py
+          wget https://raw.githubusercontent.com/${{ github.repository }}/${{ github.ref_name }}/tools/merge-upstream/translation_context.txt
+
+      - name: Run the script
+        env:
+          GITHUB_TOKEN: ${{ env.GH_TOKEN }}
+          TARGET_REPO: 'ss220club/BandaStation'
+          TARGET_BRANCH: 'master'
+          UPSTREAM_REPO: 'tgstation/tgstation'
+          UPSTREAM_BRANCH: 'master'
+          MERGE_BRANCH: 'merge-upstream'
+          CHANGELOG_AUTHOR: 'tgstation'
+          TRANSLATE_CHANGES: 'true'
+          OPENAI_API_KEY: ${{ secrets.ORG_EMPTY_TOKEN }}
+          LOG_LEVEL: ${{ runner.debug && 'DEBUG' || 'INFO' }}
+        run: |
+          git config --global user.email "action@github.com"
+          git config --global user.name "Upstream Sync"
+          python3 -u merge_upstream.py

.github/workflows/run_integration_tests.yml

@@ -31,6 +31,12 @@ jobs:
         options: --health-cmd="mysqladmin ping" --health-interval=10s --health-timeout=5s --health-retries=3
     steps:
       - uses: actions/checkout@v4
+      - name: Install required packages
+        run: |
+          sudo dpkg --add-architecture i386
+          sudo apt-get update
+          sudo apt-get install zlib1g-dev:i386
+      - uses: actions/checkout@v4
       - name: Restore BYOND cache
         uses: actions/cache@v4
         with:

.github/workflows/stale.yml

@@ -22,9 +22,9 @@ jobs:
         stale-pr-message: "This PR has been inactive for long enough to be automatically marked as stale. This means it is at risk of being auto closed in ~ 7 days, please address any outstanding review items and ensure your PR is finished, if these are all true and you are auto-staled anyway, you need to actively ask maintainers if your PR will be merged. Once you have done any of the previous actions then you should request a maintainer remove the stale label on your PR, to reset the stale timer. If you feel no maintainer will respond in that time, you may wish to close this PR youself, while you seek maintainer comment, as you will then be able to reopen the PR yourself"
         days-before-stale: 7
         days-before-close: 7
-        stale-pr-label: 'Stale'
+        stale-pr-label: ':poop: Stale'
         days-before-issue-stale: -1
         stale-issue-label: 'Cleanup Flagged'
         remove-issue-stale-when-updated: false
-        exempt-pr-labels: 'RED LABEL,Good First PR'
+        exempt-pr-labels: ':shield: Stale Exempt,RED LABEL,Good First PR'
         operations-per-run: 300

.vscode/settings.json

@@ -18,27 +18,7 @@
 	"git.branchProtection": ["master"],
 	"gitlens.advanced.blame.customArguments": ["-w"],
 	"tgstationTestExplorer.project.resultsType": "json",
-	"[javascript]": {
-		"editor.rulers": [80],
-		"editor.defaultFormatter": "esbenp.prettier-vscode",
-		"editor.formatOnSave": true
-	},
-	"[javascriptreact]": {
-		"editor.rulers": [80],
-		"editor.defaultFormatter": "esbenp.prettier-vscode",
-		"editor.formatOnSave": true
-	},
-	"[typescript]": {
-		"editor.rulers": [80],
-		"editor.defaultFormatter": "esbenp.prettier-vscode",
-		"editor.formatOnSave": true
-	},
-	"[typescriptreact]": {
-		"editor.rulers": [80],
-		"editor.defaultFormatter": "esbenp.prettier-vscode",
-		"editor.formatOnSave": true
-	},
-	"[scss]": {
+	"[javascript][typescript][typescriptreact][javascriptreact][html][scss][css][json][jsonc][markdown][yaml]": {
 		"editor.rulers": [80],
 		"editor.defaultFormatter": "esbenp.prettier-vscode",
 		"editor.formatOnSave": true

README.md

@@ -1,18 +1,18 @@
-# Добро пожаловать в репозиторий Bandastation по игре Space Station 13
+# Добро пожаловать в репозиторий BandaStation по игре Space Station 13
 
-[![Build Status](https://github.com/ss220club/Bandastation/workflows/CI%20Suite/badge.svg)](https://github.com/ss220club/Bandastation/actions?query=workflow%3A%22CI+Suite%22)
-[![Percentage of issues still open](https://isitmaintained.com/badge/open/ss220club/Bandastation.svg)](https://isitmaintained.com/project/ss220club/Bandastation "Percentage of issues still open")
-[![Average time to resolve an issue](https://isitmaintained.com/badge/resolution/ss220club/Bandastation.svg)](https://isitmaintained.com/project/ss220club/Bandastation "Average time to resolve an issue")
+[![Build Status](https://github.com/ss220club/BandaStation/workflows/CI%20Suite/badge.svg)](https://github.com/ss220club/BandaStation/actions?query=workflow%3A%22CI+Suite%22)
+[![Percentage of issues still open](https://isitmaintained.com/badge/open/ss220club/BandaStation.svg)](https://isitmaintained.com/project/ss220club/BandaStation "Percentage of issues still open")
+[![Average time to resolve an issue](https://isitmaintained.com/badge/resolution/ss220club/BandaStation.svg)](https://isitmaintained.com/project/ss220club/BandaStation "Average time to resolve an issue")
 ![Coverage](https://img.shields.io/badge/coverage---4%25-red.svg)
 
 [![resentment](.github/images/badges/built-with-resentment.svg)](.github/images/comics/131-bug-free.png) [![technical debt](.github/images/badges/contains-technical-debt.svg)](.github/images/comics/106-tech-debt-modified.png) [![forinfinityandbyond](.github/images/badges/made-in-byond.gif)](https://www.reddit.com/r/SS13/comments/5oplxp/what_is_the_main_problem_with_byond_as_an_engine/dclbu1a)
 
 | Website                   | Link                                           |
 |---------------------------|------------------------------------------------|
 | Website                   | [https://ss220.club](https://ss220.club)          |
-| Code                      | [https://github.com/ss220club/Bandastation](https://github.com/ss220club/Bandastation)    |
+| Code                      | [https://github.com/ss220club/BandaStation](https://github.com/ss220club/BandaStation)    |
 | Wiki                      | [https://tg.ss220.club](https://tg.ss220.club)   |
-| Codedocs                  | [https://ss220club.github.io/Bandastation/](https://ss220club.github.io/Bandastation/)       |
+| Codedocs                  | [https://ss220club.github.io/BandaStation/](https://ss220club.github.io/BandaStation/)       |
 | SS220 Discord             | [https://discord.gg/ss220](https://discord.gg/ss220) |
 | Coderbus Discord          | [https://discord.gg/Vh8TJp9](https://discord.gg/Vh8TJp9)               |
 
@@ -44,9 +44,9 @@
 
 ## LICENSE
 
-All code after [commit 333c566b88108de218d882840e61928a9b759d8f on 2014/31/12 at 4:38 PM PST](https://github.com/ss220club/Bandastation/commit/333c566b88108de218d882840e61928a9b759d8f) is licensed under [GNU AGPL v3](https://www.gnu.org/licenses/agpl-3.0.html).
+All code after [commit 333c566b88108de218d882840e61928a9b759d8f on 2014/31/12 at 4:38 PM PST](https://github.com/ss220club/BandaStation/commit/333c566b88108de218d882840e61928a9b759d8f) is licensed under [GNU AGPL v3](https://www.gnu.org/licenses/agpl-3.0.html).
 
-All code before [commit 333c566b88108de218d882840e61928a9b759d8f on 2014/31/12 at 4:38 PM PST](https://github.com/ss220club/Bandastation/commit/333c566b88108de218d882840e61928a9b759d8f) is licensed under [GNU GPL v3](https://www.gnu.org/licenses/gpl-3.0.html).
+All code before [commit 333c566b88108de218d882840e61928a9b759d8f on 2014/31/12 at 4:38 PM PST](https://github.com/ss220club/BandaStation/commit/333c566b88108de218d882840e61928a9b759d8f) is licensed under [GNU GPL v3](https://www.gnu.org/licenses/gpl-3.0.html).
 (Including tools unless their readme specifies otherwise.)
 
 See LICENSE and GPLv3.txt for more details.

_maps/RandomRuins/IceRuins/icemoon_underground_comms_agent.dmm

@@ -993,9 +993,6 @@
 /area/ruin/comms_agent)
 "UI" = (
 /obj/structure/table/reinforced,
-/obj/machinery/computer/records/security/laptop/syndie{
-	dir = 1
-	},
 /obj/item/paper/monitorkey{
 	pixel_x = -15;
 	pixel_y = 7

_maps/RandomRuins/SpaceRuins/bigderelict1.dmm

@@ -584,7 +584,7 @@
 	name = "dried blood trail"
 	},
 /mob/living/basic/creature{
-	desc = "Awh its so sm-OH GOD WHAT THE FUCK.";
+	desc = "Awh, it's so sm-OH GOD, WHAT THE FUCK.";
 	health = 25;
 	maxHealth = 25;
 	name = "hatchling";

_maps/RandomRuins/SpaceRuins/hauntedtradingpost.dmm

@@ -2024,7 +2024,6 @@
 	pixel_x = 5
 	},
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4,
-/obj/structure/cable/layer1,
 /obj/machinery/cell_charger{
 	pixel_y = -7
 	},
@@ -2769,7 +2768,6 @@
 /obj/effect/decal/cleanable/dirt,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4,
 /obj/machinery/duct,
-/obj/structure/cable/layer1,
 /obj/effect/decal/cleanable/dirt,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{
 	pipe_color = "#FF7B00";
@@ -3705,7 +3703,6 @@
 /obj/structure/cable/layer1,
 /obj/structure/sign/poster/contraband/revolver/directional/south,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4,
-/obj/structure/cable/layer1,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{
 	pipe_color = "#FF7B00";
 	color = "#FF7B00"
@@ -5355,7 +5352,6 @@
 /obj/structure/cable/layer1,
 /obj/structure/sign/departments/custodian/directional/south,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4,
-/obj/structure/cable/layer1,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{
 	pipe_color = "#FF7B00";
 	color = "#FF7B00"
@@ -5494,7 +5490,6 @@
 	pixel_y = 12
 	},
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4,
-/obj/structure/cable/layer1,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{
 	pipe_color = "#FF7B00";
 	color = "#FF7B00"