Merge remote-tracking branch 'upstream/master' into ert-shuttles

.github/workflows/autowiki.yml

@@ -33,7 +33,7 @@ jobs:
       run: |
         sudo dpkg --add-architecture i386
         sudo apt update || true
-        sudo apt install -o APT::Immediate-Configure=false libssl1.1:i386
+        sudo apt install -o APT::Immediate-Configure=false libssl-dev:i386
         bash tools/ci/install_rust_g.sh
     - name: Install auxmos
       if: steps.secrets_set.outputs.SECRETS_ENABLED

.github/workflows/ci_suite.yml

@@ -13,7 +13,7 @@ jobs:
   run_linters:
     if: "!contains(github.event.head_commit.message, '[ci skip]')"
     name: Run Linters
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     steps:
       - uses: actions/checkout@v3
         with:
@@ -39,9 +39,11 @@ jobs:
           bash tools/ci/install_node.sh
           bash tools/ci/install_byond.sh
           bash tools/ci/install_spaceman_dmm.sh dreamchecker
+          cargo install ripgrep --features pcre2
           tools/bootstrap/python -c ''
       - name: Run Linters
         run: |
+          tools/bootstrap/python -m tools.maplint.source --github
           tools/build/build --ci lint tgui-test
           bash tools/ci/check_filedirs.sh shiptest.dme
           bash tools/ci/check_changelogs.sh

.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/RandomRuins/BeachRuins/beach_ancient_ruin.dmm

@@ -2657,17 +2657,6 @@
 	light_range = 2
 	},
 /area/ruin/beach/complex)
-"Py" = (
-/obj/structure/window/reinforced/fulltile,
-/obj/structure/grille,
-/obj/structure/cable{
-	icon_state = "0-8"
-	},
-/obj/structure/cable{
-	icon_state = "0-8"
-	},
-/turf/open/floor/plating,
-/area/ruin/beach/complex/wall)
 "PD" = (
 /obj/structure/cable{
 	icon_state = "4-8"
@@ -4857,7 +4846,7 @@ lS
 lS
 lS
 Lt
-Py
+nt
 lS
 lS
 lS

_maps/RandomRuins/BeachRuins/beach_crashed_engineer.dmm

@@ -663,9 +663,6 @@
 /turf/open/water/beach,
 /area/overmap_encounter/planetoid/beachplanet/explored)
 "BF" = (
-/obj/structure/cable{
-	icon_state = "4-8"
-	},
 /obj/structure/cable{
 	icon_state = "4-8"
 	},

_maps/RandomRuins/BeachRuins/beach_ocean_town.dmm

@@ -2871,7 +2871,6 @@
 /area/overmap_encounter/planetoid/beachplanet/explored)
 "Ip" = (
 /obj/structure/table,
-/obj/structure/table,
 /obj/structure/window,
 /obj/structure/window{
 	dir = 4