Merge remote-tracking branch 'upstream/master' into ipcs-but-good

.github/workflows/tgs_test.yml

@@ -35,7 +35,7 @@ env:
   PR_NUMBER: ${{ github.event.number }}
 jobs:
   test_tgs_docker:
-    if: "!contains(github.event.head_commit.message, '[ci skip]')"
+    if: ( !contains(github.event.head_commit.message, '[ci skip]') )
     name: Test TGS Docker
     runs-on: ubuntu-22.04
     concurrency:
@@ -47,7 +47,7 @@ jobs:
         env:
           Database__DatabaseType: Sqlite
           Database__ConnectionString: Data Source=TGS_TGTest.sqlite3;Mode=ReadWriteCreate
-          General__ConfigVersion: 4.1.0
+          General__ConfigVersion: 5.0.0
           General__ApiPort: ${{ env.TGS_API_PORT }}
           General__SetupWizardMode: Never
         ports:
@@ -56,7 +56,7 @@ jobs:
       - name: Setup dotnet
         uses: actions/setup-dotnet@v2
         with:
-          dotnet-version: 7.0.x
+          dotnet-version: 8.0.x
 
       - name: Checkout Repository
         uses: actions/checkout@v3

.vscode/settings.json

@@ -17,14 +17,14 @@
 		"**/.pnp.*": true
 	},
 	"editor.codeActionsOnSave": {
-		"source.fixAll.eslint": true
+		"source.fixAll.eslint": "explicit"
 	},
 	"files.insertFinalNewline": true,
 	"gitlens.advanced.blame.customArguments": ["-w"],
 	"tgstationTestExplorer.project.resultsType": "json",
 	"[python]": {
 		"gitlens.codeLens.symbolScopes": ["!Module"],
-		"editor.wordBasedSuggestions": false,
+		"editor.wordBasedSuggestions": "off",
 		"editor.insertSpaces": true,
 		"editor.tabSize": 4
 	},

_maps/configs/independent_shetland.json

@@ -22,11 +22,6 @@
 			"officer": true,
 			"slots": 1
 		},
-		"Lieutenant": {
-			"outfit": "/datum/outfit/job/lieutenant",
-			"officer": true,
-			"slots": 1
-		},
 		"First Mate": {
 			"outfit": "/datum/outfit/job/head_of_personnel",
 			"officer": true,

_maps/outpost/elevator_ice.dmm

@@ -0,0 +1,47 @@
+//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
+"a" = (
+/obj/structure/elevator_platform,
+/obj/machinery/light/small/directional/east{
+	pixel_y = 6
+	},
+/turf/template_noop,
+/area/template_noop)
+"e" = (
+/obj/structure/elevator_platform,
+/obj/machinery/light/small/directional/east{
+	pixel_y = -6
+	},
+/obj/machinery/elevator_floor_button{
+	pixel_y = 10;
+	dir = 8;
+	pixel_x = 24
+	},
+/turf/template_noop,
+/area/template_noop)
+"A" = (
+/obj/structure/elevator_platform,
+/turf/template_noop,
+/area/template_noop)
+"S" = (
+/obj/structure/elevator_platform,
+/obj/machinery/status_display/elevator{
+	pixel_x = 32
+	},
+/turf/template_noop,
+/area/template_noop)
+
+(1,1,1) = {"
+A
+A
+A
+"}
+(2,1,1) = {"
+A
+A
+A
+"}
+(3,1,1) = {"
+a
+S
+e
+"}