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 Jul 2, 2024
2 parents 1f45184 + bd29dae commit d814082
Show file tree
Hide file tree
Showing 543 changed files with 7,370 additions and 13,387 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/label_stale.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,6 @@ jobs:
days-before-issue-stale: 60
days-before-close: 7
days-before-issue-close: 14
exempt-issue-labels: '"Stale Exempt"'
exempt-pr-labels: '"Stale Exempt", "-Status: Awaiting approval", "-Status: Awaiting Merge", "-Status: Awaiting type assignment"'
any-of-issue-labels: '"Need Verification", "Cannot Reproduce", "Not A Bug", "(99% Sure) Not A Bug"'
exempt-issue-labels: 'Stale Exempt'
exempt-pr-labels: 'Stale Exempt, -Status: Awaiting approval, -Status: Awaiting Merge, -Status: Awaiting type assignment'
any-of-issue-labels: 'Need Verification, Cannot Reproduce, Not A Bug, (99% Sure) Not A Bug'
10 changes: 5 additions & 5 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,27 +20,27 @@
],

"[javascript]": {
"editor.rulers": [80],
"editor.rulers": [120],
"editor.defaultFormatter": "esbenp.prettier-vscode",
"editor.formatOnSave": true
},
"[javascriptreact]": {
"editor.rulers": [80],
"editor.rulers": [120],
"editor.defaultFormatter": "esbenp.prettier-vscode",
"editor.formatOnSave": true
},
"[typescript]": {
"editor.rulers": [80],
"editor.rulers": [120],
"editor.defaultFormatter": "esbenp.prettier-vscode",
"editor.formatOnSave": true
},
"[typescriptreact]": {
"editor.rulers": [80],
"editor.rulers": [120],
"editor.defaultFormatter": "esbenp.prettier-vscode",
"editor.formatOnSave": true
},
"[scss]": {
"editor.rulers": [80],
"editor.rulers": [120],
"editor.defaultFormatter": "esbenp.prettier-vscode",
"editor.formatOnSave": true
},
Expand Down
4 changes: 4 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
> [!IMPORTANT]
> July is a month of focus on "Quality releases", this means no new balance or feature PRs are permitted without prior approval.</br>
> [For more info, see the following discord post on our public discord](https://discord.com/channels/145533722026967040/499000353312735233/1256632472196878337)
<a href="#"><img src=".github/assets/paradise.png" alt="Paradise Station"></a>

## <p align="center">Добро пожаловать в репозиторий Paradise WyccStation SS220 по игре [Space Station 13](https://spacestation13.com/).</p>
Expand Down
2 changes: 1 addition & 1 deletion _build_dependencies.sh
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# This file has all the information on what versions of libraries are thrown into the code
# For dreamchecker
export SPACEMANDMM_TAG=suite-1.8
export SPACEMANDMM_TAG=suite-1.9
# For TGUI
export NODE_VERSION=20
# Stable Byond Major
Expand Down
2 changes: 1 addition & 1 deletion _maps/map_files/RandomRuins/SpaceRuins/voyager.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
"q" = (
/obj/structure/safe/floor,
/obj/item/golden_record,
/turf/simulated/satellite,
/turf/simulated/wall/satellite,
/area/template_noop)
"O" = (
/obj/structure/target_stake{
Expand Down
Loading

0 comments on commit d814082

Please sign in to comment.