Merge branch 'master' into auxmos-update

shiptest-ss13 · Dec 30, 2023 · ad4740f · ad4740f
2 parents 2d85e92 + 84df369
commit ad4740f
Show file tree

Hide file tree

Showing 71 changed files with 8,527 additions and 367 deletions.
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -17,14 +17,14 @@
 		"**/.pnp.*": true
 	},
 	"editor.codeActionsOnSave": {
-		"source.fixAll.eslint": true
+		"source.fixAll.eslint": "explicit"
 	},
 	"files.insertFinalNewline": true,
 	"gitlens.advanced.blame.customArguments": ["-w"],
 	"tgstationTestExplorer.project.resultsType": "json",
 	"[python]": {
 		"gitlens.codeLens.symbolScopes": ["!Module"],
-		"editor.wordBasedSuggestions": false,
+		"editor.wordBasedSuggestions": "off",
 		"editor.insertSpaces": true,
 		"editor.tabSize": 4
 	},