Merge remote-tracking branch 'upstream/master'

.github/workflows/ci.yml

@@ -8,31 +8,58 @@ env:
   BASENAME: "vorestation"
 
 jobs:
-  file_tests:
+
+  run_linters:
     name: Run Linters
     runs-on: ubuntu-20.04
+
     steps:
       - uses: actions/checkout@v4
-      - name: Ensure +x on CI directory
-        run: |
-          chmod -R +x ./tools/ci
-      - name: Install Tools
-        run: |
-          bash tools/ci/install_build_deps.sh
+      # Caches
       - name: Restore Yarn cache
-        if: "${{ contains(github.event.pull_request.labels.*.name, 'Type: TGUI Bundle') }}"
         uses: actions/cache@v4
         with:
           path: tgui/.yarn/cache
-          key: ${{ runner.os }}-yarn-${{ secrets.CACHE_PURGE_KEY }}-${{ hashFiles('tgui/yarn.lock') }}
+          key: ${{ runner.os }}-yarn-${{ hashFiles('tgui/yarn.lock') }}
+          restore-keys: |
+            ${{ runner.os }}-yarn-
+      - name: Restore Node cache
+        uses: actions/cache@v4
+        with:
+          path: ~/.nvm
+          key: ${{ runner.os }}-node-${{ hashFiles('dependencies.sh') }}
           restore-keys: |
-            ${{ runner.os }}-build-${{ secrets.CACHE_PURGE_KEY }}-
-            ${{ runner.os }}-build-
-            ${{ runner.os }}-
-      - name: Run Tests
+            ${{ runner.os }}-node-
+      - name: Restore Bootstrap cache
+        uses: actions/cache@v4
+        with:
+          path: tools/bootstrap/.cache
+          key: ${{ runner.os }}-bootstrap-${{ hashFiles('tools/requirements.txt') }}
+          restore-keys: |
+            ${{ runner.os }}-bootstrap-
+      - name: Restore Rust cache
+        uses: actions/cache@v4
+        with:
+          path: ~/.cargo
+          key: ${{ runner.os }}-rust-${{ hashFiles('tools/ci/ci_dependencies.sh')}}
+          restore-keys: |
+            ${{ runner.os }}-rust-
+      - name: Restore Cutter cache
+        uses: actions/cache@v4
+        with:
+          path: tools/icon_cutter/cache
+          key: ${{ runner.os }}-cutter-${{ hashFiles('dependencies.sh') }}
+      # End Caches
+      - name: Install Tools
         run: |
-          tools/ci/validate_files.sh
-          tools/ci/build_tgui.sh
+          pip3 install setuptools
+          bash tools/ci/install_node.sh
+          bash tools/ci/install_ripgrep.sh
+          tools/bootstrap/python -c ''
+      - name: Run Grep Checks
+        run: tools/ci/validate_files.sh
+      - name: Run TGUI Checks
+        run: tools/build/build --ci lint tgui-test
 
   dreamchecker:
     name: DreamChecker
@@ -68,7 +95,7 @@ jobs:
         map: ['tether', 'stellar_delight', 'groundbase']
     # name: Integration Tests (${{ matrix.map }})
     name: Integration Tests
-    # needs: ['file_tests', 'dreamchecker']
+    # needs: ['run_linters', 'dreamchecker']
     runs-on: ubuntu-20.04
     steps:
       - uses: actions/checkout@v4
@@ -119,7 +146,7 @@ jobs:
 
   tests_successful:
     name: Integration Tests
-    needs: ['file_tests', 'dreamchecker', 'unit_tests']
+    needs: ['run_linters', 'dreamchecker', 'unit_tests']
     runs-on: ubuntu-20.04
     steps:
       - name: Report Success

.gitignore

@@ -31,3 +31,6 @@ temp.dmi
 
 node_modules/
 package-lock.json
+
+# CBT Things
+.cache

.vscode/launch.json

@@ -4,13 +4,59 @@
     // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
     "version": "0.2.0",
     "configurations": [
-        {
-            "type": "byond",
-            "request": "launch",
-            "name": "Launch DreamDaemon",
-            "preLaunchTask": "dm: build - ${command:CurrentDME}",
-            "dmb": "${workspaceFolder}/${command:CurrentDMB}",
-            "dreamDaemon": true
-        }
+		{
+			"type": "byond",
+			"request": "launch",
+			"name": "Launch DreamSeeker",
+			"preLaunchTask": "Build All",
+			"dmb": "${workspaceFolder}/${command:CurrentDMB}"
+		},
+		{
+			"type": "byond",
+			"request": "launch",
+			"name": "Launch DreamSeeker (low memory mode)",
+			"preLaunchTask": "Build All (low memory mode)",
+			"dmb": "${workspaceFolder}/${command:CurrentDMB}"
+		},
+		{
+			"type": "byond",
+			"request": "launch",
+			"name": "Launch DreamDaemon",
+			"preLaunchTask": "Build All",
+			"dmb": "${workspaceFolder}/${command:CurrentDMB}",
+			"dreamDaemon": true
+		},
+		{
+			"type": "byond",
+			"request": "launch",
+			"name": "Launch DreamDaemon (low memory mode)",
+			"preLaunchTask": "Build All (low memory mode)",
+			"dmb": "${workspaceFolder}/${command:CurrentDMB}",
+			"dreamDaemon": true
+		},
+		{
+			"name": "Debug External Libraries",
+			"type": "cppvsdbg",
+			"request": "launch",
+			"program": "${command:dreammaker.returnDreamDaemonPath}",
+			"cwd": "${workspaceRoot}",
+			"args": [
+				"${command:dreammaker.getFilenameDmb}",
+				"-trusted"
+			],
+			"preLaunchTask": "Build All"
+		},
+		{
+			"name": "Debug External Libraries (low memory mode)",
+			"type": "cppvsdbg",
+			"request": "launch",
+			"program": "${command:dreammaker.returnDreamDaemonPath}",
+			"cwd": "${workspaceRoot}",
+			"args": [
+				"${command:dreammaker.getFilenameDmb}",
+				"-trusted"
+			],
+			"preLaunchTask": "Build All (low memory mode)"
+		}
     ]
-}
+}

.vscode/tasks.json

@@ -1,6 +1,53 @@
 {
 	"version": "2.0.0",
 	"tasks": [
+		{
+			"type": "process",
+			"command": "tools/build/build",
+			"windows": {
+				"command": ".\\tools\\build\\build.bat"
+			},
+			"options": {
+				"env": {
+					"DM_EXE": "${config:dreammaker.byondPath}"
+				}
+			},
+			"problemMatcher": [
+				"$dreammaker",
+				"$tsc",
+				"$eslint-stylish"
+			],
+			"group": {
+				"kind": "build",
+				"isDefault": true
+			},
+			"dependsOn": "dm: reparse",
+			"label": "Build All"
+		},
+		{
+			"type": "process",
+			"command": "tools/build/build",
+			"args": ["-DLOWMEMORYMODE"],
+			"windows": {
+				"command": ".\\tools\\build\\build.bat",
+				"args": ["-DLOWMEMORYMODE"]
+			},
+			"options": {
+				"env": {
+					"DM_EXE": "${config:dreammaker.byondPath}"
+				}
+			},
+			"problemMatcher": [
+				"$dreammaker",
+				"$tsc",
+				"$eslint-stylish"
+			],
+			"group": {
+				"kind": "build"
+			},
+			"dependsOn": "dm: reparse",
+			"label": "Build All (low memory mode)"
+		},
 		{
 			"type": "dreammaker",
 			"dme": "vorestation.dme",
@@ -10,11 +57,16 @@
 			"group": "build",
 			"label": "dm: build - vorestation.dme"
 		},
+		{
+			"command": "${command:dreammaker.reparse}",
+			"group": "build",
+			"label": "dm: reparse"
+		},
 		{
 			"type": "shell",
-			"command": "tgui/bin/tgui",
+			"command": "bin/tgui-build",
 			"windows": {
-				"command": ".\\tgui\\bin\\tgui.bat"
+				"command": ".\\bin\\tgui-build.cmd"
 			},
 			"problemMatcher": [
 				"$tsc",
@@ -25,43 +77,55 @@
 		},
 		{
 			"type": "shell",
-			"command": "yarn build",
-			"options": {
-				"cwd": "tgui/packages/tgfont/",
+			"command": "bin/tgui-dev",
+			"windows": {
+				"command": ".\\bin\\tgui-dev.cmd"
 			},
+			"problemMatcher": [
+				"$tsc",
+				"$eslint-stylish"
+			],
 			"group": "build",
-			"problemMatcher": [],
-			"label": "tgui: build tgfont",
-			"detail": "node mkdist.cjs && fantasticon --config config.cjs"
+			"label": "tgui: dev server"
 		},
 		{
 			"type": "shell",
-			"command": "tgui/bin/tgui",
+			"command": "bin/tgui-bench",
 			"windows": {
-				"command": ".\\tgui\\bin\\tgui-prettybuild.bat"
+				"command": ".\\bin\\tgui-bench.cmd"
 			},
 			"problemMatcher": [
 				"$tsc",
 				"$eslint-stylish"
 			],
 			"group": "build",
-			"label": "tgui: prettybuild"
+			"label": "tgui: bench"
 		},
 		{
 			"type": "shell",
-			"command": "bin/tgui --dev",
+			"command": "bin/tgui-sonar",
 			"windows": {
-				"command": ".\\bin\\tgui.bat --dev"
+				"command": ".\\bin\\tgui-sonar.cmd"
 			},
 			"problemMatcher": [
 				"$tsc",
 				"$eslint-stylish"
 			],
-			"options": {
-				"cwd": ".\\tgui\\",
+			"group": "build",
+			"label": "tgui: sonar"
+		},
+		{
+			"type": "shell",
+			"command": "bin/tgfont",
+			"windows": {
+				"command": ".\\bin\\tgfont.cmd"
 			},
+			"problemMatcher": [
+				"$tsc",
+				"$eslint-stylish"
+			],
 			"group": "build",
-			"label": "tgui: dev server"
+			"label": "tgui: rebuild tgfont"
 		}
 	]
 }

README.md

@@ -54,11 +54,11 @@ This will take a while to download, but it provides an easier method for updatin
 
 First-time installation should be fairly straightforward.  First, you'll need BYOND installed.  You can get it from [here](http://www.byond.com/).
 
-This is a sourcecode-only release, so the next step is to compile the server files.  Open vorestation.dme by double-clicking it, open the Build menu, and click compile.  This'll take a little while, and if everything's done right you'll get a message like this:
+**The quick way**. Find `bin/server.cmd` in this folder and double click it to automatically build and host the server on port 1337.
 
-    saving vorestation.dmb (DEBUG mode)
+**The long way**. Find `bin/build.cmd` in this folder, and double click it to initiate the build. It consists of multiple steps and might take around 1-5 minutes to compile. If it closes, it means it has finished its job. You can then [setup the server](.github/guides/RUNNING_A_SERVER.md) normally by opening `tgstation.dmb` in DreamDaemon.
 
-    vorestation.dmb - 0 errors, 0 warnings
+**Building vorestation in DreamMaker directly is deprecated and might produce errors**, such as `'tgui.bundle.js': cannot find file`.
 
 If you see any errors or warnings, something has gone wrong - possibly a corrupt download or the files extracted wrong, or a code issue on the main repo.  Ask on IRC.
 

_build_dependencies.sh

@@ -6,6 +6,6 @@ export NODE_VERSION=20
 # Byond Major
 export BYOND_MAJOR=515
 # Byond Minor
-export BYOND_MINOR=1630
+export BYOND_MINOR=1637
 # Macro Count
-export MACRO_COUNT=4
+export MACRO_COUNT=8

bin/build.cmd

@@ -0,0 +1,2 @@
+@echo off
+call "%~dp0\..\tools\build\build.bat" --wait-on-error build %*

bin/clean.cmd

@@ -0,0 +1,2 @@
+@echo off
+call "%~dp0\..\tools\build\build.bat" --wait-on-error clean-all %*

bin/server.cmd

@@ -0,0 +1,2 @@
+@echo off
+call "%~dp0\..\tools\build\build.bat" --wait-on-error server %*

bin/test.cmd

@@ -0,0 +1,2 @@
+@echo off
+call "%~dp0\..\tools\build\build.bat" --wait-on-error dm-test %*

bin/tgfont.cmd

@@ -0,0 +1,2 @@
+@echo off
+call "%~dp0\..\tools\build\build.bat" --wait-on-error tg-font %*

bin/tgui-bench.cmd

@@ -0,0 +1,3 @@
+@echo off
+call "%~dp0\..\tools\build\build.bat" --wait-on-error tgui-bench %*
+pause

bin/tgui-build.cmd

@@ -0,0 +1,2 @@
+@echo off
+call "%~dp0\..\tools\build\build.bat" --wait-on-error tgui tgui-lint tgui-test %*

bin/tgui-dev.cmd

@@ -0,0 +1,2 @@
+@echo off
+call "%~dp0\..\tools\build\build.bat" --wait-on-error tgui-dev %*

bin/tgui-sonar.cmd

@@ -0,0 +1,2 @@
+@echo off
+call "%~dp0\..\tools\build\build.bat" --wait-on-error tgui-sonar %*

build.cmd

@@ -0,0 +1,2 @@
+@echo off
+call "%~dp0\tools\build\build.bat" --wait-on-error build %*

code/__defines/cooldowns.dm

@@ -25,6 +25,9 @@
  * Cooldown system based on an datum-level associative lazylist using timers.
 */
 
+// random cooldowns
+#define COOLDOWN_VENOM_MILKING "venom_milking"
+
 // admin verb cooldowns
 #define COOLDOWN_INTERNET_SOUND "internet_sound"
 

code/controllers/subsystems/media_tracks.dm

@@ -172,7 +172,7 @@ SUBSYSTEM_DEF(media_tracks)
 			sort_tracks()
 			return
 
-	to_chat(C, "<span class='warning>Couldn't find a track matching the specified parameters.</span>")
+	to_chat(C, "<span class='warning'>Couldn't find a track matching the specified parameters.</span>")
 
 /datum/controller/subsystem/media_tracks/proc/add_track(var/mob/user, var/new_url, var/new_title, var/new_duration, var/new_artist, var/new_genre, var/new_secret, var/new_lobby)
 	if(!check_rights(R_DEBUG|R_FUN))