Skip to content

Commit e67f635

Browse files
committed
Initial deconflict
2 parents e8a4f6f + 984503e commit e67f635

File tree

2,998 files changed

+593647
-534133
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

2,998 files changed

+593647
-534133
lines changed

.github/CODEOWNERS

+19-11
Original file line numberDiff line numberDiff line change
@@ -12,15 +12,23 @@
1212
/_maps/ @BeeStation/nsv-mapping
1313

1414
# Multiple Owners
15-
/SQL/ @francinum @Ansome101 @Bokkiewokkie
16-
/SQL/database_changelog.txt @francinum @Ansome101 @Bokkiewokkie
17-
/config @francinum @Ansome101 @Bokkiewokkie
15+
/SQL/ @Bokkiewokkie @Kmc2000 @covertcorvid @Karmic-Skink
16+
/SQL/database_changelog.txt @Bokkiewokkie @Kmc2000 @covertcorvid @Karmic-Skink
17+
/config @Bokkiewokkie @Kmc2000 @covertcorvid @Karmic-Skink
1818

19-
/code/__DEFINES/MC.dm @francinum @covertcorvid @Karmic-Skink
20-
/code/__DEFINES/tick.dm @francinum @covertcorvid @Karmic-Skink
21-
/code/controllers/admin.dm @francinum @covertcorvid @Karmic-Skink
22-
/code/controllers/master.dm @francinum @covertcorvid @Karmic-Skink
23-
/code/controllers/failsafe.dm @francinum @covertcorvid @Karmic-Skink
24-
/code/controllers/subsystem.dm @francinum @covertcorvid @Karmic-Skink
25-
/code/controllers/subsystem/dbcore.dm @francinum @covertcorvid @Karmic-Skink
26-
/code/controllers/subsystem/timer.dm @francinum @covertcorvid @Karmic-Skink
19+
/code/__DEFINES/MC.dm @Bokkiewokkie @Kmc2000 @covertcorvid @Karmic-Skink
20+
/code/__DEFINES/tick.dm @Bokkiewokkie @Kmc2000 @covertcorvid @Karmic-Skink
21+
/code/controllers/admin.dm @Bokkiewokkie @Kmc2000 @covertcorvid @Karmic-Skink
22+
/code/controllers/master.dm @Bokkiewokkie @Kmc2000 @covertcorvid @Karmic-Skink
23+
/code/controllers/failsafe.dm @Bokkiewokkie @Kmc2000 @covertcorvid @Karmic-Skink
24+
/code/controllers/subsystem.dm @Bokkiewokkie @Kmc2000 @covertcorvid @Karmic-Skink
25+
/code/controllers/subsystem/dbcore.dm @Bokkiewokkie @Kmc2000 @covertcorvid @Karmic-Skink
26+
/code/controllers/subsystem/timer.dm @Bokkiewokkie @Kmc2000 @covertcorvid @Karmic-Skink
27+
28+
.dockerignore @Bokkiewokkie @Kmc2000 @covertcorvid @Karmic-Skink
29+
.github @Bokkiewokkie @Kmc2000 @covertcorvid @Karmic-Skink
30+
/code/_compile_options.dm @Bokkiewokkie @Kmc2000 @covertcorvid @Karmic-Skink
31+
/code/modules/tgs @Bokkiewokkie @Kmc2000 @covertcorvid @Karmic-Skink
32+
dependencies.sh @Bokkiewokkie @Kmc2000 @covertcorvid @Karmic-Skink
33+
Dockerfile @Bokkiewokkie @Kmc2000 @covertcorvid @Karmic-Skink
34+
/tools @Bokkiewokkie @Kmc2000 @covertcorvid @Karmic-Skink

.github/CONTRIBUTING.md

+26-5
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,8 @@ CONTRIBUTING
1010
4. Code Standards
1111
5. Codebase-specific Policies
1212
6. Asset Policy
13-
7. Banned Content
13+
7. Pull Request Standards
14+
8. Banned Content
1415

1516
## 1. Introduction
1617
Hello and welcome to BeeStation's contributing page. You are presumably here because you are interested in contributing - thank you! Everyone is free to contribute to this project as long as they follow the simple guidelines and specifications below; at BeeStation, we strive to maintain code stability and maintainability, and to do that, we need all pull requests to meet our standards. It's in everyone's best interests - including yours!
@@ -38,12 +39,15 @@ You can of course, as always, ask for help on our discord.
3839

3940
## 3. Recommended Tools - Creating a Decent Dev Environment
4041

41-
By default, the only thing BYOND provides people with is Dream Maker. It is hardly sufficient, and few (if any) contributors regularly use it. Instead, we have a variety of alternative tools for different purposes that make our lives a lot easier:
42+
**Important:** Using Dream Maker to write code is not supported and will cause problems. All coding needs to be done in VSCode with the recommended extension(s).
43+
44+
In addition to VSCode, several other tools exist to make your life easier.
4245

4346
* Git client - [GitKraken](https://www.gitkraken.com/)
4447
* Code editing - [VSCode](https://code.visualstudio.com/) (NOT THE SAME AS VISUAL STUDIO)
45-
* VSCode Extensions - [DM syntax highlighting](https://marketplace.visualstudio.com/items?itemName=gbasood.byond-dm-language-support), [DM language support](https://marketplace.visualstudio.com/items?itemName=platymuus.dm-langclient)
46-
* Map editing - [FastDMM2](https://fastdmm2.ss13.io/) or [StrongDMM](https://github.com/SpaiR/StrongDMM)
48+
* VSCode Extensions - You will be prompted to install this recommended extension automatically: [Goonstation Extension Pack](https://marketplace.visualstudio.com/items?itemName=Goonstation.goonstation-extpack)
49+
* Map editing - [StrongDMM](https://github.com/SpaiR/StrongDMM) or [FastDMM2](https://fastdmm2.ss13.io/). Dream Maker works but requires additional steps for SS13 that these automate.
50+
* Icon editing - Dream Maker or your image editor of choice. Any PNG can be imported into Dream Maker.
4751

4852
## 4. Code Standards
4953
There are a variety of ways you can write valid DM code. However, BeeStation is not as lenient. Maintaining good code standards is important for performance and readability reasons. You can find details about our code standards [here](https://github.com/BeeStation/BeeStation-Hornet/wiki/Code-Standards).
@@ -53,6 +57,9 @@ They are mostly the same as /tg/station's code standards, though we are not quit
5357
Failure to meet these standards can result in your pull request being closed. The code standards are non-exhaustive and Maintainers have the final say.
5458

5559
## 5. Codebase-specific Policies
60+
### CEV-Eris
61+
Sprites from CEV-Eris and sprites clearly inspired by their art style are generally not permitted unless you recolor them using a tolerable color palette.
62+
5663
### HippieStation
5764
HippieStation's code standards are much more lax than BeeStation. Their code typically does not meet our standards. Therefore, you should not attempt to port code from HippieStation unless you have the experience and knowledge necessary to rewrite the code to our standards. Maintainers will not hold your hand for this, instead they will simply close the pull request.
5865

@@ -90,7 +97,21 @@ If you are adding new assets that are not already explicitly licensed under CC-B
9097

9198
If at any point you are confused or unsure of an asset's license or our policy, ask a Maintainer to help you.
9299

93-
## 7. Banned Content
100+
## 7. Pull Request Standards
101+
102+
You should complete the pull-request template in its entirety.
103+
104+
Any pull-request that does not adequately complete the provided template may be closed or marked 'do not merge' by maintainers.
105+
- Any changes that may affect game balance should be documented as a balance change. This also applies to bug fixes which directly alter the game's balance.
106+
- Changes must be documented in their entirety including the extent of their effects. (For example, if you change it so all mobs are half speed, don't label the PR as 'monkeys now move twice as slow'). Failing to document the full extent of the changes may result in a repo-ban if the intent of hiding changes is seen as malicious.
107+
- The section labeled 'about this pull request' should describe the pull request's changes in detail. This includes the changes being made, any important details about how it was implemented, the issues it closes, and links to any other pull requests if code is being ported from another codebase.
108+
- The section labeled "why it's good for the game" should include the reasons behind the changes and how they will be good for the game.
109+
- The testing section should contain screenshots, videos, and/or reproducible testing procedures showing that the PR works as specified. Pull-requests that ignore this section, or are not tested, may be closed by maintainers. This applies to small PRs that may seem trivial.
110+
- The changelog should include a short summary of the changes made. If your pull request includes things made by other people, you should list everybody who contributed, including yourself, after the :cl: tag.
111+
112+
If a pull-request requires updates to the wiki, these changes should be made on your user account page (For example: https://wiki.beestation13.com/view/User:PowerfulBacon), so that the original page can be updated on merge.
113+
114+
## 8. Banned Content
94115

95116
Do not add any of the following in a Pull Request or risk getting the PR closed:
96117

.github/PULL_REQUEST_TEMPLATE.md

+11-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,17 @@
77

88
## Why It's Good For The Game
99

10-
<!-- Please add a short description of why you think these changes would benefit the game. If you can't justify it in words, it might not be worth adding. -->
10+
<!-- Please add a short description of why you think these changes would benefit the game. If you can't justify it in words, it might not be worth adding.
11+
-->
12+
13+
## Testing Photographs and Procedure
14+
<!-- Include any screenshots/videos/debugging steps of the modified code functioning successfully, ideally including edge cases. -->
15+
<details>
16+
<summary>Screenshots&Videos</summary>
17+
18+
Put screenshots and videos here with an empty line between the screenshots and the `<details>` tags.
19+
20+
</details>
1121

1222
## Changelog
1323
:cl:

.github/workflows/compile_changelogs.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
- name: Python setup
1818
uses: actions/setup-python@v1
1919
with:
20-
python-version: "3.8"
20+
python-version: "3.9"
2121
- name: Install depends
2222
run: |
2323
python -m pip install --upgrade pip

.github/workflows/continuous_integration.yml

+12-8
Original file line numberDiff line numberDiff line change
@@ -4,19 +4,23 @@ on:
44
workflow_dispatch:
55
push:
66
paths-ignore:
7-
- 'html/changelogs/**'
8-
- 'html/changelog.html'
7+
- "html/changelogs/**"
8+
- "html/changelog.html"
99
branches:
10-
- master
1110
pull_request:
11+
- master
1212
branches:
13-
- master
13+
- master
1414

1515
jobs:
1616
run_linters:
1717
runs-on: ubuntu-latest
1818
steps:
1919
- uses: actions/checkout@v2
20+
- name: Python setup
21+
uses: actions/setup-python@v1
22+
with:
23+
python-version: "3.9"
2024
- name: Setup cache
2125
id: cache-spacemandmm
2226
uses: actions/cache@v2
@@ -28,16 +32,16 @@ jobs:
2832
run: bash tools/ci/install_spaceman_dmm.sh dreamchecker
2933
- name: Install Tools
3034
run: |
31-
pip3 install setuptools
35+
pip install setuptools
3236
bash tools/ci/install_node.sh
3337
bash tools/ci/install_auxmos.sh
34-
pip3 install -r tools/requirements.txt
38+
pip install -r tools/requirements.txt
3539
- name: Run Linters
3640
run: |
3741
bash tools/ci/check_filedirs.sh nsv13.dme
3842
bash tools/ci/check_changelogs.sh
3943
find . -name "*.php" -print0 | xargs -0 -n1 php -l
40-
find . -name "*.json" -not -path "*/node_modules/*" -print0 | xargs -0 python3 ./tools/json_verifier.py
44+
find . -name "*.json" -not -path "*/node_modules/*" -print0 | xargs -0 python ./tools/json_verifier.py
4145
bash tools/ci/check_grep.sh
4246
tools/build/build --ci lint tgui-test
4347
tools/bootstrap/python -m dmi.test
@@ -53,8 +57,8 @@ jobs:
5357
with:
5458
path: ~/BYOND
5559
key: ${{ runner.os }}-byond-cache-${{ hashFiles('Dockerfile') }}
56-
- name: Install BYOND
5760
if: steps.cache-byond.outputs.cache-hit != 'true'
61+
- name: Install BYOND
5862
run: bash tools/ci/install_byond.sh
5963
- name: Compile All Maps
6064
run: |

.github/workflows/make_changelogs.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
- name: Python setup
1818
uses: actions/setup-python@v1
1919
with:
20-
python-version: "3.8"
20+
python-version: "3.9"
2121
- name: Install depends
2222
run: |
2323
python -m pip install --upgrade pip

.github/workflows/stale_prs.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,5 +15,5 @@ jobs:
1515
stale-pr-message: "This PR has been inactive for long enough to be automatically marked as stale. This means it is at risk of being closed by a maintainer if it is not updated or reviews are not addressed. If your PR is closed as stale, feel free to open a new one after dealing with the issues. This may also be an indication that the maintainers do not have interest in this change, you can try to convince them otherwise, or persist in the doomed world you have created."
1616
stale-pr-label: 'Stale'
1717
exempt-pr-label: 'Needs Review'
18-
days-before-stale: 30
18+
days-before-stale: 100000
1919
days-before-close: 5

.github/workflows/update_tgs_dmapi.yml

-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ jobs:
99
update-dmapi:
1010
runs-on: ubuntu-latest
1111
name: Update the TGS DMAPI
12-
if: github.repository == 'BeeStation/NSV13'
1312
steps:
1413
- name: Clone
1514
uses: actions/checkout@v2

.gitignore

+4
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,13 @@
1111
/*.so
1212

1313
#Ignore compiled files and other files generated during compilation.
14+
beestation_unit_test_focus_file.dm
1415
*.mdme
16+
*.mdme.*
1517
*.dmb
1618
*.rsc
19+
*.m.dme
20+
*.test.dme
1721
*.lk
1822
*.int
1923
*.backup

.vscode/extensions.json

+2-4
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,7 @@
11
{
22
"recommendations": [
3-
"gbasood.byond-dm-language-support",
4-
"platymuus.dm-langclient",
5-
"EditorConfig.EditorConfig",
3+
"Goonstation.goonstation-extpack",
64
"arcanis.vscode-zipfs",
7-
"dbaeumer.vscode-eslint"
5+
"github.vscode-pull-request-github"
86
]
97
}

.vscode/settings.json

+5-2
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,15 @@
99
"**/.yarn": true,
1010
"**/.pnp.*": true
1111
},
12-
"workbench.editorAssociations": {
13-
"*.dmi": "imagePreview.previewEditor"
12+
"editor.codeActionsOnSave": {
13+
"source.fixAll.eslint": true
1414
},
1515
"files.eol": "\n",
16+
"files.insertFinalNewline": true,
1617
"gitlens.advanced.blame.customArguments": ["-w"],
1718
"tgstationTestExplorer.project.resultsType": "json",
19+
"tgstationTestExplorer.project.DMEName": "nsv13.dme",
20+
"tgstationTestExplorer.project.defines": ["#define UNIT_TESTS", "#define CBT"],
1821
"[javascript]": {
1922
"editor.rulers": [80]
2023
},

.vscode/tasks.json

+13
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,19 @@
4646
"group": "build",
4747
"label": "Run All Tests"
4848
},
49+
{
50+
"type": "shell",
51+
"command": "bin/temp-fast-test",
52+
"windows": {
53+
"command": ".\\bin\\temp-fast-test.cmd"
54+
},
55+
"problemMatcher": [
56+
"$tsc",
57+
"$eslint-stylish"
58+
],
59+
"group": "build",
60+
"label": "dm: find hard deletes"
61+
},
4962
{
5063
"command": "${command:dreammaker.reparse}",
5164
"group": "build",

0 commit comments

Comments
 (0)