Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/master' into objectives-backstory
Browse files Browse the repository at this point in the history
  • Loading branch information
itsmeow committed Jan 5, 2024
2 parents cd62324 + f56307a commit a2a0478
Show file tree
Hide file tree
Showing 3,676 changed files with 191,705 additions and 132,829 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
4 changes: 4 additions & 0 deletions .editorconfig
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
# http://editorconfig.org
root = true

[*]
indent_style = tab
indent_size = 4
end_of_line = lf
charset = utf-8
trim_trailing_whitespace = true
insert_final_newline = true
Expand Down
4 changes: 2 additions & 2 deletions .github/CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
Expand Up @@ -44,5 +44,5 @@ Dockerfile @crossedfall

/tgui/packages/tgui/interfaces/
/tgui/packages/tgui/styles/interfaces/
/tgui/packages/tgui-panel/styles/tgchat/chat-dark.scss
/tgui/packages/tgui-panel/styles/tgchat/chat-light.scss
/tgui/packages/tgui-panel/styles/goon/chat-dark.scss
/tgui/packages/tgui-panel/styles/goon/chat-light.scss
33 changes: 0 additions & 33 deletions .github/ISSUE_TEMPLATE/bug_report.md

This file was deleted.

72 changes: 72 additions & 0 deletions .github/ISSUE_TEMPLATE/bug_report.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,72 @@
name: Bug Report
description: Create a report to help us improve
title: "[Bug]: "
labels: ["bug"]
body:
- type: markdown
attributes:
value: |
> _Thanks for filing a bug ticket. We appreciate your time and effort! If you need real-time support, consider joining us on Discord!_
- type: input
id: byond
attributes:
label: BYOND Version
description: What version of BYOND are you using?
placeholder: "514.1589"
validations:
required: false
- type: input
id: round-date
attributes:
label: Round Date
placeholder: "YYYY/MM/DD"
validations:
required: false
- type: input
id: round-id
attributes:
label: Round ID
placeholder: "12345"
validations:
required: false
- type: textarea
id: testmerges
attributes:
label: Test merges
description: A list of currently active test merges (you can get this from the Message of the Day when you connect to the server, or the `Show Server Revision` OOC verb)
placeholder: |
- #pr-number
- #pr-number2
validations:
required: false
- type: markdown
attributes:
value: ------
- type: textarea
id: description
attributes:
label: Describe the bug
description: A clear and concise description of what the bug is. Plain-text snippets preferred, but screenshots welcome.
placeholder: Tell us what you saw
value: "When I did [...], I noticed [...]"
validations:
required: true
- type: textarea
id: expected-behavior
attributes:
label: What did you expect?
description: A clear and concise description of what you expect to happen
placeholder: Tell us what you expected
value: "I expected [...]"
validations:
required: true
- type: textarea
id: reproduction
attributes:
label: Reproducible steps
description: "How would we reproduce this bug? Please walk us through it step by step. Plain text is preferred, but screenshots are also welcome."
placeholder: |
1.
2.
3.
...
7 changes: 0 additions & 7 deletions .github/ISSUE_TEMPLATE/feature_request.md

This file was deleted.

18 changes: 18 additions & 0 deletions .github/ISSUE_TEMPLATE/feature_request.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
name: Feature request
description: Suggest an idea for this project
title: "[New Feature]: "
labels: ["Feature-Request"]
body:
- type: markdown
attributes:
value: |
> _Feature requests are handled in the repository, but you could also discuss your ideas on BeeStation discord or forums here: https://forums.beestation13.com/_
- type: textarea
id: description
attributes:
label: Describe the feature request
description: A clear and concise description of your request.
placeholder: Tell us what you want
value: "I'd like it if [...]"
validations:
required: true
15 changes: 0 additions & 15 deletions .github/comment-agent.yml

This file was deleted.

34 changes: 27 additions & 7 deletions .github/workflows/continuous_integration.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,13 @@ jobs:
uses: actions/setup-python@v4
with:
python-version: "3.11"
- name: Setup cache
cache: 'pip'
- uses: actions/setup-node@v3
with:
node-version: 18
cache: yarn
cache-dependency-path: tgui/yarn.lock
- name: Cache SpacemanDMM
id: cache-spacemandmm
uses: actions/cache@v3
with:
Expand All @@ -34,8 +40,6 @@ jobs:
- name: Install Tools
run: |
pip install setuptools
bash tools/ci/install_node.sh
bash tools/ci/install_auxmos.sh
pip install -r tools/requirements.txt
- name: Run Linters
run: |
Expand Down Expand Up @@ -69,16 +73,21 @@ jobs:
run_all_tests:
runs-on: ubuntu-20.04
services:
mysql:
image: mysql:latest
mariadb:
image: mariadb:latest
env:
MYSQL_ROOT_PASSWORD: root
ports:
- 3306
options: --health-cmd="mysqladmin ping" --health-interval=10s --health-timeout=5s --health-retries=3
options: --health-cmd="mariadb-admin ping" --health-interval=10s --health-timeout=5s --health-retries=3
steps:
- uses: actions/checkout@v3
- name: Setup cache
- uses: actions/setup-node@v3
with:
node-version: 18
cache: yarn
cache-dependency-path: tgui/yarn.lock
- name: Cache BYOND
id: cache-byond
uses: actions/cache@v3
with:
Expand Down Expand Up @@ -110,6 +119,17 @@ jobs:
runs-on: windows-latest
steps:
- uses: actions/checkout@v3
- uses: actions/setup-node@v3
with:
node-version: 18
cache: yarn
cache-dependency-path: tgui/yarn.lock
- name: Cache BYOND
id: cache-byond
uses: actions/cache@v3
with:
path: C:/byond
key: ${{ runner.os }}-byond-cache-${{ hashFiles('dependencies.sh') }}
- name: Compile
run: pwsh tools/ci/build.ps1
env:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/extra_pr_labels.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
commentOnDirty: "This pull request has conflicts, please resolve those before we can evaluate the pull request."
- name: Apply labels based on changed files
if: github.event_name != 'push'
uses: actions/labeler@main
uses: actions/labeler@v4.3.0
with:
repo-token: "${{ secrets.GITHUB_TOKEN }}"
sync-labels: true
Expand Down
4 changes: 4 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -186,3 +186,7 @@ Temporary Items

# Common build tooling, C B T
!/tools/build

# byond-tracy
prof.dll
libprof.so
4 changes: 3 additions & 1 deletion .vscode/extensions.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@
"recommendations": [
"Goonstation.goonstation-extpack",
"arcanis.vscode-zipfs",
"github.vscode-pull-request-github"
"github.vscode-pull-request-github",
"EditorConfig.EditorConfig",
"esbenp.prettier-vscode"
]
}
20 changes: 10 additions & 10 deletions .vscode/launch.json
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
{
"version": "0.2.0",
"configurations": [
{
"type": "byond",
"request": "launch",
"name": "Launch DreamSeeker",
"preLaunchTask": "Build All",
"dmb": "${workspaceFolder}/${command:CurrentDMB}"
}
]
"version": "0.2.0",
"configurations": [
{
"type": "byond",
"request": "launch",
"name": "Launch DreamSeeker",
"preLaunchTask": "Build All",
"dmb": "${workspaceFolder}/${command:CurrentDMB}"
}
]
}
34 changes: 26 additions & 8 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -1,30 +1,48 @@
{
"eslint.nodePath": "./tgui/.yarn/sdks",
"eslint.workingDirectories": [
"./tgui"
],
"eslint.workingDirectories": ["./tgui"],
"prettier.prettierPath": "./tgui/.yarn/sdks/prettier/index.js",
"typescript.tsdk": "./tgui/.yarn/sdks/typescript/lib",
"typescript.enablePromptUseWorkspaceTsdk": true,
"search.exclude": {
"**/.yarn": true,
"**/.pnp.*": true
},
"editor.codeActionsOnSave": {
"source.fixAll.eslint": true
"source.fixAll.eslint": "explicit"
},
"files.eol": "\n",
"files.insertFinalNewline": true,
"gitlens.advanced.blame.customArguments": ["-w"],
"tgstationTestExplorer.project.resultsType": "json",
"tgstationTestExplorer.project.DMEName": "beestation.dme",
"tgstationTestExplorer.project.defines": ["#define UNIT_TESTS", "#define CBT"],
"tgstationTestExplorer.project.defines": [
"#define UNIT_TESTS",
"#define CBT"
],
"[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
}
}
Loading

0 comments on commit a2a0478

Please sign in to comment.