Merge branch 'BeeStation:master' into master

DrDuckedGoose · Apr 19, 2024 · e4e5f84 · e4e5f84
2 parents b36711a + 5f79461
commit e4e5f84
Show file tree

Hide file tree

Showing 825 changed files with 76,560 additions and 70,492 deletions.
diff --git a/.github/workflows/continuous_integration.yml b/.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

diff --git a/.vscode/settings.json b/.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",