Merge Upstream 07.04.2024

.gitignore

@@ -29,6 +29,7 @@ stddef.dm
 *.vscode/*
 !/.vscode/extensions.json
 !/.vscode/tasks.json
+!/.vscode/launch.json
 
 # ignore DMI tool build cache
 /tools/dmitool/bin/

.vscode/launch.json

@@ -0,0 +1,18 @@
+{
+	"version": "0.2.0",
+	"configurations": [
+	  {
+		"type": "byond",
+		"request": "launch",
+		"name": "Build & DS Debug",
+		"preLaunchTask": "dm: build - ${command:CurrentDME}",
+		"dmb": "${workspaceFolder}/${command:CurrentDMB}"
+	  },
+	  {
+		"type": "byond",
+		"request": "launch",
+		"name": "DS Debug",
+		"dmb": "${workspaceFolder}/${command:CurrentDMB}"
+	  }
+	]
+  }

.vscode/settings.json

@@ -1,35 +1,53 @@
 {
-	"gitlens.advanced.blame.customArguments": [
-		"--ignore-revs-file",
-		"${workspaceRoot}/.git-blame-ignore-revs"
-	],
 	// ESLint settings:
 	"eslint.workingDirectories": ["tgui/"],
-	"search.exclude": {
-		"**/.yarn": true,
-		"**/.pnp.*": true
-	},
 	"eslint.nodePath": "tgui/.yarn/sdks",
 	"prettier.configPath": "tgui/.prettierrc.yml",
 	"prettier.prettierPath": "tgui/.yarn/sdks/prettier/index.cjs",
 	"typescript.tsdk": "tgui/.yarn/sdks/typescript/lib",
 	"typescript.enablePromptUseWorkspaceTsdk": true,
+	"search.exclude": {
+		"**/.yarn": true,
+		"**/.pnp.*": true
+	},
+	"eslint.format.enable": true,
 	"eslint.rules.customizations": [
 		// We really want to fail the CI builds on styling errors,
 		// but it's better to show them as yellow squigglies in IDE
 		// and thus differentiate from the red typescript ones which
 		// are actually hard errors.
 		{ "rule": "*", "severity": "warn" }
 	],
-	"eslint.format.enable": true,
+
 	"[javascript]": {
-		"editor.rulers": [80]
+		"editor.rulers": [80],
+		"editor.defaultFormatter": "esbenp.prettier-vscode",
+		"editor.formatOnSave": true
+	},
+	"[javascriptreact]": {
+		"editor.rulers": [80],
+		"editor.defaultFormatter": "esbenp.prettier-vscode",
+		"editor.formatOnSave": true
 	},
 	"[typescript]": {
-		"editor.rulers": [80]
+		"editor.rulers": [80],
+		"editor.defaultFormatter": "esbenp.prettier-vscode",
+		"editor.formatOnSave": true
+	},
+	"[typescriptreact]": {
+		"editor.rulers": [80],
+		"editor.defaultFormatter": "esbenp.prettier-vscode",
+		"editor.formatOnSave": true
 	},
 	"[scss]": {
-		"editor.rulers": [80]
+		"editor.rulers": [80],
+		"editor.defaultFormatter": "esbenp.prettier-vscode",
+		"editor.formatOnSave": true
 	},
-	"editor.formatOnSave": true
+
+	"editor.formatOnSave": true,
+	"gitlens.advanced.blame.customArguments": [
+		"--ignore-revs-file",
+		"${workspaceRoot}/.git-blame-ignore-revs"
+	],
 }

_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_hermit.dmm

@@ -175,6 +175,10 @@
 /obj/effect/baseturf_helper,
 /turf/simulated/floor/plating,
 /area/ruin/powered)
+"P" = (
+/obj/effect/mapping_helpers/no_lava,
+/turf/simulated/floor/plating/asteroid/basalt/lava_land_surface,
+/area/lavaland/surface/outdoors)
 "X" = (
 /obj/item/flashlight/lantern,
 /turf/simulated/floor/plating,
@@ -189,14 +193,14 @@ a
 a
 a
 a
-s
-s
-s
-s
-s
-s
-s
-s
+P
+P
+P
+a
+a
+a
+a
+a
 "}
 (2,1,1) = {"
 a
@@ -209,12 +213,12 @@ a
 a
 a
 a
+P
+P
 s
-s
-s
-s
-s
-s
+a
+a
+a
 "}
 (3,1,1) = {"
 a
@@ -227,12 +231,12 @@ a
 a
 a
 a
+P
+P
+P
 s
-s
-s
-s
-s
-s
+a
+a
 "}
 (4,1,1) = {"
 a
@@ -246,11 +250,11 @@ a
 a
 a
 a
+P
+P
+P
 s
-s
-s
-s
-s
+a
 "}
 (5,1,1) = {"
 a
@@ -266,9 +270,9 @@ t
 t
 t
 t
-s
-s
-s
+P
+P
+a
 "}
 (6,1,1) = {"
 a
@@ -284,8 +288,8 @@ v
 x
 B
 t
-s
-s
+P
+P
 s
 "}
 (7,1,1) = {"
@@ -302,9 +306,9 @@ w
 y
 y
 D
-s
-s
-s
+P
+P
+a
 "}
 (8,1,1) = {"
 a
@@ -320,9 +324,9 @@ o
 z
 C
 t
-s
-s
-s
+P
+P
+a
 "}
 (9,1,1) = {"
 b
@@ -338,9 +342,9 @@ o
 t
 t
 t
+P
 s
-s
-s
+a
 "}
 (10,1,1) = {"
 b
@@ -356,8 +360,8 @@ o
 A
 b
 a
-s
-s
+P
+P
 s
 "}
 (11,1,1) = {"
@@ -375,7 +379,7 @@ c
 b
 a
 a
-s
+P
 s
 "}
 (12,1,1) = {"
@@ -446,7 +450,7 @@ a
 a
 a
 a
-G
+F
 J
 G
 "}

_maps/map_files/RandomRuins/SpaceRuins/oldstation.dmm

@@ -1054,10 +1054,6 @@
 /obj/effect/decal/cleanable/dirt,
 /turf/simulated/floor/plating,
 /area/ruin/ancientstation)
-"de" = (
-/obj/structure/transit_tube/crossing/horizontal,
-/turf/template_noop,
-/area/space/nearstation)
 "df" = (
 /obj/structure/cable/yellow,
 /turf/simulated/floor/plating/airless,
@@ -4992,10 +4988,6 @@
 /obj/machinery/power/tesla_coil,
 /turf/simulated/floor/plating,
 /area/ruin/ancientstation/thetacorridor)
-"Db" = (
-/obj/structure/transit_tube/crossing,
-/turf/template_noop,
-/area/space/nearstation)
 "Lu" = (
 /obj/structure/transit_tube/horizontal{
 	dir = 4
@@ -5810,7 +5802,7 @@ aa
 aa
 aa
 aa
-de
+VT
 aa
 uQ
 ck
@@ -7443,7 +7435,7 @@ aa
 aa
 aa
 dk
-Db
+cX
 aa
 dg
 dg
@@ -7506,7 +7498,7 @@ aa
 aa
 aa
 aa
-de
+VT
 aa
 aa
 aa

_maps/map_files/generic/centcomm.dmm

@@ -3631,10 +3631,6 @@
 /turf/simulated/floor/plasteel,
 /area/admin)
 "mt" = (
-/obj/structure/cable{
-	d2 = 2;
-	icon_state = "0-2"
-	},
 /obj/machinery/mech_bay_recharge_port/upgraded,
 /turf/simulated/floor/plasteel,
 /area/admin)
@@ -3646,10 +3642,6 @@
 /turf/simulated/floor/mineral/titanium,
 /area/shuttle/administration)
 "mw" = (
-/obj/structure/cable{
-	d2 = 2;
-	icon_state = "0-2"
-	},
 /obj/machinery/computer/mech_bay_power_console,
 /turf/simulated/floor/plasteel,
 /area/admin)
@@ -8297,10 +8289,6 @@
 /area/centcom/suppy)
 "DD" = (
 /obj/machinery/power/apc/directional/south,
-/obj/structure/cable{
-	d2 = 4;
-	icon_state = "0-4"
-	},
 /obj/structure/sign/securearea{
 	pixel_x = -32
 	},
@@ -8344,15 +8332,6 @@
 /turf/simulated/floor/plasteel/dark,
 /area/admin)
 "DL" = (
-/obj/structure/cable{
-	d2 = 8;
-	icon_state = "0-8"
-	},
-/obj/structure/cable{
-	d1 = 4;
-	d2 = 8;
-	icon_state = "4-8"
-	},
 /obj/machinery/mech_bay_recharge_port/upgraded,
 /turf/simulated/floor/mineral/plastitanium/red,
 /area/shuttle/gamma/space)
@@ -8363,11 +8342,6 @@
 /area/centcom/specops)
 "DN" = (
 /obj/mecha/combat/marauder/ares/loaded,
-/obj/structure/cable{
-	d1 = 4;
-	d2 = 8;
-	icon_state = "4-8"
-	},
 /turf/simulated/floor/mineral/plastitanium/red,
 /area/shuttle/gamma/space)
 "DO" = (
@@ -8440,10 +8414,6 @@
 /turf/simulated/floor/engine,
 /area/admin)
 "DY" = (
-/obj/structure/cable{
-	d2 = 8;
-	icon_state = "0-8"
-	},
 /obj/machinery/computer/mech_bay_power_console{
 	dir = 1
 	},