Skip to content

Commit

Permalink
Merge branch 'master' into translate
Browse files Browse the repository at this point in the history
  • Loading branch information
Legendaxe committed Jan 22, 2024
2 parents 7cbef5b + 1b243a2 commit c77d9a9
Show file tree
Hide file tree
Showing 1,122 changed files with 52,315 additions and 38,313 deletions.
4 changes: 2 additions & 2 deletions .github/CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -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)

---
Expand All @@ -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)

Expand All @@ -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)

---

Expand Down
3 changes: 2 additions & 1 deletion .vscode/extensions.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
"eamodio.gitlens",
"usernamehw.errorlens",
"anturk.dmi-editor",
"esbenp.prettier-vscode"
"esbenp.prettier-vscode",
"arcanis.vscode-zipfs"
]
}
13 changes: 11 additions & 2 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -22,5 +30,6 @@
},
"[scss]": {
"editor.rulers": [80]
}
},
"editor.formatOnSave": true
}
15 changes: 1 addition & 14 deletions .vscode/tasks.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand All @@ -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"
}
]
}
2 changes: 1 addition & 1 deletion _build_dependencies.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# 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
Expand Down
Loading

0 comments on commit c77d9a9

Please sign in to comment.