Merge branch 'master' of https://github.com/shiptest-ss13/Shiptest in…

…to shiptouchup
shiptest-ss13 · Jan 26, 2024 · 9ed7f14 · 9ed7f14
2 parents 161cb30 + 286941e
commit 9ed7f14
Show file tree

Hide file tree

Showing 407 changed files with 47,816 additions and 94,806 deletions.
diff --git a/.github/workflows/autowiki.yml b/.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

diff --git a/.github/workflows/ci_suite.yml b/.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

diff --git a/.github/workflows/tgs_test.yml b/.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

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

diff --git a/_maps/RandomRuins/BeachRuins/beach_ancient_ruin.dmm b/_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

diff --git a/_maps/RandomRuins/BeachRuins/beach_crashed_engineer.dmm b/_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"
 	},

diff --git a/_maps/RandomRuins/BeachRuins/beach_ocean_town.dmm b/_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

diff --git a/_maps/RandomRuins/IceRuins/icemoon_surface_corporate_rejects.dmm b/_maps/RandomRuins/IceRuins/icemoon_surface_corporate_rejects.dmm
@@ -840,7 +840,7 @@
 "uE" = (
 /obj/structure/fans/tiny,
 /obj/machinery/door/keycard{
-	name = "NanoTrasen Secure Solutions";
+	name = "Nanotrasen Secure Solutions";
 	puzzle_id = "NTB1"
 	},
 /turf/open/floor/wood,

diff --git a/_maps/RandomRuins/IceRuins/icemoon_surface_engioutpost.dmm b/_maps/RandomRuins/IceRuins/icemoon_surface_engioutpost.dmm
@@ -6,7 +6,7 @@
 /turf/open/floor/plating/snowed/smoothed/icemoon,
 /area/ruin)
 "ac" = (
-/obj/effect/mob_spawn/human/engineer/rig,
+/obj/effect/mob_spawn/human/engineer,
 /turf/open/floor/plating/snowed/smoothed/icemoon,
 /area/overmap_encounter/planetoid/ice/explored)
 "ad" = (
@@ -209,18 +209,6 @@
 /obj/machinery/door/firedoor/border_only,
 /turf/open/floor/plating/airless,
 /area/ruin)
-"aN" = (
-/obj/effect/spawner/structure/window/plasma/reinforced,
-/obj/machinery/atmospherics/pipe/simple/general/visible,
-/obj/machinery/door/firedoor/border_only{
-	dir = 1
-	},
-/obj/machinery/door/firedoor/border_only{
-	dir = 1
-	},
-/obj/machinery/door/firedoor/border_only,
-/turf/open/floor/plating/airless,
-/area/ruin)
 "aO" = (
 /turf/closed/wall/r_wall/rust,
 /area/overmap_encounter/planetoid/ice/explored)
@@ -1211,7 +1199,7 @@
 /turf/open/floor/plating/ice/icemoon,
 /area/overmap_encounter/planetoid/ice/explored)
 "cU" = (
-/obj/effect/mob_spawn/human/engineer/rig,
+/obj/effect/mob_spawn/human/engineer,
 /obj/structure/cable{
 	icon_state = "4-8"
 	},
@@ -1384,7 +1372,6 @@
 "dr" = (
 /obj/machinery/power/floodlight,
 /obj/structure/cable,
-/obj/structure/cable,
 /turf/open/floor/plating/icemoon,
 /area/overmap_encounter/planetoid/ice/explored)
 "ds" = (
@@ -2592,7 +2579,7 @@ av
 va
 ay
 aE
-aN
+wA
 aW
 bv
 bN

diff --git a/_maps/RandomRuins/IceRuins/icemoon_underground_drakelair.dmm b/_maps/RandomRuins/IceRuins/icemoon_underground_drakelair.dmm
@@ -127,7 +127,8 @@
 "iT" = (
 /obj/structure/stone_tile/slab,
 /mob/living/simple_animal/hostile/megafauna/dragon/icemoon{
-	loot = list(/obj/structure/closet/crate/necropolis/dragon,/obj/item/keycard/gatedrop/drakelair)
+	loot = list(/obj/structure/closet/crate/necropolis/dragon,/obj/item/keycard/gatedrop/drakelair);
+	crusher_loot = list(/obj/structure/closet/crate/necropolis/dragon/crusher,/obj/item/keycard/gatedrop/drakelair)
 	},
 /turf/open/indestructible/boss,
 /area/ruin)

diff --git a/_maps/RandomRuins/IceRuins/icemoon_underground_oldstation.dmm b/_maps/RandomRuins/IceRuins/icemoon_underground_oldstation.dmm
@@ -672,7 +672,7 @@
 /obj/machinery/power/apc{
 	dir = 1;
 	name = "Beta Station Main Corridor APC";
-	pixel_y = 23;
+	pixel_y = 25;
 	start_charge = 0
 	},
 /obj/structure/cable{
@@ -1218,7 +1218,7 @@
 /obj/machinery/power/apc{
 	dir = 1;
 	name = "Charlie Station Bridge APC";
-	pixel_y = 23;
+	pixel_y = 25;
 	start_charge = 0
 	},
 /obj/effect/decal/cleanable/cobweb,
@@ -1262,7 +1262,7 @@
 /obj/machinery/power/apc{
 	dir = 1;
 	name = "Delta Station RnD APC";
-	pixel_y = 23;
+	pixel_y = 25;
 	start_charge = 0
 	},
 /obj/structure/cable{
@@ -3557,7 +3557,7 @@
 /obj/machinery/power/apc{
 	dir = 1;
 	name = "Delta Prototype Lab APC";
-	pixel_y = 23;
+	pixel_y = 25;
 	start_charge = 0
 	},
 /obj/structure/cable{
@@ -4075,7 +4075,7 @@
 /obj/machinery/power/apc{
 	dir = 1;
 	name = "Beta Station Medbay APC";
-	pixel_y = 23;
+	pixel_y = 25;
 	start_charge = 0
 	},
 /obj/effect/turf_decal/corner/opaque/blue,
@@ -4388,7 +4388,7 @@
 "mQ" = (
 /obj/machinery/power/apc{
 	name = "Beta Station Mining Equipment APC ";
-	pixel_y = -23;
+	pixel_y = -25;
 	start_charge = 0
 	},
 /obj/effect/turf_decal/corner/opaque/brown{
@@ -6751,7 +6751,7 @@
 /obj/machinery/power/apc{
 	dir = 1;
 	name = "Charlie Station Kitchen APC";
-	pixel_y = 23;
+	pixel_y = 25;
 	start_charge = 0
 	},
 /obj/machinery/light/small/directional/north,
@@ -6913,7 +6913,7 @@
 /obj/structure/cable,
 /obj/machinery/power/apc{
 	name = "Charlie Station Garden APC ";
-	pixel_y = -23;
+	pixel_y = -25;
 	start_charge = 0
 	},
 /obj/item/reagent_containers/glass/bottle/nutrient/ez,

diff --git a/_maps/RandomRuins/JungleRuins/jungle_abandoned_library.dmm b/_maps/RandomRuins/JungleRuins/jungle_abandoned_library.dmm
@@ -1564,7 +1564,7 @@
 /obj/effect/mob_spawn/human/corpse/assistant{
 	oxy_damage = 200;
 	name = "Dungeon Master";
-	outfit = /datum/outfit/job/curator/dungeonmaster;
+	outfit = /datum/outfit/job/curator;
 	backpack_contents = null
 	},
 /obj/effect/decal/cleanable/blood,
@@ -3387,7 +3387,7 @@
 "Zw" = (
 /obj/structure/bed,
 /obj/item/bedsheet/brown,
-/obj/structure/sign/poster/official/sgt{
+/obj/structure/sign/poster/rilena/random{
 	pixel_y = 32
 	},
 /obj/structure/spider/stickyweb,

diff --git a/_maps/RandomRuins/JungleRuins/jungle_bombed_starport.dmm b/_maps/RandomRuins/JungleRuins/jungle_bombed_starport.dmm
@@ -1640,19 +1640,6 @@
 	icon_state = "plastitanium_dam2"
 	},
 /area/overmap_encounter/planetoid/jungle/explored)
-"lD" = (
-/obj/structure/catwalk/over/plated_catwalk,
-/obj/structure/cable{
-	icon_state = "4-8"
-	},
-/obj/structure/cable{
-	icon_state = "4-8"
-	},
-/obj/machinery/atmospherics/pipe/simple/orange/hidden{
-	dir = 4
-	},
-/turf/open/floor/plating,
-/area/overmap_encounter/planetoid/jungle/explored)
 "lG" = (
 /obj/effect/decal/cleanable/ash/large,
 /obj/structure/flora/rock/pile,
@@ -7684,20 +7671,6 @@
 	icon_state = "panelscorched"
 	},
 /area/overmap_encounter/planetoid/jungle/explored)
-"ZY" = (
-/obj/structure/cable{
-	icon_state = "4-8"
-	},
-/obj/structure/cable{
-	icon_state = "4-8"
-	},
-/obj/machinery/atmospherics/pipe/simple/orange/hidden{
-	dir = 4
-	},
-/turf/open/floor/concrete/reinforced{
-	light_range = 2
-	},
-/area/overmap_encounter/planetoid/jungle/explored)
 
 (1,1,1) = {"
 UE
@@ -10110,7 +10083,7 @@ Al
 Al
 Al
 pU
-ZY
+Is
 pU
 pU
 pU
@@ -11650,7 +11623,7 @@ Nb
 ce
 ir
 kv
-lD
+Mg
 MU
 ce
 xf

diff --git a/_maps/RandomRuins/JungleRuins/jungle_interceptor.dmm b/_maps/RandomRuins/JungleRuins/jungle_interceptor.dmm
@@ -902,18 +902,6 @@
 	},
 /turf/open/floor/plasteel/tech,
 /area/ruin/jungle/interceptor/forehall)
-"gQ" = (
-/obj/effect/spawner/structure/window/shuttle,
-/obj/machinery/door/poddoor/shutters/preopen{
-	id = "condorwindows";
-	name = "External Shutters"
-	},
-/obj/machinery/door/poddoor/shutters/preopen{
-	id = "condorwindows";
-	name = "External Shutters"
-	},
-/turf/open/floor/plating,
-/area/ruin/jungle/interceptor/starhall)
 "gR" = (
 /obj/effect/decal/remains/robot,
 /turf/open/floor/plating/dirt/jungle/dark/lit,
@@ -1908,7 +1896,6 @@
 "pY" = (
 /obj/item/stack/ore/salvage/scrapmetal,
 /obj/structure/girder,
-/obj/structure/girder,
 /turf/open/floor/plating/dirt/jungle/dark/lit,
 /area/overmap_encounter/planetoid/jungle/explored)
 "qa" = (
@@ -6036,7 +6023,6 @@
 /turf/open/floor/plating/dirt/jungle/dark/lit,
 /area/overmap_encounter/planetoid/jungle/explored)
 "Ya" = (
-/obj/structure/catwalk/over/plated_catwalk/dark,
 /obj/machinery/door/airlock/maintenance{
 	dir = 4
 	},
@@ -6121,7 +6107,6 @@
 	icon_state = "2-8"
 	},
 /obj/structure/catwalk/over,
-/obj/structure/catwalk/over,
 /obj/item/clothing/accessory/armband/engine,
 /obj/item/clothing/accessory/armband/engine,
 /turf/open/floor/plating/rust,
@@ -8649,7 +8634,7 @@ vl
 vl
 cL
 lj
-gQ
+pC
 UY
 XC
 Ih