Merge branch 'BeeStation:master' into master

.github/CODEOWNERS

@@ -14,16 +14,20 @@ dependencies.sh @crossedfall
 Dockerfile @crossedfall
 /SQL @crossedfall
 /tools @crossedfall
-
-
-# ike709
-
-/code/modules/client/loadout @ike709
-
+/config @crossedfall
 
 # powerfulbacon
 
 /code/game/machinery/shuttle @powerfulbacon
 /code/modules/shuttle/super_cruise @powerfulbacon
 /code/modules/shuttle/shuttle_creation @powerfulbacon
 /_maps/map_files/CorgStation @powerfulbacon
+
+# pestoverde322
+
+/_maps @pestoverde322
+
+# itsmeow
+
+/code/game/gamemodes/dynamic @itsmeow
+/code/modules/modular_computers @itsmeow

.github/CONTRIBUTING.md

@@ -10,7 +10,8 @@ CONTRIBUTING
 4. Code Standards
 5. Codebase-specific Policies
 6. Asset Policy
-7. Banned Content
+7. Pull Request Standards
+8. Banned Content
 
 ## 1. Introduction
 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.
 
 ## 3. Recommended Tools - Creating a Decent Dev Environment
 
-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:
+**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).
+
+In addition to VSCode, several other tools exist to make your life easier.
 
 * Git client - [GitKraken](https://www.gitkraken.com/)
 * Code editing - [VSCode](https://code.visualstudio.com/) (NOT THE SAME AS VISUAL STUDIO)
-* 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)
-* Map editing - [FastDMM2](https://fastdmm2.ss13.io/) or [StrongDMM](https://github.com/SpaiR/StrongDMM)
+* VSCode Extensions - You will be prompted to install this recommended extension automatically: [Goonstation Extension Pack](https://marketplace.visualstudio.com/items?itemName=Goonstation.goonstation-extpack)
+* 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.
+* Icon editing - Dream Maker or your image editor of choice. Any PNG can be imported into Dream Maker.
 
 ## 4. Code Standards
 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).
@@ -93,7 +97,21 @@ If you are adding new assets that are not already explicitly licensed under CC-B
 
 If at any point you are confused or unsure of an asset's license or our policy, ask a Maintainer to help you.
 
-## 7. Banned Content
+## 7. Pull Request Standards
+
+You should complete the pull-request template in its entirety.
+
+Any pull-request that does not adequately complete the provided template may be closed or marked 'do not merge' by maintainers.
+ - 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.
+ - 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.
+ - 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.
+ - 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.
+ - 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.
+ - 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.
+
+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.
+
+## 8. Banned Content
 
 Do not add any of the following in a Pull Request or risk getting the PR closed:
 

.github/ISSUE_TEMPLATE/bug_report.md

@@ -3,9 +3,9 @@ name: Bug report
 about: Create a report to help reproduce and fix the issue
 ---
 <!-- Write **BELOW** The Headers and **ABOVE** The comments else it may not be viewable -->
-## Round ID:
+## Round ID & Round Date:
 
-<!--- **INCLUDE THE ROUND ID**
+<!--- **INCLUDE THE ROUND ID AND THE ROUND DATE**
 If you discovered this issue from playing beestation hosted servers:-->
 
 ## Testmerges:

.github/PULL_REQUEST_TEMPLATE.md

@@ -7,7 +7,17 @@
 
 ## Why It's Good For The Game
 
-<!-- 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. -->
+<!-- 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.
+-->
+
+## Testing Photographs and Procedure
+<!-- Include any screenshots/videos/debugging steps of the modified code functioning successfully, ideally including edge cases. -->
+<details>
+<summary>Screenshots&Videos</summary>
+
+Put screenshots and videos here with an empty line between the screenshots and the `<details>` tags.
+
+</details>
 
 ## Changelog
 :cl:

.github/workflows/compile_changelogs.yml

@@ -10,13 +10,13 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v1
+        uses: actions/checkout@v3
         with:
           fetch-depth: 25
       - name: Python setup
-        uses: actions/setup-python@v1
+        uses: actions/setup-python@v4
         with:
-          python-version: "3.8"
+          python-version: "3.9"
       - name: Install depends
         run: |
           python -m pip install --upgrade pip

.github/workflows/continuous_integration.yml

@@ -4,22 +4,29 @@ on:
   workflow_dispatch:
   push:
     paths-ignore:
-    - 'html/changelogs/**'
-    - 'html/changelog.html'
+      - "html/changelogs/**"
+      - "html/changelog.html"
     branches:
-    - master
+      - master
   pull_request:
+    branches:
+      - master
+  merge_group:
     branches:
     - master
 
 jobs:
   run_linters:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-20.04
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
+      - name: Python setup
+        uses: actions/setup-python@v4
+        with:
+          python-version: "3.9"
       - name: Setup cache
         id: cache-spacemandmm
-        uses: actions/cache@v2
+        uses: actions/cache@v3
         with:
           path: ~/dreamchecker
           key: ${{ runner.os }}-spacemandmm-cache-${{ hashFiles('dependencies.sh') }}
@@ -28,29 +35,28 @@ jobs:
         run: bash tools/ci/install_spaceman_dmm.sh dreamchecker
       - name: Install Tools
         run: |
-          pip3 install setuptools
+          pip install setuptools
           bash tools/ci/install_node.sh
           bash tools/ci/install_auxmos.sh
-          pip3 install -r tools/requirements.txt
+          pip install -r tools/requirements.txt
       - name: Run Linters
         run: |
           bash tools/ci/check_filedirs.sh beestation.dme
           bash tools/ci/check_changelogs.sh
           find . -name "*.php" -print0 | xargs -0 -n1 php -l
-          find . -name "*.json" -not -path "*/node_modules/*" -print0 | xargs -0 python3 ./tools/json_verifier.py
-          tgui/bin/tgui --lint
-          tgui/bin/tgui --test
+          find . -name "*.json" -not -path "*/node_modules/*" -print0 | xargs -0 python ./tools/json_verifier.py
           bash tools/ci/check_grep.sh
+          tools/build/build --ci lint tgui-test
           tools/bootstrap/python -m dmi.test
           tools/bootstrap/python -m mapmerge2.dmm_test
           ~/dreamchecker
   compile_all_maps:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-20.04
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
       - name: Setup cache
         id: cache-byond
-        uses: actions/cache@v2
+        uses: actions/cache@v3
         with:
           path: ~/BYOND
           key: ${{ runner.os }}-byond-cache-${{ hashFiles('Dockerfile') }}
@@ -61,9 +67,9 @@ jobs:
         run: |
           source $HOME/BYOND/byond/bin/byondsetup
           python3 tools/ci/template_dm_generator.py
-          tools/build/build dm -DCIBUILDING -DCITESTING -DALL_MAPS
+          tools/build/build --ci dm -DCIBUILDING -DCITESTING -DALL_MAPS
   run_all_tests:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-20.04
     services:
       mysql:
         image: mysql:latest
@@ -73,10 +79,10 @@ jobs:
           - 3306
         options: --health-cmd="mysqladmin ping" --health-interval=10s --health-timeout=5s --health-retries=3
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
       - name: Setup cache
         id: cache-byond
-        uses: actions/cache@v2
+        uses: actions/cache@v3
         with:
           path: ~/BYOND
           key: ${{ runner.os }}-byond-cache-${{ hashFiles('Dockerfile') }}
@@ -100,12 +106,12 @@ jobs:
       - name: Compile and run tests
         run: |
           source $HOME/BYOND/byond/bin/byondsetup
-          tools/build/build -DCIBUILDING
+          tools/build/build --ci build -DCIBUILDING
           bash tools/ci/run_server.sh
   test_windows:
     runs-on: windows-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
       - name: Compile
         run: pwsh tools/ci/build.ps1
         env:

.github/workflows/docker.yml

@@ -9,7 +9,7 @@ jobs:
   build:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
     - name: Publish to Registry
       uses: elgohr/Publish-Docker-Github-Action@master
       with:

.github/workflows/make_changelogs.yml

@@ -11,13 +11,13 @@ jobs:
     if: "!contains(github.event.head_commit.message, '[ci skip]')"
     steps:
       - name: Checkout
-        uses: actions/checkout@v1
+        uses: actions/checkout@v3
         with:
           fetch-depth: 25
       - name: Python setup
-        uses: actions/setup-python@v1
+        uses: actions/setup-python@v4
         with:
-          python-version: "3.8"
+          python-version: "3.9"
       - name: Install depends
         run: |
           python -m pip install --upgrade pip

.github/workflows/stale_prs.yml

@@ -14,5 +14,5 @@ jobs:
         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."
         stale-pr-label: 'Stale'
         exempt-pr-label: 'Needs Review'
-        days-before-stale: 30
+        days-before-stale: 100000
         days-before-close: 5

.gitignore

@@ -11,9 +11,13 @@
 /*.so
 
 #Ignore compiled files and other files generated during compilation.
+beestation_unit_test_focus_file.dm
 *.mdme
+*.mdme.*
 *.dmb
 *.rsc
+*.m.dme
+*.test.dme
 *.lk
 *.int
 *.backup

.vscode/extensions.json

@@ -1,9 +1,7 @@
 {
 	"recommendations": [
-		"gbasood.byond-dm-language-support",
-		"platymuus.dm-langclient",
-		"EditorConfig.EditorConfig",
+		"Goonstation.goonstation-extpack",
 		"arcanis.vscode-zipfs",
-		"dbaeumer.vscode-eslint"
+		"github.vscode-pull-request-github"
 	]
 }