Merge branch 'ss220-space:master220' into master220

.gitattributes

@@ -35,10 +35,14 @@
 *.png binary
 *.so binary
 
-## Merger hooks, run tools/hooks/install.bat or install.sh to set up
+## Merge hooks, run tools/hooks/install.bat or install.sh to set up
 *.dmm text eol=lf merge=dmm
 *.dmi binary merge=dmi
 
+## TGUI bundle merge drivers
+*.bundle.* binary merge=tgui-merge-bundle
+*.chunk.* binary merge=tgui-merge-bundle
+
 ## Force tab indents on dm files
 *.dm whitespace=indent-with-non-tab
 

.github/PULL_REQUEST_TEMPLATE.md

@@ -2,11 +2,18 @@
 <!-- В Contributing.MD вы можете найти некоторые рекомендации к оформлению пулл-реквеста. -->
 
 ## Описание
+
 <!-- Опишите, что делает ваш ПР. Документировать каждую деталь не требуется, просто укажите основные изменения. -->
 
 ## Ссылка на предложение/Причина создания ПР
+
 <!-- Здесь оставьте ссылку на сообщение в #отчеты-по-предложениям, чтобы подтвердить, что ваше предложение одобрено. Либо укажите, почему этот ПР должен пройти без предложки. -->
 <!-- Пример ссылки: https://discord.com/channels/617003227182792704/755125334097133628/ID-сообщения -->
 
 ## Демонстрация изменений
+
 <!-- Здесь вы можете показать изменения внешне, к примеру новые спрайты, звуки или изменения карты. Или написать, что именно изменилось для игроков. Этот пункт полностью опционален и его можно удалить. -->
+
+## Тесты
+
+<!-- Как вы тестировали свой код. Ревьеюру будет проще, если он будет знать какие действия вы совершали, проверяя свой ПР. -->

.github/workflows/ci.yml

@@ -2,16 +2,16 @@ name: CI
 on:
   push:
     branches:
-    - master220
-    - whitelist220
-    - testmerge
-    - tutorial
-    - dev
+      - master220
+      - whitelist220
+      - testmerge
+      - tutorial
+      - dev
   pull_request:
     branches:
-    - master220
-    - whitelist220
-    - tutorial
+      - master220
+      - whitelist220
+      - tutorial
   merge_group:
   workflow_call:
 
@@ -21,22 +21,40 @@ jobs:
     runs-on: ubuntu-22.04
     steps:
       - uses: actions/checkout@v4
+
       - name: Setup Cache
         uses: actions/cache@v4
         with:
           path: $HOME/SpacemanDMM
           key: ${{ runner.os }}-spacemandmm
+
       - name: Install Tools
         run: |
           bash tools/ci/install_build_deps.sh
           bash tools/ci/install_dreamchecker.sh
+
+      - uses: actions/setup-python@v5
+        with:
+          python-version: '3.11.6'
+          cache: 'pip'
+
+      - uses: actions/setup-node@v4
+        with:
+          node-version: 20
+          cache: 'yarn'
+          cache-dependency-path: ./tgui/yarn.lock
+
+      - name: Install python packages
+        run: pip3 install -r tools/requirements.txt
+
       - name: Run Linters
         run: |
           find . -name "*.json" -not -path "*/node_modules/*" -print0 | xargs -0 python3 ./tools/ci/json_verifier.py
-          tools/ci/build_tgui.sh
+          tgui/bin/tgui --ci
           tools/ci/check_grep.sh
           python3 tools/ci/check_line_endings.py
           python3 tools/ci/unticked_files.py ${GITHUB_WORKSPACE}
+
       - name: Run DreamChecker
         shell: bash
         run: ~/dreamchecker 2>&1 | bash tools/ci/annotate_dm.sh
@@ -64,7 +82,14 @@ jobs:
     strategy:
       fail-fast: false # Let all map tests run to completion
       matrix:
-        maptype: ['/datum/map/cyberiad', '/datum/map/delta', '/datum/map/cerestation']
+        maptype:
+          [
+            '/datum/map/cyberiad',
+            '/datum/map/delta',
+            '/datum/map/cerestation',
+            '/datum/map/celestation',
+            '/datum/map/nova',
+          ]
         byondtype: ['STABLE']
     services:
       mariadb:
@@ -103,4 +128,3 @@ jobs:
           tools/ci/dm.sh -DCIBUILDING paradise.dme
           echo '${{ matrix.maptype }}' > data/next_map.txt
           tools/ci/run_server.sh
-

.github/workflows/deploy.yml

@@ -7,40 +7,40 @@ on:
   workflow_dispatch:
     inputs:
       ci_required:
-        description: "CI Suite is required"
+        description: 'CI Suite is required'
         type: boolean
         required: true
         default: true
       perform_deploy_main:
-        description: "Deploy Paradise Main/Secondary"
+        description: 'Deploy Paradise Main/Secondary'
         type: boolean
         required: true
         default: true
       perform_deploy_vega:
-        description: "Deploy Paradise Vega"
+        description: 'Deploy Paradise Vega'
         type: boolean
         required: true
         default: true
       perform_deploy_cleo:
-        description: "Deploy Paradise Cleo"
+        description: 'Deploy Paradise Cleo'
         type: boolean
         required: true
         default: true
       perform_deploy_prime:
-        description: "Deploy Paradise Prime"
+        description: 'Deploy Paradise Prime'
         type: boolean
         required: true
-        default: true
+        default: false
       perform_deploy_wl:
-        description: "Deploy Paradise WL"
+        description: 'Deploy Paradise WL'
         type: boolean
         required: true
-        default: true
+        default: false
       perform_deploy_tutorial:
-        description: "Deploy Paradise Tutorial"
+        description: 'Deploy Paradise Tutorial'
         type: boolean
         required: true
-        default: true
+        default: false
 
 jobs:
   check:
@@ -120,13 +120,13 @@ jobs:
         name: Create GitHub deployment
         id: deployment
         with:
-          token: "${{ github.token }}"
+          token: '${{ github.token }}'
           environment: ${{ matrix.environment }}
           environment-url: ${{ vars.ENVIRONMENT_URL }}
-          log-url: "${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}"
+          log-url: '${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}'
           ref: ${{ vars.BRANCH }}
           production-environment: true
-          initial-status: "in_progress"
+          initial-status: 'in_progress'
 
       - name: Update and Build Paradise Main
         if: matrix.environment == 'Main' && inputs.perform_deploy_main
@@ -228,22 +228,22 @@ jobs:
           success()
         uses: chrnorm/deployment-status@v2
         with:
-          token: "${{ github.token }}"
+          token: '${{ github.token }}'
           environment-url: ${{ steps.deployment.outputs.environment_url }}
-          log-url: "${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}"
+          log-url: '${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}'
           deployment-id: ${{ steps.deployment.outputs.deployment_id }}
-          state: "success"
+          state: 'success'
 
       - name: Update deployment status (failure)
         if: |
           failure()
         uses: chrnorm/deployment-status@v2
         with:
-          token: "${{ github.token }}"
+          token: '${{ github.token }}'
           environment-url: ${{ steps.deployment.outputs.environment_url }}
-          log-url: "${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}"
+          log-url: '${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}'
           deployment-id: ${{ steps.deployment.outputs.deployment_id }}
-          state: "failure"
+          state: 'failure'
 
   delete-automatic-deployments:
     name: Delete Automatic Deployments

.github/workflows/label_merge_conflicts.yml

@@ -11,7 +11,7 @@ jobs:
   triage:
     runs-on: ubuntu-22.04
     steps:
-      - uses: eps1lon/actions-label-merge-conflict@v2.1.0
+      - uses: eps1lon/actions-label-merge-conflict@v3.0.2
         with:
           dirtyLabel: 'Merge Conflict'
           repoToken: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/label_testmerge_conflicts.yml

@@ -0,0 +1,46 @@
+name: 'Testmerge Conflict Detection'
+
+on:
+  push:
+    branches:
+      - testmerge
+  pull_request_target:
+    types: [ready_for_review, opened, synchronize, reopened]
+
+jobs:
+  triage:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Git checkout
+        uses: actions/checkout@v4
+        with:
+          token: ${{ secrets.GITHUB_TOKEN }}
+          fetch-depth: 0
+          ref: testmerge
+      - name: Check for testmerge conflicts
+        id: check
+        run: |
+          git config --local user.email "action@github.com"
+          git config --local user.name "Testmerge Conflict Detection"
+          git fetch origin pull/${{ github.event.number }}/head:PR${{ github.event.number }}
+          git merge --no-commit --no-ff PR${{ github.event.number }} || true
+          CONFLICTS=$(git ls-files -u | wc -l)
+          if [ "$CONFLICTS" -gt 0 ] ; then
+            echo "There is a merge conflict. Aborting"
+            git merge --abort
+            echo "success=0" >> $GITHUB_OUTPUT
+            exit 0
+          fi
+          echo "success=1" >> $GITHUB_OUTPUT
+      - name: Label PR
+        uses: jburgess/AddRemovePrLabels@v1.0.4
+        if: steps.check.outputs.success == 0
+        with:
+          githubToken: '${{ secrets.GITHUB_TOKEN }}'
+          labelsToAdd: 'Testmerge Conflict'
+      - name: Unlabel PR
+        uses: jburgess/AddRemovePrLabels@v1.0.4
+        if: steps.check.outputs.success == 1
+        with:
+          githubToken: '${{ secrets.GITHUB_TOKEN }}'
+          labelsToRemove: 'Testmerge Conflict'

.github/workflows/pr-conflicts.yml

@@ -0,0 +1,16 @@
+name: Check Potential Conflicts
+
+on:
+  pull_request:
+    branches:
+      - master220
+
+jobs:
+  build:
+    name: potential-conflicts-checker
+    runs-on: ubuntu-latest
+    permissions: write-all
+    steps:
+      - uses: outsideris/potential-conflicts-checker-action@0.1.0
+        with:
+          ghToken: ${{ secrets.GITHUB_TOKEN }}