Merge branch 'master' of https://github.com/tgstation/TerraGov-Marine…

…-Corps

.github/workflows/ci_suite.yml

@@ -14,12 +14,12 @@ jobs:
     steps:
       - uses: actions/checkout@v3
       - name: Restore SpacemanDMM cache
-        uses: actions/cache@v2
+        uses: actions/cache@v3
         with:
           path: $HOME/SpacemanDMM
           key: ${{ runner.os }}-spacemandmm
       - name: Restore Yarn cache
-        uses: actions/cache@v2
+        uses: actions/cache@v3
         with:
           path: tgui/.yarn/cache
           key: ${{ runner.os }}-yarn-${{ secrets.CACHE_PURGE_KEY }}
@@ -54,7 +54,7 @@ jobs:
     steps:
       - uses: actions/checkout@v3
       - name: Restore BYOND cache
-        uses: actions/cache@v2
+        uses: actions/cache@v3
         with:
           path: $HOME/BYOND
           key: ${{ runner.os }}-byond
@@ -79,7 +79,7 @@ jobs:
     steps:
       - uses: actions/checkout@v3
       - name: Setup cache
-        uses: actions/cache@v2
+        uses: actions/cache@v3
         with:
           path: $HOME/BYOND
           key: ${{ runner.os }}-byond

.vscode/settings.json

@@ -1,12 +1,15 @@
 {
 	"eslint.nodePath": "./tgui/.yarn/sdks",
 	"eslint.workingDirectories": ["./tgui"],
-	"prettier.prettierPath": "./tgui/.yarn/sdks/prettier/index.js",
+	"prettier.prettierPath": "./tgui/.yarn/sdks/prettier/index.cjs",
 	"typescript.tsdk": "./tgui/.yarn/sdks/typescript/lib",
 	"typescript.enablePromptUseWorkspaceTsdk": true,
 	"search.exclude": {
-    	"**/.yarn": true,
-    	"**/.pnp.*": true
+		"**/.yarn": true,
+		"**/.pnp.*": true
+	},
+	"editor.codeActionsOnSave": {
+		"source.fixAll.eslint": "explicit"
 	},
 	"files.eol": "\n",
 	"gitlens.advanced.blame.customArguments": ["-w"],

_maps/_basemap.dm

@@ -23,6 +23,7 @@
 		#include "map_files\desparity\desparity.dmm"
 		#include "map_files\Lawanka_Outpost\LawankaOutpost.dmm"
 		#include "map_files\slumbridge\slumbridge.dmm"
+		#include "map_files\DaedalusPrison\DaedalusPrison.dmm"
 		#ifdef CIBUILDING
 			#include "templates.dm"
 		#endif

_maps/daedalusprison.json

@@ -0,0 +1,20 @@
+{
+    "map_name": "Daedalus Prison",
+    "map_path": "map_files/DaedalusPrison",
+    "map_file": "DaedalusPrison.dmm",
+	"environment_traits": {
+        "COLD": true
+    },
+	"disk_sets": {
+		"set1": 1,
+		"set2": 1,
+		"set3": 1,
+		"set4": 1
+	},
+	"armor": "prison",
+	"quickbuilds": 2300,
+	"announce_text": "Coming from an icy planet within our jump drive range, a penal colony has sent out an emergency frequency that our comms array received. TGMC, prepare to deploy!",
+	"traits":[{
+		"weather_snowstorm": true
+	}]
+}