Merge branch 'master' into upstream-merge-31045

_maps/basemap.dm

@@ -3,6 +3,7 @@
 #include "map_files\generic\Space.dmm"
 #include "map_files\generic\SpaceDock.dmm"
 #include "map_files\Mining\Lavaland.dmm"
+#include "map_files\generic\City_of_Cogs.dmm"
 
 #ifdef ALL_MAPS
 #include "map_files\debug\runtimestation.dmm"

_maps/map_files/BoxStation/BoxStation.dmm

@@ -7441,14 +7441,6 @@
 /obj/effect/spawner/structure/window/reinforced,
 /turf/open/floor/plating,
 /area/crew_quarters/fitness)
-"aqt" = (
-/obj/effect/landmark/syndicate_breach_area,
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
-	dir = 4
-	},
-/obj/effect/spawner/structure/window/reinforced,
-/turf/open/floor/plating,
-/area/crew_quarters/fitness)
 "aqu" = (
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
 	dir = 10
@@ -14777,7 +14769,6 @@
 /turf/open/floor/plating,
 /area/chapel/main)
 "aHr" = (
-/obj/effect/landmark/marauder_entry,
 /turf/open/space,
 /area/space)
 "aHs" = (
@@ -100719,7 +100710,7 @@ aaa
 aaa
 aaa
 aaa
-aqt
+aqs
 aro
 aro
 aro

_maps/map_files/MetaStation/MetaStation.dmm

@@ -178,7 +178,6 @@
 /turf/open/floor/plasteel/airless/solarpanel,
 /area/solar/port/fore)
 "aav" = (
-/obj/effect/landmark/marauder_entry,
 /turf/open/space,
 /area/space)
 "aaw" = (
@@ -2225,14 +2224,6 @@
 	},
 /turf/open/floor/plating,
 /area/crew_quarters/fitness/recreation)
-"aeD" = (
-/obj/effect/spawner/structure/window/reinforced,
-/obj/effect/landmark/syndicate_breach_area,
-/obj/machinery/atmospherics/pipe/simple/supply/hidden{
-	dir = 4
-	},
-/turf/open/floor/plating,
-/area/crew_quarters/fitness/recreation)
 "aeE" = (
 /obj/effect/spawner/structure/window/reinforced,
 /obj/machinery/atmospherics/pipe/simple/supply/hidden{
@@ -129060,7 +129051,7 @@ aaa
 aaa
 bii
 aaa
-aeD
+aeC
 afD
 afD
 afD

_maps/map_files/OmegaStation/OmegaStation.dmm

@@ -38904,7 +38904,7 @@
 	volume_rate = 200
 	},
 /turf/open/space/basic,
-/area/space)
+/area/engine/engineering)
 "bxd" = (
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
 	dir = 4

_maps/map_files/generic/CentCom.dmm

@@ -5751,6 +5751,10 @@
 /obj/structure/mirror{
 	pixel_x = 28
 	},
+/obj/structure/sink{
+	dir = 4;
+	pixel_x = 11
+	},
 /turf/open/floor/plasteel/freezer{
 	dir = 2
 	},
@@ -6101,7 +6105,7 @@
 /area/syndicate_mothership/control)
 "qp" = (
 /obj/structure/chair/stool,
-/obj/effect/landmark/syndicate_spawn,
+/obj/effect/landmark/start/nukeop,
 /turf/open/floor/plasteel/bar{
 	dir = 2
 	},
@@ -6506,6 +6510,7 @@
 /area/syndicate_mothership/control)
 "rj" = (
 /obj/structure/closet/cardboard,
+/obj/effect/turf_decal/stripes/corner,
 /turf/open/floor/plating/airless,
 /area/syndicate_mothership/control)
 "rk" = (
@@ -7623,7 +7628,7 @@
 /turf/open/floor/wood,
 /area/syndicate_mothership/control)
 "tT" = (
-/obj/effect/landmark/syndicate_spawn,
+/obj/effect/landmark/start/nukeop_leader,
 /turf/open/floor/wood,
 /area/syndicate_mothership/control)
 "tU" = (
@@ -8025,6 +8030,9 @@
 /area/syndicate_mothership/control)
 "vb" = (
 /obj/structure/closet/cardboard/metal,
+/obj/effect/turf_decal/stripes/corner{
+	dir = 8
+	},
 /turf/open/floor/plating/airless,
 /area/syndicate_mothership/control)
 "vc" = (
@@ -9731,7 +9739,6 @@
 /area/wizard_station)
 "zj" = (
 /obj/structure/table/wood,
-/obj/effect/landmark/teleport_scroll,
 /obj/item/dice/d20,
 /obj/item/dice,
 /turf/open/floor/carpet,
@@ -13652,6 +13659,44 @@
 	},
 /turf/open/floor/holofloor,
 /area/holodeck/rec_center/school)
+"QT" = (
+/obj/effect/turf_decal/stripes/corner,
+/turf/open/floor/plating/airless,
+/area/syndicate_mothership/control)
+"QU" = (
+/obj/effect/turf_decal/stripes/line,
+/turf/open/floor/plating/airless,
+/area/syndicate_mothership/control)
+"QV" = (
+/obj/effect/turf_decal/stripes/corner{
+	dir = 1
+	},
+/turf/open/floor/plating/airless,
+/area/syndicate_mothership/control)
+"QW" = (
+/obj/effect/turf_decal/stripes/corner{
+	dir = 1
+	},
+/turf/open/floor/plating/airless,
+/area/syndicate_mothership/control)
+"QX" = (
+/obj/effect/turf_decal/stripes/corner{
+	dir = 4
+	},
+/turf/open/floor/plating/airless,
+/area/syndicate_mothership/control)
+"QY" = (
+/obj/effect/turf_decal/stripes/corner{
+	dir = 8
+	},
+/turf/open/floor/plating/airless,
+/area/syndicate_mothership/control)
+"QZ" = (
+/obj/effect/turf_decal/stripes/corner{
+	dir = 4
+	},
+/turf/open/floor/plating/airless,
+/area/syndicate_mothership/control)
 
 (1,1,1) = {"
 aa
@@ -34895,7 +34940,7 @@ lG
 hm
 aa
 kl
-qs
+QT
 rk
 rl
 rm
@@ -34903,7 +34948,7 @@ tl
 rm
 ux
 vc
-qs
+QY
 kl
 aa
 aa
@@ -36180,7 +36225,7 @@ hq
 hm
 aa
 kl
-qt
+QU
 ro
 rm
 sd
@@ -36437,7 +36482,7 @@ hq
 hm
 aa
 kl
-qs
+QV
 rp
 ro
 rm
@@ -36445,7 +36490,7 @@ tl
 rm
 uy
 ve
-qs
+QZ
 kl
 aa
 aa
@@ -36695,13 +36740,13 @@ hm
 aa
 kl
 qs
-qs
+QW
 se
 se
 se
 se
 se
-qs
+QX
 qs
 kl
 aa
@@ -76391,9 +76436,9 @@ dM
 QJ
 QL
 fg
-QO
-QQ
-QR
+QL
+QK
+QL
 dM
 fN
 fQ
@@ -76903,11 +76948,11 @@ dM
 QI
 dM
 QK
-QM
+QL
 QN
-QP
+QL
 fr
-QS
+QL
 dM
 fN
 ab