diff --git a/_maps/map_files220/cyberiad/cyberiad.dmm b/_maps/map_files220/cyberiad/cyberiad.dmm
index 13178353637e..48ad7192f28f 100644
--- a/_maps/map_files220/cyberiad/cyberiad.dmm
+++ b/_maps/map_files220/cyberiad/cyberiad.dmm
@@ -891,7 +891,7 @@
 "aeV" = (
 /obj/machinery/computer/security{
 	dir = 8;
-	network = list("SS13","Research  Outpost","Mining  Outpost")
+	network = list("SS13","Research    Outpost","Mining    Outpost")
 	},
 /obj/item/radio/intercom/custom{
 	dir = 8;
@@ -1672,11 +1672,13 @@
 	},
 /obj/structure/chair/stool,
 /obj/effect/decal/cleanable/dirt,
+/obj/effect/landmark/start/prisoner,
 /turf/simulated/floor/plasteel,
 /area/station/security/permabrig)
 "ajg" = (
 /obj/structure/chair/stool,
 /obj/machinery/atmospherics/pipe/simple/hidden,
+/obj/effect/landmark/start/prisoner,
 /turf/simulated/floor/plasteel,
 /area/station/security/permabrig)
 "ajj" = (
@@ -2918,6 +2920,7 @@
 	dir = 1
 	},
 /obj/effect/decal/cleanable/dirt,
+/obj/effect/landmark/spawner/prisoner,
 /turf/simulated/floor/plasteel{
 	icon_state = "red"
 	},
@@ -3484,7 +3487,7 @@
 "apk" = (
 /obj/machinery/computer/security{
 	dir = 8;
-	network = list("SS13","Research  Outpost","Mining  Outpost")
+	network = list("SS13","Research    Outpost","Mining    Outpost")
 	},
 /turf/simulated/floor/plasteel{
 	dir = 6;
@@ -3998,7 +4001,7 @@
 "arl" = (
 /obj/machinery/computer/security{
 	dir = 4;
-	network = list("SS13","Research  Outpost","Mining  Outpost")
+	network = list("SS13","Research    Outpost","Mining    Outpost")
 	},
 /turf/simulated/floor/plasteel{
 	dir = 8;
@@ -8022,7 +8025,7 @@
 /area/station/security/detective)
 "aEp" = (
 /obj/machinery/computer/security/wooden_tv{
-	network = list("SS13","Research  Outpost","Mining  Outpost")
+	network = list("SS13","Research    Outpost","Mining    Outpost")
 	},
 /obj/machinery/button/windowtint/north{
 	id = "Detective";
@@ -8784,6 +8787,7 @@
 	d2 = 2;
 	icon_state = "0-2"
 	},
+/obj/effect/landmark/start/barber,
 /turf/simulated/floor/plasteel{
 	icon_state = "barber"
 	},
@@ -9544,6 +9548,7 @@
 	icon_state = "1-2"
 	},
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/effect/landmark/start/barber,
 /turf/simulated/floor/plasteel{
 	icon_state = "barber"
 	},
@@ -9838,6 +9843,7 @@
 	dir = 10
 	},
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/effect/landmark/start/barber,
 /turf/simulated/floor/plasteel{
 	icon_state = "barber"
 	},
@@ -10666,6 +10672,7 @@
 	d2 = 2;
 	icon_state = "1-2"
 	},
+/obj/effect/landmark/start/dealer,
 /turf/simulated/floor/carpet,
 /area/station/public/mrchangs)
 "aOn" = (
@@ -12109,6 +12116,7 @@
 /obj/structure/chair{
 	dir = 4
 	},
+/obj/effect/landmark/start/artist,
 /turf/simulated/floor/plasteel{
 	dir = 1;
 	icon_state = "neutralcorner"
@@ -12134,6 +12142,7 @@
 /obj/structure/window/reinforced{
 	dir = 1
 	},
+/obj/effect/landmark/start/artist,
 /turf/simulated/floor/wood/oak,
 /area/station/public/dorms)
 "aTI" = (
@@ -12834,7 +12843,7 @@
 "aWf" = (
 /obj/structure/reagent_dispensers/peppertank/north,
 /obj/machinery/computer/security{
-	network = list("SS13","Research  Outpost","Mining  Outpost")
+	network = list("SS13","Research    Outpost","Mining    Outpost")
 	},
 /turf/simulated/floor/plasteel{
 	dir = 1;
@@ -13014,6 +13023,7 @@
 /obj/structure/chair/sofa/right{
 	dir = 4
 	},
+/obj/effect/landmark/start/artist,
 /turf/simulated/floor/wood/oak,
 /area/station/public/dorms)
 "aWD" = (
@@ -13994,6 +14004,7 @@
 /obj/structure/chair{
 	dir = 4
 	},
+/obj/effect/landmark/start/bath,
 /turf/simulated/floor/plasteel{
 	dir = 8;
 	icon_state = "arrival"
@@ -15639,6 +15650,7 @@
 	dir = 8
 	},
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/effect/landmark/start/chaplain,
 /turf/simulated/floor/carpet/black,
 /area/station/service/chapel/office)
 "bfW" = (
@@ -16368,6 +16380,7 @@
 /obj/structure/chair/wood{
 	dir = 4
 	},
+/obj/effect/landmark/start/dealer,
 /turf/simulated/floor/carpet,
 /area/station/public/mrchangs)
 "biQ" = (
@@ -16381,6 +16394,7 @@
 /obj/structure/chair/wood{
 	dir = 8
 	},
+/obj/effect/landmark/start/dealer,
 /turf/simulated/floor/carpet,
 /area/station/public/mrchangs)
 "biT" = (
@@ -18179,7 +18193,7 @@
 	c_tag = "Bridge West"
 	},
 /obj/machinery/computer/security{
-	network = list("SS13","Research  Outpost","Mining  Outpost","Telecomms")
+	network = list("SS13","Research    Outpost","Mining    Outpost","Telecomms")
 	},
 /obj/machinery/computer/security/telescreen/entertainment/directional/north,
 /turf/simulated/floor/plasteel{
@@ -25891,6 +25905,7 @@
 /obj/structure/chair/wood{
 	dir = 4
 	},
+/obj/effect/landmark/start/uncertain,
 /turf/simulated/floor/carpet,
 /area/station/maintenance/aft)
 "cam" = (
@@ -28875,7 +28890,7 @@
 /area/station/command/office/rd)
 "clZ" = (
 /obj/machinery/computer/general_air_control{
-	autolink_sensors = list("mair_in_meter"="Mixed  Air  In","air_sensor"="Mixed  Air  Supply  Tank","mair_out_meter"="Mixed  Air  Out","dloop_atm_meter"="Distribution  Loop","wloop_atm_meter"="Waste  Loop");
+	autolink_sensors = list("mair_in_meter"="Mixed    Air    In","air_sensor"="Mixed    Air    Supply    Tank","mair_out_meter"="Mixed    Air    Out","dloop_atm_meter"="Distribution    Loop","wloop_atm_meter"="Waste    Loop");
 	dir = 8;
 	level = 3;
 	name = "Distribution and Waste Monitor"
@@ -38083,7 +38098,7 @@
 /obj/machinery/keycard_auth/south,
 /obj/machinery/computer/security/engineering{
 	dir = 1;
-	network = list("Power  Alarms","Atmosphere  Alarms","Fire  Alarms","Engineering","Singularity","engine")
+	network = list("Power    Alarms","Atmosphere    Alarms","Fire    Alarms","Engineering","Singularity","engine")
 	},
 /turf/simulated/floor/plasteel{
 	dir = 8;
@@ -38149,6 +38164,7 @@
 /area/station/maintenance/aft)
 "cUi" = (
 /obj/structure/chair/wood,
+/obj/effect/landmark/start/dealer,
 /turf/simulated/floor/carpet,
 /area/station/public/mrchangs)
 "cUj" = (
@@ -39131,7 +39147,7 @@
 "cXS" = (
 /obj/machinery/computer/security/engineering{
 	dir = 1;
-	network = list("Power  Alarms","Atmosphere  Alarms","Fire  Alarms","Singularity")
+	network = list("Power    Alarms","Atmosphere    Alarms","Fire    Alarms","Singularity")
 	},
 /turf/simulated/floor/plasteel{
 	icon_state = "darkyellowfull"
@@ -41512,6 +41528,7 @@
 /obj/structure/chair/stool{
 	dir = 8
 	},
+/obj/effect/landmark/start/uncertain,
 /turf/simulated/floor/plating,
 /area/station/maintenance/asmaint)
 "dfW" = (
@@ -41838,6 +41855,7 @@
 	dir = 8
 	},
 /obj/machinery/light_switch/east,
+/obj/effect/landmark/start/dealer,
 /turf/simulated/floor/wood/oak,
 /area/station/public/mrchangs)
 "dhv" = (
@@ -46391,6 +46409,7 @@
 	dir = 4
 	},
 /obj/machinery/atmospherics/pipe/simple/hidden/cyan,
+/obj/effect/landmark/start/uncertain,
 /turf/simulated/floor/plating,
 /area/station/maintenance/asmaint)
 "dXo" = (
@@ -46812,6 +46831,7 @@
 	icon_state = "1-2"
 	},
 /obj/structure/weightmachine/weightlifter,
+/obj/effect/landmark/start/prisoner,
 /turf/simulated/floor/plasteel{
 	dir = 10;
 	icon_state = "black"
@@ -47949,6 +47969,7 @@
 "exu" = (
 /obj/structure/chair/sofa/left,
 /obj/effect/decal/cleanable/dirt,
+/obj/effect/landmark/start/uncertain,
 /turf/simulated/floor/plasteel,
 /area/station/maintenance/aft)
 "exC" = (
@@ -48133,6 +48154,7 @@
 /obj/structure/chair/stool{
 	dir = 4
 	},
+/obj/effect/landmark/start/prisoner,
 /turf/simulated/floor/plasteel,
 /area/station/security/permabrig)
 "eBE" = (
@@ -48392,6 +48414,7 @@
 	icon_state = "2-8"
 	},
 /obj/effect/landmark/damageturf,
+/obj/effect/landmark/start/uncertain,
 /turf/simulated/floor/wood/oak,
 /area/station/maintenance/aft)
 "eGZ" = (
@@ -48916,6 +48939,7 @@
 /area/station/maintenance/apmaint)
 "eSa" = (
 /obj/structure/chair/sofa/corp/right,
+/obj/effect/landmark/start/bar,
 /turf/simulated/floor/carpet/black,
 /area/station/service/bar/atrium)
 "eSg" = (
@@ -49129,6 +49153,7 @@
 /obj/machinery/atmospherics/unary/vent_pump/on{
 	dir = 4
 	},
+/obj/effect/landmark/start/bar,
 /turf/simulated/floor/wood/fancy/cherry,
 /area/station/service/bar/atrium)
 "eWx" = (
@@ -49360,7 +49385,7 @@
 /area/station/service/chapel)
 "fbT" = (
 /obj/machinery/computer/general_air_control{
-	autolink_sensors = list("mair_in_meter"="Mixed  Air  In","air_sensor"="Mixed  Air  Supply  Tank","mair_out_meter"="Mixed  Air  Out","dloop_atm_meter"="Distribution  Loop","wloop_atm_meter"="Waste  Loop");
+	autolink_sensors = list("mair_in_meter"="Mixed    Air    In","air_sensor"="Mixed    Air    Supply    Tank","mair_out_meter"="Mixed    Air    Out","dloop_atm_meter"="Distribution    Loop","wloop_atm_meter"="Waste    Loop");
 	dir = 1;
 	level = 3;
 	name = "Distribution and Waste Monitor"
@@ -50530,6 +50555,7 @@
 	dir = 1
 	},
 /obj/item/bedsheet/orange,
+/obj/effect/landmark/start/prisoner,
 /turf/simulated/floor/plasteel{
 	dir = 4;
 	icon_state = "red"
@@ -51459,6 +51485,7 @@
 /obj/structure/chair/sofa/right{
 	dir = 4
 	},
+/obj/effect/landmark/start/uncertain,
 /turf/simulated/floor/wood/oak,
 /area/station/maintenance/asmaint)
 "fQr" = (
@@ -52161,6 +52188,7 @@
 /obj/structure/chair/sofa{
 	dir = 4
 	},
+/obj/effect/landmark/start/uncertain,
 /turf/simulated/floor/wood/oak,
 /area/station/maintenance/asmaint)
 "geX" = (
@@ -52477,6 +52505,7 @@
 	color = "#85130b";
 	dir = 4
 	},
+/obj/effect/landmark/start/prisoner,
 /turf/simulated/floor/wood/oak,
 /area/station/security/permabrig)
 "gkf" = (
@@ -52757,6 +52786,7 @@
 	d2 = 4;
 	icon_state = "0-4"
 	},
+/obj/effect/landmark/start/bar,
 /turf/simulated/floor/wood/fancy/cherry,
 /area/station/service/bar/atrium)
 "goX" = (
@@ -52856,6 +52886,13 @@
 /obj/item/newspaper,
 /turf/simulated/floor/plating,
 /area/station/maintenance/port)
+"gpN" = (
+/obj/structure/chair/sofa/corp/right{
+	dir = 8
+	},
+/obj/effect/landmark/start/artist,
+/turf/simulated/floor/carpet/black,
+/area/station/service/bar/atrium)
 "gqn" = (
 /obj/machinery/atmospherics/unary/vent_scrubber/on,
 /turf/simulated/floor/plating,
@@ -53417,6 +53454,7 @@
 	dir = 8
 	},
 /obj/effect/decal/cleanable/dirt,
+/obj/effect/landmark/start/prisoner,
 /turf/simulated/floor/plasteel{
 	icon_state = "bar"
 	},
@@ -53532,6 +53570,10 @@
 	icon_state = "yellow"
 	},
 /area/station/engineering/atmos)
+"gDn" = (
+/obj/effect/landmark/start/chaplain,
+/turf/simulated/floor/carpet/black,
+/area/station/service/chapel/office)
 "gDp" = (
 /obj/machinery/door/firedoor,
 /obj/machinery/door/poddoor/preopen{
@@ -54295,6 +54337,13 @@
 	},
 /turf/simulated/floor/plating,
 /area/station/maintenance/fpmaint)
+"gOU" = (
+/obj/effect/landmark/start/bath,
+/turf/simulated/floor/plasteel{
+	dir = 8;
+	icon_state = "arrival"
+	},
+/area/station/public/dorms)
 "gPb" = (
 /obj/machinery/hydroponics/soil,
 /obj/effect/decal/cleanable/dirt,
@@ -58119,6 +58168,7 @@
 /obj/structure/chair/sofa/left{
 	dir = 4
 	},
+/obj/effect/landmark/start/uncertain,
 /turf/simulated/floor/wood/oak,
 /area/station/maintenance/asmaint)
 "igV" = (
@@ -60083,6 +60133,7 @@
 /obj/machinery/atmospherics/unary/vent_pump/on{
 	dir = 1
 	},
+/obj/effect/landmark/start/vip,
 /turf/simulated/floor/carpet/purple,
 /area/station/service/bar)
 "iUf" = (
@@ -61059,6 +61110,7 @@
 /obj/machinery/atmospherics/unary/vent_scrubber/on{
 	dir = 4
 	},
+/obj/effect/landmark/start/bar,
 /turf/simulated/floor/wood/fancy/cherry,
 /area/station/service/bar/atrium)
 "jpn" = (
@@ -61337,6 +61389,7 @@
 /area/station/engineering/gravitygenerator)
 "juH" = (
 /obj/item/storage/fancy/cigarettes/cigpack_random,
+/obj/effect/landmark/start/uncertain,
 /turf/simulated/floor/plating,
 /area/station/maintenance/aft)
 "juO" = (
@@ -62104,6 +62157,7 @@
 	icon_state = "4-8"
 	},
 /obj/effect/decal/cleanable/dirt,
+/obj/effect/landmark/start/prisoner,
 /turf/simulated/floor/plasteel{
 	icon_state = "bar"
 	},
@@ -64967,6 +65021,7 @@
 /area/station/maintenance/assembly_line)
 "kNX" = (
 /obj/structure/chair/sofa/corp/left,
+/obj/effect/landmark/start/vip,
 /turf/simulated/floor/carpet/green,
 /area/station/command/bridge)
 "kNY" = (
@@ -65057,6 +65112,7 @@
 	cover_color = "#85130b";
 	dir = 1
 	},
+/obj/effect/landmark/spawner/prisoner,
 /turf/simulated/floor/plasteel{
 	dir = 10;
 	icon_state = "red"
@@ -65290,6 +65346,7 @@
 "kTP" = (
 /obj/structure/weightmachine/stacklifter,
 /obj/machinery/atmospherics/pipe/simple/hidden,
+/obj/effect/landmark/start/prisoner,
 /turf/simulated/floor/plasteel{
 	dir = 1;
 	icon_state = "black"
@@ -65338,6 +65395,7 @@
 /obj/structure/chair/sofa/corp/left{
 	dir = 1
 	},
+/obj/effect/landmark/start/vip,
 /turf/simulated/floor/carpet/purple,
 /area/station/service/bar)
 "kVw" = (
@@ -66009,6 +66067,7 @@
 	dir = 5
 	},
 /obj/structure/chair/sofa/corp/left,
+/obj/effect/landmark/start/vip,
 /turf/simulated/floor/carpet/purple,
 /area/station/service/bar)
 "lie" = (
@@ -66706,6 +66765,7 @@
 /obj/structure/chair/sofa/corp/left{
 	dir = 8
 	},
+/obj/effect/landmark/start/bar,
 /turf/simulated/floor/carpet/black,
 /area/station/service/bar/atrium)
 "lxA" = (
@@ -66764,6 +66824,7 @@
 /obj/structure/chair{
 	dir = 4
 	},
+/obj/effect/landmark/start/uncertain,
 /turf/simulated/floor/plasteel,
 /area/station/maintenance/aft)
 "lzb" = (
@@ -68757,6 +68818,7 @@
 /obj/structure/chair/stool{
 	dir = 1
 	},
+/obj/effect/landmark/start/prisoner,
 /turf/simulated/floor/wood/oak,
 /area/station/security/permabrig)
 "mha" = (
@@ -69330,6 +69392,7 @@
 	dir = 1
 	},
 /obj/effect/landmark/damageturf,
+/obj/effect/landmark/start/uncertain,
 /turf/simulated/floor/wood/oak,
 /area/station/maintenance/aft)
 "mrd" = (
@@ -70273,6 +70336,7 @@
 /obj/structure/chair/stool{
 	dir = 1
 	},
+/obj/effect/landmark/start/prisoner,
 /turf/simulated/floor/plasteel,
 /area/station/security/permabrig)
 "mIU" = (
@@ -71363,6 +71427,7 @@
 /area/station/medical/psych)
 "ngT" = (
 /obj/structure/chair/sofa/corp/left,
+/obj/effect/landmark/start/vip,
 /turf/simulated/floor/carpet/black,
 /area/station/service/bar/atrium)
 "nhc" = (
@@ -72506,6 +72571,7 @@
 "nAy" = (
 /obj/structure/bed/mattress/dirty,
 /obj/effect/decal/cleanable/dirt,
+/obj/effect/landmark/start/uncertain,
 /turf/simulated/floor/plating,
 /area/station/maintenance/aft)
 "nAE" = (
@@ -72873,6 +72939,7 @@
 	cover_color = "#2f8faf";
 	dir = 1
 	},
+/obj/effect/landmark/start/vip,
 /turf/simulated/floor/plasteel{
 	icon_state = "bluefull"
 	},
@@ -73118,6 +73185,12 @@
 	icon_state = "white"
 	},
 /area/station/maintenance/asmaint)
+"nMR" = (
+/obj/effect/landmark/start/artist,
+/turf/simulated/floor/plasteel{
+	icon_state = "vault"
+	},
+/area/station/public/dorms)
 "nMT" = (
 /obj/structure/closet/secure_closet/personal,
 /obj/machinery/power/apc/directional/south,
@@ -74154,6 +74227,7 @@
 /obj/structure/chair/sofa/left{
 	color = "#85130b"
 	},
+/obj/effect/landmark/start/prisoner,
 /turf/simulated/floor/wood/oak,
 /area/station/security/permabrig)
 "oil" = (
@@ -76180,6 +76254,7 @@
 	dir = 8
 	},
 /obj/machinery/atmospherics/unary/vent_scrubber/on,
+/obj/effect/landmark/start/artist,
 /turf/simulated/floor/carpet/black,
 /area/station/service/bar/atrium)
 "oSF" = (
@@ -79131,7 +79206,7 @@
 /area/station/engineering/supermatter_room)
 "pUZ" = (
 /obj/machinery/computer/general_air_control{
-	autolink_sensors = list("n2_sensor"="Nitrogen","o2_sensor"="Oxygen","co2_sensor"="Carbon  Dioxide","tox_sensor"="Toxins","n2o_sensor"="Nitrous  Oxide","waste_sensor"="Gas  Mix  Tank");
+	autolink_sensors = list("n2_sensor"="Nitrogen","o2_sensor"="Oxygen","co2_sensor"="Carbon    Dioxide","tox_sensor"="Toxins","n2o_sensor"="Nitrous    Oxide","waste_sensor"="Gas    Mix    Tank");
 	dir = 1;
 	name = "Tank Monitor"
 	},
@@ -79253,6 +79328,7 @@
 /obj/structure/chair/stool{
 	dir = 8
 	},
+/obj/effect/landmark/start/prisoner,
 /turf/simulated/floor/plasteel,
 /area/station/security/permabrig)
 "pZl" = (
@@ -79572,6 +79648,7 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
 	dir = 10
 	},
+/obj/effect/landmark/start/barber,
 /turf/simulated/floor/plasteel{
 	icon_state = "barber"
 	},
@@ -80025,7 +80102,7 @@
 	dir = 4
 	},
 /obj/machinery/computer/general_air_control{
-	autolink_sensors = list("burn_sensor"="Burn  Mix");
+	autolink_sensors = list("burn_sensor"="Burn    Mix");
 	name = "Bomb Mix Monitor"
 	},
 /obj/machinery/door_control/shutter/north{
@@ -80608,6 +80685,7 @@
 /obj/machinery/camera{
 	c_tag = "Bridge Lounge Zone Center"
 	},
+/obj/effect/landmark/start/vip,
 /turf/simulated/floor/carpet/green,
 /area/station/command/bridge)
 "qwV" = (
@@ -80988,6 +81066,7 @@
 /area/station/maintenance/fsmaint)
 "qDr" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/effect/landmark/start/chaplain,
 /turf/simulated/floor/carpet/black,
 /area/station/service/chapel/office)
 "qDM" = (
@@ -81691,6 +81770,16 @@
 	icon_state = "red"
 	},
 /area/station/security/permabrig)
+"qNr" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 4
+	},
+/obj/effect/landmark/start/artist,
+/turf/simulated/floor/plasteel,
+/area/station/public/dorms)
 "qNx" = (
 /obj/structure/grille/broken,
 /turf/simulated/floor/plating,
@@ -81983,6 +82072,7 @@
 "qTA" = (
 /obj/structure/chair/sofa/right,
 /obj/effect/decal/cleanable/dirt,
+/obj/effect/landmark/start/uncertain,
 /turf/simulated/floor/plasteel,
 /area/station/maintenance/aft)
 "qTK" = (
@@ -83656,6 +83746,7 @@
 /obj/structure/chair{
 	dir = 8
 	},
+/obj/effect/landmark/start/uncertain,
 /turf/simulated/floor/plating,
 /area/station/maintenance/aft)
 "rED" = (
@@ -84233,6 +84324,7 @@
 	name = "Prison Intercom (General)";
 	pixel_y = 24
 	},
+/obj/effect/landmark/start/prisoner,
 /turf/simulated/floor/plasteel{
 	icon_state = "freezerfloor"
 	},
@@ -84853,6 +84945,7 @@
 /obj/structure/chair/sofa/corp/right{
 	dir = 8
 	},
+/obj/effect/landmark/start/bar,
 /turf/simulated/floor/carpet/black,
 /area/station/service/bar/atrium)
 "sec" = (
@@ -85106,6 +85199,7 @@
 	dir = 8
 	},
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/effect/landmark/start/bar,
 /turf/simulated/floor/carpet/black,
 /area/station/service/bar/atrium)
 "sjM" = (
@@ -85517,6 +85611,7 @@
 	dir = 1
 	},
 /obj/item/bedsheet/orange,
+/obj/effect/landmark/start/prisoner,
 /turf/simulated/floor/plasteel{
 	dir = 4;
 	icon_state = "red"
@@ -86502,7 +86597,7 @@
 /area/station/science/hallway)
 "sFl" = (
 /obj/machinery/computer/general_air_control{
-	autolink_sensors = list("n2_sensor"="Nitrogen","o2_sensor"="Oxygen","co2_sensor"="Carbon  Dioxide","tox_sensor"="Toxins","n2o_sensor"="Nitrous  Oxide","waste_sensor"="Gas  Mix  Tank");
+	autolink_sensors = list("n2_sensor"="Nitrogen","o2_sensor"="Oxygen","co2_sensor"="Carbon    Dioxide","tox_sensor"="Toxins","n2o_sensor"="Nitrous    Oxide","waste_sensor"="Gas    Mix    Tank");
 	dir = 4;
 	name = "Tank Monitor"
 	},
@@ -87102,6 +87197,7 @@
 	dir = 8
 	},
 /obj/effect/landmark/damageturf,
+/obj/effect/landmark/start/uncertain,
 /turf/simulated/floor/wood/oak,
 /area/station/maintenance/aft)
 "sSa" = (
@@ -87124,6 +87220,7 @@
 /obj/structure/chair/stool{
 	dir = 1
 	},
+/obj/effect/landmark/start/prisoner,
 /turf/simulated/floor/plasteel,
 /area/station/security/permabrig)
 "sSj" = (
@@ -88447,6 +88544,7 @@
 	cover_color = "#2f8faf";
 	dir = 1
 	},
+/obj/effect/landmark/start/vip,
 /turf/simulated/floor/plasteel{
 	icon_state = "bluefull"
 	},
@@ -88754,6 +88852,7 @@
 /area/station/science/xenobiology)
 "twH" = (
 /obj/structure/chair/sofa/corp/right,
+/obj/effect/landmark/start/vip,
 /turf/simulated/floor/carpet/green,
 /area/station/command/bridge)
 "twL" = (
@@ -88938,6 +89037,22 @@
 	icon_state = "whitepurple"
 	},
 /area/station/science/xenobiology)
+"tAH" = (
+/obj/structure/chair/stool/bar/dark{
+	dir = 1
+	},
+/obj/effect/landmark/start/bar,
+/turf/simulated/floor/carpet/black,
+/area/station/service/bar)
+"tAU" = (
+/obj/machinery/shower{
+	dir = 4
+	},
+/obj/effect/landmark/start/prisoner,
+/turf/simulated/floor/plasteel{
+	icon_state = "freezerfloor"
+	},
+/area/station/security/permabrig)
 "tBn" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
@@ -90035,6 +90150,7 @@
 	icon_state = "1-2"
 	},
 /obj/machinery/atmospherics/pipe/simple/hidden/cyan,
+/obj/effect/landmark/start/uncertain,
 /turf/simulated/floor/plasteel,
 /area/station/maintenance/aft)
 "tVF" = (
@@ -92579,6 +92695,24 @@
 	},
 /turf/simulated/floor/plating/airless,
 /area/space/nearstation)
+"uQi" = (
+/obj/structure/cable{
+	d1 = 4;
+	d2 = 8;
+	icon_state = "4-8"
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden{
+	dir = 4
+	},
+/obj/effect/landmark/start/prisoner,
+/turf/simulated/floor/plasteel,
+/area/station/security/permabrig)
 "uQv" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 4
@@ -93801,6 +93935,7 @@
 /obj/structure/chair{
 	dir = 8
 	},
+/obj/effect/landmark/start/uncertain,
 /turf/simulated/floor/wood/oak,
 /area/station/maintenance/aft)
 "vnZ" = (
@@ -93977,6 +94112,7 @@
 	cover_color = "#85130b";
 	dir = 1
 	},
+/obj/effect/landmark/spawner/prisoner,
 /turf/simulated/floor/plasteel{
 	icon_state = "red"
 	},
@@ -94594,6 +94730,7 @@
 	dir = 8
 	},
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/effect/landmark/start/bar,
 /turf/simulated/floor/carpet/black,
 /area/station/service/bar/atrium)
 "vDt" = (
@@ -95893,6 +96030,7 @@
 	},
 /obj/structure/chair/sofa/corp/right,
 /obj/machinery/atmospherics/unary/vent_scrubber/on,
+/obj/effect/landmark/start/vip,
 /turf/simulated/floor/carpet/purple,
 /area/station/service/bar)
 "wbr" = (
@@ -98311,6 +98449,13 @@
 /obj/machinery/atmospherics/unary/vent_scrubber/on,
 /turf/simulated/floor/plasteel,
 /area/station/supply/storage)
+"wZG" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/landmark/start/prisoner,
+/turf/simulated/floor/plasteel{
+	icon_state = "cmo"
+	},
+/area/station/security/permabrig)
 "wZU" = (
 /obj/machinery/atmospherics/pipe/manifold/hidden/cyan,
 /turf/simulated/floor/plating,
@@ -100516,6 +100661,7 @@
 /obj/structure/chair/stool{
 	dir = 1
 	},
+/obj/effect/landmark/start/uncertain,
 /turf/simulated/floor/wood/oak,
 /area/station/maintenance/aft)
 "xOQ" = (
@@ -101333,6 +101479,12 @@
 /obj/effect/spawner/lootdrop/trash,
 /turf/simulated/floor/plating,
 /area/station/maintenance/fsmaint)
+"yaT" = (
+/obj/effect/landmark/start/artist,
+/turf/simulated/floor/plasteel{
+	icon_state = "dark"
+	},
+/area/station/public/dorms)
 "ybE" = (
 /obj/machinery/hydroponics/constructable,
 /obj/machinery/light/directional/east,
@@ -101651,7 +101803,7 @@
 /obj/machinery/firealarm/directional/east,
 /obj/machinery/computer/security/engineering{
 	dir = 1;
-	network = list("Power  Alarms","Atmosphere  Alarms","Fire  Alarms","Engineering")
+	network = list("Power    Alarms","Atmosphere    Alarms","Fire    Alarms","Engineering")
 	},
 /turf/simulated/floor/plasteel{
 	icon_state = "dark"
@@ -101922,6 +102074,7 @@
 	dir = 8
 	},
 /obj/structure/sign/poster/contraband/random/east,
+/obj/effect/landmark/start/uncertain,
 /turf/simulated/floor/plating,
 /area/station/maintenance/asmaint)
 "yme" = (
@@ -120274,11 +120427,11 @@ avm
 xhW
 exh
 hjX
-orU
+wZG
 uVr
 rAe
 luh
-luh
+tAU
 vON
 xPE
 aaa
@@ -121555,7 +121708,7 @@ qWR
 fct
 anf
 ado
-sDL
+uQi
 anf
 ado
 anf
@@ -136761,7 +136914,7 @@ nQW
 sea
 lxc
 tqo
-sea
+gpN
 lxc
 mFq
 vAC
@@ -137000,7 +137153,7 @@ gLe
 aPf
 aQz
 oqZ
-aUJ
+gOU
 aWL
 aZz
 aUJ
@@ -137012,7 +137165,7 @@ aUS
 kFB
 sSj
 nQl
-hUa
+tAH
 tth
 fbz
 fbz
@@ -137772,7 +137925,7 @@ aPf
 aQv
 aZD
 aVo
-aZG
+yaT
 aZG
 bbu
 aPm
@@ -137783,7 +137936,7 @@ aUS
 spe
 kPF
 nQl
-hUa
+tAH
 oXr
 tqo
 oSA
@@ -138030,7 +138183,7 @@ aQv
 jKA
 aUT
 aZG
-aWT
+nMR
 bbu
 bdj
 bfq
@@ -138544,7 +138697,7 @@ aQE
 bxP
 aUT
 aZG
-aWT
+nMR
 bbu
 bdj
 kGL
@@ -138800,7 +138953,7 @@ raG
 fzl
 aZD
 aVs
-aZG
+yaT
 aZG
 bbu
 aPm
@@ -140598,7 +140751,7 @@ aFK
 aPm
 aPm
 aSM
-wsC
+qNr
 vca
 aIc
 sbR
@@ -141112,7 +141265,7 @@ aOI
 aPm
 aPm
 aSM
-wsC
+qNr
 jJh
 aLA
 aXi
@@ -148318,7 +148471,7 @@ aXd
 baz
 bcw
 bet
-bcx
+gDn
 biw
 baz
 aYP