Merge pull request #1196 from SaraSayomi/Lambda-and-meta-fixin

Lambda reversion, meta general fixes
SPLURT-Station · Sep 20, 2024 · 4a1fb37 · 4a1fb37
2 parents 761c988 + ca95f03
commit 4a1fb37
Show file tree

Hide file tree

Showing 5 changed files with 94,113 additions and 3,671 deletions.
diff --git a/_maps/_basemap.dm b/_maps/_basemap.dm
@@ -11,7 +11,7 @@
 		#include "map_files\OmegaStation\OmegaStation.dmm"
 		#include "map_files\PubbyStation\PubbyStation.dmm"
 		#include "map_files\BoxStation\BoxStation.dmm"
-		#include "map_files\LambdaStation\lambda.dmm"
+		#include "splurt_maps\map_files\LambdaStation\lambda.dmm"
 		#include "map_files\SpookyStation\SpookyStation.dmm"
 		#include "map_files\CogStation\CogStation.dmm"
 		#include "map_files\TauStation\TauStation.dmm"

diff --git a/_maps/lambdastation.json b/_maps/lambdastation.json
@@ -1,6 +1,6 @@
 {
     "map_name": "Lambda Station",
-    "map_path": "map_files/LambdaStation",
+    "map_path": "splurt_maps/map_files/LambdaStation",
     "map_file": "lambda.dmm",
     "shuttles": {
         "cargo": "cargo_box",
@@ -10,11 +10,13 @@
     },
     "traits":[
         {
-            "Up":1,
-			"Baseturf":"/turf/open/openspace"
+		"Up":1,
+		"Baseturf":"/turf/open/openspace",
+		"Linkage": "Cross"
         },
         {
-            "Down":-1
+		"Down":-1,
+		"Linkage": "Cross"
         }
     ]
 }
diff --git a/_maps/map_files/MetaStation/MetaStation.dmm b/_maps/map_files/MetaStation/MetaStation.dmm
@@ -191,40 +191,6 @@
 	},
 /turf/open/floor/plasteel/dark,
 /area/security/execution/education)
-"aaC" = (
-/obj/machinery/atmospherics/pipe/simple/general/hidden,
-/obj/effect/turf_decal/tile/red{
-	dir = 1
-	},
-/obj/effect/turf_decal/tile/red{
-	dir = 4
-	},
-/obj/machinery/atmospherics/pipe/manifold/supply/hidden{
-	dir = 1
-	},
-/turf/open/floor/plasteel/dark,
-/area/security/execution/education)
-"aaD" = (
-/obj/structure/sink/kitchen{
-	desc = "A sink used for washing one's hands and face. It looks rusty and home-made";
-	name = "old sink";
-	pixel_y = 28
-	},
-/obj/effect/turf_decal/tile/red{
-	dir = 1
-	},
-/obj/effect/turf_decal/tile/red{
-	dir = 4
-	},
-/obj/machinery/atmospherics/pipe/simple/supply/hidden{
-	dir = 4
-	},
-/obj/machinery/light/small{
-	dir = 1;
-	light_color = "#ffc1c1"
-	},
-/turf/open/floor/plasteel/dark,
-/area/security/execution/education)
 "aaE" = (
 /obj/machinery/power/apc{
 	areastring = "/area/security/execution/education";
@@ -273,7 +239,9 @@
 /obj/structure/chair/office/dark{
 	dir = 1
 	},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
+/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{
+	dir = 8
+	},
 /turf/open/floor/plasteel/dark,
 /area/security/execution/education)
 "aaI" = (
@@ -322,8 +290,10 @@
 	dir = 8
 	},
 /obj/effect/turf_decal/tile/red,
-/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden,
 /obj/machinery/light/small,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
+	dir = 4
+	},
 /turf/open/floor/plasteel/dark,
 /area/security/execution/education)
 "aaT" = (
@@ -1274,10 +1244,6 @@
 	},
 /turf/open/floor/plating,
 /area/security/prison/cells)
-"adp" = (
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on,
-/turf/open/floor/plasteel/dark,
-/area/security/execution/education)
 "adq" = (
 /obj/structure/cable/yellow{
 	icon_state = "4-8"
@@ -60899,12 +60865,6 @@
 	},
 /turf/open/floor/plasteel,
 /area/cargo/miningoffice)
-"kEV" = (
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
-	dir = 6
-	},
-/turf/open/floor/plasteel/dark,
-/area/ai_monitored/security/armory)
 "kFi" = (
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
 	dir = 5
@@ -65412,6 +65372,19 @@
 	},
 /turf/open/floor/plasteel,
 /area/engineering/atmos)
+"mZL" = (
+/obj/machinery/atmospherics/pipe/simple/general/hidden,
+/obj/effect/turf_decal/tile/red{
+	dir = 1
+	},
+/obj/effect/turf_decal/tile/red{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+	dir = 4
+	},
+/turf/open/floor/plasteel/dark,
+/area/security/execution/education)
 "mZQ" = (
 /obj/structure/chair/office/light{
 	dir = 1
@@ -69989,6 +69962,22 @@
 	},
 /turf/open/floor/plasteel,
 /area/commons/storage/art)
+"pyq" = (
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
+	dir = 6
+	},
+/obj/effect/turf_decal/tile/neutral{
+	dir = 1
+	},
+/obj/effect/turf_decal/tile/neutral,
+/obj/effect/turf_decal/tile/neutral{
+	dir = 4
+	},
+/obj/effect/turf_decal/tile/neutral{
+	dir = 8
+	},
+/turf/open/floor/plasteel/dark,
+/area/ai_monitored/security/armory)
 "pyW" = (
 /obj/item/cartridge/medical{
 	pixel_x = -2;
@@ -75566,6 +75555,12 @@
 	luminosity = 2
 	},
 /area/ai_monitored/command/nuke_storage)
+"sss" = (
+/obj/machinery/atmospherics/components/unary/vent_pump/on{
+	dir = 1
+	},
+/turf/open/floor/plasteel/dark,
+/area/security/execution/education)
 "ssE" = (
 /obj/structure/lattice/catwalk,
 /obj/structure/cable{
@@ -79655,13 +79650,6 @@
 	},
 /turf/open/floor/plasteel,
 /area/service/bar)
-"uNg" = (
-/obj/machinery/atmospherics/pipe/simple/general/hidden,
-/obj/machinery/atmospherics/components/unary/vent_pump/on{
-	dir = 1
-	},
-/turf/open/floor/plasteel/dark,
-/area/security/execution/education)
 "uOc" = (
 /obj/effect/landmark/start/captain,
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
@@ -82572,6 +82560,13 @@
 	},
 /turf/open/floor/plasteel/dark,
 /area/command/bridge)
+"wsi" = (
+/obj/machinery/atmospherics/pipe/simple/general/hidden,
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on{
+	dir = 8
+	},
+/turf/open/floor/plasteel/dark,
+/area/security/execution/education)
 "wsI" = (
 /obj/structure/cable/yellow{
 	icon_state = "1-2"
@@ -84732,6 +84727,27 @@
 	},
 /turf/open/floor/engine,
 /area/engineering/main)
+"xtL" = (
+/obj/structure/sink/kitchen{
+	desc = "A sink used for washing one's hands and face. It looks rusty and home-made";
+	name = "old sink";
+	pixel_y = 28
+	},
+/obj/effect/turf_decal/tile/red{
+	dir = 1
+	},
+/obj/effect/turf_decal/tile/red{
+	dir = 4
+	},
+/obj/machinery/light/small{
+	dir = 1;
+	light_color = "#ffc1c1"
+	},
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden{
+	dir = 1
+	},
+/turf/open/floor/plasteel/dark,
+/area/security/execution/education)
 "xtS" = (
 /obj/effect/landmark/carpspawn,
 /turf/open/space,
@@ -109995,8 +110011,8 @@ abz
 abX
 aco
 syL
-aaC
-uNg
+mZL
+wsi
 kUL
 aei
 aeJ
@@ -110252,8 +110268,8 @@ aaZ
 aaZ
 aaZ
 aaZ
-aaD
-adp
+xtL
+sss
 aaS
 aaZ
 aaZ
@@ -114119,7 +114135,7 @@ aaa
 lMJ
 aeq
 aes
-kEV
+pyq
 fEr
 gYh
 xae

diff --git a/_maps/shuttles/whiteship_meta.dmm b/_maps/shuttles/whiteship_meta.dmm
@@ -1414,9 +1414,6 @@
 	name = "NTSS Evergreen Salvage Bay"
 	},
 /obj/structure/fans/tiny,
-/obj/effect/mapping_helpers/airlock/cyclelink_helper{
-	dir = 4
-	},
 /obj/structure/cable{
 	icon_state = "4-8"
 	},
@@ -1977,9 +1974,6 @@
 	name = "dust"
 	},
 /obj/structure/fans/tiny,
-/obj/effect/mapping_helpers/airlock/cyclelink_helper{
-	dir = 4
-	},
 /obj/structure/cable{
 	icon_state = "4-8"
 	},
@@ -2370,9 +2364,6 @@
 	name = "dust"
 	},
 /obj/structure/fans/tiny,
-/obj/effect/mapping_helpers/airlock/cyclelink_helper{
-	dir = 8
-	},
 /obj/machinery/atmospherics/pipe/simple/supply/hidden{
 	dir = 4
 	},
@@ -3395,9 +3386,6 @@
 	name = "dust"
 	},
 /obj/structure/fans/tiny,
-/obj/effect/mapping_helpers/airlock/cyclelink_helper{
-	dir = 8
-	},
 /obj/machinery/atmospherics/pipe/simple/supply/hidden{
 	dir = 4
 	},