Merge remote-tracking branch 'Upstream/master' into TGUI-equip

.github/CODEOWNERS

@@ -4,6 +4,10 @@
 # In the event that multiple org members are to be informed of changes
 # to the same file or dir, add them to the end under Multiple Owners
 
+# Mapping
+
+/_maps @BeeStation/beestation-mapping
+
 # crossedfall
 
 .dockerignore @crossedfall
@@ -26,10 +30,6 @@ Dockerfile @crossedfall
 /code/modules/shuttle/super_cruise @powerfulbacon
 /code/modules/shuttle/shuttle_creation @powerfulbacon
 
-# pestoverde322
-
-/_maps @pestoverde322
-
 # itsmeow
 
 /code/game/gamemodes/dynamic @itsmeow

.github/workflows/continuous_integration.yml

@@ -110,10 +110,13 @@ jobs:
       - name: Install auxmos
         run: |
           bash tools/ci/install_auxmos.sh
-      - name: Compile and run tests
+      - name: Compile Tests
+        run: |
+          source $HOME/BYOND/byond/bin/byondsetup
+          tools/build/build --ci dm -DCIBUILDING -DANSICOLORS
+      - name: Run Tests
         run: |
           source $HOME/BYOND/byond/bin/byondsetup
-          tools/build/build --ci build -DCIBUILDING
           bash tools/ci/run_server.sh
   test_windows:
     runs-on: windows-latest

.vscode/settings.json

@@ -13,6 +13,7 @@
 	},
 	"files.eol": "\n",
 	"files.insertFinalNewline": true,
+	"git.branchProtection": ["master"],
 	"gitlens.advanced.blame.customArguments": ["-w"],
 	"tgstationTestExplorer.project.resultsType": "json",
 	"tgstationTestExplorer.project.DMEName": "beestation.dme",