Merge branch 'master' into rank_name

.github/CONTRIBUTING.md

@@ -753,7 +753,7 @@ Each role inherits the lower role's responsibilities (IE: Headcoders also have c
 `Headcoders` are the overarching "administrators" of the repository. People included in this role are:
 
 * [farie82](https://github.com/farie82)
-* [Fox P McCloud](https://github.com/Fox-McCloud)
+* [Charliminator](https://github.com/hal9000PR)
 * [SteelSlayer](https://github.com/SteelSlayer)
 
 ---
@@ -762,7 +762,6 @@ Each role inherits the lower role's responsibilities (IE: Headcoders also have c
 
 
 * [AffectedArc07](https://github.com/AffectedArc07)
-* [Charliminator](https://github.com/hal9000PR)
 * [lewcc](https://github.com/lewcc)
 * [S34N](https://github.com/S34NW)
 
@@ -776,6 +775,7 @@ Each role inherits the lower role's responsibilities (IE: Headcoders also have c
 * [Contrabang](https://github.com/Contrabang)
 * [Burzah](https://github.com/Burzah)
 * [DGamerL](https://github.com/DGamerL)
+* [Warriorstar](https://github.com/warriorstar-orion)
 
 ---
 

.github/workflows/ci.yml

@@ -14,7 +14,7 @@ jobs:
     steps:
       - uses: actions/checkout@v4
       - name: Setup Cache
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: $HOME/SpacemanDMM
           key: ${{ runner.os }}-spacemandmm
@@ -63,7 +63,7 @@ jobs:
     steps:
       - uses: actions/checkout@v4
       - name: Setup Cache
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: $HOME/BYOND
           key: ${{ runner.os }}-byond
@@ -93,7 +93,7 @@ jobs:
     steps:
       - uses: actions/checkout@v4
       - name: Setup Cache
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: $HOME/BYOND
           key: ${{ runner.os }}-byond

.vscode/extensions.json

@@ -7,6 +7,7 @@
 		"eamodio.gitlens",
 		"usernamehw.errorlens",
 		"anturk.dmi-editor",
-		"esbenp.prettier-vscode"
+		"esbenp.prettier-vscode",
+		"arcanis.vscode-zipfs"
     ]
 }

.vscode/settings.json

@@ -4,8 +4,16 @@
 	],
 	// ESLint settings:
 	"eslint.workingDirectories": [
-		"tgui/"
+		"./tgui"
 	],
+	"search.exclude": {
+    "**/.yarn": true,
+    "**/.pnp.*": true
+	},
+	"eslint.nodePath": "tgui/.yarn/sdks",
+	"prettier.prettierPath": "tgui/.yarn/sdks/prettier/index.cjs",
+	"typescript.tsdk": "tgui/.yarn/sdks/typescript/lib",
+	"typescript.enablePromptUseWorkspaceTsdk": true,
 	"eslint.rules.customizations": [
 		// We really want to fail the CI builds on styling errors,
 		// but it's better to show them as yellow squigglies in IDE
@@ -22,5 +30,6 @@
 	},
 	"[scss]": {
 		"editor.rulers": [80]
-	}
+	},
+	"editor.formatOnSave": true
 }

.vscode/tasks.json

@@ -14,7 +14,7 @@
 			"type": "shell",
 			"command": "tgui/bin/tgui-build",
 			"windows": {
-				"command": ".\\tgui\\bin\\tgui-build.bat"
+				"command": ".\\tgui\\bin\\tgui.bat"
 			},
 			"problemMatcher": [
 				"$tsc",
@@ -37,18 +37,5 @@
 			"label": "tgui: run dev server"
 		}
 		,
-		{
-			"type": "shell",
-			"command": "tgui/bin/tgui-formatting",
-			"windows": {
-				"command": ".\\tgui\\bin\\tgui-formatting.bat"
-			},
-			"problemMatcher": [
-				"$tsc",
-				"$eslint-stylish"
-			],
-			"group": "build",
-			"label": "tgui: run prettier formatting"
-		}
 	]
 }

_build_dependencies.sh

@@ -2,15 +2,15 @@
 # For dreamchecker
 export SPACEMANDMM_TAG=suite-1.7.1
 # For TGUI
-export NODE_VERSION=18
+export NODE_VERSION=20
 # Stable Byond Major
 export STABLE_BYOND_MAJOR=515
 # Stable Byond Minor
-export STABLE_BYOND_MINOR=1620
+export STABLE_BYOND_MINOR=1630
 # Beta Byond Major
 export BETA_BYOND_MAJOR=515
 # Beta Byond Minor
-export BETA_BYOND_MINOR=1620
+export BETA_BYOND_MINOR=1630
 # Python version for mapmerge and other tools
 export PYTHON_VERSION=3.11.6
 # RUSTG version