diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/alien animals/catslug.dm b/code/modules/mob/living/simple_mob/subtypes/animal/alien animals/catslug.dm
index d29c706e6c..e28af85a9c 100644
--- a/code/modules/mob/living/simple_mob/subtypes/animal/alien animals/catslug.dm	
+++ b/code/modules/mob/living/simple_mob/subtypes/animal/alien animals/catslug.dm	
@@ -531,7 +531,7 @@
 	makes_dirt = 0
 	say_list_type = /datum/say_list/catslug/gatslug
 	melee_damage_upper = 10		//"Trained" security member, so they can hit that little bit harder
-	list/armor = list(
+	armor = list(
 		"melee" = 15,
 		"bullet" = 0,
 		"laser" = 0,
diff --git a/maps/groundbase/gb-centcomm.dmm b/maps/groundbase/gb-centcomm.dmm
index c5cff635d0..d067d146ae 100644
--- a/maps/groundbase/gb-centcomm.dmm
+++ b/maps/groundbase/gb-centcomm.dmm
@@ -22,7 +22,6 @@
 	door_color = "#822a1e";
 	frequency = 1380;
 	id_tag = "escape_shuttle_hatch";
-	locked = 1;
 	name = "Docking Port Airlock"
 	},
 /obj/effect/shuttle_landmark{
diff --git a/maps/groundbase/gb-z1.dmm b/maps/groundbase/gb-z1.dmm
index f43b6225be..2446849d5b 100644
--- a/maps/groundbase/gb-z1.dmm
+++ b/maps/groundbase/gb-z1.dmm
@@ -302,6 +302,14 @@
 	},
 /turf/simulated/floor/tiled/white,
 /area/groundbase/medical/or1)
+"aU" = (
+/obj/effect/landmark{
+	name = "maint_pred"
+	},
+/turf/simulated/floor/outdoors/newdirt_nograss/virgo3c{
+	outdoors = 0
+	},
+/area/maintenance/groundbase/level1/swtunnel)
 "aW" = (
 /obj/machinery/door/firedoor,
 /obj/machinery/door/airlock/command{
@@ -460,6 +468,9 @@
 	},
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/effect/landmark/start{
+	name = "Roboticist"
+	},
 /turf/simulated/floor/outdoors/sidewalk/slab/virgo3c,
 /area/groundbase/level1/centsquare)
 "bB" = (
@@ -598,6 +609,12 @@
 	},
 /turf/simulated/floor/tiled/dark,
 /area/groundbase/medical/resleeving)
+"bZ" = (
+/obj/effect/landmark/start{
+	name = "Chief Medical Officer"
+	},
+/turf/simulated/floor/outdoors/sidewalk/side/virgo3c,
+/area/groundbase/level1/centsquare)
 "ca" = (
 /turf/simulated/floor/outdoors/newdirt/virgo3c{
 	outdoors = 0
@@ -721,7 +738,6 @@
 /obj/random/tech_supply,
 /obj/random/tech_supply,
 /obj/item/device/paicard,
-/obj/effect/landmark/vines,
 /turf/simulated/floor/tiled,
 /area/groundbase/civilian/toolstorage)
 "cs" = (
@@ -853,6 +869,10 @@
 	},
 /turf/simulated/floor/tiled/techmaint,
 /area/groundbase/engineering/atmos)
+"cM" = (
+/obj/effect/landmark/vines,
+/turf/simulated/floor/outdoors/grass/virgo3c,
+/area/groundbase/level1/eastspur)
 "cN" = (
 /obj/structure/cable/yellow{
 	icon_state = "1-2"
@@ -919,6 +939,18 @@
 	},
 /turf/simulated/floor/tiled/white,
 /area/groundbase/medical/office)
+"cT" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	dir = 8
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 4
+	},
+/obj/effect/landmark/start{
+	name = "Botanist"
+	},
+/turf/simulated/floor/outdoors/sidewalk/side/virgo3c,
+/area/groundbase/level1/centsquare)
 "cU" = (
 /obj/item/weapon/stock_parts/manipulator,
 /obj/item/weapon/stock_parts/matter_bin,
@@ -929,6 +961,12 @@
 /obj/item/weapon/circuitboard/autolathe,
 /turf/simulated/floor/tiled,
 /area/groundbase/engineering/techstorage)
+"cV" = (
+/obj/effect/landmark/start{
+	name = "Explorer"
+	},
+/turf/simulated/floor/outdoors/sidewalk/slab/virgo3c,
+/area/groundbase/level1/centsquare)
 "cW" = (
 /obj/structure/table/rack/steel,
 /obj/item/weapon/circuitboard/mech_recharger{
@@ -980,6 +1018,12 @@
 	},
 /turf/simulated/floor/tiled/white,
 /area/groundbase/medical/or1)
+"cZ" = (
+/obj/effect/landmark/start{
+	name = "Internal Affairs Agent"
+	},
+/turf/simulated/floor/outdoors/sidewalk/virgo3c,
+/area/groundbase/level1/centsquare)
 "db" = (
 /obj/machinery/door/firedoor,
 /obj/machinery/door/airlock{
@@ -1055,6 +1099,12 @@
 	},
 /turf/simulated/floor/carpet,
 /area/groundbase/security/detective)
+"dt" = (
+/obj/effect/landmark/start{
+	name = "Field Medic"
+	},
+/turf/simulated/floor/outdoors/sidewalk/virgo3c,
+/area/groundbase/level1/centsquare)
 "du" = (
 /obj/structure/table/standard,
 /obj/item/stack/nanopaste,
@@ -1311,6 +1361,18 @@
 /obj/item/weapon/stool/padded,
 /turf/simulated/floor/tiled,
 /area/groundbase/engineering/techstorage)
+"eb" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	dir = 8
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 4
+	},
+/obj/effect/landmark/start{
+	name = "Cargo Technician"
+	},
+/turf/simulated/floor/outdoors/sidewalk/side/virgo3c,
+/area/groundbase/level1/centsquare)
 "ec" = (
 /obj/machinery/door/airlock/hatch{
 	icon_state = "door_locked";
@@ -2149,6 +2211,10 @@
 /obj/machinery/atmospherics/pipe/manifold/hidden/supply,
 /turf/simulated/floor/tiled,
 /area/groundbase/engineering/engine)
+"gy" = (
+/obj/effect/landmark/vines,
+/turf/simulated/floor/outdoors/grass/forest/virgo3c,
+/area/groundbase/level1/centsquare)
 "gz" = (
 /turf/simulated/floor/tiled/dark,
 /area/groundbase/security/hos)
@@ -2967,7 +3033,9 @@
 /obj/structure/cable/yellow{
 	icon_state = "2-8"
 	},
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
+	dir = 8
+	},
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /obj/structure/disposalpipe/segment,
 /turf/simulated/floor/tiled/dark,
@@ -2994,6 +3062,12 @@
 	},
 /turf/simulated/floor/tiled/dark,
 /area/groundbase/security/armory)
+"ja" = (
+/obj/effect/landmark{
+	name = "lightsout"
+	},
+/turf/simulated/floor/tiled/white,
+/area/groundbase/medical/equipment)
 "jb" = (
 /obj/machinery/atmospherics/unary/vent_pump/on{
 	dir = 8
@@ -3193,6 +3267,9 @@
 /obj/machinery/atmospherics/unary/vent_pump/on{
 	dir = 4
 	},
+/obj/effect/landmark{
+	name = "morphspawn"
+	},
 /turf/simulated/floor/tiled,
 /area/groundbase/civilian/toolstorage)
 "jB" = (
@@ -3228,6 +3305,7 @@
 "jH" = (
 /obj/structure/table/steel_reinforced,
 /obj/machinery/atmospherics/unary/vent_pump/on,
+/obj/effect/landmark/vermin,
 /turf/simulated/floor/tiled/dark,
 /area/groundbase/security/briefing)
 "jI" = (
@@ -3373,6 +3451,12 @@
 /obj/structure/disposalpipe/segment,
 /turf/simulated/floor/outdoors/sidewalk/virgo3c,
 /area/groundbase/engineering/lobby)
+"ke" = (
+/obj/effect/landmark/start{
+	name = "Chemist"
+	},
+/turf/simulated/floor/outdoors/sidewalk/side/virgo3c,
+/area/groundbase/level1/centsquare)
 "kf" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/black{
 	dir = 4
@@ -3420,6 +3504,9 @@
 /obj/machinery/firealarm{
 	dir = 8
 	},
+/obj/machinery/light{
+	dir = 8
+	},
 /turf/simulated/floor/tiled,
 /area/groundbase/engineering/workshop)
 "km" = (
@@ -3578,6 +3665,9 @@
 /obj/machinery/atmospherics/unary/vent_scrubber/on{
 	dir = 4
 	},
+/obj/machinery/light{
+	dir = 8
+	},
 /turf/simulated/floor/tiled,
 /area/groundbase/command/tcomms/foyer)
 "kH" = (
@@ -3660,6 +3750,12 @@
 	},
 /turf/simulated/floor/tiled/dark,
 /area/groundbase/security/equipment)
+"kN" = (
+/obj/machinery/atmospherics/unary/vent_scrubber/on{
+	dir = 8
+	},
+/turf/simulated/floor/tiled/dark,
+/area/groundbase/security/halls)
 "kP" = (
 /obj/effect/floor_decal/techfloor/orange{
 	dir = 4
@@ -3692,6 +3788,9 @@
 	dir = 8;
 	network = "tcommsat"
 	},
+/obj/machinery/light{
+	dir = 4
+	},
 /turf/simulated/floor/tiled/techfloor/grid,
 /area/groundbase/command/tcomms/computer)
 "kU" = (
@@ -3851,6 +3950,9 @@
 /area/groundbase/command/ai/hall)
 "lp" = (
 /obj/machinery/atmospherics/unary/vent_scrubber/on,
+/obj/machinery/light{
+	dir = 1
+	},
 /turf/simulated/floor/tiled/techmaint,
 /area/groundbase/command/tcomms/storage)
 "lq" = (
@@ -3974,6 +4076,9 @@
 /turf/simulated/floor/tiled,
 /area/groundbase/civilian/toolstorage)
 "lH" = (
+/obj/machinery/light/small{
+	dir = 8
+	},
 /turf/simulated/floor/outdoors/newdirt_nograss/virgo3c{
 	outdoors = 0
 	},
@@ -4285,10 +4390,19 @@
 /turf/simulated/floor/carpet/sblucarpet,
 /area/groundbase/security/hos)
 "mI" = (
+/obj/machinery/light/small{
+	dir = 4
+	},
 /turf/simulated/floor/outdoors/newdirt_nograss/virgo3c{
 	outdoors = 0
 	},
 /area/groundbase/medical/lhallway)
+"mJ" = (
+/obj/machinery/light{
+	dir = 8
+	},
+/turf/simulated/floor/bluegrid,
+/area/groundbase/command/ai/foyer)
 "mK" = (
 /obj/machinery/door/firedoor,
 /obj/machinery/door/airlock/glass_security{
@@ -4950,6 +5064,12 @@
 	},
 /turf/simulated/floor/tiled/white,
 /area/groundbase/medical/office)
+"oG" = (
+/obj/machinery/light{
+	dir = 4
+	},
+/turf/simulated/floor/tiled/techfloor/grid,
+/area/groundbase/command/ai/chamber)
 "oH" = (
 /obj/machinery/light{
 	dir = 8
@@ -5449,6 +5569,17 @@
 /obj/item/device/radio/off,
 /turf/simulated/floor/tiled,
 /area/groundbase/civilian/gateway)
+"qh" = (
+/obj/machinery/light{
+	dir = 4
+	},
+/turf/simulated/floor/bluegrid{
+	name = "Mainframe Base";
+	nitrogen = 100;
+	oxygen = 0;
+	temperature = 80
+	},
+/area/groundbase/command/tcomms)
 "qj" = (
 /obj/structure/table/reinforced,
 /obj/machinery/computer/skills{
@@ -5668,6 +5799,9 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 4
 	},
+/obj/effect/landmark/start{
+	name = "Atmospheric Technician"
+	},
 /turf/simulated/floor/outdoors/sidewalk/side/virgo3c,
 /area/groundbase/level1/centsquare)
 "qQ" = (
@@ -6108,6 +6242,12 @@
 	},
 /turf/simulated/floor/tiled/dark,
 /area/groundbase/security/armory)
+"sa" = (
+/obj/machinery/atmospherics/unary/vent_pump/on{
+	dir = 4
+	},
+/turf/simulated/floor/tiled/dark,
+/area/groundbase/security/halls)
 "sb" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /turf/simulated/floor/tiled,
@@ -6828,6 +6968,12 @@
 	},
 /turf/simulated/floor/tiled/dark,
 /area/groundbase/security/detective)
+"ue" = (
+/obj/effect/landmark/start{
+	name = "Head of Personnel"
+	},
+/turf/simulated/floor/outdoors/sidewalk/virgo3c,
+/area/groundbase/level1/centsquare)
 "uf" = (
 /obj/structure/table/standard,
 /obj/item/weapon/stock_parts/subspace/sub_filter,
@@ -6977,6 +7123,18 @@
 /obj/structure/disposalpipe/segment,
 /turf/simulated/floor/outdoors/sidewalk/virgo3c,
 /area/groundbase/engineering/lobby)
+"uB" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	dir = 8
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 4
+	},
+/obj/effect/landmark/start{
+	name = "Bartender"
+	},
+/turf/simulated/floor/outdoors/sidewalk/side/virgo3c,
+/area/groundbase/level1/centsquare)
 "uC" = (
 /obj/structure/closet/bombcloset/double,
 /turf/simulated/floor/tiled/dark,
@@ -7105,6 +7263,14 @@
 	},
 /turf/simulated/floor/tiled/dark,
 /area/groundbase/medical/resleeving)
+"uV" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/effect/landmark/start{
+	name = "Xenobiologist"
+	},
+/turf/simulated/floor/outdoors/sidewalk/virgo3c,
+/area/groundbase/level1/centsquare)
 "uY" = (
 /obj/effect/floor_decal/industrial/warning/corner{
 	dir = 8
@@ -7421,6 +7587,17 @@
 	},
 /turf/simulated/floor/tiled/white,
 /area/groundbase/medical/office)
+"vV" = (
+/obj/structure/cable{
+	icon_state = "1-2"
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/effect/landmark/start{
+	name = "Security Officer"
+	},
+/turf/simulated/floor/outdoors/sidewalk/virgo3c,
+/area/groundbase/level1/centsquare)
 "vW" = (
 /obj/effect/landmark/vermin,
 /obj/structure/cable/yellow{
@@ -7618,6 +7795,12 @@
 	},
 /turf/simulated/floor/tiled/white,
 /area/groundbase/medical/or1)
+"wD" = (
+/obj/effect/landmark/start{
+	name = "Head of Security"
+	},
+/turf/simulated/floor/outdoors/sidewalk/virgo3c,
+/area/groundbase/level1/centsquare)
 "wE" = (
 /obj/structure/cable/yellow{
 	icon_state = "1-2"
@@ -7844,8 +8027,15 @@
 /obj/item/weapon/aiModule/pleasurebot,
 /obj/item/weapon/aiModule/protective_shell,
 /obj/item/weapon/aiModule/scientific_pursuer,
+/obj/machinery/light,
 /turf/simulated/floor/bluegrid,
 /area/groundbase/command/ai/storage)
+"xe" = (
+/obj/effect/landmark/start{
+	name = "Detective"
+	},
+/turf/simulated/floor/outdoors/sidewalk/virgo3c,
+/area/groundbase/level1/centsquare)
 "xf" = (
 /obj/machinery/power/breakerbox/activated{
 	RCon_tag = "Engineering Substation Bypass"
@@ -8013,6 +8203,7 @@
 /obj/structure/table/standard,
 /obj/item/weapon/stock_parts/subspace/transmitter,
 /obj/item/weapon/stock_parts/subspace/transmitter,
+/obj/machinery/light,
 /turf/simulated/floor/tiled/techmaint,
 /area/groundbase/command/tcomms/storage)
 "xz" = (
@@ -8363,6 +8554,12 @@
 	},
 /turf/simulated/floor/tiled/steel_ridged,
 /area/groundbase/medical/or2)
+"yA" = (
+/obj/effect/landmark/start{
+	name = "Pilot"
+	},
+/turf/simulated/floor/outdoors/sidewalk/side/virgo3c,
+/area/groundbase/level1/centsquare)
 "yD" = (
 /obj/structure/table/standard,
 /obj/item/weapon/aiModule/oxygen,
@@ -8446,6 +8643,21 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /turf/simulated/floor/outdoors/sidewalk/slab/virgo3c,
 /area/groundbase/civilian/arrivals)
+"yN" = (
+/obj/structure/cable/yellow{
+	icon_state = "4-8"
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	dir = 8
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 4
+	},
+/obj/effect/landmark{
+	name = "lightsout"
+	},
+/turf/simulated/floor/tiled/white,
+/area/groundbase/medical/lhallway)
 "yP" = (
 /obj/machinery/light{
 	dir = 4
@@ -8594,7 +8806,6 @@
 /turf/simulated/floor/tiled,
 /area/groundbase/engineering/engine)
 "zi" = (
-/obj/effect/landmark/vermin,
 /obj/structure/cable/yellow{
 	icon_state = "1-2"
 	},
@@ -8882,6 +9093,12 @@
 	},
 /turf/simulated/floor/tiled,
 /area/groundbase/engineering/engine)
+"zS" = (
+/obj/machinery/light{
+	dir = 8
+	},
+/turf/simulated/floor/bluegrid,
+/area/groundbase/command/ai/robot)
 "zU" = (
 /obj/structure/cable/yellow{
 	icon_state = "1-8"
@@ -8903,6 +9120,14 @@
 	},
 /turf/simulated/floor/tiled/white,
 /area/groundbase/medical/or2)
+"zW" = (
+/obj/effect/landmark{
+	name = "maint_pred"
+	},
+/turf/simulated/floor/outdoors/newdirt_nograss/virgo3c{
+	outdoors = 0
+	},
+/area/maintenance/groundbase/level1/netunnel)
 "zX" = (
 /obj/machinery/alarm{
 	dir = 4
@@ -8937,6 +9162,7 @@
 /obj/structure/disposalpipe/segment{
 	dir = 4
 	},
+/obj/effect/landmark/vines,
 /turf/simulated/floor/outdoors/sidewalk/slab/virgo3c,
 /area/groundbase/level1/southwestspur)
 "Ac" = (
@@ -9008,6 +9234,9 @@
 /obj/machinery/atmospherics/unary/vent_scrubber/on{
 	dir = 4
 	},
+/obj/machinery/light{
+	dir = 8
+	},
 /turf/simulated/floor/tiled/dark,
 /area/groundbase/security/halls)
 "Am" = (
@@ -9108,6 +9337,17 @@
 	},
 /turf/simulated/floor/tiled/dark,
 /area/groundbase/security/hos)
+"AA" = (
+/obj/structure/cable{
+	icon_state = "1-2"
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/effect/landmark/start{
+	name = "Shaft Miner"
+	},
+/turf/simulated/floor/outdoors/sidewalk/virgo3c,
+/area/groundbase/level1/centsquare)
 "AB" = (
 /obj/structure/bed/chair{
 	dir = 4
@@ -9473,6 +9713,7 @@
 /obj/machinery/atmospherics/unary/vent_pump/on{
 	dir = 8
 	},
+/obj/effect/landmark/vermin,
 /turf/simulated/floor/tiled,
 /area/groundbase/engineering/workshop)
 "BI" = (
@@ -10170,6 +10411,12 @@
 "DQ" = (
 /turf/simulated/wall,
 /area/groundbase/medical/equipment)
+"DR" = (
+/obj/effect/landmark/start{
+	name = "Engineer"
+	},
+/turf/simulated/floor/outdoors/sidewalk/virgo3c,
+/area/groundbase/level1/centsquare)
 "DS" = (
 /obj/structure/cable/yellow{
 	icon_state = "2-8"
@@ -10331,6 +10578,12 @@
 	},
 /turf/simulated/floor/tiled/dark,
 /area/groundbase/security/equipment)
+"Ep" = (
+/obj/effect/landmark/start{
+	name = "Clown"
+	},
+/turf/simulated/floor/outdoors/sidewalk/slab/virgo3c,
+/area/groundbase/level1/centsquare)
 "Eq" = (
 /obj/structure/table/rack{
 	dir = 8;
@@ -10654,6 +10907,7 @@
 /obj/machinery/atmospherics/unary/vent_pump/on{
 	dir = 4
 	},
+/obj/effect/landmark/vermin,
 /turf/simulated/floor/tiled/white,
 /area/groundbase/medical/equipment)
 "Fr" = (
@@ -10683,6 +10937,12 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /turf/simulated/floor/tiled,
 /area/groundbase/engineering/storage)
+"Fv" = (
+/obj/effect/landmark{
+	name = "morphspawn"
+	},
+/turf/simulated/floor,
+/area/maintenance/groundbase/trashpit)
 "Fw" = (
 /turf/simulated/floor/tiled,
 /area/groundbase/engineering/atmos)
@@ -10865,6 +11125,17 @@
 /obj/machinery/atmospherics/unary/vent_scrubber/on,
 /turf/simulated/floor/carpet/bcarpet,
 /area/groundbase/security/briefing)
+"Gd" = (
+/obj/structure/cable{
+	icon_state = "1-2"
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/effect/landmark/start{
+	name = "Scientist"
+	},
+/turf/simulated/floor/outdoors/sidewalk/virgo3c,
+/area/groundbase/level1/centsquare)
 "Gg" = (
 /obj/machinery/atmospherics/pipe/manifold/visible/cyan{
 	dir = 8
@@ -11264,6 +11535,17 @@
 	outdoors = 0
 	},
 /area/groundbase/level1/northspur)
+"Ho" = (
+/obj/structure/cable/yellow{
+	icon_state = "1-2"
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
+	dir = 4
+	},
+/obj/structure/disposalpipe/segment,
+/turf/simulated/floor/tiled/dark,
+/area/groundbase/security/halls)
 "Hp" = (
 /turf/simulated/wall,
 /area/maintenance/groundbase/substation/secsci)
@@ -11742,6 +12024,7 @@
 	dir = 4
 	},
 /obj/machinery/atmospherics/unary/vent_pump/on,
+/obj/effect/landmark/vermin,
 /turf/simulated/floor/tiled/dark,
 /area/groundbase/security/lobby)
 "IH" = (
@@ -11779,8 +12062,15 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 6
 	},
+/obj/effect/landmark/start{
+	name = "Assistant"
+	},
 /turf/simulated/floor/outdoors/sidewalk/slab/virgo3c,
 /area/groundbase/level1/centsquare)
+"IL" = (
+/obj/machinery/light,
+/turf/simulated/floor/tiled/techfloor/grid,
+/area/groundbase/command/ai/upload)
 "IN" = (
 /obj/effect/floor_decal/industrial/danger,
 /turf/simulated/floor/tiled,
@@ -11845,6 +12135,17 @@
 /obj/machinery/recharge_station,
 /turf/simulated/floor/tiled/white,
 /area/groundbase/civilian/bar)
+"Jc" = (
+/obj/structure/cable{
+	icon_state = "1-2"
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/effect/landmark/start{
+	name = "Site Manager"
+	},
+/turf/simulated/floor/outdoors/sidewalk/virgo3c,
+/area/groundbase/level1/centsquare)
 "Je" = (
 /obj/machinery/portable_atmospherics/canister/oxygen,
 /obj/machinery/atmospherics/unary/vent_scrubber/on{
@@ -11924,6 +12225,12 @@
 /obj/machinery/atmospherics/unary/vent_scrubber/on,
 /turf/simulated/floor/tiled/dark,
 /area/groundbase/security/warden)
+"Jq" = (
+/obj/effect/landmark/start{
+	name = "Paramedic"
+	},
+/turf/simulated/floor/outdoors/sidewalk/side/virgo3c,
+/area/groundbase/level1/centsquare)
 "Jr" = (
 /obj/structure/cable/yellow{
 	icon_state = "1-2"
@@ -12002,6 +12309,12 @@
 	},
 /turf/simulated/floor/lino,
 /area/groundbase/civilian/bar)
+"JF" = (
+/obj/effect/landmark/start{
+	name = "Research Director"
+	},
+/turf/simulated/floor/outdoors/sidewalk/side/virgo3c,
+/area/groundbase/level1/centsquare)
 "JG" = (
 /obj/structure/cable{
 	icon_state = "1-8"
@@ -12298,6 +12611,17 @@
 	},
 /turf/simulated/floor/tiled/dark,
 /area/groundbase/medical/autoresleeving)
+"Kp" = (
+/obj/machinery/light{
+	dir = 8
+	},
+/turf/simulated/floor/bluegrid{
+	name = "Mainframe Base";
+	nitrogen = 100;
+	oxygen = 0;
+	temperature = 80
+	},
+/area/groundbase/command/tcomms)
 "Kq" = (
 /obj/machinery/door/firedoor,
 /obj/machinery/door/airlock/highsecurity{
@@ -12423,6 +12747,12 @@
 /obj/machinery/atmospherics/unary/vent_pump/on,
 /turf/simulated/floor/tiled/techmaint,
 /area/groundbase/command/tcomms/storage)
+"KL" = (
+/obj/machinery/light{
+	dir = 8
+	},
+/turf/simulated/floor/tiled/techfloor/grid,
+/area/groundbase/command/ai/upload)
 "KM" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /turf/simulated/floor/tiled,
@@ -12514,6 +12844,9 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 9
 	},
+/obj/effect/landmark/start{
+	name = "Chaplain"
+	},
 /turf/simulated/floor/outdoors/sidewalk/slab/virgo3c,
 /area/groundbase/level1/centsquare)
 "Lb" = (
@@ -13096,6 +13429,12 @@
 	},
 /turf/simulated/floor/tiled,
 /area/groundbase/engineering/ce)
+"MB" = (
+/obj/effect/landmark/start{
+	name = "Entertainer"
+	},
+/turf/simulated/floor/outdoors/sidewalk/virgo3c,
+/area/groundbase/level1/centsquare)
 "MC" = (
 /obj/machinery/atmospherics/pipe/manifold/hidden/supply,
 /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
@@ -13161,6 +13500,22 @@
 /obj/item/weapon/pickaxe,
 /turf/simulated/floor/tiled,
 /area/groundbase/cargo/mining)
+"MM" = (
+/obj/effect/landmark/start{
+	name = "Pathfinder"
+	},
+/turf/simulated/floor/outdoors/sidewalk/slab/virgo3c,
+/area/groundbase/level1/centsquare)
+"MN" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	dir = 8
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 4
+	},
+/obj/machinery/light,
+/turf/simulated/floor/tiled/techfloor/grid,
+/area/groundbase/command/tcomms/computer)
 "MO" = (
 /turf/simulated/mineral/cave/virgo3c,
 /area/groundbase/level1/nw)
@@ -13307,6 +13662,12 @@
 	},
 /turf/simulated/floor/tiled/techmaint,
 /area/groundbase/engineering/atmos)
+"Nl" = (
+/obj/effect/landmark/start{
+	name = "Mime"
+	},
+/turf/simulated/floor/outdoors/sidewalk/side/virgo3c,
+/area/groundbase/level1/centsquare)
 "Nm" = (
 /obj/structure/cable/yellow{
 	icon_state = "1-2"
@@ -13781,6 +14142,12 @@
 	},
 /turf/simulated/wall/r_wall,
 /area/groundbase/security/iaa1)
+"OD" = (
+/obj/machinery/light/small{
+	dir = 4
+	},
+/turf/simulated/floor/outdoors/newdirt/virgo3c,
+/area/groundbase/level1/ne)
 "OG" = (
 /obj/machinery/alarm,
 /turf/simulated/floor/bluegrid,
@@ -13850,6 +14217,12 @@
 	},
 /turf/simulated/floor/tiled/techmaint,
 /area/groundbase/engineering/atmos)
+"OW" = (
+/obj/effect/landmark/start{
+	name = "Janitor"
+	},
+/turf/simulated/floor/outdoors/sidewalk/slab/virgo3c,
+/area/groundbase/level1/centsquare)
 "OX" = (
 /obj/machinery/door/firedoor,
 /obj/machinery/door/airlock/glass_security/polarized{
@@ -13901,6 +14274,13 @@
 	},
 /turf/simulated/floor/tiled/techfloor/grid,
 /area/groundbase/command/ai/foyer)
+"Pe" = (
+/obj/machinery/light/floortube{
+	dir = 4;
+	pixel_x = 6
+	},
+/turf/simulated/floor/tiled/techmaint,
+/area/groundbase/engineering/atmos)
 "Pf" = (
 /obj/machinery/atmospherics/unary/vent_pump/on{
 	dir = 1
@@ -14300,6 +14680,12 @@
 "QD" = (
 /turf/simulated/floor/outdoors/grass/forest/virgo3c,
 /area/groundbase/level1/westspur)
+"QE" = (
+/obj/effect/landmark/start{
+	name = "Chef"
+	},
+/turf/simulated/floor/outdoors/sidewalk/side/virgo3c,
+/area/groundbase/level1/centsquare)
 "QG" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/black{
 	dir = 4
@@ -14465,6 +14851,14 @@
 	},
 /turf/simulated/floor/outdoors/sidewalk/side/virgo3c,
 /area/groundbase/level1/southwestspur)
+"Rd" = (
+/obj/effect/landmark{
+	name = "maint_pred"
+	},
+/turf/simulated/floor/outdoors/newdirt_nograss/virgo3c{
+	outdoors = 0
+	},
+/area/maintenance/groundbase/level1/setunnel)
 "Rf" = (
 /obj/machinery/atmospherics/pipe/tank/oxygen,
 /turf/simulated/floor/tiled/techmaint,
@@ -14665,6 +15059,14 @@
 	},
 /turf/simulated/floor/tiled,
 /area/groundbase/engineering/storage)
+"RJ" = (
+/obj/effect/landmark{
+	name = "maint_pred"
+	},
+/turf/simulated/floor/outdoors/newdirt_nograss/virgo3c{
+	outdoors = 0
+	},
+/area/maintenance/groundbase/level1/stunnel)
 "RL" = (
 /obj/structure/filingcabinet/chestdrawer,
 /obj/machinery/power/apc{
@@ -14704,6 +15106,9 @@
 /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
 	dir = 4
 	},
+/obj/effect/landmark/start{
+	name = "Warden"
+	},
 /turf/simulated/floor/outdoors/sidewalk/slab/virgo3c,
 /area/groundbase/level1/centsquare)
 "RR" = (
@@ -14734,6 +15139,7 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 9
 	},
+/obj/effect/landmark/vines,
 /turf/simulated/floor/outdoors/sidewalk/slab/virgo3c,
 /area/groundbase/level1/westspur)
 "RU" = (
@@ -14789,6 +15195,7 @@
 	id = "Bar";
 	layer = 3.3
 	},
+/obj/effect/landmark/vermin,
 /turf/simulated/floor/lino,
 /area/groundbase/civilian/bar)
 "Se" = (
@@ -15316,6 +15723,12 @@
 /obj/machinery/computer/security/wooden_tv,
 /turf/simulated/floor/carpet,
 /area/groundbase/security/detective)
+"TB" = (
+/obj/effect/landmark/start{
+	name = "Librarian"
+	},
+/turf/simulated/floor/outdoors/sidewalk/side/virgo3c,
+/area/groundbase/level1/centsquare)
 "TC" = (
 /turf/simulated/wall/r_wall,
 /area/groundbase/security/processing)
@@ -15637,6 +16050,12 @@
 /obj/machinery/atmospherics/pipe/manifold4w/hidden/supply,
 /turf/simulated/floor/tiled/white,
 /area/groundbase/medical/lhallway)
+"UB" = (
+/obj/effect/landmark/start{
+	name = "Medical Doctor"
+	},
+/turf/simulated/floor/outdoors/sidewalk/side/virgo3c,
+/area/groundbase/level1/centsquare)
 "UC" = (
 /turf/simulated/floor/outdoors/grass/virgo3c,
 /area/groundbase/civilian/gateway)
@@ -15816,6 +16235,9 @@
 /turf/simulated/floor/tiled,
 /area/groundbase/engineering/storage)
 "Vs" = (
+/obj/effect/landmark/start{
+	name = "Command Secretary"
+	},
 /turf/simulated/floor/outdoors/sidewalk/virgo3c,
 /area/groundbase/level1/centsquare)
 "Vt" = (
@@ -15845,6 +16267,12 @@
 /obj/structure/cable/yellow,
 /turf/simulated/floor/tiled,
 /area/groundbase/civilian/toolstorage)
+"Vw" = (
+/obj/effect/landmark/start{
+	name = "Quartermaster"
+	},
+/turf/simulated/floor/outdoors/sidewalk/side/virgo3c,
+/area/groundbase/level1/centsquare)
 "Vx" = (
 /obj/structure/cable{
 	icon_state = "1-2"
@@ -16121,6 +16549,13 @@
 	},
 /turf/simulated/floor/outdoors/sidewalk/side/virgo3c,
 /area/groundbase/level1/southwestspur)
+"Wo" = (
+/obj/machinery/light/floortube{
+	dir = 8;
+	pixel_x = -6
+	},
+/turf/simulated/floor/tiled/techmaint,
+/area/groundbase/engineering/atmos)
 "Wq" = (
 /obj/machinery/button/remote/blast_door{
 	dir = 8;
@@ -16294,6 +16729,12 @@
 	},
 /turf/simulated/floor/tiled,
 /area/groundbase/civilian/gateway)
+"WO" = (
+/obj/effect/landmark/start{
+	name = "Chief Engineer"
+	},
+/turf/simulated/floor/outdoors/sidewalk/side/virgo3c,
+/area/groundbase/level1/centsquare)
 "WP" = (
 /turf/simulated/floor/bluegrid,
 /area/groundbase/command/ai/foyer)
@@ -16626,6 +17067,12 @@
 /obj/machinery/light,
 /turf/simulated/floor/tiled/white,
 /area/groundbase/medical/lhallway)
+"XI" = (
+/obj/machinery/light{
+	dir = 8
+	},
+/turf/simulated/floor/tiled,
+/area/groundbase/command/tcomms/foyer)
 "XJ" = (
 /obj/structure/closet/secure_closet/engineering_personal,
 /turf/simulated/floor/tiled,
@@ -16689,6 +17136,9 @@
 	dir = 1;
 	icon_state = "pipe-c"
 	},
+/obj/effect/landmark{
+	name = "maint_pred"
+	},
 /turf/simulated/floor/virgo3c{
 	outdoors = 0
 	},
@@ -16774,6 +17224,12 @@
 	},
 /turf/simulated/floor/tiled,
 /area/groundbase/engineering/atmos/monitoring)
+"Ye" = (
+/obj/machinery/light{
+	dir = 8
+	},
+/turf/simulated/floor/tiled/techfloor/grid,
+/area/groundbase/command/tcomms/computer)
 "Yf" = (
 /obj/structure/disposalpipe/segment{
 	dir = 4
@@ -16804,6 +17260,12 @@
 	outdoors = 0
 	},
 /area/maintenance/groundbase/level1/swtunnel)
+"Yn" = (
+/obj/effect/landmark/start{
+	name = "Psychiatrist"
+	},
+/turf/simulated/floor/outdoors/sidewalk/side/virgo3c,
+/area/groundbase/level1/centsquare)
 "Yo" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 4
@@ -16834,6 +17296,12 @@
 	},
 /turf/simulated/floor/tiled/dark,
 /area/groundbase/cargo/mining)
+"Yr" = (
+/obj/machinery/light{
+	dir = 8
+	},
+/turf/simulated/floor/tiled/techfloor/grid,
+/area/groundbase/command/ai/chamber)
 "Ys" = (
 /obj/machinery/power/apc{
 	dir = 4
@@ -17169,6 +17637,10 @@
 /obj/structure/closet/secure_closet/medical2,
 /turf/simulated/floor/tiled/white,
 /area/groundbase/medical/or1)
+"Zt" = (
+/obj/machinery/light,
+/turf/simulated/floor/bluegrid,
+/area/groundbase/command/ai/hall)
 "Zu" = (
 /obj/structure/closet/crate{
 	name = "Camera Assembly Crate"
@@ -17179,6 +17651,7 @@
 /obj/item/weapon/camera_assembly,
 /obj/item/weapon/camera_assembly,
 /obj/item/weapon/camera_assembly,
+/obj/machinery/light,
 /turf/simulated/floor/bluegrid,
 /area/groundbase/command/ai/robot)
 "Zw" = (
@@ -18348,14 +18821,14 @@ Uv
 cX
 za
 HA
-za
+Kp
 za
 JK
 cX
 Uv
 CZ
 nW
-GG
+Ye
 Sn
 eo
 CZ
@@ -18368,14 +18841,14 @@ Dc
 Dc
 qD
 mN
-ql
+Yr
 ql
 ZM
 yG
 ZM
 ql
 ql
-ql
+Yr
 qD
 MO
 MO
@@ -18642,7 +19115,7 @@ GG
 GG
 me
 GG
-oq
+MN
 WH
 KK
 Rt
@@ -19358,7 +19831,7 @@ kG
 au
 zz
 JC
-JC
+XI
 kw
 qD
 ZM
@@ -19787,7 +20260,7 @@ SS
 SS
 SS
 qD
-ql
+oG
 ND
 ql
 ZM
@@ -19795,7 +20268,7 @@ yG
 ZM
 ax
 Lg
-ql
+oG
 qD
 MO
 FF
@@ -19923,7 +20396,7 @@ ct
 AU
 ms
 Pm
-PL
+zS
 lC
 ZY
 Wa
@@ -20077,7 +20550,7 @@ rz
 XY
 sK
 XF
-Nq
+KL
 QJ
 sK
 XY
@@ -20164,7 +20637,7 @@ dM
 dM
 dM
 dM
-dM
+aU
 dM
 wX
 ei
@@ -20204,7 +20677,7 @@ GG
 GG
 GG
 GG
-oq
+MN
 ms
 Qg
 hN
@@ -20215,7 +20688,7 @@ Gn
 ms
 JT
 NF
-fr
+Zt
 XY
 Nq
 Kw
@@ -20363,7 +20836,7 @@ yJ
 XU
 xA
 rM
-Nq
+IL
 XY
 MO
 FF
@@ -20499,7 +20972,7 @@ Zu
 ms
 OG
 NF
-fr
+Zt
 XY
 sY
 Kw
@@ -20620,7 +21093,7 @@ Uv
 cX
 za
 bT
-za
+qh
 za
 qq
 cX
@@ -20922,11 +21395,11 @@ Su
 zH
 Ef
 WP
-WP
+mJ
 nn
 Pd
 nn
-WP
+mJ
 ve
 Fz
 en
@@ -23564,8 +24037,8 @@ yQ
 SP
 Uk
 IH
-Tk
-Tk
+BY
+sa
 Tk
 Tk
 rY
@@ -23707,7 +24180,7 @@ iU
 lI
 iV
 zi
-on
+Ho
 on
 on
 tf
@@ -23847,7 +24320,7 @@ Tk
 vB
 Ic
 fw
-Tk
+kN
 Hj
 Tk
 Xj
@@ -26658,12 +27131,12 @@ IK
 Oz
 Oz
 Oz
-Oz
+uV
 RQ
-LA
-LA
-LA
-LA
+Jc
+AA
+vV
+Gd
 bA
 LA
 LA
@@ -26806,7 +27279,7 @@ Eb
 Eb
 Eb
 Lk
-Zh
+JF
 YC
 Eb
 Eb
@@ -26938,7 +27411,7 @@ Eb
 Eb
 Eb
 Lk
-qP
+uB
 Eb
 Eb
 Eb
@@ -26948,7 +27421,7 @@ Nv
 Nv
 Eb
 Eb
-Zh
+Vw
 Eb
 Eb
 Eb
@@ -27080,7 +27553,7 @@ Eb
 Eb
 Eb
 Eb
-qP
+cT
 Eb
 Eb
 Eb
@@ -27090,7 +27563,7 @@ Nv
 Nv
 Nv
 Eb
-Zh
+Yn
 Eb
 Eb
 Eb
@@ -27222,7 +27695,7 @@ Eb
 Eb
 Eb
 Eb
-qP
+eb
 Eb
 Eb
 Nv
@@ -27232,7 +27705,7 @@ Nv
 Nv
 Eb
 Eb
-Zh
+yA
 Eb
 Eb
 Eb
@@ -27369,12 +27842,12 @@ Eb
 Eb
 Nv
 Nv
-Nv
+gy
 Nv
 Nv
 Eb
 Eb
-OA
+MM
 Eb
 Eb
 Eb
@@ -27506,7 +27979,7 @@ Eb
 Eb
 Eb
 Eb
-Zh
+QE
 Eb
 Eb
 Nv
@@ -27516,7 +27989,7 @@ Nv
 Nv
 Eb
 Eb
-Zh
+Jq
 Eb
 Eb
 Eb
@@ -27648,7 +28121,7 @@ Eb
 Eb
 Eb
 Eb
-Zh
+ke
 Eb
 Eb
 Nv
@@ -27658,7 +28131,7 @@ Nv
 Eb
 Eb
 Eb
-Zh
+Nl
 Eb
 Eb
 Nv
@@ -27736,7 +28209,7 @@ qE
 qE
 qE
 qE
-qE
+OD
 CM
 qE
 qE
@@ -27790,7 +28263,7 @@ Eb
 Eb
 Eb
 Lk
-Zh
+WO
 Eb
 Nv
 Eb
@@ -27800,7 +28273,7 @@ Eb
 Eb
 Eb
 Eb
-Zh
+UB
 Lk
 Eb
 Eb
@@ -27932,7 +28405,7 @@ Nv
 Eb
 Eb
 Lk
-Zh
+bZ
 Lk
 Eb
 Eb
@@ -27942,7 +28415,7 @@ Eb
 Eb
 Eb
 Lk
-Zh
+TB
 Lk
 Eb
 Eb
@@ -28074,17 +28547,17 @@ Nv
 Eb
 Eb
 Lk
-OA
+Ep
 Vs
-Vs
-Vs
-Vs
-OA
-Vs
-Vs
-Vs
-Vs
-OA
+xe
+DR
+MB
+cV
+dt
+ue
+wD
+cZ
+OW
 Lk
 Eb
 Eb
@@ -28552,7 +29025,7 @@ nS
 Yw
 ww
 JG
-nS
+RJ
 nS
 Lt
 Lt
@@ -29897,7 +30370,7 @@ lJ
 DQ
 tK
 QC
-QC
+ja
 QC
 wO
 DQ
@@ -30149,7 +30622,7 @@ qE
 jI
 be
 QA
-be
+Fv
 Kx
 Ys
 jI
@@ -30460,7 +30933,7 @@ we
 Ts
 jz
 wA
-ox
+yN
 wA
 DQ
 Be
@@ -30728,7 +31201,7 @@ pU
 qE
 pU
 pU
-pU
+zW
 Ro
 pU
 qE
@@ -33055,23 +33528,23 @@ PF
 nr
 Jx
 FK
-RW
+Pe
 RW
 RW
 Bl
+Pe
 RW
 RW
 RW
-RW
-RW
+Pe
 RW
 wk
 RW
-RW
+Pe
 RW
 wk
 RW
-RW
+Pe
 RW
 Bl
 wk
@@ -33339,23 +33812,23 @@ HL
 Fw
 Va
 lt
-RW
+Wo
 RW
 RW
 Bl
+Wo
 RW
 RW
 RW
-RW
-RW
+Wo
 Zd
 th
 RW
-RW
+Wo
 Zd
 th
 RW
-RW
+Wo
 Zd
 Bl
 th
@@ -34284,7 +34757,7 @@ MK
 Os
 MK
 MK
-MK
+cM
 MK
 MK
 MK
@@ -36300,7 +36773,7 @@ vj
 vj
 vj
 vj
-vj
+Rd
 vj
 vj
 vj
diff --git a/maps/groundbase/gb-z2.dmm b/maps/groundbase/gb-z2.dmm
index 7062e659ab..3a13d5e7e0 100644
--- a/maps/groundbase/gb-z2.dmm
+++ b/maps/groundbase/gb-z2.dmm
@@ -119,6 +119,17 @@
 /obj/item/weapon/towel/random,
 /turf/simulated/floor/wood,
 /area/groundbase/dorms/room7)
+"ay" = (
+/obj/structure/cable/yellow,
+/obj/machinery/power/apc{
+	dir = 4;
+	nightshift_setting = 2
+	},
+/turf/simulated/floor/tiled/virgo3c{
+	edge_blending_priority = -1;
+	outdoors = 0
+	},
+/area/groundbase/level2/nw)
 "az" = (
 /obj/machinery/vending/coffee,
 /turf/simulated/floor/tiled/virgo3c{
@@ -137,6 +148,15 @@
 /obj/structure/closet/secure_closet/scientist,
 /turf/simulated/floor/tiled,
 /area/groundbase/science/hall)
+"aD" = (
+/obj/effect/landmark/start{
+	name = "Janitor"
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	dir = 8
+	},
+/turf/simulated/floor/tiled,
+/area/groundbase/civilian/janitor)
 "aE" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 6
@@ -161,6 +181,15 @@
 	},
 /turf/simulated/floor/wood,
 /area/groundbase/dorms/room6)
+"aJ" = (
+/obj/structure/sign/painting/public{
+	pixel_y = 30
+	},
+/turf/simulated/floor/tiled/virgo3c{
+	edge_blending_priority = -1;
+	outdoors = 0
+	},
+/area/groundbase/level2/nw)
 "aM" = (
 /obj/machinery/requests_console{
 	announcementConsole = 1;
@@ -181,6 +210,15 @@
 /obj/item/weapon/bedsheet/clowndouble,
 /turf/simulated/floor/wood,
 /area/groundbase/dorms/room4)
+"aO" = (
+/obj/machinery/requests_console{
+	department = "Janitorial";
+	dir = 8;
+	pixel_x = 32
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/turf/simulated/floor/tiled,
+/area/groundbase/civilian/janitor)
 "aP" = (
 /obj/structure/bed/double/padded,
 /obj/item/weapon/bedsheet/clowndouble,
@@ -229,6 +267,7 @@
 /obj/machinery/atmospherics/unary/vent_pump/on{
 	dir = 8
 	},
+/obj/effect/landmark/vermin,
 /turf/simulated/floor/tiled/dark,
 /area/groundbase/command/bridge)
 "aS" = (
@@ -597,6 +636,12 @@
 "bT" = (
 /turf/simulated/floor/outdoors/grass/forest/virgo3c,
 /area/groundbase/civilian/hydroponics)
+"bU" = (
+/obj/effect/landmark{
+	name = "lightsout"
+	},
+/turf/simulated/floor/tiled,
+/area/groundbase/science/xenobot)
 "bV" = (
 /obj/structure/closet/l3closet/scientist,
 /turf/simulated/floor/tiled,
@@ -758,6 +803,9 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 4
 	},
+/obj/effect/landmark{
+	name = "lightsout"
+	},
 /turf/simulated/floor/tiled/dark,
 /area/groundbase/science/robotics)
 "cv" = (
@@ -1011,6 +1059,9 @@
 "dj" = (
 /obj/structure/table/fancyblack,
 /obj/item/weapon/book/manual/security_space_law,
+/obj/effect/landmark{
+	name = "lightsout"
+	},
 /turf/simulated/floor/tiled/dark,
 /area/groundbase/command/tcomms)
 "dk" = (
@@ -1365,6 +1416,27 @@
 	},
 /turf/simulated/floor/tiled,
 /area/groundbase/science/server)
+"ew" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 4
+	},
+/obj/effect/landmark{
+	name = "lightsout"
+	},
+/turf/simulated/floor/tiled/white,
+/area/groundbase/medical/triage)
+"ey" = (
+/obj/effect/landmark/start{
+	name = "Janitor"
+	},
+/obj/structure/cable/yellow{
+	icon_state = "1-4"
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	dir = 8
+	},
+/turf/simulated/floor/tiled,
+/area/groundbase/civilian/janitor)
 "eA" = (
 /obj/structure/cable/yellow{
 	icon_state = "1-8"
@@ -1398,6 +1470,12 @@
 "eD" = (
 /turf/simulated/floor/tiled/dark,
 /area/groundbase/civilian/chapel)
+"eE" = (
+/obj/structure/cable/yellow{
+	icon_state = "1-2"
+	},
+/turf/simulated/floor/tiled,
+/area/groundbase/civilian/janitor)
 "eF" = (
 /obj/structure/grille,
 /obj/machinery/door/firedoor/glass,
@@ -1421,6 +1499,34 @@
 	},
 /turf/simulated/floor/plating,
 /area/groundbase/command/bridge)
+"eG" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/effect/landmark{
+	name = "lightsout"
+	},
+/turf/simulated/floor/carpet,
+/area/groundbase/civilian/library)
+"eJ" = (
+/obj/machinery/door/airlock{
+	name = "Custodial Closet";
+	req_access = list(26)
+	},
+/obj/machinery/door/firedoor,
+/obj/structure/disposalpipe/segment{
+	dir = 4
+	},
+/obj/structure/cable/yellow{
+	icon_state = "4-8"
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	dir = 8
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 4
+	},
+/turf/simulated/floor/bmarble,
+/area/groundbase/civilian/janitor)
 "eL" = (
 /obj/structure/cable/yellow{
 	icon_state = "1-4"
@@ -1608,6 +1714,21 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /turf/simulated/floor/carpet/deco,
 /area/groundbase/civilian/kitchen/backroom)
+"fp" = (
+/obj/structure/disposalpipe/segment{
+	dir = 4
+	},
+/obj/structure/cable/yellow{
+	icon_state = "4-8"
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	dir = 8
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 4
+	},
+/turf/simulated/floor/outdoors/sidewalk/side/virgo3c,
+/area/groundbase/civilian/janitor)
 "fq" = (
 /obj/machinery/camera/network/cargo{
 	dir = 4
@@ -1737,9 +1858,21 @@
 /obj/structure/cable/yellow{
 	icon_state = "1-2"
 	},
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/obj/structure/disposalpipe/segment,
+/obj/structure/disposalpipe/sortjunction/flipped{
+	dir = 1;
+	name = "Janitor";
+	sortType = "Janitor"
+	},
+/obj/structure/cable/yellow{
+	icon_state = "1-8"
+	},
+/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
+	dir = 4
+	},
+/obj/effect/landmark/vines,
 /turf/simulated/floor/outdoors/sidewalk/slab/virgo3c,
 /area/groundbase/level2/nw)
 "fM" = (
@@ -1844,6 +1977,13 @@
 /obj/machinery/disposal,
 /turf/simulated/floor/wood,
 /area/groundbase/dorms/room5)
+"fZ" = (
+/obj/structure/janitorialcart,
+/obj/machinery/light{
+	dir = 1
+	},
+/turf/simulated/floor/tiled,
+/area/groundbase/civilian/janitor)
 "ga" = (
 /obj/structure/disposalpipe/segment,
 /obj/structure/cable/yellow{
@@ -1905,6 +2045,14 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /turf/simulated/floor/lino,
 /area/groundbase/civilian/chapel/office)
+"gr" = (
+/obj/effect/landmark{
+	name = "maint_pred"
+	},
+/turf/simulated/floor/outdoors/newdirt_nograss{
+	outdoors = 0
+	},
+/area/groundbase/level2/nw)
 "gt" = (
 /obj/machinery/atmospherics/pipe/manifold/hidden/supply{
 	dir = 1
@@ -1975,6 +2123,12 @@
 /obj/structure/disposalpipe/segment,
 /turf/simulated/floor/tiled,
 /area/groundbase/cargo/office)
+"gC" = (
+/obj/machinery/light/small{
+	dir = 8
+	},
+/turf/simulated/floor/outdoors/grass/virgo3c,
+/area/groundbase/civilian/janitor)
 "gE" = (
 /turf/simulated/floor/tiled/dark,
 /area/groundbase/command/tcomms)
@@ -2058,6 +2212,9 @@
 /obj/machinery/disposal,
 /turf/simulated/floor/wood,
 /area/groundbase/civilian/library)
+"gS" = (
+/turf/simulated/wall,
+/area/groundbase/civilian/janitor)
 "gT" = (
 /obj/machinery/firealarm,
 /obj/machinery/light{
@@ -2497,6 +2654,10 @@
 	},
 /turf/simulated/floor/tiled,
 /area/groundbase/science/xenobot/storage)
+"il" = (
+/obj/effect/landmark/vines,
+/turf/simulated/floor/outdoors/sidewalk/slab/virgo3c,
+/area/groundbase/level2/nw)
 "im" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /turf/simulated/floor/wood,
@@ -3037,6 +3198,13 @@
 /obj/structure/disposalpipe/segment,
 /turf/simulated/floor/tiled/dark,
 /area/groundbase/dorms)
+"jX" = (
+/obj/structure/disposalpipe/trunk{
+	dir = 1
+	},
+/obj/machinery/disposal,
+/turf/simulated/floor/tiled,
+/area/groundbase/civilian/janitor)
 "jY" = (
 /turf/simulated/floor/outdoors/sidewalk/virgo3c,
 /area/groundbase/cargo/office)
@@ -3095,6 +3263,11 @@
 	},
 /turf/simulated/floor/outdoors/sidewalk/slab/virgo3c,
 /area/groundbase/level2/nw)
+"kn" = (
+/obj/structure/closet/l3closet/janitor,
+/obj/machinery/atmospherics/unary/vent_pump/on,
+/turf/simulated/floor/tiled,
+/area/groundbase/civilian/janitor)
 "ko" = (
 /obj/effect/floor_decal/corner_steel_grid{
 	dir = 10
@@ -3349,6 +3522,14 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /turf/simulated/floor/carpet,
 /area/groundbase/civilian/library)
+"lg" = (
+/obj/structure/table/standard,
+/obj/machinery/atmospherics/unary/vent_pump/on{
+	dir = 1
+	},
+/obj/effect/landmark/vermin,
+/turf/simulated/floor/tiled/eris/cafe,
+/area/groundbase/civilian/kitchen)
 "lh" = (
 /obj/machinery/computer/arcade{
 	dir = 4
@@ -3551,6 +3732,9 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 4
 	},
+/obj/effect/landmark{
+	name = "lightsout"
+	},
 /turf/simulated/floor/tiled/white,
 /area/groundbase/medical/Chemistry)
 "lN" = (
@@ -3629,6 +3813,12 @@
 /obj/machinery/recharge_station,
 /turf/simulated/floor/tiled/white,
 /area/groundbase/medical/lobby)
+"mg" = (
+/obj/effect/landmark{
+	name = "lightsout"
+	},
+/turf/simulated/floor/tiled/dark,
+/area/groundbase/civilian/bar)
 "mi" = (
 /obj/machinery/computer/med_data{
 	dir = 4
@@ -3925,6 +4115,15 @@
 	},
 /turf/simulated/floor/virgo3c,
 /area/groundbase/science/circuits)
+"nd" = (
+/obj/effect/landmark/start{
+	name = "Janitor"
+	},
+/obj/structure/cable/yellow{
+	icon_state = "1-2"
+	},
+/turf/simulated/floor/tiled,
+/area/groundbase/civilian/janitor)
 "nf" = (
 /obj/structure/table/wooden_reinforced,
 /turf/simulated/floor/carpet/deco,
@@ -4068,6 +4267,9 @@
 	},
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/effect/landmark{
+	name = "lightsout"
+	},
 /turf/simulated/floor/tiled/dark,
 /area/groundbase/command/bridge)
 "nD" = (
@@ -4223,6 +4425,18 @@
 /obj/machinery/door/firedoor,
 /turf/simulated/floor,
 /area/groundbase/cargo/office)
+"oc" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	dir = 8
+	},
+/obj/effect/landmark{
+	name = "lightsout"
+	},
+/turf/simulated/floor/tiled/eris/cafe,
+/area/groundbase/civilian/kitchen)
 "od" = (
 /obj/machinery/access_button{
 	command = "cycle_interior";
@@ -4356,6 +4570,15 @@
 	},
 /turf/simulated/floor/reinforced,
 /area/rnd/xenobiology)
+"oB" = (
+/obj/machinery/light{
+	dir = 4
+	},
+/turf/simulated/floor/tiled/virgo3c{
+	edge_blending_priority = -1;
+	outdoors = 0
+	},
+/area/groundbase/level2/nw)
 "oD" = (
 /obj/machinery/door/firedoor,
 /obj/structure/table/glass,
@@ -4922,6 +5145,15 @@
 "qq" = (
 /turf/simulated/floor/outdoors/newdirt/virgo3c,
 /area/groundbase/science/robotics)
+"qr" = (
+/obj/structure/cable/yellow{
+	icon_state = "4-8"
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	dir = 8
+	},
+/turf/simulated/floor/tiled,
+/area/groundbase/civilian/janitor)
 "qs" = (
 /obj/machinery/hologram/holopad,
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
@@ -5206,6 +5438,21 @@
 /obj/machinery/light,
 /turf/simulated/floor/wood,
 /area/groundbase/dorms/room7)
+"ro" = (
+/obj/structure/easel,
+/obj/item/paint_palette,
+/obj/item/paint_palette{
+	pixel_y = -4
+	},
+/obj/item/paint_brush,
+/obj/item/paint_brush{
+	pixel_x = 4
+	},
+/turf/simulated/floor/tiled/virgo3c{
+	edge_blending_priority = -1;
+	outdoors = 0
+	},
+/area/groundbase/level2/nw)
 "rq" = (
 /obj/structure/cable/yellow{
 	icon_state = "4-8"
@@ -5367,6 +5614,14 @@
 	},
 /turf/simulated/floor/tiled,
 /area/rnd/xenobiology)
+"rU" = (
+/obj/structure/extinguisher_cabinet{
+	dir = 8;
+	pixel_x = 30
+	},
+/obj/structure/disposalpipe/segment,
+/turf/simulated/floor/tiled,
+/area/groundbase/civilian/janitor)
 "rW" = (
 /obj/machinery/firealarm{
 	dir = 4
@@ -5609,6 +5864,13 @@
 	},
 /turf/simulated/floor/outdoors/sidewalk/side/virgo3c,
 /area/groundbase/level2/nw)
+"sO" = (
+/obj/machinery/atmospherics/unary/vent_pump/on{
+	dir = 1
+	},
+/obj/effect/landmark/vermin,
+/turf/simulated/floor/tiled,
+/area/groundbase/civilian/hydroponics)
 "sP" = (
 /obj/structure/disposalpipe/sortjunction/untagged/flipped{
 	dir = 1
@@ -5659,6 +5921,21 @@
 	},
 /turf/simulated/floor/wood,
 /area/groundbase/civilian/kitchen/backroom)
+"sZ" = (
+/obj/structure/disposalpipe/segment{
+	dir = 4
+	},
+/obj/structure/cable/yellow{
+	icon_state = "4-8"
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	dir = 8
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 4
+	},
+/turf/simulated/floor/outdoors/sidewalk/side/virgo3c,
+/area/groundbase/level2/nw)
 "ta" = (
 /obj/structure/cable/yellow{
 	icon_state = "4-8"
@@ -6447,6 +6724,41 @@
 	},
 /turf/simulated/floor/wood,
 /area/groundbase/civilian/library)
+"vS" = (
+/obj/structure/mopbucket,
+/obj/item/weapon/mop,
+/obj/item/weapon/reagent_containers/glass/bucket,
+/obj/machinery/atmospherics/unary/vent_scrubber/on{
+	dir = 4
+	},
+/turf/simulated/floor/tiled,
+/area/groundbase/civilian/janitor)
+"vT" = (
+/obj/structure/closet/walllocker_double{
+	dir = 4;
+	pixel_x = 27
+	},
+/obj/item/stack/cable_coil/random,
+/obj/item/stack/cable_coil/random,
+/obj/item/stack/cable_coil/random,
+/obj/item/stack/cable_coil/random,
+/obj/item/stack/cable_coil/random,
+/obj/item/stack/cable_coil/random,
+/obj/item/stack/cable_coil/random,
+/obj/item/stack/cable_coil/random,
+/obj/item/stack/cable_coil/random,
+/obj/item/stack/cable_coil/random,
+/obj/item/stack/cable_coil/random,
+/obj/item/stack/cable_coil/random,
+/obj/item/stack/cable_coil/random,
+/obj/item/stack/cable_coil/random,
+/obj/item/stack/cable_coil/random,
+/obj/item/stack/cable_coil/random,
+/turf/simulated/floor/tiled/virgo3c{
+	edge_blending_priority = -1;
+	outdoors = 0
+	},
+/area/groundbase/level2/nw)
 "vV" = (
 /obj/structure/disposalpipe/sortjunction{
 	dir = 1;
@@ -6904,6 +7216,12 @@
 	},
 /turf/simulated/floor/tiled/white,
 /area/groundbase/medical/triage)
+"xA" = (
+/turf/simulated/floor/tiled/virgo3c{
+	edge_blending_priority = -1;
+	outdoors = 0
+	},
+/area/groundbase/level2/nw)
 "xB" = (
 /obj/structure/bed/chair{
 	dir = 1
@@ -7345,6 +7663,10 @@
 	},
 /turf/simulated/floor/tiled,
 /area/groundbase/science/xenobot)
+"yX" = (
+/obj/structure/janitorialcart,
+/turf/simulated/floor/tiled,
+/area/groundbase/civilian/janitor)
 "yY" = (
 /obj/structure/closet/l3closet/virology,
 /turf/simulated/floor/tiled/white,
@@ -7353,6 +7675,10 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /turf/simulated/floor/tiled,
 /area/groundbase/cargo/office)
+"zb" = (
+/obj/machinery/light,
+/turf/simulated/floor/tiled,
+/area/groundbase/civilian/janitor)
 "zc" = (
 /obj/structure/table/marble,
 /obj/machinery/chemical_dispenser/bar_soft/full{
@@ -7431,6 +7757,15 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /turf/simulated/floor/tiled,
 /area/groundbase/cargo/office)
+"zq" = (
+/obj/effect/landmark{
+	name = "morphspawn"
+	},
+/turf/simulated/floor/tiled/virgo3c{
+	edge_blending_priority = -1;
+	outdoors = 0
+	},
+/area/groundbase/level2/nw)
 "zs" = (
 /turf/simulated/wall,
 /area/groundbase/civilian/chapel)
@@ -7446,6 +7781,10 @@
 "zx" = (
 /turf/simulated/floor/glass/reinforced/virgo3c,
 /area/groundbase/level2/ne)
+"zz" = (
+/obj/machinery/vending/wardrobe/janidrobe,
+/turf/simulated/floor/tiled,
+/area/groundbase/civilian/janitor)
 "zA" = (
 /obj/machinery/computer/aifixer{
 	dir = 1
@@ -7561,6 +7900,13 @@
 	},
 /turf/simulated/floor/virgo3c,
 /area/groundbase/science/rnd)
+"zO" = (
+/obj/structure/closet/l3closet/janitor,
+/obj/machinery/light{
+	dir = 1
+	},
+/turf/simulated/floor/tiled,
+/area/groundbase/civilian/janitor)
 "zP" = (
 /obj/machinery/smartfridge/drying_rack,
 /obj/machinery/light{
@@ -8138,6 +8484,12 @@
 	outdoors = 0
 	},
 /area/groundbase/cargo/office)
+"BK" = (
+/obj/structure/sink/kitchen{
+	pixel_y = 22
+	},
+/turf/simulated/floor/tiled,
+/area/groundbase/civilian/janitor)
 "BO" = (
 /obj/machinery/door/firedoor,
 /obj/machinery/door/airlock/freezer{
@@ -8232,6 +8584,12 @@
 	},
 /turf/simulated/floor/tiled/white,
 /area/groundbase/dorms/bathroom)
+"BZ" = (
+/obj/structure/railing/grey{
+	dir = 1
+	},
+/turf/simulated/open,
+/area/groundbase/level2/nw)
 "Ca" = (
 /obj/structure/cable/yellow{
 	icon_state = "4-8"
@@ -8356,6 +8714,12 @@
 	},
 /turf/simulated/floor/tiled/dark,
 /area/groundbase/dorms)
+"Cw" = (
+/obj/structure/cable/yellow{
+	icon_state = "1-2"
+	},
+/turf/simulated/floor/outdoors/sidewalk/virgo3c,
+/area/groundbase/level2/nw)
 "Cx" = (
 /obj/structure/railing/grey,
 /obj/structure/railing/grey{
@@ -9459,6 +9823,12 @@
 	},
 /turf/simulated/floor/tiled/eris/cafe,
 /area/groundbase/civilian/kitchen)
+"FX" = (
+/obj/effect/landmark{
+	name = "lightsout"
+	},
+/turf/simulated/floor/tiled/white,
+/area/medical/virology)
 "Ga" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
 	dir = 6
@@ -9755,6 +10125,22 @@
 	},
 /turf/simulated/floor/tiled/white,
 /area/groundbase/medical/triage)
+"GO" = (
+/obj/structure/closet/walllocker_double{
+	dir = 4;
+	pixel_x = 27
+	},
+/obj/item/weapon/storage/fancy/crayons,
+/obj/item/weapon/storage/fancy/crayons,
+/obj/item/weapon/storage/fancy/crayons,
+/obj/item/weapon/storage/fancy/crayons,
+/obj/item/weapon/storage/fancy/crayons,
+/obj/item/weapon/storage/fancy/crayons,
+/turf/simulated/floor/tiled/virgo3c{
+	edge_blending_priority = -1;
+	outdoors = 0
+	},
+/area/groundbase/level2/nw)
 "GP" = (
 /obj/structure/bed/chair/sofa/pew/left{
 	dir = 1
@@ -9809,6 +10195,24 @@
 /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers,
 /turf/simulated/floor/tiled/white,
 /area/groundbase/medical/triage)
+"GZ" = (
+/obj/structure/disposalpipe/segment{
+	dir = 4
+	},
+/obj/structure/cable/yellow{
+	icon_state = "4-8"
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	dir = 8
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 4
+	},
+/obj/structure/cable/yellow{
+	icon_state = "2-4"
+	},
+/turf/simulated/floor/outdoors/sidewalk/slab/virgo3c,
+/area/groundbase/level2/nw)
 "Ha" = (
 /obj/structure/table/steel,
 /obj/item/device/multitool,
@@ -9957,6 +10361,16 @@
 	},
 /turf/simulated/floor/tiled/dark,
 /area/groundbase/command/hall)
+"HB" = (
+/obj/structure/closet/jequipcloset,
+/obj/machinery/power/apc{
+	dir = 1
+	},
+/obj/structure/cable/yellow{
+	icon_state = "0-2"
+	},
+/turf/simulated/floor/tiled,
+/area/groundbase/civilian/janitor)
 "HC" = (
 /obj/structure/bed/chair/office/light{
 	dir = 8
@@ -9988,6 +10402,22 @@
 	},
 /turf/simulated/floor/tiled,
 /area/groundbase/civilian/hydroponics)
+"HG" = (
+/obj/structure/disposalpipe/segment{
+	dir = 4;
+	icon_state = "pipe-c"
+	},
+/obj/structure/cable/yellow{
+	icon_state = "4-8"
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 5
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	dir = 8
+	},
+/turf/simulated/floor/tiled,
+/area/groundbase/civilian/janitor)
 "HH" = (
 /turf/simulated/floor/outdoors/grass/virgo3c,
 /area/groundbase/civilian/hydroponics)
@@ -10223,6 +10653,9 @@
 /obj/structure/cable/yellow{
 	icon_state = "1-2"
 	},
+/obj/effect/landmark{
+	name = "lightsout"
+	},
 /turf/simulated/floor/tiled,
 /area/groundbase/science/rnd)
 "Iz" = (
@@ -10580,6 +11013,16 @@
 	},
 /turf/simulated/floor/tiled/dark,
 /area/groundbase/civilian/bar)
+"JC" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 6
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	dir = 6
+	},
+/obj/effect/landmark/vines,
+/turf/simulated/floor/outdoors/sidewalk/slab/virgo3c,
+/area/groundbase/level2/se)
 "JD" = (
 /obj/machinery/appliance/cooker/oven,
 /turf/simulated/floor/tiled/eris/cafe,
@@ -10679,6 +11122,15 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /turf/simulated/floor/tiled/dark,
 /area/groundbase/dorms)
+"JS" = (
+/obj/effect/floor_decal/chapel{
+	dir = 8
+	},
+/obj/effect/landmark{
+	name = "lightsout"
+	},
+/turf/simulated/floor/tiled/dark,
+/area/groundbase/civilian/chapel)
 "JU" = (
 /obj/machinery/camera/network/research{
 	dir = 4
@@ -10906,6 +11358,30 @@
 /obj/structure/flora/pottedplant/minitree,
 /turf/simulated/floor/wood,
 /area/groundbase/cargo/qm)
+"KC" = (
+/obj/structure/closet/walllocker_double{
+	dir = 8;
+	pixel_x = -28
+	},
+/obj/item/device/camera{
+	pixel_x = 3;
+	pixel_y = -4
+	},
+/obj/item/device/camera,
+/obj/item/device/camera_film{
+	pixel_x = 2;
+	pixel_y = 2
+	},
+/obj/item/device/camera_film{
+	pixel_x = -2;
+	pixel_y = -2
+	},
+/obj/item/device/taperecorder,
+/turf/simulated/floor/tiled/virgo3c{
+	edge_blending_priority = -1;
+	outdoors = 0
+	},
+/area/groundbase/level2/nw)
 "KD" = (
 /obj/structure/bookcase,
 /obj/item/weapon/book/manual/security_space_law,
@@ -10913,6 +11389,12 @@
 /obj/item/weapon/book/manual/command_guide,
 /turf/simulated/floor/wood,
 /area/groundbase/command/captain)
+"KE" = (
+/obj/effect/landmark/start{
+	name = "Janitor"
+	},
+/turf/simulated/floor/tiled,
+/area/groundbase/civilian/janitor)
 "KF" = (
 /obj/machinery/biogenerator,
 /obj/machinery/light{
@@ -10957,6 +11439,12 @@
 /obj/machinery/honey_extractor,
 /turf/simulated/floor/tiled,
 /area/groundbase/civilian/hydroponics)
+"KO" = (
+/obj/structure/mopbucket,
+/obj/item/weapon/mop,
+/obj/item/weapon/reagent_containers/glass/bucket,
+/turf/simulated/floor/tiled,
+/area/groundbase/civilian/janitor)
 "KP" = (
 /obj/machinery/atmospherics/unary/vent_pump/on,
 /turf/simulated/floor/tiled,
@@ -11145,6 +11633,12 @@
 	outdoors = 0
 	},
 /area/groundbase/cargo/office)
+"LA" = (
+/obj/structure/cable/yellow{
+	icon_state = "1-8"
+	},
+/turf/simulated/floor/outdoors/sidewalk/slab/virgo3c,
+/area/groundbase/level2/nw)
 "LB" = (
 /obj/structure/window/reinforced{
 	dir = 1
@@ -11948,6 +12442,14 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /turf/simulated/floor/tiled/eris/cafe,
 /area/groundbase/civilian/kitchen)
+"NN" = (
+/obj/effect/landmark{
+	name = "maint_pred"
+	},
+/turf/simulated/floor/outdoors/newdirt_nograss{
+	outdoors = 0
+	},
+/area/groundbase/level2/se)
 "NO" = (
 /obj/structure/railing/grey,
 /turf/simulated/floor/tiled/virgo3c{
@@ -12294,6 +12796,15 @@
 	},
 /turf/simulated/floor/tiled/dark,
 /area/groundbase/command/tcomms)
+"OU" = (
+/obj/structure/sign/painting/public{
+	pixel_y = -30
+	},
+/turf/simulated/floor/tiled/virgo3c{
+	edge_blending_priority = -1;
+	outdoors = 0
+	},
+/area/groundbase/level2/nw)
 "OV" = (
 /obj/structure/table/woodentable,
 /obj/machinery/photocopier/faxmachine{
@@ -12313,6 +12824,12 @@
 "OY" = (
 /turf/simulated/wall/r_wall,
 /area/groundbase/science/rnd)
+"OZ" = (
+/obj/structure/cable/yellow{
+	icon_state = "2-4"
+	},
+/turf/simulated/floor/outdoors/sidewalk/slab/virgo3c,
+/area/groundbase/level2/nw)
 "Pa" = (
 /obj/machinery/atmospherics/pipe/manifold/hidden/supply{
 	dir = 8
@@ -12466,6 +12983,14 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /turf/simulated/floor/wood,
 /area/groundbase/civilian/library)
+"Pz" = (
+/obj/machinery/light{
+	dir = 8
+	},
+/turf/simulated/floor/tiled/virgo3c{
+	edge_blending_priority = -1
+	},
+/area/groundbase/level2/nw)
 "PA" = (
 /obj/machinery/door/firedoor,
 /obj/machinery/door/airlock/glass{
@@ -12641,6 +13166,21 @@
 	temperature = 80
 	},
 /area/groundbase/science/server)
+"Qb" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	dir = 8
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 4
+	},
+/obj/machinery/light/floortube{
+	pixel_y = 4
+	},
+/obj/effect/landmark{
+	name = "lightsout"
+	},
+/turf/simulated/floor/tiled,
+/area/rnd/xenobiology)
 "Qc" = (
 /obj/random/mob/bird,
 /turf/simulated/floor/outdoors/grass/virgo3c,
@@ -12860,6 +13400,42 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /turf/simulated/floor/tiled/dark,
 /area/groundbase/civilian/chapel)
+"QK" = (
+/obj/structure/closet/walllocker_double{
+	dir = 8;
+	pixel_x = -28
+	},
+/obj/item/canvas,
+/obj/item/canvas,
+/obj/item/canvas,
+/obj/item/canvas,
+/obj/item/canvas,
+/obj/item/canvas/nineteen_nineteen,
+/obj/item/canvas/nineteen_nineteen,
+/obj/item/canvas/nineteen_nineteen,
+/obj/item/canvas/nineteen_nineteen,
+/obj/item/canvas/nineteen_nineteen,
+/obj/item/canvas/twentyfour_twentyfour,
+/obj/item/canvas/twentyfour_twentyfour,
+/obj/item/canvas/twentyfour_twentyfour,
+/obj/item/canvas/twentyfour_twentyfour,
+/obj/item/canvas/twentyfour_twentyfour,
+/obj/item/canvas/twentythree_nineteen,
+/obj/item/canvas/twentythree_nineteen,
+/obj/item/canvas/twentythree_nineteen,
+/obj/item/canvas/twentythree_nineteen,
+/obj/item/canvas/twentythree_nineteen,
+/obj/item/canvas/twentythree_twentythree,
+/obj/item/canvas/twentythree_twentythree,
+/obj/item/canvas/twentythree_twentythree,
+/obj/item/canvas/twentythree_twentythree,
+/obj/item/canvas/twentythree_twentythree,
+/obj/structure/easel,
+/turf/simulated/floor/tiled/virgo3c{
+	edge_blending_priority = -1;
+	outdoors = 0
+	},
+/area/groundbase/level2/nw)
 "QL" = (
 /obj/structure/cable/yellow{
 	icon_state = "4-8"
@@ -13076,6 +13652,11 @@
 /obj/machinery/door/firedoor,
 /turf/simulated/floor/bmarble,
 /area/groundbase/civilian/chapel)
+"Rt" = (
+/turf/simulated/floor/outdoors/newdirt_nograss{
+	outdoors = 0
+	},
+/area/groundbase/level2/nw)
 "Ru" = (
 /turf/simulated/floor/reinforced/virgo3c{
 	edge_blending_priority = -1
@@ -13519,6 +14100,44 @@
 /obj/machinery/camera/network/civilian,
 /turf/simulated/floor/carpet,
 /area/groundbase/civilian/library)
+"SJ" = (
+/obj/structure/closet/walllocker_double{
+	dir = 4;
+	pixel_x = 27
+	},
+/obj/item/weapon/packageWrap,
+/obj/item/weapon/packageWrap,
+/obj/item/weapon/tape_roll,
+/obj/item/weapon/tape_roll,
+/obj/item/weapon/storage/box{
+	pixel_x = 3;
+	pixel_y = 3
+	},
+/obj/item/weapon/storage/box{
+	pixel_x = 3;
+	pixel_y = 3
+	},
+/obj/item/weapon/storage/box{
+	pixel_x = 3;
+	pixel_y = 3
+	},
+/obj/item/weapon/storage/box{
+	pixel_x = 3;
+	pixel_y = 3
+	},
+/obj/item/weapon/storage/box{
+	pixel_x = 3;
+	pixel_y = 3
+	},
+/obj/item/weapon/storage/box{
+	pixel_x = 3;
+	pixel_y = 3
+	},
+/turf/simulated/floor/tiled/virgo3c{
+	edge_blending_priority = -1;
+	outdoors = 0
+	},
+/area/groundbase/level2/nw)
 "SK" = (
 /obj/structure/cable/yellow{
 	icon_state = "1-2"
@@ -13541,6 +14160,9 @@
 /obj/item/weapon/bedsheet/green,
 /obj/structure/bed/padded,
 /obj/machinery/atmospherics/unary/vent_pump/on,
+/obj/effect/landmark{
+	name = "morphspawn"
+	},
 /turf/simulated/floor/tiled/white,
 /area/medical/virology)
 "SN" = (
@@ -13876,6 +14498,12 @@
 	},
 /turf/simulated/floor/carpet,
 /area/groundbase/command/captainq)
+"TZ" = (
+/obj/structure/railing/grey{
+	dir = 1
+	},
+/turf/simulated/floor/outdoors/grass/virgo3c,
+/area/groundbase/level2/nw)
 "Ub" = (
 /obj/structure/cable/yellow{
 	icon_state = "1-8"
@@ -14034,6 +14662,12 @@
 	},
 /turf/simulated/floor/reinforced,
 /area/rnd/xenobiology)
+"UJ" = (
+/obj/effect/landmark{
+	name = "lightsout"
+	},
+/turf/simulated/floor/tiled,
+/area/groundbase/cargo/office)
 "UK" = (
 /obj/structure/table/glass,
 /obj/item/weapon/storage/box/beakers{
@@ -14089,6 +14723,10 @@
 /obj/machinery/light,
 /turf/simulated/floor/wood,
 /area/groundbase/civilian/library)
+"US" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/turf/simulated/floor/tiled,
+/area/groundbase/civilian/janitor)
 "UT" = (
 /turf/simulated/wall,
 /area/groundbase/command/hop)
@@ -14128,6 +14766,9 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /turf/simulated/floor/tiled,
 /area/groundbase/science/circuits)
+"Vb" = (
+/turf/simulated/floor/tiled,
+/area/groundbase/civilian/janitor)
 "Vd" = (
 /obj/structure/cable/yellow{
 	icon_state = "1-2"
@@ -14322,6 +14963,12 @@
 /obj/item/device/slime_scanner,
 /turf/simulated/floor/tiled,
 /area/rnd/xenobiology)
+"VJ" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	dir = 8
+	},
+/turf/simulated/floor/tiled,
+/area/groundbase/civilian/janitor)
 "VK" = (
 /turf/simulated/floor/wood,
 /area/groundbase/dorms/room1)
@@ -14538,6 +15185,19 @@
 "Wn" = (
 /turf/simulated/wall/r_wall,
 /area/groundbase/science/robotics)
+"Wo" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	dir = 8
+	},
+/obj/structure/disposalpipe/segment{
+	dir = 4
+	},
+/obj/effect/landmark/vines,
+/turf/simulated/floor/outdoors/sidewalk/side/virgo3c,
+/area/groundbase/level2/nw)
 "Wp" = (
 /obj/structure/table/standard,
 /obj/machinery/requests_console{
@@ -14797,6 +15457,12 @@
 /obj/structure/disposalpipe/segment,
 /turf/simulated/floor/tiled/dark,
 /area/groundbase/civilian/chapel)
+"Xk" = (
+/obj/effect/landmark{
+	name = "lightsout"
+	},
+/turf/simulated/floor/tiled/dark,
+/area/groundbase/command/hall)
 "Xl" = (
 /obj/machinery/atmospherics/unary/vent_scrubber/on{
 	dir = 8
@@ -15197,6 +15863,13 @@
 	},
 /turf/simulated/floor/tiled/dark,
 /area/groundbase/science/xenohall)
+"YJ" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/effect/landmark{
+	name = "lightsout"
+	},
+/turf/simulated/floor/tiled/white,
+/area/groundbase/medical/lobby)
 "YL" = (
 /obj/machinery/atmospherics/pipe/simple/visible{
 	dir = 6
@@ -15261,6 +15934,20 @@
 	},
 /turf/simulated/floor/outdoors/grass/forest/virgo3c,
 /area/groundbase/civilian/hydroponics/out)
+"YX" = (
+/obj/structure/table/steel,
+/obj/item/weapon/grenade/chem_grenade/cleaner,
+/obj/item/weapon/grenade/chem_grenade/cleaner,
+/obj/item/weapon/grenade/chem_grenade/cleaner,
+/obj/item/weapon/grenade/chem_grenade/cleaner,
+/obj/item/weapon/reagent_containers/spray/cleaner,
+/obj/item/weapon/reagent_containers/spray/cleaner,
+/obj/item/weapon/reagent_containers/spray/cleaner,
+/obj/item/weapon/soap/nanotrasen,
+/obj/item/weapon/soap/nanotrasen,
+/obj/item/weapon/soap/nanotrasen,
+/turf/simulated/floor/tiled,
+/area/groundbase/civilian/janitor)
 "Za" = (
 /obj/machinery/light,
 /turf/simulated/floor/wood,
@@ -15301,6 +15988,10 @@
 /obj/machinery/atmospherics/pipe/manifold4w/hidden/supply,
 /turf/simulated/floor/tiled/white,
 /area/medical/virology)
+"Zg" = (
+/obj/machinery/light/bigfloorlamp,
+/turf/simulated/floor/outdoors/grass/virgo3c,
+/area/groundbase/level2/nw)
 "Zh" = (
 /obj/structure/disposalpipe/segment{
 	dir = 1;
@@ -15503,6 +16194,17 @@
 	},
 /turf/simulated/floor/tiled/dark,
 /area/groundbase/civilian/chapel)
+"ZQ" = (
+/obj/structure/cable/yellow{
+	icon_state = "1-2"
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/effect/landmark{
+	name = "lightsout"
+	},
+/turf/simulated/floor/tiled/dark,
+/area/groundbase/science/hall)
 "ZR" = (
 /obj/structure/table/woodentable,
 /obj/machinery/computer/skills{
@@ -15983,6 +16685,9 @@ xE
 xE
 xE
 xE
+Rt
+Rt
+Rt
 xE
 xE
 xE
@@ -16017,10 +16722,7 @@ xE
 xE
 xE
 xE
-xE
-xE
-xE
-xE
+Rt
 xE
 xE
 xE
@@ -16123,6 +16825,28 @@ fX
 xE
 xE
 xE
+Rt
+Rt
+Rt
+Rt
+Rt
+Rt
+xE
+xE
+xE
+xE
+xE
+xE
+xE
+xE
+xE
+xE
+xE
+Rt
+Rt
+Rt
+Rt
+Rt
 xE
 xE
 xE
@@ -16137,34 +16861,12 @@ xE
 xE
 xE
 xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
+Rt
+Rt
+Rt
+Rt
+Rt
+Rt
 bY
 bY
 bY
@@ -16265,6 +16967,30 @@ fX
 xE
 xE
 xE
+Rt
+Rt
+Rt
+Rt
+Rt
+Rt
+xE
+xE
+xE
+xE
+xE
+xE
+xE
+Rt
+Rt
+Rt
+Rt
+Rt
+Rt
+Rt
+Rt
+Rt
+Rt
+Rt
 xE
 xE
 xE
@@ -16274,39 +17000,15 @@ xE
 xE
 xE
 xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
+Rt
+Rt
+Rt
+Rt
+Rt
+Rt
+Rt
+Rt
+Rt
 bY
 bY
 Jc
@@ -16406,49 +17108,49 @@ ON
 fX
 xE
 xE
+Rt
+Rt
+Rt
+Rt
+Rt
+Rt
+xE
+xE
+xE
+xE
+xE
+Rt
+Rt
+Rt
+Rt
+Rt
+Rt
+Rt
+xE
+xE
+Rt
+Rt
+Rt
+Rt
+Rt
+Rt
 xE
 xE
 xE
 xE
 xE
 xE
+Rt
+Rt
+Rt
+Rt
+xE
+Rt
 xE
 xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
+Rt
+Rt
+Rt
 bY
 Jc
 Jc
@@ -16548,6 +17250,19 @@ ON
 fX
 xE
 xE
+Rt
+Rt
+Rt
+Rt
+Rt
+xE
+xE
+xE
+xE
+xE
+Rt
+Rt
+Rt
 xE
 xE
 xE
@@ -16558,38 +17273,25 @@ xE
 xE
 xE
 xE
+Rt
+Rt
+Rt
+Rt
 xE
 xE
 xE
 xE
 xE
+Rt
+Rt
+Rt
+Rt
+Rt
+Rt
 xE
 xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
+Rt
+Rt
 xE
 bY
 bY
@@ -16690,6 +17392,17 @@ ON
 fX
 xE
 xE
+Rt
+Rt
+Rt
+Rt
+xE
+xE
+xE
+xE
+xE
+Rt
+Rt
 xE
 xE
 xE
@@ -16704,34 +17417,23 @@ xE
 xE
 xE
 xE
+Rt
+Rt
 xE
 xE
 xE
 xE
 xE
+Rt
+Rt
+Rt
+Rt
+Rt
 xE
 xE
 xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
+Rt
+Rt
 xE
 bY
 bY
@@ -16739,15 +17441,15 @@ Jc
 Jc
 Jc
 Jc
+Jc
+Jc
 bY
 bY
 bY
 bY
 bY
-bY
-bY
-bY
-bY
+Jc
+Jc
 bY
 bY
 bY
@@ -16832,6 +17534,17 @@ ON
 fX
 xE
 xE
+Rt
+Rt
+Rt
+Rt
+xE
+xE
+xE
+xE
+Rt
+Rt
+Rt
 xE
 xE
 xE
@@ -16847,29 +17560,18 @@ xE
 xE
 xE
 xE
+Rt
+Rt
+Rt
 xE
 xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
+Rt
+Rt
+Rt
+Rt
+Rt
+Rt
+Rt
 xE
 xE
 xE
@@ -16886,8 +17588,8 @@ bY
 bY
 Jc
 Jc
-bY
-bY
+Jc
+Jc
 Jc
 Jc
 Jc
@@ -16975,6 +17677,15 @@ fX
 xE
 xE
 xE
+Rt
+Rt
+xE
+xE
+xE
+xE
+Rt
+Rt
+Rt
 xE
 xE
 xE
@@ -16982,6 +17693,17 @@ xE
 xE
 xE
 xE
+Rt
+Rt
+Rt
+Rt
+xE
+xE
+xE
+xE
+xE
+Rt
+Rt
 xE
 xE
 xE
@@ -16989,30 +17711,10 @@ xE
 xE
 xE
 xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
+Rt
+Rt
+Rt
+Rt
 xE
 xE
 xE
@@ -17027,12 +17729,12 @@ xE
 bY
 bY
 bY
+Jc
+Jc
 bY
-bY
-bY
-bY
-bY
-bY
+Jc
+Jc
+Jc
 Jc
 Jc
 Jc
@@ -17117,6 +17819,34 @@ fX
 xE
 xE
 xE
+Rt
+Rt
+Rt
+Rt
+xE
+xE
+Rt
+Rt
+Rt
+xE
+xE
+xE
+xE
+xE
+xE
+Rt
+Rt
+Rt
+Rt
+Rt
+xE
+xE
+xE
+xE
+xE
+xE
+Rt
+Rt
 xE
 xE
 xE
@@ -17125,37 +17855,9 @@ xE
 xE
 xE
 xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
+Rt
+Rt
+Rt
 xE
 xE
 xE
@@ -17179,9 +17881,9 @@ bY
 Jc
 Jc
 Jc
-Jc
-Jc
-Jc
+bY
+bY
+bY
 bY
 bY
 bY
@@ -17259,6 +17961,34 @@ fX
 xE
 xE
 xE
+Rt
+Rt
+Rt
+Rt
+xE
+xE
+Rt
+Rt
+Rt
+xE
+xE
+xE
+xE
+xE
+Rt
+Rt
+Rt
+Rt
+Rt
+Rt
+xE
+xE
+xE
+xE
+xE
+xE
+Rt
+Rt
 xE
 xE
 xE
@@ -17269,35 +17999,7 @@ xE
 xE
 xE
 xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
+Rt
 xE
 xE
 xE
@@ -17319,14 +18021,14 @@ bY
 bY
 bY
 bY
-Jc
-Jc
-Jc
-Jc
-Jc
-Jc
 bY
 bY
+pw
+Gp
+Gp
+Gp
+Gp
+Gp
 bY
 bY
 ce
@@ -17402,45 +18104,45 @@ xE
 xE
 xE
 xE
+Rt
+Rt
+xE
+xE
+Rt
+Rt
+Rt
+Rt
+Rt
+xE
+xE
+xE
+xE
+Rt
+Rt
+Rt
+Rt
+Rt
+Rt
 xE
 xE
 xE
 xE
 xE
 xE
+Rt
+Rt
+xE
+xE
+xE
+xE
+Rt
 xE
 xE
 xE
 xE
 xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
+Rt
+Rt
 xE
 xE
 xE
@@ -17462,13 +18164,13 @@ xE
 xE
 bY
 bY
-Jc
-Jc
-Jc
-Jc
-Jc
-Jc
-bY
+Hn
+Ja
+xA
+Pz
+KC
+ro
+QK
 bY
 bY
 bY
@@ -17544,6 +18246,24 @@ xE
 xE
 xE
 xE
+Rt
+Rt
+xE
+xE
+xE
+Rt
+Rt
+Rt
+Rt
+xE
+xE
+xE
+xE
+Rt
+Rt
+Rt
+Rt
+Rt
 xE
 xE
 xE
@@ -17551,38 +18271,20 @@ xE
 xE
 xE
 xE
+Rt
+Rt
+xE
+Rt
+Rt
+Rt
 xE
 xE
 xE
 xE
 xE
 xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
+Rt
+Rt
 xE
 xE
 xE
@@ -17604,15 +18306,15 @@ xE
 xE
 bY
 bY
-bY
-bY
-Jc
-Jc
-Jc
-Jc
-Jc
-bY
-bY
+bX
+pw
+OU
+Gp
+aJ
+xA
+xA
+fD
+TZ
 bY
 ce
 ce
@@ -17687,6 +18389,46 @@ xE
 xE
 xE
 xE
+Rt
+xE
+xE
+xE
+xE
+Rt
+Rt
+Rt
+xE
+xE
+xE
+xE
+xE
+Rt
+Rt
+Rt
+Rt
+xE
+xE
+xE
+xE
+xE
+xE
+xE
+Rt
+Rt
+Rt
+Rt
+Rt
+Rt
+Rt
+Rt
+xE
+xE
+xE
+xE
+xE
+Rt
+Rt
+Rt
 xE
 xE
 xE
@@ -17695,66 +18437,26 @@ xE
 xE
 xE
 xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
+gS
+gS
+gS
+gS
+gS
+gS
+gS
+gS
 xE
 bY
 bY
+bX
 bY
-bY
-Jc
-Jc
-Jc
-Jc
-Jc
-bY
-bY
+OU
+Gp
+aJ
+xA
+xA
+fD
+TZ
 bY
 ce
 ce
@@ -17829,6 +18531,45 @@ xE
 xE
 xE
 xE
+Rt
+xE
+xE
+xE
+xE
+Rt
+Rt
+Rt
+Rt
+xE
+xE
+xE
+xE
+xE
+Rt
+Rt
+Rt
+xE
+xE
+xE
+xE
+xE
+xE
+xE
+Rt
+Rt
+Rt
+Rt
+Rt
+Rt
+Rt
+Rt
+Rt
+xE
+xE
+xE
+xE
+Rt
+Rt
 xE
 xE
 xE
@@ -17838,65 +18579,26 @@ xE
 xE
 xE
 xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
+gS
+fZ
+yX
+yX
+vS
+KO
+KO
+gS
 xE
 xE
 bY
+bX
 bY
-bY
-Jc
-Jc
-Jc
-Jc
-Jc
-bY
-bY
+OU
+Gp
+aJ
+xA
+xA
+fD
+TZ
 bY
 ce
 ce
@@ -17971,6 +18673,45 @@ xE
 xE
 xE
 xE
+Rt
+xE
+xE
+xE
+xE
+xE
+Rt
+Rt
+Rt
+xE
+xE
+xE
+xE
+Rt
+Rt
+Rt
+xE
+xE
+xE
+xE
+xE
+xE
+xE
+Rt
+Rt
+Rt
+Rt
+Rt
+Rt
+Rt
+Rt
+xE
+xE
+xE
+xE
+xE
+xE
+xE
+Rt
 xE
 xE
 xE
@@ -17980,65 +18721,26 @@ xE
 xE
 xE
 xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
+gS
+BK
+Vb
+Vb
+VJ
+Vb
+zb
+gS
 xE
 xE
 bY
+bX
 bY
-Jc
-Jc
-Jc
-Jc
-bY
-Jc
-bY
-bY
+OU
+Gp
+aJ
+zq
+xA
+fD
+TZ
 bY
 ce
 ce
@@ -18088,7 +18790,7 @@ jA
 tB
 GH
 ls
-iK
+Qb
 ls
 FO
 bj
@@ -18113,6 +18815,45 @@ xE
 xE
 xE
 xE
+Rt
+xE
+xE
+xE
+xE
+xE
+Rt
+Rt
+Rt
+xE
+xE
+Rt
+Rt
+Rt
+Rt
+xE
+xE
+xE
+xE
+xE
+xE
+xE
+xE
+Rt
+Rt
+Rt
+Rt
+Rt
+Rt
+Rt
+Rt
+Rt
+xE
+xE
+xE
+xE
+Rt
+Rt
+Rt
 xE
 xE
 xE
@@ -18122,65 +18863,26 @@ xE
 xE
 xE
 xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
+gS
+zz
+Vb
+KE
+aD
+Vb
+YX
+gS
 xE
 xE
 bY
-Jc
-Jc
-Jc
-Jc
-Jc
-Jc
-Jc
-bY
+bX
 bY
+OU
+Gp
+aJ
+xA
+xA
+fD
+TZ
 bY
 ce
 ce
@@ -18255,6 +18957,44 @@ xE
 xE
 xE
 xE
+Rt
+Rt
+xE
+xE
+xE
+xE
+Rt
+Rt
+Rt
+Rt
+xE
+Rt
+Rt
+Rt
+xE
+xE
+xE
+xE
+xE
+xE
+xE
+xE
+xE
+Rt
+Rt
+xE
+xE
+Rt
+Rt
+Rt
+Rt
+Rt
+Rt
+xE
+Rt
+Rt
+Rt
+Rt
 xE
 xE
 xE
@@ -18265,64 +19005,26 @@ xE
 xE
 xE
 xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
+gS
+HB
+eE
+nd
+ey
+Vb
+Vb
+gS
 bY
 bY
 bY
+bX
 bY
-bY
-Jc
-Jc
-Jc
-Jc
-Jc
-Jc
-bY
-bY
-bY
+OU
+Gp
+aJ
+xA
+xA
+fD
+TZ
 ce
 ce
 ce
@@ -18397,6 +19099,43 @@ xE
 xE
 xE
 xE
+Rt
+Rt
+xE
+xE
+xE
+xE
+xE
+Rt
+Rt
+Rt
+Rt
+Rt
+Rt
+xE
+xE
+xE
+xE
+xE
+xE
+xE
+xE
+Rt
+Rt
+Rt
+xE
+xE
+xE
+xE
+xE
+Rt
+Rt
+Rt
+Rt
+Rt
+Rt
+Rt
+Rt
 xE
 xE
 xE
@@ -18408,63 +19147,26 @@ xE
 xE
 xE
 xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
+gS
+zO
+Vb
+Vb
+qr
+Vb
+zb
+gS
 bY
 bY
 bY
-bY
-bY
-bY
-Jc
-Jc
-Jc
-Jc
-Jc
-Jc
-bY
-bY
-ce
+bX
+pw
+OU
+Gp
+aJ
+xA
+xA
+fD
+BZ
 ce
 ce
 ce
@@ -18539,6 +19241,41 @@ xE
 xE
 xE
 xE
+Rt
+Rt
+Rt
+xE
+xE
+xE
+xE
+Rt
+Rt
+xE
+xE
+xE
+xE
+xE
+xE
+xE
+xE
+xE
+xE
+xE
+Rt
+Rt
+Rt
+Rt
+xE
+xE
+xE
+xE
+Rt
+Rt
+gr
+Rt
+Rt
+Rt
+Rt
 xE
 xE
 xE
@@ -18552,59 +19289,24 @@ xE
 xE
 xE
 xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-bY
-bY
-bY
-xE
-xE
-bY
-bY
-bY
-bY
+gS
+kn
+aO
+US
+HG
+rU
+jX
+gS
 bY
 Jc
-Jc
-Jc
-bY
-Jc
-Jc
-Jc
 bY
+OZ
+Cw
+ay
+oB
+vT
+SJ
+GO
 bY
 ce
 ce
@@ -18681,6 +19383,9 @@ xE
 xE
 xE
 xE
+Rt
+Rt
+Rt
 xE
 xE
 xE
@@ -18697,24 +19402,21 @@ xE
 xE
 xE
 xE
+Rt
+Rt
+Rt
+Rt
 xE
 xE
 xE
 xE
 xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
+Rt
+Rt
+Rt
+Rt
+Rt
+Rt
 xE
 xE
 xE
@@ -18729,24 +19431,24 @@ xE
 xE
 bY
 bY
-bY
-bY
-bY
-bY
-bY
-bY
+gS
+gS
+gS
+gS
+eJ
+gS
+gS
+gS
 bY
 Jc
-Jc
-Jc
-Jc
-Jc
-Jc
-Jc
-Jc
-Jc
-Jc
 bY
+Ad
+pw
+Gp
+Gp
+Gp
+Gp
+Gp
 bY
 ce
 ce
@@ -18823,6 +19525,9 @@ xE
 xE
 xE
 xE
+Rt
+Rt
+Rt
 xE
 xE
 xE
@@ -18837,24 +19542,21 @@ xE
 xE
 xE
 xE
+Rt
+Rt
+Rt
+Rt
 xE
 xE
 xE
 xE
 xE
 xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
+Rt
+Rt
+Rt
+Rt
+Rt
 xE
 xE
 xE
@@ -18871,19 +19573,19 @@ xE
 bY
 bY
 bY
-Jc
-Jc
-Jc
-Jc
-Jc
-Jc
-Jc
-Jc
-Jc
 bY
-Jc
-Jc
-Jc
+bY
+bY
+gC
+fp
+gC
+bY
+bY
+bY
+bY
+bY
+Ad
+bY
 bY
 bY
 bY
@@ -18966,6 +19668,9 @@ xE
 xE
 xE
 xE
+Rt
+Rt
+Rt
 xE
 xE
 xE
@@ -18978,23 +19683,20 @@ xE
 xE
 xE
 xE
+Rt
+Rt
+Rt
+Rt
 xE
 xE
 xE
 xE
 xE
 xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
+Rt
+Rt
+Rt
+Rt
 xE
 xE
 xE
@@ -19013,22 +19715,22 @@ xE
 bY
 bY
 Jc
-bY
-bY
 Jc
 bY
+Zg
+bY
+GZ
+Cw
+Cw
+Cw
+Cw
+Cw
+Cw
+LA
 bY
 Jc
 Jc
 Jc
-Jc
-Jc
-bY
-bY
-bY
-bY
-bY
-bY
 bY
 bY
 bY
@@ -19107,6 +19809,11 @@ xE
 xE
 xE
 xE
+Rt
+Rt
+Rt
+Rt
+Rt
 xE
 xE
 xE
@@ -19116,24 +19823,19 @@ xE
 xE
 xE
 xE
+Rt
+Rt
+Rt
+Rt
 xE
 xE
 xE
 xE
 xE
 xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
+Rt
+Rt
+Rt
 xE
 xE
 xE
@@ -19159,7 +19861,7 @@ bY
 bY
 bY
 bY
-bY
+sZ
 bY
 bY
 bY
@@ -19248,6 +19950,12 @@ xE
 xE
 xE
 xE
+Rt
+Rt
+Rt
+Rt
+Rt
+Rt
 xE
 xE
 xE
@@ -19255,6 +19963,11 @@ xE
 xE
 xE
 xE
+Rt
+Rt
+Rt
+Rt
+Rt
 xE
 xE
 xE
@@ -19262,18 +19975,7 @@ xE
 xE
 xE
 xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
+Rt
 xE
 xE
 xE
@@ -19301,7 +20003,7 @@ FF
 FF
 FF
 bY
-bX
+sZ
 uj
 Vl
 Vl
@@ -19390,24 +20092,24 @@ xE
 xE
 xE
 xE
+Rt
+Rt
+Rt
+Rt
+Rt
+Rt
+Rt
+Rt
 xE
 xE
 xE
 xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
+Rt
+Rt
+Rt
+Rt
+Rt
+Rt
 xE
 xE
 xE
@@ -19443,7 +20145,7 @@ ib
 sd
 FF
 bY
-bX
+sZ
 GT
 tW
 vI
@@ -19532,21 +20234,21 @@ xE
 xE
 xE
 xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
+Rt
+Rt
+Rt
+Rt
+Rt
+Rt
+Rt
+Rt
+Rt
+Rt
+Rt
+Rt
+Rt
+Rt
+Rt
 xE
 xE
 xE
@@ -19585,7 +20287,7 @@ JB
 jT
 rl
 bY
-bX
+sZ
 GT
 Bz
 WR
@@ -19674,20 +20376,20 @@ xE
 xE
 xE
 xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
+Rt
+Rt
+Rt
+Rt
+Rt
+Rt
+Rt
+Rt
+Rt
+Rt
+Rt
+Rt
+Rt
+Rt
 xE
 xE
 xE
@@ -19727,7 +20429,7 @@ LS
 sl
 rl
 bY
-bX
+sZ
 fz
 Bz
 WR
@@ -19777,7 +20479,7 @@ wF
 KY
 wF
 BR
-BR
+bU
 BR
 cv
 ZF
@@ -19816,12 +20518,12 @@ xE
 xE
 xE
 xE
+Rt
+Rt
 xE
-xE
-xE
-xE
-xE
-xE
+Rt
+Rt
+Rt
 xE
 xE
 xE
@@ -19869,7 +20571,7 @@ Ny
 DT
 FF
 bY
-bX
+sZ
 fz
 Bz
 WR
@@ -19958,11 +20660,11 @@ xE
 xE
 xE
 xE
-xE
-xE
-xE
-xE
-xE
+Rt
+Rt
+Rt
+Rt
+Rt
 xE
 xE
 xE
@@ -20011,13 +20713,13 @@ Ny
 cs
 rl
 bY
-bX
+sZ
 fz
 Bz
 WR
 ZZ
 ht
-CQ
+lg
 Es
 jv
 qA
@@ -20101,10 +20803,10 @@ xE
 xE
 xE
 xE
-xE
-xE
-xE
-xE
+Rt
+Rt
+Rt
+Rt
 xE
 xE
 xE
@@ -20153,7 +20855,7 @@ LS
 sl
 rl
 bY
-bX
+sZ
 fz
 Bz
 WR
@@ -20295,7 +20997,7 @@ LS
 sl
 rl
 bY
-bX
+sZ
 fz
 kf
 WR
@@ -20437,7 +21139,7 @@ xS
 TN
 FF
 bY
-bX
+sZ
 fz
 Bz
 WR
@@ -20446,7 +21148,7 @@ rL
 eq
 YA
 gv
-qA
+oc
 Vf
 cm
 rk
@@ -20551,7 +21253,7 @@ gx
 Bm
 DR
 lf
-gx
+eG
 Py
 yt
 cW
@@ -20579,7 +21281,7 @@ LS
 cU
 rl
 bY
-bX
+sZ
 fz
 Bz
 WR
@@ -20721,7 +21423,7 @@ LS
 cU
 rl
 bY
-bX
+sZ
 fz
 Bz
 WR
@@ -20863,7 +21565,7 @@ Ny
 Ny
 rl
 bY
-bX
+sZ
 fz
 Bz
 WR
@@ -21005,7 +21707,7 @@ GS
 CD
 FF
 bY
-bX
+sZ
 GT
 Bz
 WR
@@ -21147,7 +21849,7 @@ YO
 Gl
 rl
 bY
-bX
+sZ
 GT
 Bz
 Op
@@ -21279,7 +21981,7 @@ Ny
 Ny
 Ny
 Ny
-Ny
+mg
 ip
 xm
 xm
@@ -21289,7 +21991,7 @@ Ny
 hL
 rl
 bY
-bX
+sZ
 GT
 Bz
 Bz
@@ -21431,7 +22133,7 @@ jt
 Ny
 FF
 bY
-bX
+sZ
 GT
 Hz
 zc
@@ -21458,7 +22160,7 @@ bY
 bY
 bY
 bY
-Hn
+il
 Ja
 Ja
 Ja
@@ -21495,7 +22197,7 @@ xJ
 Cd
 vB
 LL
-cy
+ZQ
 hx
 cy
 LL
@@ -21573,7 +22275,7 @@ rl
 FF
 FF
 bY
-bX
+sZ
 uj
 Vl
 Vl
@@ -21715,7 +22417,7 @@ bY
 bY
 bY
 bY
-bX
+sZ
 bY
 bY
 bY
@@ -21857,7 +22559,7 @@ bY
 bY
 bY
 pw
-bX
+sZ
 pw
 bY
 bY
@@ -22269,7 +22971,7 @@ bY
 bY
 Vk
 bY
-bY
+Zg
 bY
 Jc
 Jc
@@ -22283,7 +22985,7 @@ bY
 bY
 bY
 bY
-bY
+Zg
 bY
 bY
 bY
@@ -23254,7 +23956,7 @@ eD
 Qp
 hD
 kV
-Ah
+JS
 WO
 eD
 eD
@@ -23290,7 +23992,7 @@ Tr
 Zl
 Tr
 Tr
-FM
+sO
 WP
 In
 bY
@@ -24965,7 +25667,7 @@ ce
 ce
 ce
 bY
-HX
+Wo
 bY
 ce
 ce
@@ -27085,7 +27787,7 @@ Ki
 za
 za
 Vu
-Lc
+UJ
 Lc
 FR
 XU
@@ -27528,7 +28230,7 @@ to
 HL
 eP
 au
-wa
+YJ
 wa
 Xw
 Du
@@ -28410,7 +29112,7 @@ Bo
 Bo
 Bo
 Bo
-uI
+JC
 TL
 TL
 TL
@@ -28530,7 +29232,7 @@ eX
 pf
 Ij
 PL
-ID
+ew
 Mu
 nR
 zW
@@ -29414,7 +30116,7 @@ OV
 Rw
 qg
 Pr
-sv
+Xk
 Pm
 iC
 QI
@@ -32971,7 +33673,7 @@ tN
 fk
 fk
 tN
-tN
+NN
 tN
 tN
 fk
@@ -33517,7 +34219,7 @@ pe
 tk
 OH
 cG
-cG
+FX
 cG
 cG
 pe
diff --git a/maps/groundbase/gb-z3.dmm b/maps/groundbase/gb-z3.dmm
index d310c9e0ce..57153dc832 100644
--- a/maps/groundbase/gb-z3.dmm
+++ b/maps/groundbase/gb-z3.dmm
@@ -135,6 +135,10 @@
 	},
 /turf/simulated/floor/tiled/steel_ridged,
 /area/groundbase/medical/patient4)
+"dz" = (
+/obj/random/mob/bird,
+/turf/simulated/floor/outdoors/grass/forest/virgo3c,
+/area/groundbase/level3/se)
 "dE" = (
 /obj/machinery/door/firedoor/glass,
 /obj/machinery/door/airlock/science{
@@ -507,6 +511,10 @@
 /obj/machinery/atmospherics/unary/vent_pump/on,
 /turf/simulated/floor/tiled/white,
 /area/groundbase/medical/patient2)
+"kI" = (
+/obj/random/mob/bird,
+/turf/simulated/floor/outdoors/grass/forest/virgo3c,
+/area/groundbase/level3/nw)
 "kQ" = (
 /obj/structure/closet/secure_closet/paramedic,
 /obj/machinery/atmospherics/unary/vent_pump/on,
@@ -664,6 +672,10 @@
 /obj/machinery/suit_cycler/medical,
 /turf/simulated/floor/tiled/white,
 /area/groundbase/medical/paramedic)
+"ok" = (
+/obj/random/mob/bird,
+/turf/simulated/floor/outdoors/grass/forest/virgo3c,
+/area/groundbase/level3/sw)
 "om" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 9
@@ -831,6 +843,9 @@
 	},
 /turf/simulated/shuttle/plating/airless,
 /area/shuttle/groundbase/exploration)
+"rl" = (
+/turf/simulated/floor/outdoors/grass/forest/virgo3c,
+/area/groundbase/level3/sw)
 "ro" = (
 /obj/structure/bed/padded,
 /obj/item/weapon/bedsheet/medical,
@@ -1071,6 +1086,17 @@
 	},
 /turf/simulated/floor/tiled/virgo3c,
 /area/groundbase/medical/patio)
+"xD" = (
+/obj/structure/cable/yellow{
+	icon_state = "1-2"
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/effect/landmark{
+	name = "lightsout"
+	},
+/turf/simulated/floor/tiled/white,
+/area/groundbase/medical/uhallway)
 "xH" = (
 /obj/structure/closet/secure_closet/explorer,
 /turf/simulated/floor/tiled,
@@ -1235,6 +1261,9 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
 	dir = 8
 	},
+/obj/effect/landmark{
+	name = "lightsout"
+	},
 /turf/simulated/floor/tiled/white,
 /area/groundbase/medical/paramedic)
 "BB" = (
@@ -1854,6 +1883,9 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 6
 	},
+/obj/effect/landmark{
+	name = "lightsout"
+	},
 /turf/simulated/floor/tiled,
 /area/groundbase/exploration/equipment)
 "Oh" = (
@@ -3414,8 +3446,8 @@ gE
 gE
 gE
 gE
-gE
-gE
+rl
+rl
 gE
 gE
 gE
@@ -3553,13 +3585,13 @@ gE
 gE
 gE
 gE
-gE
-gE
-gE
-gE
-gE
-gE
-gE
+rl
+rl
+rl
+rl
+rl
+rl
+rl
 gE
 gE
 Lt
@@ -3698,10 +3730,10 @@ gE
 gE
 gE
 gE
-gE
-gE
-gE
-gE
+rl
+rl
+rl
+rl
 gE
 gE
 gE
@@ -3840,11 +3872,11 @@ gE
 gE
 gE
 gE
-gE
-gE
-gE
-gE
-gE
+rl
+rl
+rl
+rl
+rl
 gE
 gE
 gE
@@ -3931,8 +3963,8 @@ qO
 qO
 qO
 qO
-qO
-qO
+Qa
+Qa
 qO
 qO
 qO
@@ -3983,13 +4015,13 @@ gE
 gE
 gE
 gE
-gE
-gE
-gE
-gE
-gE
-gE
-gE
+rl
+rl
+rl
+rl
+rl
+rl
+rl
 gE
 gE
 gE
@@ -4015,10 +4047,10 @@ gE
 gE
 gE
 gE
-gE
-gE
-gE
-gE
+rl
+rl
+rl
+rl
 gE
 gE
 Lt
@@ -4073,8 +4105,8 @@ qO
 qO
 qO
 qO
-qO
-qO
+Qa
+Qa
 qO
 qO
 qO
@@ -4126,15 +4158,15 @@ Kr
 gE
 gE
 gE
-gE
-gE
-gE
-gE
-gE
-gE
-gE
-gE
-gE
+rl
+rl
+rl
+rl
+rl
+rl
+rl
+rl
+rl
 gE
 gE
 gE
@@ -4155,11 +4187,11 @@ gE
 gE
 gE
 gE
-gE
-gE
-gE
-gE
-gE
+rl
+rl
+rl
+rl
+rl
 gE
 gE
 gE
@@ -4213,10 +4245,10 @@ qO
 qO
 qO
 qO
-qO
-qO
-qO
-qO
+Qa
+Qa
+Qa
+Qa
 qO
 qO
 qO
@@ -4241,11 +4273,11 @@ lh
 lh
 lh
 lh
-lh
-lh
-lh
-Kr
-Kr
+fN
+fN
+fN
+QD
+QD
 Kr
 Kr
 Kr
@@ -4273,6 +4305,17 @@ gE
 gE
 gE
 gE
+rl
+rl
+rl
+rl
+rl
+gE
+gE
+gE
+gE
+gE
+gE
 gE
 gE
 gE
@@ -4284,25 +4327,14 @@ gE
 gE
 gE
 gE
-gE
-gE
-gE
-gE
-gE
-gE
-gE
-gE
-gE
-gE
-gE
-gE
-gE
-gE
-gE
-gE
-gE
-gE
-gE
+rl
+rl
+rl
+rl
+rl
+rl
+rl
+rl
 gE
 gE
 Lt
@@ -4354,13 +4386,13 @@ qO
 qO
 qO
 qO
-qO
-qO
-qO
-qO
-qO
-qO
-qO
+Qa
+Qa
+Qa
+Qa
+Qa
+Qa
+Qa
 qO
 qO
 qO
@@ -4383,11 +4415,11 @@ lh
 lh
 lh
 lh
-lh
-lh
-lh
-Kr
-Kr
+fN
+fN
+fN
+QD
+QD
 Kr
 Kr
 Kr
@@ -4418,33 +4450,33 @@ gE
 gE
 gE
 gE
+rl
+rl
+rl
+rl
+rl
+rl
+rl
+gE
+gE
+gE
+gE
 gE
 gE
 gE
 gE
 gE
 gE
-gE
-gE
-gE
-gE
-gE
-gE
-gE
-gE
-gE
-gE
-gE
-gE
-gE
-gE
-gE
-gE
-gE
-gE
-gE
-gE
-gE
+rl
+rl
+rl
+rl
+rl
+rl
+rl
+rl
+rl
+rl
 gE
 gE
 Lt
@@ -4494,6 +4526,19 @@ qO
 qO
 qO
 qO
+Qa
+Qa
+Qa
+Qa
+Qa
+Qa
+Qa
+Qa
+Qa
+Qa
+Qa
+Qa
+Qa
 qO
 qO
 qO
@@ -4501,20 +4546,7 @@ qO
 qO
 qO
 qO
-qO
-qO
-qO
-qO
-qO
-qO
-qO
-qO
-qO
-qO
-qO
-qO
-qO
-qO
+Qa
 qO
 qO
 qO
@@ -4525,12 +4557,12 @@ lh
 lh
 lh
 lh
-lh
-lh
-lh
-Kr
-Kr
-Kr
+fN
+fN
+fN
+QD
+QD
+QD
 Kr
 Kr
 Kr
@@ -4564,30 +4596,30 @@ gE
 gE
 gE
 gE
+rl
+rl
+rl
+rl
+rl
+rl
 gE
 gE
 gE
-gE
-gE
-gE
-gE
-gE
-gE
-gE
-gE
-gE
-gE
-gE
-gE
-gE
-gE
-gE
-gE
-gE
-gE
-gE
-gE
-gE
+rl
+rl
+rl
+rl
+rl
+rl
+rl
+rl
+rl
+rl
+rl
+rl
+rl
+rl
+rl
 gE
 Lt
 Lt
@@ -4637,28 +4669,28 @@ Qa
 Qa
 Qa
 Qa
-qO
-qO
-qO
-qO
-qO
-qO
-qO
-qO
-qO
-qO
-qO
-qO
-qO
-qO
-qO
-qO
-qO
-qO
-qO
-qO
-qO
-qO
+Qa
+Qa
+Qa
+Qa
+Qa
+Qa
+Qa
+Qa
+Qa
+Qa
+Qa
+Qa
+Qa
+Qa
+Qa
+Qa
+Qa
+Qa
+Qa
+Qa
+Qa
+Qa
 qO
 qO
 qO
@@ -4667,12 +4699,12 @@ lh
 lh
 lh
 lh
-lh
-lh
-lh
-Kr
-Kr
-Kr
+fN
+fN
+fN
+QD
+QD
+QD
 Kr
 Kr
 Kr
@@ -4704,32 +4736,32 @@ gE
 gE
 gE
 gE
+rl
+rl
+gE
+rl
+rl
+rl
+rl
+rl
+rl
+rl
+rl
+rl
+rl
+rl
+gE
+rl
 gE
 gE
 gE
 gE
 gE
-gE
-gE
-gE
-gE
-gE
-gE
-gE
-gE
-gE
-gE
-gE
-gE
-gE
-gE
-gE
-gE
-gE
-gE
-gE
-gE
-gE
+rl
+rl
+rl
+rl
+rl
 gE
 Lt
 Lt
@@ -4780,25 +4812,25 @@ Qa
 Qa
 Qa
 Qa
-qO
-qO
-qO
-qO
-qO
-qO
-qO
-qO
-qO
-qO
-qO
-qO
-qO
-qO
-qO
-qO
-qO
-qO
-qO
+Qa
+Qa
+Qa
+Qa
+Qa
+Qa
+Qa
+Qa
+Qa
+Qa
+Qa
+Qa
+Qa
+Qa
+Qa
+Qa
+Qa
+Qa
+Qa
 qO
 qO
 qO
@@ -4809,12 +4841,12 @@ qO
 lh
 lh
 lh
-lh
-lh
-lh
-Kr
-Kr
-Kr
+fN
+fN
+fN
+QD
+QD
+QD
 Kr
 Kr
 Kr
@@ -4849,20 +4881,17 @@ gE
 gE
 gE
 gE
+rl
+rl
+rl
+ok
+rl
+rl
+rl
+rl
+rl
 gE
-gE
-gE
-ji
-gE
-gE
-gE
-gE
-gE
-gE
-gE
-gE
-gE
-gE
+rl
 gE
 gE
 gE
@@ -4872,6 +4901,9 @@ gE
 gE
 gE
 gE
+rl
+rl
+rl
 gE
 Lt
 Lt
@@ -4913,7 +4945,6 @@ qO
 qO
 qO
 qO
-qO
 Qa
 Qa
 Qa
@@ -4923,24 +4954,25 @@ Qa
 Qa
 Qa
 Qa
-qO
-qO
-qO
-qO
-qO
-qO
-qO
-qO
-qO
-qO
-qO
-qO
-qO
-qO
-qO
-qO
-qO
-qO
+Qa
+Qa
+Qa
+Qa
+Qa
+Qa
+Qa
+Qa
+Qa
+Qa
+Qa
+Qa
+Qa
+Qa
+Qa
+Qa
+Qa
+Qa
+Qa
 qO
 qO
 qO
@@ -4951,12 +4983,12 @@ qO
 lh
 lh
 lh
-lh
-lh
-lh
-Kr
-Kr
-Kr
+fN
+fN
+fN
+QD
+QD
+QD
 Kr
 Kr
 Kr
@@ -4992,6 +5024,13 @@ gE
 gE
 gE
 gE
+rl
+rl
+rl
+rl
+rl
+rl
+rl
 gE
 gE
 gE
@@ -5005,15 +5044,8 @@ gE
 gE
 gE
 gE
-gE
-gE
-gE
-gE
-gE
-gE
-gE
-gE
-gE
+rl
+rl
 gE
 Lt
 Lt
@@ -5054,8 +5086,6 @@ jv
 qO
 qO
 qO
-qO
-qO
 Qa
 Qa
 Qa
@@ -5066,18 +5096,20 @@ Qa
 Qa
 Qa
 Qa
-qO
-qO
-qO
-qO
-qO
-qO
-qO
-qO
-qO
-qO
-qO
-qO
+Qa
+Qa
+Qa
+Qa
+Qa
+Qa
+Qa
+Qa
+Qa
+Qa
+Qa
+Qa
+Qa
+Qa
 qO
 qO
 qO
@@ -5093,12 +5125,12 @@ qO
 lh
 lh
 lh
-lh
-lh
-lh
-Kr
-Kr
-Kr
+fN
+fN
+fN
+QD
+QD
+QD
 Kr
 Kr
 Kr
@@ -5133,13 +5165,13 @@ gE
 gE
 gE
 gE
+rl
+rl
 gE
-gE
-gE
-gE
-gE
-gE
-gE
+rl
+rl
+rl
+rl
 gE
 gE
 gE
@@ -5155,7 +5187,7 @@ gE
 gE
 gE
 gE
-gE
+rl
 gE
 Lt
 Lt
@@ -5196,8 +5228,6 @@ qO
 qO
 qO
 qO
-qO
-qO
 Qa
 Qa
 Qa
@@ -5209,15 +5239,17 @@ Qa
 Qa
 Qa
 Qa
-qO
-qO
-qO
-qO
-qO
-HV
-qO
-qO
-qO
+Qa
+Qa
+Qa
+Qa
+Qa
+Qa
+Qa
+kI
+Qa
+Qa
+Qa
 qO
 qO
 qO
@@ -5228,19 +5260,19 @@ qO
 qO
 qO
 qO
+fN
+fN
 lh
 lh
 lh
 lh
 lh
-lh
-lh
-lh
-lh
-lh
-Kr
-Kr
-Kr
+fN
+fN
+fN
+QD
+QD
+QD
 Kr
 Kr
 Kr
@@ -5277,7 +5309,7 @@ gE
 gE
 gE
 gE
-gE
+rl
 gE
 gE
 gE
@@ -5297,7 +5329,7 @@ QD
 gE
 gE
 gE
-gE
+rl
 gE
 Lt
 Lt
@@ -5326,8 +5358,8 @@ qO
 HV
 qO
 qO
-qO
-qO
+Qa
+Qa
 qO
 qO
 qO
@@ -5336,10 +5368,17 @@ jv
 jv
 qO
 qO
-qO
-qO
-qO
-qO
+Qa
+Qa
+Qa
+Qa
+Qa
+Qa
+Qa
+Qa
+Qa
+Qa
+Qa
 Qa
 Qa
 Qa
@@ -5362,27 +5401,20 @@ qO
 qO
 qO
 qO
-qO
-qO
-qO
-qO
-qO
-qO
-qO
+fN
+fN
+fN
 lh
 lh
 lh
 lh
 lh
-lh
-lh
-lh
-lh
-lh
-lh
-Kr
-Kr
-Kr
+fN
+fN
+fN
+QD
+QD
+QD
 Kr
 Kr
 Kr
@@ -5467,13 +5499,9 @@ qO
 qO
 qO
 qO
-qO
-qO
-qO
-qO
-qO
-qO
-qO
+Qa
+Qa
+Qa
 qO
 qO
 qO
@@ -5494,36 +5522,40 @@ Qa
 Qa
 Qa
 Qa
+Qa
+Qa
+Qa
+Qa
+Qa
+Qa
+Qa
+Qa
+Qa
+Qa
+Qa
 qO
 qO
 qO
 qO
 qO
+fN
+fN
+fN
 qO
 qO
-qO
-qO
-qO
-qO
-qO
-lh
-lh
-lh
-qO
-qO
+fN
+fN
+fN
 lh
 lh
 lh
 lh
 lh
-lh
-lh
-lh
-lh
-lh
-lh
-Kr
-Kr
+fN
+fN
+fN
+QD
+QD
 Kr
 Kr
 Kr
@@ -5610,20 +5642,20 @@ qO
 qO
 qO
 qO
+Qa
+Qa
+Qa
 qO
 qO
 qO
 qO
 qO
-qO
-qO
-qO
-qO
-qO
-qO
-qO
-qO
-qO
+Qa
+Qa
+Qa
+Qa
+Qa
+Qa
 qO
 Qa
 Qa
@@ -5636,36 +5668,36 @@ Qa
 Qa
 Qa
 Qa
+Qa
+Qa
+Qa
+Qa
+Qa
+Qa
 qO
 qO
 qO
 qO
-qO
-qO
-qO
-qO
-qO
-qO
-lh
-lh
-lh
-lh
-lh
-lh
-lh
-lh
-lh
-lh
-lh
-lh
-lh
-lh
-lh
+lh
+lh
+fN
+fN
+fN
+fN
+fN
+fN
+fN
+fN
 lh
 lh
 lh
 lh
 lh
+fN
+fN
+fN
+fN
+fN
 lh
 lh
 lh
@@ -5751,19 +5783,19 @@ qO
 qO
 qO
 qO
+Qa
+Qa
+Qa
+Qa
+Qa
+Qa
 qO
 qO
 qO
-qO
-qO
-qO
-qO
-qO
-qO
-qO
-qO
-qO
-qO
+Qa
+Qa
+Qa
+Qa
 qO
 qO
 qO
@@ -5779,12 +5811,12 @@ Qa
 Qa
 Qa
 Qa
-qO
-qO
-qO
-qO
-qO
-qO
+Qa
+Qa
+Qa
+Qa
+Qa
+Qa
 qO
 qO
 lh
@@ -5894,17 +5926,17 @@ qO
 qO
 qO
 qO
-qO
-qO
-qO
-qO
-qO
-qO
-qO
-qO
-qO
-qO
-qO
+Qa
+Qa
+Qa
+Qa
+Qa
+Qa
+Qa
+Qa
+Qa
+Qa
+Qa
 qO
 qO
 aa
@@ -5922,11 +5954,11 @@ Qa
 Qa
 Qa
 Qa
-qO
-qO
-qO
-qO
-qO
+Qa
+Qa
+Qa
+Qa
+Qa
 qO
 qO
 lh
@@ -6037,16 +6069,16 @@ qO
 qO
 qO
 qO
-qO
-qO
-qO
-qO
-qO
-qO
-qO
-qO
-qO
-qO
+Qa
+Qa
+Qa
+Qa
+Qa
+Qa
+Qa
+Qa
+Qa
+Qa
 qO
 qO
 aa
@@ -6064,10 +6096,10 @@ Qa
 Qa
 Qa
 Qa
-qO
-qO
-qO
-qO
+Qa
+Qa
+Qa
+Qa
 qO
 qO
 qO
@@ -6179,16 +6211,16 @@ qO
 qO
 qO
 qO
-qO
-qO
-qO
 Qa
-qO
-qO
-qO
-qO
-qO
-qO
+Qa
+Qa
+Qa
+Qa
+Qa
+Qa
+Qa
+Qa
+Qa
 qO
 qO
 aa
@@ -6206,11 +6238,11 @@ Qa
 Qa
 Qa
 Qa
-qO
-qO
-qO
-qO
-qO
+Qa
+Qa
+Qa
+Qa
+Qa
 qO
 qO
 qO
@@ -6320,16 +6352,16 @@ jv
 jv
 qO
 qO
-qO
-qO
-qO
 Qa
 Qa
 Qa
 Qa
 Qa
-qO
-qO
+Qa
+Qa
+Qa
+Qa
+Qa
 qO
 qO
 qO
@@ -6349,11 +6381,11 @@ Qa
 Qa
 Qa
 qO
-qO
-qO
-qO
-qO
-qO
+Qa
+Qa
+Qa
+Qa
+Qa
 qO
 qO
 fN
@@ -6463,15 +6495,15 @@ jv
 qO
 qO
 qO
-qO
 Qa
 Qa
 Qa
 Qa
 Qa
-qO
-qO
-qO
+Qa
+Qa
+Qa
+Qa
 qO
 qO
 qO
@@ -6493,10 +6525,10 @@ Qa
 qO
 qO
 qO
-qO
-qO
-qO
-qO
+Qa
+Qa
+Qa
+Qa
 qO
 fN
 fN
@@ -6606,14 +6638,14 @@ qO
 qO
 qO
 qO
-qO
 Qa
 Qa
 Qa
 Qa
 Qa
-qO
-qO
+Qa
+Qa
+Qa
 qO
 qO
 qO
@@ -6635,9 +6667,9 @@ Qa
 qO
 qO
 qO
-qO
-qO
-qO
+Qa
+Qa
+Qa
 qO
 qO
 qO
@@ -6752,10 +6784,10 @@ Qa
 Qa
 Qa
 Qa
-qO
-qO
-qO
-qO
+Qa
+Qa
+Qa
+Qa
 qO
 qO
 qO
@@ -6778,9 +6810,9 @@ qO
 qO
 qO
 qO
-qO
-qO
-qO
+Qa
+Qa
+Qa
 qO
 qO
 fN
@@ -6895,8 +6927,8 @@ Qa
 Qa
 Qa
 Qa
-qO
-qO
+Qa
+Qa
 qO
 qO
 qO
@@ -6921,8 +6953,8 @@ GU
 GU
 qO
 qO
-qO
-qO
+Qa
+Qa
 qO
 qO
 qO
@@ -7036,8 +7068,8 @@ Qa
 Qa
 Qa
 Qa
-qO
-qO
+Qa
+Qa
 qO
 qO
 qO
@@ -7063,8 +7095,8 @@ bm
 GU
 qO
 qO
-qO
-qO
+Qa
+Qa
 qO
 qO
 fN
@@ -7178,8 +7210,8 @@ Qa
 Qa
 Qa
 Qa
-qO
-qO
+Qa
+Qa
 qO
 qO
 qO
@@ -7205,7 +7237,7 @@ iN
 GU
 qO
 qO
-qO
+Qa
 qO
 qO
 qO
@@ -7319,7 +7351,7 @@ Qa
 Qa
 Qa
 Qa
-qO
+Qa
 qO
 qO
 qO
@@ -7347,8 +7379,8 @@ bk
 GU
 qO
 qO
-qO
-qO
+Qa
+Qa
 qO
 qO
 fN
@@ -7460,9 +7492,9 @@ Qa
 Qa
 Qa
 Qa
-qO
-qO
-qO
+Qa
+Qa
+Qa
 qO
 qO
 qO
@@ -7489,7 +7521,7 @@ iN
 GU
 qO
 qO
-qO
+Qa
 qO
 qO
 qO
@@ -7744,8 +7776,8 @@ qO
 Qa
 Qa
 Qa
-qO
-qO
+Qa
+Qa
 qO
 qO
 qO
@@ -7886,7 +7918,7 @@ qO
 Qa
 Qa
 Qa
-qO
+Qa
 qO
 qO
 qO
@@ -8024,11 +8056,11 @@ jv
 qO
 qO
 qO
-qO
 Qa
 Qa
 Qa
-qO
+Qa
+Qa
 qO
 qO
 qO
@@ -8166,10 +8198,10 @@ jv
 jv
 qO
 qO
-qO
 Qa
 Qa
-qO
+Qa
+Qa
 qO
 qO
 qO
@@ -8308,7 +8340,7 @@ jv
 jv
 qO
 qO
-qO
+Qa
 Qa
 Qa
 qO
@@ -8449,10 +8481,10 @@ jv
 jv
 jv
 qO
-qO
-qO
 Qa
-qO
+Qa
+Qa
+Qa
 qO
 qO
 qO
@@ -8591,10 +8623,10 @@ jv
 jv
 qO
 qO
-qO
-qO
 Qa
-qO
+Qa
+Qa
+Qa
 qO
 qO
 qO
@@ -8733,9 +8765,9 @@ qO
 qO
 qO
 qO
-qO
-qO
-qO
+Qa
+Qa
+Qa
 qO
 qO
 qO
@@ -8874,11 +8906,11 @@ qO
 qO
 qO
 qO
-qO
-qO
-qO
-qO
-qO
+Qa
+Qa
+Qa
+Qa
+Qa
 qO
 qO
 qO
@@ -9016,11 +9048,11 @@ qO
 qO
 qO
 qO
-qO
-qO
-qO
-qO
-qO
+Qa
+Qa
+Qa
+Qa
+Qa
 qO
 qO
 qO
@@ -9157,13 +9189,13 @@ qO
 qO
 qO
 qO
-qO
-qO
-qO
-qO
-qO
-qO
-qO
+Qa
+Qa
+Qa
+Qa
+Qa
+Qa
+Qa
 qO
 qO
 qO
@@ -9299,14 +9331,14 @@ qO
 qO
 qO
 qO
+Qa
 qO
-qO
-qO
-qO
-qO
-qO
-qO
-qO
+Qa
+Qa
+Qa
+Qa
+Qa
+Qa
 qO
 qO
 qO
@@ -9440,16 +9472,16 @@ qO
 qO
 qO
 qO
-qO
-qO
-qO
-qO
-qO
-qO
-qO
-qO
-qO
-qO
+Qa
+Qa
+Qa
+Qa
+Qa
+Qa
+Qa
+Qa
+Qa
+Qa
 qO
 qO
 qO
@@ -9581,16 +9613,16 @@ qO
 qO
 qO
 qO
-qO
-qO
-qO
-qO
-qO
-qO
-qO
-qO
-qO
-qO
+Qa
+Qa
+Qa
+Qa
+Qa
+Qa
+Qa
+Qa
+Qa
+Qa
 qO
 qO
 qO
@@ -9723,16 +9755,16 @@ qO
 qO
 qO
 qO
-qO
-qO
-qO
-qO
-qO
-qO
-qO
-qO
-qO
-qO
+Qa
+Qa
+Qa
+Qa
+Qa
+Qa
+Qa
+Qa
+Qa
+Qa
 qO
 qO
 qO
@@ -9866,15 +9898,15 @@ qO
 qO
 qO
 qO
-qO
-qO
-qO
-qO
-qO
-qO
-qO
-qO
-qO
+Qa
+Qa
+Qa
+Qa
+Qa
+Qa
+Qa
+Qa
+Qa
 qO
 qO
 qO
@@ -10007,15 +10039,15 @@ qO
 qO
 qO
 qO
-qO
-qO
-qO
-qO
-qO
-qO
-qO
-qO
-qO
+Qa
+Qa
+Qa
+Qa
+Qa
+Qa
+Qa
+Qa
+Qa
 qO
 qO
 qO
@@ -10149,14 +10181,14 @@ qO
 qO
 qO
 qO
-qO
-qO
-qO
-qO
-qO
-HV
-qO
-qO
+Qa
+Qa
+Qa
+Qa
+Qa
+kI
+Qa
+Qa
 qO
 qO
 qO
@@ -10290,11 +10322,11 @@ qO
 qO
 qO
 qO
-qO
-qO
-qO
-qO
-qO
+Qa
+Qa
+Qa
+Qa
+Qa
 qO
 qO
 qO
@@ -10432,9 +10464,9 @@ qO
 qO
 qO
 qO
-qO
-qO
-qO
+Qa
+Qa
+Qa
 qO
 qO
 qO
@@ -10573,8 +10605,8 @@ qO
 qO
 qO
 qO
-qO
-qO
+Qa
+Qa
 qO
 qO
 qO
@@ -12966,8 +12998,8 @@ Zo
 Zo
 Zo
 Zo
-Zo
-Zo
+Xv
+Xv
 Zo
 tZ
 tZ
@@ -13106,9 +13138,9 @@ cj
 Zo
 Zo
 Zo
-Zo
-Zo
-Zo
+Xv
+Xv
+Xv
 Zo
 Zo
 tZ
@@ -13247,10 +13279,10 @@ cj
 cj
 Zo
 Zo
-Zo
-Zo
-Zo
-Zo
+Xv
+Xv
+Xv
+Xv
 Zo
 tZ
 tZ
@@ -13389,10 +13421,10 @@ cj
 cj
 Zo
 Zo
-Zo
-ci
-Zo
-Zo
+Xv
+dz
+Xv
+Xv
 Zo
 tZ
 tZ
@@ -13532,8 +13564,8 @@ cj
 Zo
 Zo
 Zo
-Zo
-Zo
+Xv
+Xv
 Zo
 Zo
 tZ
@@ -13674,9 +13706,9 @@ cj
 cj
 Zo
 Zo
-Zo
-Zo
-Zo
+Xv
+Xv
+Xv
 Zo
 tZ
 tZ
@@ -13817,7 +13849,7 @@ cj
 Zo
 Zo
 Zo
-Zo
+Xv
 Zo
 Zo
 Zo
@@ -13959,8 +13991,8 @@ cj
 cj
 Zo
 Zo
-Zo
-Zo
+Xv
+Xv
 Zo
 Zo
 tZ
@@ -14102,7 +14134,7 @@ cj
 Zo
 Zo
 Zo
-Zo
+Xv
 Zo
 Zo
 tZ
@@ -14245,7 +14277,7 @@ cj
 Zo
 Zo
 Zo
-Zo
+Xv
 Zo
 Zo
 tZ
@@ -14738,7 +14770,7 @@ PV
 gl
 QC
 Ph
-Ph
+xD
 SD
 nq
 Gb
@@ -18902,7 +18934,7 @@ Zo
 Zo
 Zo
 Zo
-Zo
+Xv
 Zo
 Xv
 Xv
@@ -19043,9 +19075,9 @@ Zo
 Zo
 Zo
 Zo
-Zo
-Zo
-Zo
+Xv
+Xv
+Xv
 Xv
 Xv
 Xv
@@ -19185,9 +19217,9 @@ Zo
 Zo
 Zo
 Zo
-Zo
-Zo
-Zo
+Xv
+Xv
+Xv
 Xv
 Xv
 Xv
@@ -19326,13 +19358,13 @@ Zo
 Zo
 Zo
 Zo
-Zo
-Zo
-Zo
-Zo
-Zo
-Zo
-Zo
+Xv
+Xv
+Xv
+Xv
+Xv
+Xv
+Xv
 Xv
 Zo
 Zo
@@ -19468,13 +19500,13 @@ Zo
 Zo
 Zo
 Zo
-Zo
-Zo
-Zo
-Zo
-Zo
-Zo
-Zo
+Xv
+Xv
+Xv
+Xv
+Xv
+Xv
+Xv
 Xv
 Zo
 Zo
@@ -19610,12 +19642,12 @@ Zo
 Zo
 Zo
 Zo
-Zo
-Zo
-Zo
-Zo
-Zo
-Zo
+Xv
+Xv
+Xv
+Xv
+Xv
+Xv
 Zo
 Zo
 Zo
@@ -19750,14 +19782,14 @@ Zo
 Zo
 Zo
 Zo
+Xv
+Xv
+Xv
 Zo
-Zo
-Zo
-Zo
-Zo
-Zo
-Zo
-Zo
+Xv
+Xv
+Xv
+Xv
 Zo
 Zo
 Zo
@@ -19887,18 +19919,18 @@ Xv
 Xv
 Xv
 Zo
-Zo
-Zo
-Zo
-Zo
-Zo
-Zo
-Zo
-Zo
-Zo
-Zo
-Zo
-Zo
+Xv
+Xv
+Xv
+Xv
+Xv
+Xv
+Xv
+Xv
+Xv
+Xv
+Xv
+Xv
 Zo
 Zo
 Zo
@@ -20028,18 +20060,18 @@ Xv
 Xv
 Xv
 Xv
-Zo
-Zo
-Zo
-Zo
-Zo
-Zo
-Zo
-Zo
-Zo
-Zo
-Zo
-Zo
+Xv
+Xv
+Xv
+Xv
+Xv
+Xv
+Xv
+Xv
+Xv
+Xv
+Xv
+Xv
 Zo
 Zo
 Zo
@@ -20166,22 +20198,22 @@ Zo
 Xv
 Xv
 Xv
-Zo
+Xv
+Xv
+Xv
+Xv
+Xv
+Xv
+Xv
+Xv
+Xv
+Xv
+Xv
 Xv
 Xv
 Zo
-Zo
-Zo
-Zo
-Zo
-Zo
-Zo
-Zo
-Zo
-Zo
-Zo
-Zo
-Zo
+Xv
+Xv
 Zo
 Zo
 Zo
@@ -20312,18 +20344,18 @@ Zo
 Zo
 Zo
 Zo
+Xv
+Xv
+Xv
+Xv
 Zo
-Zo
-Zo
-Zo
-Zo
-Zo
-Zo
-Zo
-Zo
-Zo
-Zo
-Zo
+Xv
+Xv
+Xv
+Xv
+Xv
+Xv
+Xv
 Zo
 Zo
 Zo
@@ -20456,15 +20488,15 @@ Zo
 Zo
 Zo
 Zo
+Xv
 Zo
 Zo
 Zo
-Zo
-Zo
-Zo
-Zo
-Zo
-Zo
+Xv
+Xv
+Xv
+Xv
+Xv
 Zo
 Zo
 Zo
diff --git a/maps/groundbase/groundbase_areas.dm b/maps/groundbase/groundbase_areas.dm
index f456bf1cac..2cdb429918 100644
--- a/maps/groundbase/groundbase_areas.dm
+++ b/maps/groundbase/groundbase_areas.dm
@@ -269,6 +269,8 @@
 	name = "Pilot Equipment Room"
 /area/groundbase/civilian/gateway
 	name = "Gateway"
+/area/groundbase/civilian/janitor
+	name = "Janitor's Closet"
 
 /area/groundbase/exploration
 	name = "Exploration"
diff --git a/maps/groundbase/groundbase_defines.dm b/maps/groundbase/groundbase_defines.dm
index 97546c903a..94ccab7e85 100644
--- a/maps/groundbase/groundbase_defines.dm
+++ b/maps/groundbase/groundbase_defines.dm
@@ -444,7 +444,7 @@
 /obj/effect/step_trigger/teleporter/to_mining/Initialize()
 	. = ..()
 	teleport_x = x
-	teleport_y = y + 1
+	teleport_y = y ++
 	teleport_z = Z_LEVEL_MINING
 
 /obj/effect/step_trigger/teleporter/from_mining
@@ -454,5 +454,5 @@
 /obj/effect/step_trigger/teleporter/from_mining/Initialize()
 	. = ..()
 	teleport_x = x
-	teleport_y = y - 1
+	teleport_y = y --
 	teleport_z = Z_LEVEL_GB_BOTTOM