Merge branch 'master' into tajaran

.github/CODEOWNERS

@@ -59,7 +59,7 @@
 /code/controllers/master.dm @LemonInTheDark
 /code/controllers/subsystem.dm @LemonInTheDark
 /code/controllers/subsystem/air.dm @LemonInTheDark
-/code/controllers/subsystem/timer.dm @MrStonedOne
+/code/controllers/subsystem/timer.dm @LemonInTheDark
 
 # Mothblocks
 
@@ -182,6 +182,10 @@
 /code/modules/atmospherics/ @Pickle-Coding
 /code/modules/power/ @Pickle-Coding
 
+# Sadboysuss
+
+/sound/ @Sadboysuss
+
 # MULTIPLE OWNERS
 
 /SQL/ @Jordie0608 @scriptis

.github/actions/restore_or_install_byond/action.yml

@@ -1,4 +1,4 @@
-# This is a reusable workflow to restore BYOND from a cache, or to install it otherwise.
+# This action attempts to restore BYOND from a cache, or to install it otherwise.
 name: Restore or Install BYOND
 description: Attempts to restore a specified BYOND version from cache; if it can't, it installs it.
 

.github/actions/setup_node/action.yml

@@ -0,0 +1,26 @@
+# This action is a wrapper around `actions/setup-node`, to use the version specified in
+# `dependencies.sh`.
+name: Setup Node
+description: Install Node using the version specified in `dependencies.sh`; additionally, restores the Yarn cache if one exists
+
+inputs:
+  restore-yarn-cache:
+    description: 'If `true`, restores the Yarn cache alongside installing node.'
+    required: false
+    type: boolean
+    default: false
+
+runs:
+  using: composite
+  steps:
+    - name: Configure Node version
+      shell: bash
+      run: |
+        source dependencies.sh
+        echo "NODE_VERSION_REQUIRED=$NODE_VERSION_LTS" >> $GITHUB_ENV
+    - name: Install Node
+      uses: actions/setup-node@v4
+      with:
+        node-version: ${{ env.NODE_VERSION_REQUIRED }}
+        cache: ${{ fromJSON(inputs.restore-yarn-cache) && 'yarn' || '' }}
+        cache-dependency-path: ${{ fromJSON(inputs.restore-yarn-cache) && 'tgui/yarn.lock' || '' }}

.github/labeler.yml

@@ -53,7 +53,7 @@
     - head-branch: 'merge-upstream'
 
 ':pencil: Перевод':
-  - base-branch: 'translate'
+  - head-branch: ['^translate', 'translate', '^translation', 'translation']
 
 ':wrench: Фикс':
   - head-branch: ['^fix', 'fix']

.github/workflows/ci_suite.yml

@@ -3,19 +3,16 @@ on:
   push:
     branches:
     - master
-    - translate
     - 'project/**'
     - 'gh-readonly-queue/master/**'
     - 'gh-readonly-queue/project/**'
   pull_request:
     branches:
     - master
-    - translate
     - 'project/**'
   merge_group:
     branches:
     - master
-    - translate
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}
@@ -51,20 +48,10 @@ jobs:
           key: ${{ runner.os }}-spacemandmm-${{ hashFiles('dependencies.sh') }}
           restore-keys: |
             ${{ runner.os }}-spacemandmm-
-      - name: Restore Yarn cache
-        uses: actions/cache@v4
-        with:
-          path: tgui/.yarn/cache
-          key: ${{ runner.os }}-yarn-${{ hashFiles('tgui/yarn.lock') }}
-          restore-keys: |
-            ${{ runner.os }}-yarn-
-      - name: Restore Node cache
-        uses: actions/cache@v4
+      - name: Setup Node
+        uses: ./.github/actions/setup_node
         with:
-          path: ~/.nvm
-          key: ${{ runner.os }}-node-${{ hashFiles('dependencies.sh') }}
-          restore-keys: |
-            ${{ runner.os }}-node-
+          restore-yarn-cache: true
       - name: Restore Bootstrap cache
         uses: actions/cache@v4
         with:
@@ -98,7 +85,6 @@ jobs:
       - name: Install Tools
         run: |
           pip3 install setuptools
-          bash tools/ci/install_node.sh
           bash tools/ci/install_spaceman_dmm.sh dreamchecker
           bash tools/ci/install_ripgrep.sh
           tools/bootstrap/python -c ''
@@ -159,6 +145,8 @@ jobs:
 
     steps:
       - uses: actions/checkout@v4
+      - name: Setup Node
+        uses: ./.github/actions/setup_node
       - name: Restore BYOND from Cache
         uses: ./.github/actions/restore_or_install_byond
       - name: Compile All Maps
@@ -268,13 +256,10 @@ jobs:
 
     steps:
       - uses: actions/checkout@v4
-      - name: Restore Yarn cache
-        uses: actions/cache@v4
+      - name: Setup Node
+        uses: ./.github/actions/setup_node
         with:
-          path: tgui/.yarn/cache
-          key: ${{ runner.os }}-yarn-${{ hashFiles('tgui/yarn.lock') }}
-          restore-keys: |
-            ${{ runner.os }}-yarn-
+          restore-yarn-cache: true
       - name: Compile
         run: pwsh tools/ci/build.ps1
         env:

.github/workflows/run_integration_tests.yml

@@ -50,6 +50,8 @@ jobs:
           mysql -u root -proot tg_ci < SQL/tgstation_schema.sql
           mysql -u root -proot -e 'CREATE DATABASE tg_ci_prefixed;'
           mysql -u root -proot tg_ci_prefixed < SQL/tgstation_schema_prefixed.sql
+      - name: Setup Node
+        uses: ./.github/actions/setup_node
       - name: Install rust-g
         run: |
           bash tools/ci/install_rust_g.sh
@@ -67,6 +69,7 @@ jobs:
           source $HOME/BYOND/byond/bin/byondsetup
           tools/build/build --ci dm -DCIBUILDING -DANSICOLORS -Werror -ITG0001 -I"loop_checks"
       - name: Run Tests
+        id: run_tests
         run: |
           source $HOME/BYOND/byond/bin/byondsetup
           bash tools/ci/run_server.sh ${{ inputs.map }}
@@ -77,6 +80,29 @@ jobs:
           name: test_artifacts_${{ inputs.map }}_${{ inputs.major }}_${{ inputs.minor }}
           path: data/screenshots_new/
           retention-days: 1
+      - name: On test fail, write a step summary
+        if: always() && steps.run_tests.outcome == 'failure'
+        run: |
+          # Get a JSON array of failed unit tests
+          FAILED_UNIT_TESTS=$(jq 'to_entries | map(.value | select(.status == 1))' data/unit_tests.json)
+
+          FAIL_COUNT=$(echo $FAILED_UNIT_TESTS | jq 'length')
+
+          echo "# Test failures" >> $GITHUB_STEP_SUMMARY
+          echo "$FAIL_COUNT tests failed." >> $GITHUB_STEP_SUMMARY
+          echo "" >> $GITHUB_STEP_SUMMARY
+
+          for i in $( seq $FAIL_COUNT ); do
+            CURRENT_FAIL=$(echo $FAILED_UNIT_TESTS | jq --arg i $i '.[($i | tonumber) - 1]')
+
+            TEST=$(echo $CURRENT_FAIL | jq --raw-output '.name')
+
+            echo "### $TEST" >> $GITHUB_STEP_SUMMARY
+            echo '```' >> $GITHUB_STEP_SUMMARY
+            echo $CURRENT_FAIL | jq --raw-output '.message' >> $GITHUB_STEP_SUMMARY
+            echo '```' >> $GITHUB_STEP_SUMMARY
+            echo "" >> $GITHUB_STEP_SUMMARY
+          done
       - name: Check client Compatibility
         if: always() && steps.compile_tests.outcome == 'success'
         uses: tgstation/byond-client-compatibility-check@v3

.vscode/extensions.json

@@ -7,6 +7,8 @@
 		"stylemistake.auto-comment-blocks",
 		"Donkie.vscode-tgstation-test-adapter",
 		"anturk.dmi-editor",
-		"esbenp.prettier-vscode"
+		"esbenp.prettier-vscode",
+		"emilast.LogFileHighlighter",
+		"earshinov.filter-lines"
 	]
 }

.vscode/settings.json

@@ -26,5 +26,63 @@
 	"workbench.editorAssociations": {
 		"*.dmi": "dmiEditor.dmiEditor"
 	},
-	"Lua.diagnostics.enable": false
+	"Lua.diagnostics.enable": false,
+	"logFileHighlighter.customPatterns": [
+		{
+			"pattern": "(GAME: )?(RUNTIME|DYNAMIC: FAIL|SUSPICIOUS_LOGINS|ADMINPRIVATE): .+?(?=\n(\\[|$))",
+			"patternFlags": "s",
+			"foreground": "#FF0000",
+			"fontStyle": "bold"
+		},
+		{
+			"pattern": "(GAME: )?(RUNTIME|DYNAMIC: FAIL): .+?(?=\n(\\[|$))",
+			"patternFlags": "s",
+			"background": "#550000"
+		},
+		{
+			"pattern": "(GAME: )?ADMIN(: (Announce|PRIVATE|PRIVATE-ASAY|PRIVATE: PM)?)?: .+?(?=\n(\\[|$))",
+			"patternFlags": "s",
+			"foreground": "#FF8000"
+		},
+		{
+			"pattern": "(GAME: )?GAME-ACCESS(: (Login|Logout|Mob Login)?): .+?(?=\n(\\[|$))",
+			"patternFlags": "s",
+			"foreground": "#FFB84D"
+		},
+		{
+			"pattern": "(GAME: )?(DEBUG-(MAPPING|MOBTAG: TAG)|CAVE-GENERATION|CONFIG|ECONOMY|Station Trait): .+?(?=\n(\\[|$))",
+			"patternFlags": "s",
+			"foreground": "#FFD700"
+		},
+		{
+			"pattern": "(GAME: )?(HREF-TGUI|HREF|MANIFEST|MECHA|PAPER|PDA): .+?(?=\n(\\[|$))",
+			"patternFlags": "s",
+			"foreground": "#0099CC"
+		},
+		{
+			"pattern": "(GAME: )?(SHUTTLE|SIGNAL|SILICON(: (CYBORG|LAW)?)?|SILO|TRANSPORT(: (PE8VN|Sub|TC|VkLiD)?)?|TOOL|TELECOMMS): .+?(?=\n(\\[|$))",
+			"patternFlags": "s",
+			"foreground": "#14A833"
+		},
+		{
+			"pattern": "(GAME: )?(UPLINK(-CHANGELING|-HERETIC)?|SPEECH-INDICIATOR|ATTACK): .+?(?=\n(\\[|$))",
+			"patternFlags": "s",
+			"foreground": "#AC2EA1"
+		},
+		{
+			"pattern": "(GAME: )?(RU_NAMES_SUGGEST|VIRUS|TARGET-ZONE-SWITCH): .+?(?=\n(\\[|$))",
+			"patternFlags": "s",
+			"foreground": "#A8732B"
+		},
+		{
+			"pattern": "(GAME: )?GAME-OOC: .+?(?=\n(\\[|$))",
+			"patternFlags": "s",
+			"foreground": "#8888DD"
+		},
+		{
+			"pattern": "GAME:(?! [\\w-]+:).+?(?=\n(\\[|$))",
+			"patternFlags": "s",
+			"foreground": "#666666"
+		}
+	]
 }