Merge remote-tracking branch 'upstream/master'

# Conflicts:
#	sound/AI/delta.ogg
#	sound/AI/epsilon.ogg

.github/CODEOWNERS

@@ -26,3 +26,8 @@ _build_dependencies.sh @AffectedArc07
 dreamchecker.exe @AffectedArc07
 rust_g.dll @AffectedArc07
 librust_g.so @AffectedArc07
+
+### S34NW
+
+# TGUI stuff
+/tgui/bin @S34NW

.github/workflows/ci.yml

@@ -48,6 +48,7 @@ jobs:
           python tools/ci/unticked_files.py ${GITHUB_WORKSPACE}
           python tools/ci/illegal_dme_files.py ${GITHUB_WORKSPACE}
           python tools/ci/define_sanity.py
+          python tools/ci/restrict_file_types.py
           python -m tools.ci.check_icon_conflicts
           python -m tools.ci.check_icon_dupenames
           python -m tools.maplint.source --github

.github/workflows/merge_upstream_master.yml

@@ -101,7 +101,7 @@ jobs:
           # Check if a workflow file would be modified by the merge (permissions prevent pushes if so)
           latest_workflow_commit=$(git log -n 1 --pretty=format:"%H" upstream/$BASE_BRANCH -- .github/workflows)
           if ! git branch --contains $latest_workflow_commit | grep -q "$(git rev-parse --abbrev-ref HEAD)"; then
-            gh pr comment ${{ github.event.issue.html_url }} --body "GitHub Actions can not push to this branch as workflow files have been changed since your branch was last updated. Please update your branch past https://github.com/ParadiseSS13/Paradise/commit/$latest_workflow_commit before using this command again."#
+            gh pr comment ${{ github.event.issue.html_url }} --body "GitHub Actions can not push to this branch as workflow files have been changed since your branch was last updated. Please update your branch past https://github.com/ParadiseSS13/Paradise/commit/$latest_workflow_commit before using this command again."
             echo "FAIL_NOTIFIED=true" >> "$GITHUB_ENV"
             exit 1
           fi

.github/workflows/render_nanomaps.yml

@@ -43,4 +43,7 @@ jobs:
         git pull origin master
         git commit -m "NanoMap Auto-Update (`date`)" -a || true
         git push -f -u origin nanomap-render
-        gh pr create -t "Automatic NanoMap Update" -b "This pull request updates the server NanoMaps. Please review the diff images before merging." -l "NanoMaps" -H "nanomap-render" -B "master"
+        result=$(gh pr create -t "Automatic NanoMap Update" -b "This pull request updates the server NanoMaps. Please review the diff images before merging." -l "NanoMaps" -H "nanomap-render" -B "master")
+        if echo "$result" | grep -q "No commits between master and nanomap-render"
+          echo "No NanoMaps update required, skipping."
+          exit 78

.gitignore

@@ -29,6 +29,7 @@ stddef.dm
 *.vscode/*
 !/.vscode/extensions.json
 !/.vscode/tasks.json
+!/.vscode/launch.json
 
 # ignore DMI tool build cache
 /tools/dmitool/bin/
@@ -67,3 +68,6 @@ $RECYCLE.BIN
 
 # Linux libs
 /*.so
+
+# VIM swap files.
+*.swp

.tgs.yml

@@ -3,7 +3,7 @@
 version: 1
 # The BYOND version to use
 # Must be interpreted as a string, keep quoted
-byond: "515.1620"
+byond: '515.1633'
 # Folders to create in "<instance_path>/Configuration/GameStaticFiles/"
 static_files:
   # Config directory should be static

.vscode/launch.json

@@ -0,0 +1,18 @@
+{
+	"version": "0.2.0",
+	"configurations": [
+	  {
+		"type": "byond",
+		"request": "launch",
+		"name": "Build & DS Debug",
+		"preLaunchTask": "dm: build - ${command:CurrentDME}",
+		"dmb": "${workspaceFolder}/${command:CurrentDMB}"
+	  },
+	  {
+		"type": "byond",
+		"request": "launch",
+		"name": "DS Debug",
+		"dmb": "${workspaceFolder}/${command:CurrentDMB}"
+	  }
+	]
+  }

.vscode/settings.json

@@ -1,35 +1,53 @@
 {
-	"gitlens.advanced.blame.customArguments": [
-		"--ignore-revs-file",
-		"${workspaceRoot}/.git-blame-ignore-revs"
-	],
 	// ESLint settings:
 	"eslint.workingDirectories": ["tgui/"],
-	"search.exclude": {
-		"**/.yarn": true,
-		"**/.pnp.*": true
-	},
 	"eslint.nodePath": "tgui/.yarn/sdks",
 	"prettier.configPath": "tgui/.prettierrc.yml",
 	"prettier.prettierPath": "tgui/.yarn/sdks/prettier/index.cjs",
 	"typescript.tsdk": "tgui/.yarn/sdks/typescript/lib",
 	"typescript.enablePromptUseWorkspaceTsdk": true,
+	"search.exclude": {
+		"**/.yarn": true,
+		"**/.pnp.*": true
+	},
+	"eslint.format.enable": 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
 		// and thus differentiate from the red typescript ones which
 		// are actually hard errors.
 		{ "rule": "*", "severity": "warn" }
 	],
-	"eslint.format.enable": true,
+
 	"[javascript]": {
-		"editor.rulers": [80]
+		"editor.rulers": [80],
+		"editor.defaultFormatter": "esbenp.prettier-vscode",
+		"editor.formatOnSave": true
+	},
+	"[javascriptreact]": {
+		"editor.rulers": [80],
+		"editor.defaultFormatter": "esbenp.prettier-vscode",
+		"editor.formatOnSave": true
 	},
 	"[typescript]": {
-		"editor.rulers": [80]
+		"editor.rulers": [80],
+		"editor.defaultFormatter": "esbenp.prettier-vscode",
+		"editor.formatOnSave": true
+	},
+	"[typescriptreact]": {
+		"editor.rulers": [80],
+		"editor.defaultFormatter": "esbenp.prettier-vscode",
+		"editor.formatOnSave": true
 	},
 	"[scss]": {
-		"editor.rulers": [80]
+		"editor.rulers": [80],
+		"editor.defaultFormatter": "esbenp.prettier-vscode",
+		"editor.formatOnSave": true
 	},
-	"editor.formatOnSave": true
+
+	"editor.formatOnSave": true,
+	"gitlens.advanced.blame.customArguments": [
+		"--ignore-revs-file",
+		"${workspaceRoot}/.git-blame-ignore-revs"
+	],
 }