diff --git a/maps/groundbase/gb-centcomm.dmm b/maps/groundbase/gb-centcomm.dmm
index 82693aed565..bf2655e628d 100644
--- a/maps/groundbase/gb-centcomm.dmm
+++ b/maps/groundbase/gb-centcomm.dmm
@@ -1256,6 +1256,17 @@
 	icon_state = "white"
 	},
 /area/centcom/control)
+"eq" = (
+/obj/machinery/door/airlock/angled_bay/external/glass{
+	dir = 4;
+	door_color = "#822a1e";
+	frequency = 1380;
+	id_tag = "escape_shuttle_hatch";
+	locked = 1;
+	name = "Shuttle Airlock"
+	},
+/turf/simulated/shuttle/floor/yellow,
+/area/shuttle/escape)
 "et" = (
 /obj/structure/sign/department/armory,
 /turf/simulated/wall/r_wall,
@@ -20315,7 +20326,7 @@ Ll
 Ll
 ae
 ae
-Ll
+eq
 ae
 ae
 Ll
@@ -20457,7 +20468,7 @@ Ll
 Sc
 Sc
 Sc
-Sc
+jh
 Sc
 Sc
 Sc
diff --git a/maps/groundbase/gb-z1.dmm b/maps/groundbase/gb-z1.dmm
index 03fd51c9ec3..220df4f124b 100644
--- a/maps/groundbase/gb-z1.dmm
+++ b/maps/groundbase/gb-z1.dmm
@@ -108,6 +108,10 @@
 "ap" = (
 /obj/structure/closet/secure_closet/security,
 /obj/item/device/holowarrant,
+/obj/machinery/light_switch{
+	dir = 8;
+	pixel_x = 30
+	},
 /turf/simulated/floor/tiled/dark,
 /area/groundbase/security/equipment)
 "aq" = (
@@ -183,6 +187,14 @@
 	},
 /turf/simulated/floor/tiled/techfloor/grid,
 /area/groundbase/command/ai/chamber)
+"ay" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/structure/cable/yellow{
+	icon_state = "1-2"
+	},
+/turf/simulated/floor/outdoors/sidewalk/virgo3c,
+/area/groundbase/level1/centsquare)
 "az" = (
 /obj/structure/table/bench/steel,
 /turf/simulated/floor/tiled/dark,
@@ -314,6 +326,10 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 5
 	},
+/obj/machinery/light_switch{
+	dir = 1;
+	pixel_y = -30
+	},
 /turf/simulated/floor/tiled,
 /area/groundbase/engineering/atmos/monitoring)
 "aO" = (
@@ -350,6 +366,14 @@
 	},
 /turf/simulated/floor/tiled/white,
 /area/groundbase/medical/or1)
+"aV" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/machinery/light_switch{
+	dir = 8;
+	pixel_x = 30
+	},
+/turf/simulated/floor/tiled/techmaint,
+/area/groundbase/command/tcomms/storage)
 "aW" = (
 /obj/machinery/door/firedoor,
 /obj/machinery/door/airlock/command{
@@ -599,6 +623,11 @@
 /area/groundbase/level1/eastspur)
 "bL" = (
 /obj/machinery/vending/loadout/accessory,
+/obj/item/device/radio/intercom{
+	dir = 1;
+	name = "Station Intercom (General)";
+	pixel_y = 24
+	},
 /turf/simulated/floor/tiled,
 /area/groundbase/civilian/apparel)
 "bO" = (
@@ -663,6 +692,12 @@
 	},
 /turf/simulated/floor/bmarble,
 /area/groundbase/civilian/arrivals)
+"bV" = (
+/obj/machinery/light{
+	dir = 1
+	},
+/turf/simulated/floor/lino,
+/area/groundbase/civilian/cafe)
 "bX" = (
 /obj/structure/cable/yellow{
 	icon_state = "1-8"
@@ -687,6 +722,10 @@
 	pixel_y = 11
 	},
 /obj/machinery/alarm,
+/obj/machinery/light_switch{
+	dir = 4;
+	pixel_x = -30
+	},
 /turf/simulated/floor/carpet/gaycarpet,
 /area/groundbase/civilian/clown)
 "ca" = (
@@ -837,6 +876,17 @@
 "cv" = (
 /turf/simulated/wall/r_wall,
 /area/groundbase/security/briefing)
+"cw" = (
+/obj/structure/table/hardwoodtable,
+/obj/machinery/camera/network/civilian{
+	dir = 8
+	},
+/obj/random/mug,
+/obj/random/mug,
+/obj/random/mug,
+/obj/random/mug,
+/turf/simulated/floor/lino,
+/area/groundbase/civilian/cafe)
 "cx" = (
 /obj/machinery/atmospherics/valve/digital{
 	name = "supply isolation valve"
@@ -908,6 +958,15 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /turf/simulated/floor/tiled/techfloor/grid,
 /area/groundbase/command/ai/foyer)
+"cH" = (
+/obj/item/weapon/stool/baystool/padded{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 4
+	},
+/turf/simulated/floor/wood,
+/area/groundbase/civilian/cafe)
 "cI" = (
 /obj/machinery/power/apc{
 	dir = 8
@@ -1085,6 +1144,13 @@
 	},
 /turf/simulated/floor/tiled/white,
 /area/groundbase/medical/or1)
+"cZ" = (
+/obj/structure/cryofeed{
+	dir = 2
+	},
+/obj/machinery/camera/network/civilian,
+/turf/simulated/floor,
+/area/groundbase/civilian/arrivals)
 "db" = (
 /obj/machinery/door/firedoor,
 /obj/machinery/door/airlock{
@@ -1121,6 +1187,11 @@
 "dj" = (
 /obj/structure/table/marble,
 /obj/machinery/chemical_dispenser/bar_soft/full,
+/obj/item/device/radio/intercom{
+	dir = 1;
+	name = "Station Intercom (General)";
+	pixel_y = 21
+	},
 /turf/simulated/floor/lino,
 /area/groundbase/civilian/bar)
 "dk" = (
@@ -1155,6 +1226,12 @@
 	},
 /turf/simulated/floor/tiled/dark,
 /area/groundbase/security/briefing)
+"dp" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/machinery/hologram/holopad,
+/turf/simulated/floor/tiled,
+/area/groundbase/civilian/gateway)
 "dq" = (
 /obj/structure/bed/chair/comfy/brown{
 	dir = 1
@@ -1399,6 +1476,13 @@
 	},
 /turf/simulated/floor/tiled/dark,
 /area/groundbase/security/equipment)
+"dQ" = (
+/obj/structure/disposalpipe/segment{
+	dir = 8;
+	icon_state = "pipe-c"
+	},
+/turf/simulated/floor/outdoors/sidewalk/side/virgo3c,
+/area/groundbase/level1/eastspur)
 "dR" = (
 /obj/effect/floor_decal/industrial/loading{
 	dir = 4
@@ -1643,6 +1727,15 @@
 	},
 /turf/simulated/wall,
 /area/groundbase/cargo/mining)
+"eB" = (
+/obj/structure/morgue{
+	dir = 8
+	},
+/obj/machinery/camera/network/medbay{
+	dir = 1
+	},
+/turf/simulated/floor/tiled/white,
+/area/groundbase/medical/morgue)
 "eC" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/green{
 	dir = 6
@@ -1862,6 +1955,14 @@
 	temperature = 80
 	},
 /area/groundbase/command/tcomms)
+"fj" = (
+/obj/structure/table/hardwoodtable,
+/obj/item/weapon/reagent_containers/food/drinks/flask/vacuumflask,
+/obj/machinery/firealarm{
+	dir = 4
+	},
+/turf/simulated/floor/lino,
+/area/groundbase/civilian/cafe)
 "fk" = (
 /obj/structure/cable{
 	icon_state = "1-8"
@@ -1918,6 +2019,10 @@
 /turf/simulated/floor/outdoors/sidewalk/slab/virgo3c,
 /area/groundbase/level1/southeastspur)
 "fr" = (
+/obj/machinery/light_switch{
+	dir = 8;
+	pixel_x = 30
+	},
 /turf/simulated/floor/bluegrid,
 /area/groundbase/command/ai/hall)
 "fs" = (
@@ -2075,6 +2180,7 @@
 "fQ" = (
 /obj/structure/table/steel_reinforced,
 /obj/machinery/atmospherics/unary/vent_pump/on,
+/obj/item/weapon/storage/firstaid/regular,
 /turf/simulated/floor/carpet/bcarpet,
 /area/groundbase/security/briefing)
 "fR" = (
@@ -2189,6 +2295,15 @@
 	},
 /turf/simulated/floor/tiled,
 /area/groundbase/engineering/lobby)
+"gb" = (
+/obj/structure/table/hardwoodtable,
+/obj/machinery/door/blast/gate/thin{
+	dir = 8;
+	id = "Cafe";
+	layer = 3.3
+	},
+/turf/simulated/floor/lino,
+/area/groundbase/civilian/cafe)
 "gc" = (
 /obj/structure/disposaloutlet,
 /obj/structure/disposalpipe/trunk,
@@ -2288,6 +2403,7 @@
 /obj/machinery/atmospherics/pipe/manifold/hidden/supply{
 	dir = 4
 	},
+/obj/machinery/hologram/holopad,
 /turf/simulated/floor/virgo3c{
 	edge_blending_priority = -1;
 	outdoors = 0
@@ -2489,6 +2605,10 @@
 	},
 /turf/simulated/floor/tiled/techfloor,
 /area/groundbase/civilian/arrivals)
+"gQ" = (
+/obj/machinery/hologram/holopad,
+/turf/simulated/floor/tiled/dark,
+/area/groundbase/security/equipment)
 "gR" = (
 /obj/structure/cable{
 	icon_state = "1-2"
@@ -2523,6 +2643,9 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /turf/simulated/floor/tiled/techmaint,
 /area/groundbase/command/tcomms/storage)
+"gW" = (
+/turf/simulated/floor/lino,
+/area/groundbase/civilian/cafe)
 "gY" = (
 /obj/machinery/telecomms/hub/preset/groundbase,
 /turf/simulated/floor/tiled/dark{
@@ -2628,6 +2751,7 @@
 /obj/structure/cable{
 	icon_state = "1-2"
 	},
+/obj/structure/disposalpipe/segment,
 /turf/simulated/floor/outdoors/sidewalk/virgo3c,
 /area/groundbase/level1/eastspur)
 "hp" = (
@@ -2639,6 +2763,9 @@
 	},
 /turf/simulated/floor/tiled/dark,
 /area/groundbase/security/equipment)
+"hr" = (
+/turf/simulated/wall,
+/area/groundbase/civilian/cafe)
 "hs" = (
 /obj/structure/table/woodentable,
 /obj/item/weapon/folder/red_hos,
@@ -2710,9 +2837,22 @@
 "hC" = (
 /turf/simulated/wall/r_wall,
 /area/groundbase/security/equipment)
+"hD" = (
+/obj/random/trash_pile,
+/turf/simulated/floor/outdoors/newdirt_nograss/virgo3c{
+	outdoors = 0
+	},
+/area/maintenance/groundbase/level1/nwtunnel)
 "hE" = (
 /turf/simulated/floor/outdoors/newdirt_nograss/virgo3c,
 /area/groundbase/level1/se)
+"hF" = (
+/obj/structure/table/hardwoodtable,
+/obj/machinery/chemical_dispenser/bar_coffee/full{
+	dir = 8
+	},
+/turf/simulated/floor/lino,
+/area/groundbase/civilian/cafe)
 "hH" = (
 /obj/machinery/alarm{
 	dir = 8
@@ -2893,6 +3033,10 @@
 /obj/item/weapon/tool/crowbar,
 /obj/item/weapon/tool/wrench,
 /obj/item/weapon/hand_labeler,
+/obj/machinery/light_switch{
+	dir = 8;
+	pixel_x = 30
+	},
 /turf/simulated/floor/tiled/dark,
 /area/groundbase/security/warden)
 "if" = (
@@ -3099,6 +3243,15 @@
 	},
 /turf/simulated/floor/tiled/dark,
 /area/groundbase/security/detective)
+"iE" = (
+/obj/structure/table/bench/padded,
+/obj/effect/landmark/start/entertainer,
+/obj/item/device/radio/intercom{
+	dir = 8;
+	pixel_x = -24
+	},
+/turf/simulated/floor/tiled/dark,
+/area/groundbase/civilian/bar)
 "iF" = (
 /obj/machinery/power/breakerbox/activated{
 	RCon_tag = "Science Substation Bypass"
@@ -3217,6 +3370,13 @@
 	},
 /turf/simulated/floor/tiled/dark,
 /area/groundbase/security/armory)
+"ja" = (
+/obj/machinery/light_switch{
+	dir = 1;
+	pixel_y = -30
+	},
+/turf/simulated/floor/tiled/techfloor/grid,
+/area/groundbase/command/ai/chamber)
 "jb" = (
 /obj/machinery/atmospherics/unary/vent_pump/on{
 	dir = 8
@@ -3720,11 +3880,6 @@
 /obj/effect/floor_decal/industrial/warning{
 	dir = 1
 	},
-/obj/machinery/light_switch{
-	dir = 4;
-	pixel_x = -24;
-	pixel_y = -24
-	},
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
 	dir = 5
 	},
@@ -3766,6 +3921,7 @@
 /obj/structure/cable/yellow{
 	icon_state = "2-8"
 	},
+/obj/machinery/hologram/holopad,
 /turf/simulated/floor/tiled/dark,
 /area/groundbase/security/warden)
 "ku" = (
@@ -3832,6 +3988,13 @@
 	},
 /turf/simulated/floor/tiled/steel_ridged,
 /area/groundbase/medical/morgue)
+"kB" = (
+/obj/random/vendorall,
+/obj/machinery/alarm{
+	dir = 8
+	},
+/turf/simulated/floor/tiled,
+/area/groundbase/civilian/apparel)
 "kE" = (
 /obj/machinery/button/remote/airlock{
 	desc = "A remote control switch for the medbay recovery room door.";
@@ -4014,6 +4177,12 @@
 	},
 /turf/simulated/floor/tiled/techfloor/grid,
 /area/groundbase/command/tcomms/computer)
+"kV" = (
+/obj/machinery/light/small{
+	dir = 4
+	},
+/turf/simulated/floor/outdoors/newdirt_nograss/virgo3c,
+/area/groundbase/engineering/engine)
 "kW" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
 	dir = 8
@@ -4023,6 +4192,13 @@
 	},
 /turf/simulated/floor/tiled/white,
 /area/groundbase/civilian/bar)
+"kX" = (
+/obj/random/vendorall,
+/obj/machinery/firealarm{
+	dir = 4
+	},
+/turf/simulated/floor/tiled,
+/area/groundbase/civilian/apparel)
 "kY" = (
 /obj/structure/sign/directions/evac{
 	dir = 1;
@@ -4236,6 +4412,14 @@
 /obj/machinery/shieldgen,
 /turf/simulated/floor,
 /area/groundbase/engineering/storage)
+"lx" = (
+/obj/structure/disposalpipe/trunk,
+/obj/machinery/disposal,
+/turf/simulated/floor/virgo3c{
+	edge_blending_priority = -1;
+	outdoors = 0
+	},
+/area/groundbase/level1/eastspur)
 "ly" = (
 /obj/machinery/atmospherics/pipe/tank/nitrogen{
 	dir = 1
@@ -4468,6 +4652,12 @@
 "ma" = (
 /turf/simulated/wall/r_wall,
 /area/groundbase/security/halle)
+"mb" = (
+/obj/structure/bed/chair/wood{
+	dir = 8
+	},
+/turf/simulated/floor/wood,
+/area/groundbase/civilian/cafe)
 "md" = (
 /obj/structure/cable{
 	icon_state = "1-2"
@@ -4677,6 +4867,10 @@
 	},
 /turf/simulated/floor/tiled/steel_ridged,
 /area/groundbase/security/briefing)
+"mL" = (
+/obj/machinery/media/jukebox,
+/turf/simulated/floor/wood,
+/area/groundbase/civilian/cafe)
 "mM" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 4
@@ -4787,6 +4981,10 @@
 /obj/structure/bed/chair{
 	dir = 8
 	},
+/obj/machinery/light_switch{
+	dir = 8;
+	pixel_x = 30
+	},
 /turf/simulated/floor/tiled,
 /area/groundbase/security/processing)
 "na" = (
@@ -4891,6 +5089,13 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /turf/simulated/floor/tiled,
 /area/groundbase/engineering/atmos/monitoring)
+"np" = (
+/obj/machinery/light,
+/obj/item/weapon/stool/baystool/padded{
+	dir = 8
+	},
+/turf/simulated/floor/wood,
+/area/groundbase/civilian/cafe)
 "nq" = (
 /obj/structure/cable/yellow{
 	icon_state = "1-2"
@@ -5159,6 +5364,7 @@
 /obj/machinery/atmospherics/unary/vent_scrubber/on{
 	dir = 8
 	},
+/obj/machinery/camera/network/medbay,
 /turf/simulated/floor/tiled/white,
 /area/groundbase/medical/morgue)
 "od" = (
@@ -5222,8 +5428,19 @@
 	},
 /obj/item/weapon/storage/toolbox/electrical,
 /obj/item/weapon/reagent_containers/spray/cleaner,
+/obj/item/device/radio/intercom{
+	dir = 8;
+	pixel_x = -24
+	},
 /turf/simulated/floor/tiled,
 /area/groundbase/engineering/workshop)
+"om" = (
+/obj/machinery/light_switch{
+	dir = 8;
+	pixel_x = 30
+	},
+/turf/simulated/floor/tiled,
+/area/groundbase/command/tcomms/foyer)
 "on" = (
 /obj/structure/cable/yellow{
 	icon_state = "1-2"
@@ -5286,8 +5503,19 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
 	dir = 8
 	},
+/obj/item/device/radio/intercom{
+	dir = 1;
+	name = "Station Intercom (General)";
+	pixel_y = 24
+	},
 /turf/simulated/floor/tiled/dark,
 /area/groundbase/medical/resleeving)
+"ov" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/machinery/hologram/holopad,
+/turf/simulated/floor/tiled,
+/area/groundbase/engineering/workshop)
 "ow" = (
 /obj/machinery/cryopod{
 	dir = 2
@@ -5467,6 +5695,7 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
 	dir = 8
 	},
+/obj/item/weapon/bananapeel,
 /turf/simulated/floor/bmarble,
 /area/groundbase/civilian/clown)
 "oV" = (
@@ -5789,6 +6018,7 @@
 /obj/machinery/atmospherics/pipe/manifold4w/hidden/scrubbers,
 /obj/machinery/atmospherics/pipe/manifold4w/hidden/supply,
 /obj/structure/disposalpipe/segment,
+/obj/machinery/hologram/holopad,
 /turf/simulated/floor/tiled/dark,
 /area/groundbase/security/halls)
 "pP" = (
@@ -5854,6 +6084,10 @@
 /obj/machinery/light,
 /turf/simulated/floor/tiled/dark,
 /area/groundbase/security/warden)
+"pZ" = (
+/obj/machinery/hologram/holopad,
+/turf/simulated/floor/wood,
+/area/groundbase/civilian/cafe)
 "qa" = (
 /turf/simulated/wall/r_wall,
 /area/groundbase/security/iaa1)
@@ -6087,8 +6321,17 @@
 /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
 	dir = 1
 	},
+/obj/machinery/hologram/holopad,
 /turf/simulated/floor/tiled,
 /area/groundbase/engineering/techstorage)
+"qC" = (
+/obj/item/device/radio/intercom{
+	dir = 1;
+	name = "Station Intercom (General)";
+	pixel_y = 24
+	},
+/turf/simulated/floor/tiled/white,
+/area/groundbase/medical/lhallway)
 "qD" = (
 /turf/simulated/wall/r_wall,
 /area/groundbase/command/ai/chamber)
@@ -6191,6 +6434,18 @@
 /obj/machinery/mining/drill,
 /turf/simulated/floor/tiled,
 /area/groundbase/cargo/mining)
+"qV" = (
+/obj/item/weapon/stool/baystool/padded{
+	dir = 4
+	},
+/turf/simulated/floor/wood,
+/area/groundbase/civilian/cafe)
+"qX" = (
+/obj/structure/bed/chair/wood{
+	dir = 4
+	},
+/turf/simulated/floor/wood,
+/area/groundbase/civilian/cafe)
 "qY" = (
 /obj/structure/closet/crate,
 /obj/item/weapon/circuitboard/smes,
@@ -6249,11 +6504,6 @@
 /obj/effect/floor_decal/industrial/warning{
 	dir = 1
 	},
-/obj/machinery/light_switch{
-	dir = 4;
-	pixel_x = -24;
-	pixel_y = -24
-	},
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
 	dir = 5
 	},
@@ -6417,6 +6667,7 @@
 /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
 	dir = 8
 	},
+/obj/machinery/hologram/holopad,
 /turf/simulated/floor/tiled,
 /area/groundbase/engineering/storage)
 "rx" = (
@@ -6652,6 +6903,11 @@
 "se" = (
 /turf/simulated/wall/r_wall,
 /area/groundbase/engineering/workshop)
+"sg" = (
+/obj/machinery/washing_machine,
+/obj/random/coin/sometimes,
+/turf/simulated/floor/tiled,
+/area/groundbase/civilian/apparel)
 "sh" = (
 /obj/item/clothing/accessory/stethoscope,
 /obj/item/clothing/accessory/stethoscope,
@@ -6719,6 +6975,7 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 4
 	},
+/obj/machinery/hologram/holopad,
 /turf/simulated/floor/tiled,
 /area/groundbase/engineering/engine)
 "sp" = (
@@ -7263,6 +7520,10 @@
 /obj/structure/dispenser{
 	phorontanks = 0
 	},
+/obj/machinery/light_switch{
+	dir = 1;
+	pixel_y = -30
+	},
 /turf/simulated/floor/tiled,
 /area/groundbase/civilian/gateway)
 "tI" = (
@@ -7487,6 +7748,9 @@
 	},
 /turf/simulated/floor/tiled,
 /area/groundbase/cargo/mining)
+"un" = (
+/turf/simulated/floor/outdoors/newdirt_nograss/virgo3c,
+/area/groundbase/engineering/engine)
 "uo" = (
 /obj/structure/cable/yellow{
 	icon_state = "1-8"
@@ -7499,6 +7763,9 @@
 /obj/structure/bed/chair/comfy/yellow{
 	dir = 8
 	},
+/obj/machinery/light{
+	dir = 4
+	},
 /turf/simulated/floor/carpet/gaycarpet,
 /area/groundbase/civilian/clown)
 "uq" = (
@@ -7727,6 +7994,13 @@
 /obj/effect/landmark/start/cyborg,
 /turf/simulated/floor/tiled/techfloor/grid,
 /area/groundbase/command/ai/foyer)
+"uX" = (
+/obj/machinery/light_switch{
+	dir = 4;
+	pixel_x = -30
+	},
+/turf/simulated/floor/tiled,
+/area/groundbase/engineering/eva)
 "uY" = (
 /obj/effect/floor_decal/industrial/warning/corner{
 	dir = 8
@@ -7808,6 +8082,9 @@
 	},
 /turf/simulated/floor/tiled/white,
 /area/groundbase/medical/lhallway)
+"vi" = (
+/turf/simulated/floor/wood,
+/area/groundbase/civilian/cafe)
 "vj" = (
 /turf/simulated/floor/outdoors/newdirt_nograss/virgo3c{
 	outdoors = 0
@@ -7828,6 +8105,14 @@
 /obj/effect/landmark/start/iaa,
 /turf/simulated/floor/carpet/sblucarpet,
 /area/groundbase/security/iaa1)
+"vo" = (
+/obj/structure/table/hardwoodtable,
+/obj/item/weapon/reagent_containers/glass/rag,
+/obj/machinery/alarm{
+	dir = 8
+	},
+/turf/simulated/floor/lino,
+/area/groundbase/civilian/cafe)
 "vp" = (
 /turf/simulated/floor/outdoors/newdirt/virgo3c{
 	outdoors = 0
@@ -8185,6 +8470,10 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 4
 	},
+/obj/machinery/light_switch{
+	dir = 1;
+	pixel_y = -30
+	},
 /turf/simulated/floor/tiled/dark,
 /area/groundbase/security/hos)
 "wk" = (
@@ -8264,6 +8553,9 @@
 /obj/effect/floor_decal/techfloor/orange{
 	dir = 6
 	},
+/obj/machinery/camera/network/civilian{
+	dir = 8
+	},
 /turf/simulated/floor/tiled/techfloor,
 /area/groundbase/civilian/arrivals)
 "wA" = (
@@ -8464,6 +8756,17 @@
 	outdoors = 0
 	},
 /area/maintenance/groundbase/level1/swtunnel)
+"wY" = (
+/obj/item/device/radio/intercom{
+	dir = 4;
+	name = "Station Intercom (General)";
+	pixel_x = 24
+	},
+/turf/simulated/floor/tiled/dark/virgo3c{
+	edge_blending_priority = -1;
+	outdoors = 0
+	},
+/area/groundbase/security/lobby)
 "wZ" = (
 /obj/machinery/conveyor{
 	dir = 8;
@@ -8663,6 +8966,11 @@
 	outdoors = 0
 	},
 /area/maintenance/groundbase/level1/nwtunnel)
+"xt" = (
+/obj/structure/table/marble,
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/turf/simulated/floor/wood,
+/area/groundbase/civilian/cafe)
 "xu" = (
 /obj/structure/cable/yellow{
 	icon_state = "1-2"
@@ -8825,6 +9133,18 @@
 	temperature = 80
 	},
 /area/groundbase/command/tcomms)
+"xR" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	dir = 10
+	},
+/obj/structure/cable/yellow{
+	icon_state = "4-8"
+	},
+/turf/simulated/floor/wood,
+/area/groundbase/civilian/cafe)
 "xS" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /turf/simulated/floor/tiled/dark,
@@ -8843,6 +9163,7 @@
 /obj/structure/cable{
 	icon_state = "1-2"
 	},
+/obj/structure/disposalpipe/segment,
 /turf/simulated/floor/outdoors/sidewalk/virgo3c{
 	outdoors = 0
 	},
@@ -8990,6 +9311,7 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
 	dir = 8
 	},
+/obj/machinery/hologram/holopad,
 /turf/simulated/floor/tiled,
 /area/groundbase/engineering/atmos/monitoring)
 "yr" = (
@@ -9064,6 +9386,10 @@
 	},
 /turf/simulated/floor/tiled/steel_ridged,
 /area/groundbase/medical/or2)
+"yz" = (
+/obj/machinery/hologram/holopad,
+/turf/simulated/floor/tiled,
+/area/groundbase/cargo/mining)
 "yA" = (
 /obj/structure/table/bench/padded,
 /obj/effect/landmark/start/entertainer,
@@ -9165,6 +9491,11 @@
 	},
 /turf/simulated/floor/carpet/gaycarpet,
 /area/groundbase/civilian/clown)
+"yO" = (
+/obj/random/vendorall,
+/obj/machinery/camera/network/civilian,
+/turf/simulated/floor/tiled,
+/area/groundbase/civilian/apparel)
 "yP" = (
 /obj/machinery/light{
 	dir = 4
@@ -9240,6 +9571,7 @@
 "yY" = (
 /obj/effect/floor_decal/industrial/danger,
 /obj/machinery/atmospherics/pipe/simple/hidden/green,
+/obj/machinery/hologram/holopad,
 /turf/simulated/floor/tiled,
 /area/groundbase/engineering/atmos)
 "yZ" = (
@@ -9418,6 +9750,18 @@
 	},
 /turf/simulated/floor/tiled/techfloor/grid,
 /area/groundbase/command/ai/robot)
+"zu" = (
+/obj/structure/table/hardwoodtable,
+/obj/machinery/door/blast/gate/thin{
+	dir = 8;
+	id = "Cafe";
+	layer = 3.3
+	},
+/obj/machinery/atmospherics/unary/vent_pump/on{
+	dir = 8
+	},
+/turf/simulated/floor/lino,
+/area/groundbase/civilian/cafe)
 "zv" = (
 /obj/machinery/requests_console/preset/engineering{
 	pixel_x = 30
@@ -9535,6 +9879,10 @@
 /obj/item/weapon/aiModule/corp,
 /obj/item/weapon/aiModule/paladin,
 /obj/item/weapon/aiModule/robocop,
+/obj/machinery/light_switch{
+	dir = 4;
+	pixel_x = -30
+	},
 /turf/simulated/floor/bluegrid,
 /area/groundbase/command/ai/storage)
 "zI" = (
@@ -9680,6 +10028,15 @@
 /obj/machinery/recharge_station,
 /turf/simulated/floor/tiled,
 /area/holodeck_control)
+"Aa" = (
+/obj/structure/cable/yellow{
+	icon_state = "1-2"
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/machinery/hologram/holopad,
+/turf/simulated/floor/tiled/dark,
+/area/groundbase/medical/resleeving)
 "Ab" = (
 /obj/structure/cable{
 	icon_state = "4-8"
@@ -9795,6 +10152,13 @@
 	},
 /turf/simulated/floor/tiled/dark,
 /area/groundbase/security/armory)
+"Ap" = (
+/obj/machinery/light_switch{
+	dir = 1;
+	pixel_y = -30
+	},
+/turf/simulated/floor/tiled/dark,
+/area/groundbase/medical/resleeving)
 "Aq" = (
 /obj/random/vendorall,
 /turf/simulated/floor/tiled,
@@ -9965,6 +10329,7 @@
 /obj/machinery/firealarm{
 	dir = 8
 	},
+/obj/machinery/hologram/holopad,
 /turf/simulated/floor/tiled,
 /area/groundbase/engineering/techstorage)
 "AQ" = (
@@ -10064,6 +10429,9 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 4
 	},
+/obj/machinery/light_switch{
+	pixel_y = 30
+	},
 /turf/simulated/floor/tiled/white,
 /area/groundbase/medical/equipment)
 "Bf" = (
@@ -10215,6 +10583,9 @@
 	dir = 4;
 	pixel_x = -32
 	},
+/obj/machinery/atm{
+	pixel_y = -30
+	},
 /turf/simulated/floor/tiled,
 /area/groundbase/civilian/apparel)
 "BC" = (
@@ -10701,6 +11072,7 @@
 /area/groundbase/level1/centsquare)
 "CK" = (
 /obj/machinery/vending/assist,
+/obj/machinery/camera/network/civilian,
 /turf/simulated/floor/tiled,
 /area/groundbase/civilian/toolstorage)
 "CL" = (
@@ -10894,6 +11266,16 @@
 	},
 /turf/simulated/floor/tiled,
 /area/prison/cell_block/gb)
+"Dn" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 4
+	},
+/obj/machinery/light_switch{
+	dir = 1;
+	pixel_y = -30
+	},
+/turf/simulated/floor/tiled,
+/area/groundbase/engineering/ce)
 "Do" = (
 /obj/machinery/atmospherics/pipe/simple/visible/supply,
 /turf/simulated/floor/tiled/techmaint,
@@ -10942,6 +11324,10 @@
 /obj/machinery/light{
 	dir = 1
 	},
+/obj/machinery/light_switch{
+	dir = 4;
+	pixel_x = -30
+	},
 /turf/simulated/floor/tiled,
 /area/groundbase/engineering/workshop)
 "Dv" = (
@@ -10963,6 +11349,10 @@
 	},
 /turf/simulated/floor,
 /area/groundbase/engineering/storage)
+"Dx" = (
+/obj/machinery/hologram/holopad,
+/turf/simulated/floor/tiled/white,
+/area/groundbase/medical/equipment)
 "Dz" = (
 /obj/structure/disposalpipe/segment{
 	dir = 8;
@@ -11012,12 +11402,31 @@
 	},
 /turf/simulated/floor,
 /area/maintenance/groundbase/substation/medcargo)
+"DF" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 4
+	},
+/obj/structure/cable/yellow{
+	icon_state = "4-8"
+	},
+/turf/simulated/floor/wood,
+/area/groundbase/civilian/cafe)
 "DG" = (
 /obj/machinery/atmospherics/pipe/simple/visible/black{
 	dir = 6
 	},
 /turf/simulated/floor/tiled/techmaint,
 /area/groundbase/engineering/atmos)
+"DH" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 4
+	},
+/obj/machinery/light_switch{
+	dir = 1;
+	pixel_y = -30
+	},
+/turf/simulated/floor/tiled/dark,
+/area/groundbase/security/detective)
 "DI" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
@@ -11400,8 +11809,16 @@
 	},
 /area/maintenance/groundbase/level1/nwtunnel)
 "EM" = (
-/turf/simulated/floor/outdoors/grass/virgo3c,
-/area/groundbase/level1/ne)
+/obj/machinery/door/firedoor,
+/obj/structure/grille,
+/obj/structure/window/reinforced/full,
+/obj/machinery/door/blast/gate/thin{
+	dir = 8;
+	id = "Cafe";
+	layer = 3.3
+	},
+/turf/simulated/floor,
+/area/groundbase/civilian/cafe)
 "EO" = (
 /obj/machinery/light/bigfloorlamp,
 /turf/simulated/floor/outdoors/grass/virgo3c,
@@ -11537,6 +11954,10 @@
 	icon_state = "2-8"
 	},
 /obj/machinery/alarm,
+/obj/machinery/light_switch{
+	dir = 8;
+	pixel_x = 30
+	},
 /turf/simulated/floor/tiled/dark,
 /area/groundbase/security/iaa1)
 "Fg" = (
@@ -11544,6 +11965,9 @@
 /obj/machinery/atmospherics/unary/vent_pump/on{
 	dir = 8
 	},
+/obj/machinery/camera/network/civilian{
+	dir = 8
+	},
 /turf/simulated/floor/tiled,
 /area/groundbase/civilian/apparel)
 "Fh" = (
@@ -11823,6 +12247,14 @@
 	temperature = 80
 	},
 /area/groundbase/command/tcomms)
+"Ga" = (
+/obj/item/device/radio/intercom{
+	dir = 4;
+	name = "Station Intercom (General)";
+	pixel_x = 24
+	},
+/turf/simulated/floor/tiled/dark,
+/area/groundbase/security/halls)
 "Gb" = (
 /obj/structure/table/steel_reinforced,
 /obj/machinery/atmospherics/unary/vent_scrubber/on,
@@ -11840,6 +12272,10 @@
 	},
 /turf/simulated/floor/outdoors/newdirt_nograss/virgo3c,
 /area/groundbase/level1/centsquare)
+"Gf" = (
+/obj/random/coin/sometimes,
+/turf/simulated/floor/water/virgo3c,
+/area/groundbase/level1/eastspur)
 "Gg" = (
 /obj/machinery/atmospherics/pipe/manifold/visible/cyan{
 	dir = 8
@@ -11986,6 +12422,9 @@
 /area/groundbase/medical/equipment)
 "GA" = (
 /obj/machinery/vending/boozeomat,
+/obj/machinery/light_switch{
+	pixel_y = 30
+	},
 /turf/simulated/floor/lino,
 /area/groundbase/civilian/bar)
 "GC" = (
@@ -12212,6 +12651,9 @@
 /obj/machinery/status_display/supply_display{
 	pixel_x = -32
 	},
+/obj/machinery/vending/wallmed1/public{
+	pixel_y = 28
+	},
 /turf/simulated/floor/tiled,
 /area/groundbase/cargo/mining)
 "Hh" = (
@@ -12412,6 +12854,10 @@
 /obj/structure/cable{
 	icon_state = "4-8"
 	},
+/obj/structure/disposalpipe/segment{
+	dir = 4;
+	icon_state = "pipe-c"
+	},
 /turf/simulated/floor/outdoors/sidewalk/slab/virgo3c,
 /area/groundbase/level1/eastspur)
 "HH" = (
@@ -12425,6 +12871,22 @@
 	},
 /turf/simulated/floor,
 /area/maintenance/groundbase/substation/aiciv)
+"HI" = (
+/obj/machinery/door/firedoor,
+/obj/machinery/door/airlock/glass{
+	name = "Cafe"
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	dir = 4
+	},
+/obj/structure/cable/yellow{
+	icon_state = "4-8"
+	},
+/turf/simulated/floor/bmarble,
+/area/groundbase/civilian/cafe)
 "HJ" = (
 /obj/structure/cable{
 	icon_state = "1-2"
@@ -12538,6 +13000,11 @@
 /obj/structure/cable/yellow{
 	icon_state = "0-8"
 	},
+/obj/machinery/light_switch{
+	dir = 8;
+	pixel_x = 30;
+	pixel_y = -16
+	},
 /turf/simulated/floor/tiled,
 /area/groundbase/cargo/mining)
 "HZ" = (
@@ -12669,6 +13136,11 @@
 "Is" = (
 /obj/machinery/vending/loadout/uniform,
 /obj/machinery/atmospherics/unary/vent_scrubber/on,
+/obj/item/device/radio/intercom{
+	dir = 1;
+	name = "Station Intercom (General)";
+	pixel_y = 24
+	},
 /turf/simulated/floor/tiled/dark,
 /area/groundbase/medical/autoresleeving)
 "It" = (
@@ -12688,10 +13160,15 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 4
 	},
+/obj/machinery/hologram/holopad,
 /turf/simulated/floor/tiled/white,
 /area/groundbase/medical/lhallway)
 "Iv" = (
 /obj/machinery/recharge_station,
+/obj/machinery/light_switch{
+	dir = 8;
+	pixel_x = 30
+	},
 /turf/simulated/floor/bluegrid,
 /area/groundbase/command/ai/robot)
 "Iw" = (
@@ -12741,9 +13218,8 @@
 /obj/structure/cable{
 	icon_state = "2-4"
 	},
-/obj/structure/disposalpipe/segment{
-	dir = 4;
-	icon_state = "pipe-c"
+/obj/structure/disposalpipe/junction/yjunction{
+	dir = 4
 	},
 /turf/simulated/floor/outdoors/sidewalk/slab/virgo3c,
 /area/groundbase/level1/eastspur)
@@ -12805,6 +13281,11 @@
 /obj/machinery/door/firedoor,
 /obj/structure/grille,
 /obj/structure/window/reinforced/full,
+/obj/machinery/door/blast/gate/thin{
+	dir = 4;
+	id = "PubPrep";
+	layer = 3.3
+	},
 /turf/simulated/floor,
 /area/groundbase/civilian/gateway)
 "IJ" = (
@@ -12888,6 +13369,11 @@
 /obj/machinery/camera/network/medbay,
 /turf/simulated/floor/tiled/white,
 /area/groundbase/medical/lhallway)
+"IZ" = (
+/turf/simulated/floor/outdoors/newdirt_nograss/virgo3c{
+	outdoors = 0
+	},
+/area/groundbase/command/ai/foyer)
 "Ja" = (
 /obj/machinery/atmospherics/pipe/tank/phoron,
 /turf/simulated/floor/tiled/techmaint,
@@ -12914,6 +13400,10 @@
 /obj/machinery/power/apc{
 	dir = 1
 	},
+/obj/machinery/light_switch{
+	dir = 4;
+	pixel_x = -30
+	},
 /turf/simulated/floor/tiled/white,
 /area/groundbase/medical/morgue)
 "Je" = (
@@ -13035,6 +13525,9 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
 	dir = 6
 	},
+/obj/machinery/vending/wallmed2{
+	pixel_y = 28
+	},
 /turf/simulated/floor/tiled/white,
 /area/groundbase/medical/equipment)
 "Jv" = (
@@ -13639,6 +14132,15 @@
 	temperature = 80
 	},
 /area/groundbase/command/tcomms)
+"KW" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 4
+	},
+/obj/structure/cable/yellow{
+	icon_state = "1-8"
+	},
+/turf/simulated/floor/wood,
+/area/groundbase/civilian/cafe)
 "KX" = (
 /obj/machinery/door/firedoor,
 /obj/machinery/door/airlock/glass_medical{
@@ -13733,8 +14235,18 @@
 /obj/machinery/atmospherics/unary/vent_scrubber/on{
 	dir = 8
 	},
+/obj/random/coin/sometimes,
 /turf/simulated/floor/tiled,
 /area/groundbase/civilian/toolstorage)
+"Lf" = (
+/obj/machinery/power/apc{
+	dir = 1
+	},
+/obj/structure/cable/yellow{
+	icon_state = "0-2"
+	},
+/turf/simulated/floor/wood,
+/area/groundbase/civilian/cafe)
 "Lg" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 4
@@ -13790,6 +14302,16 @@
 /obj/effect/landmark/start/intern,
 /turf/simulated/floor/tiled,
 /area/groundbase/civilian/foodplace)
+"Lp" = (
+/obj/structure/table/bench/padded,
+/obj/effect/landmark/start/entertainer,
+/obj/item/device/radio/intercom{
+	dir = 4;
+	name = "Station Intercom (General)";
+	pixel_x = 24
+	},
+/turf/simulated/floor/tiled/dark,
+/area/groundbase/civilian/bar)
 "Lq" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 5
@@ -13797,6 +14319,10 @@
 /obj/structure/bed/chair/wheelchair{
 	dir = 8
 	},
+/obj/machinery/vending/wallmed2{
+	dir = 4;
+	pixel_x = -28
+	},
 /turf/simulated/floor/tiled/white,
 /area/groundbase/medical/office)
 "Lr" = (
@@ -14191,6 +14717,10 @@
 /obj/structure/bed/chair{
 	dir = 1
 	},
+/obj/machinery/light_switch{
+	dir = 1;
+	pixel_y = -30
+	},
 /turf/simulated/floor/tiled/white,
 /area/groundbase/medical/office)
 "Mo" = (
@@ -14204,6 +14734,15 @@
 /obj/effect/floor_decal/industrial/outline/yellow,
 /turf/simulated/floor/tiled/dark,
 /area/groundbase/security/armory)
+"Mq" = (
+/obj/effect/floor_decal/industrial/hatch/yellow,
+/obj/machinery/deployable/barrier,
+/obj/machinery/light_switch{
+	dir = 8;
+	pixel_x = 30
+	},
+/turf/simulated/floor/tiled/dark,
+/area/groundbase/security/armory)
 "Mr" = (
 /obj/effect/floor_decal/industrial/danger/corner{
 	dir = 1
@@ -14319,6 +14858,10 @@
 /obj/machinery/atmospherics/unary/vent_pump/on{
 	dir = 8
 	},
+/obj/machinery/vending/wallmed2{
+	dir = 8;
+	pixel_x = 24
+	},
 /turf/simulated/floor/tiled/dark,
 /area/groundbase/medical/resleeving)
 "MG" = (
@@ -14333,6 +14876,7 @@
 	icon_state = "1-2"
 	},
 /obj/effect/landmark/start/visitor,
+/obj/machinery/hologram/holopad,
 /turf/simulated/floor/tiled,
 /area/groundbase/civilian/apparel)
 "MJ" = (
@@ -14463,6 +15007,9 @@
 /area/groundbase/security/lobby)
 "Nb" = (
 /obj/machinery/atmospherics/unary/vent_scrubber/on,
+/obj/machinery/light_switch{
+	pixel_y = 30
+	},
 /turf/simulated/floor/tiled,
 /area/groundbase/engineering/atmos)
 "Nc" = (
@@ -14529,6 +15076,10 @@
 /area/groundbase/engineering/storage)
 "Ni" = (
 /obj/structure/closet/secure_closet/medical2,
+/obj/machinery/light_switch{
+	dir = 1;
+	pixel_y = -30
+	},
 /turf/simulated/floor/tiled/white,
 /area/groundbase/medical/or2)
 "Nj" = (
@@ -14919,6 +15470,13 @@
 /obj/item/weapon/computer_hardware/battery_module,
 /turf/simulated/floor/tiled,
 /area/groundbase/engineering/techstorage)
+"Og" = (
+/obj/structure/cable/yellow{
+	icon_state = "4-8"
+	},
+/obj/machinery/hologram/holopad,
+/turf/simulated/floor/tiled/dark,
+/area/groundbase/security/lobby)
 "Oh" = (
 /obj/structure/cable{
 	icon_state = "1-8"
@@ -14953,6 +15511,18 @@
 "Ol" = (
 /turf/simulated/floor,
 /area/maintenance/groundbase/substation/secsci)
+"Om" = (
+/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
+	dir = 8
+	},
+/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
+	dir = 8
+	},
+/obj/structure/cable/yellow{
+	icon_state = "2-4"
+	},
+/turf/simulated/floor/outdoors/sidewalk/slab/virgo3c,
+/area/groundbase/level1/centsquare)
 "On" = (
 /obj/structure/cable/yellow{
 	icon_state = "1-8"
@@ -14998,6 +15568,10 @@
 "Os" = (
 /turf/simulated/floor/outdoors/sidewalk/side/virgo3c,
 /area/groundbase/level1/eastspur)
+"Ot" = (
+/obj/machinery/hologram/holopad,
+/turf/simulated/floor/tiled/white,
+/area/groundbase/medical/morgue)
 "Ou" = (
 /obj/machinery/recharge_station,
 /turf/simulated/floor/tiled/techfloor/grid,
@@ -15131,6 +15705,9 @@
 /obj/structure/cable{
 	icon_state = "1-8"
 	},
+/obj/structure/disposalpipe/segment{
+	dir = 4
+	},
 /turf/simulated/floor/outdoors/sidewalk/slab/virgo3c,
 /area/groundbase/level1/eastspur)
 "OT" = (
@@ -15254,6 +15831,10 @@
 /obj/machinery/drone_fabricator,
 /turf/simulated/floor/bluegrid,
 /area/groundbase/command/ai/robot)
+"Pn" = (
+/obj/structure/disposalpipe/segment,
+/turf/simulated/floor/outdoors/sidewalk/slab/virgo3c,
+/area/groundbase/level1/eastspur)
 "Pp" = (
 /turf/simulated/floor/outdoors/grass/forest/virgo3c,
 /area/groundbase/level1/southeastspur)
@@ -15364,6 +15945,10 @@
 	},
 /turf/simulated/floor/outdoors/sidewalk/side/virgo3c,
 /area/groundbase/level1/centsquare)
+"PH" = (
+/obj/machinery/light,
+/turf/simulated/floor/lino,
+/area/groundbase/civilian/cafe)
 "PI" = (
 /obj/machinery/telecomms/processor/preset_two,
 /turf/simulated/floor/tiled/dark{
@@ -15417,6 +16002,9 @@
 	dir = 1
 	},
 /obj/machinery/disposal,
+/obj/machinery/camera/network/civilian{
+	dir = 1
+	},
 /turf/simulated/floor/tiled,
 /area/groundbase/civilian/gateway)
 "PQ" = (
@@ -15432,6 +16020,14 @@
 	},
 /turf/simulated/floor/tiled/techfloor,
 /area/groundbase/civilian/arrivals)
+"PS" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/purple,
+/obj/structure/cable/yellow{
+	icon_state = "1-2"
+	},
+/obj/machinery/hologram/holopad,
+/turf/simulated/floor/tiled/dark,
+/area/groundbase/security/armory)
 "PT" = (
 /obj/machinery/door/firedoor,
 /obj/machinery/door/airlock/highsecurity{
@@ -15566,6 +16162,9 @@
 	dir = 4;
 	pixel_x = -25
 	},
+/obj/machinery/atm{
+	pixel_y = -30
+	},
 /turf/simulated/floor/tiled,
 /area/groundbase/civilian/foodplace)
 "Qm" = (
@@ -15949,6 +16548,14 @@
 /obj/machinery/alarm,
 /turf/simulated/floor/tiled/techfloor/grid,
 /area/groundbase/command/ai/robot)
+"Rs" = (
+/obj/machinery/door/window/brigdoor/northleft{
+	dir = 8;
+	name = "Cafe";
+	req_access = list(25)
+	},
+/turf/simulated/floor/lino,
+/area/groundbase/civilian/cafe)
 "Rt" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /turf/simulated/floor/tiled/techmaint,
@@ -15974,6 +16581,14 @@
 	},
 /turf/simulated/floor,
 /area/maintenance/groundbase/substation/medcargo)
+"Rw" = (
+/obj/item/device/radio/intercom{
+	dir = 1;
+	name = "Station Intercom (General)";
+	pixel_y = 24
+	},
+/turf/simulated/floor/tiled,
+/area/groundbase/engineering/engine)
 "Rx" = (
 /obj/structure/cable{
 	icon_state = "2-4"
@@ -16012,6 +16627,18 @@
 /obj/structure/table/glass,
 /turf/simulated/floor/tiled/white,
 /area/groundbase/medical/office)
+"RA" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	dir = 4
+	},
+/obj/structure/cable/yellow{
+	icon_state = "4-8"
+	},
+/turf/simulated/floor/outdoors/sidewalk/side/virgo3c,
+/area/groundbase/level1/centsquare)
 "RC" = (
 /obj/machinery/atmospherics/unary/vent_scrubber/on,
 /obj/machinery/light{
@@ -16064,6 +16691,12 @@
 	},
 /turf/simulated/floor/tiled,
 /area/groundbase/engineering/storage)
+"RI" = (
+/obj/item/weapon/stool/baystool/padded{
+	dir = 8
+	},
+/turf/simulated/floor/wood,
+/area/groundbase/civilian/cafe)
 "RK" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
 	dir = 4
@@ -16202,6 +16835,14 @@
 /obj/effect/landmark/vermin,
 /turf/simulated/floor/lino,
 /area/groundbase/civilian/bar)
+"Sc" = (
+/obj/machinery/camera/network/command{
+	dir = 4
+	},
+/turf/simulated/floor/outdoors/newdirt_nograss/virgo3c{
+	outdoors = 0
+	},
+/area/groundbase/command/ai/foyer)
 "Se" = (
 /obj/effect/floor_decal/industrial/danger{
 	dir = 8
@@ -16253,6 +16894,19 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /turf/simulated/floor/outdoors/sidewalk/virgo3c,
 /area/groundbase/level1/centsquare)
+"Sl" = (
+/obj/structure/cable/yellow{
+	icon_state = "4-8"
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 4
+	},
+/obj/machinery/hologram/holopad,
+/turf/simulated/floor/tiled,
+/area/groundbase/engineering/eva)
 "Sm" = (
 /obj/structure/table/rack/steel,
 /obj/item/weapon/circuitboard/body_designer{
@@ -16495,6 +17149,13 @@
 /obj/structure/disposalpipe/segment,
 /turf/simulated/floor/tiled/steel_ridged,
 /area/groundbase/security/halls)
+"SO" = (
+/obj/structure/table/marble,
+/obj/machinery/atmospherics/unary/vent_scrubber/on{
+	dir = 1
+	},
+/turf/simulated/floor/wood,
+/area/groundbase/civilian/cafe)
 "SP" = (
 /obj/structure/cable/yellow{
 	icon_state = "4-8"
@@ -16510,6 +17171,13 @@
 "SQ" = (
 /turf/simulated/floor/tiled,
 /area/groundbase/civilian/toolstorage)
+"SR" = (
+/obj/machinery/light_switch{
+	dir = 8;
+	pixel_x = 30
+	},
+/turf/simulated/floor/tiled/dark,
+/area/groundbase/security/briefing)
 "SS" = (
 /turf/simulated/wall/r_wall,
 /area/groundbase/command/tcomms/foyer)
@@ -16818,6 +17486,10 @@
 	pixel_x = 3;
 	pixel_y = -3
 	},
+/obj/machinery/light_switch{
+	dir = 8;
+	pixel_x = 30
+	},
 /turf/simulated/floor/tiled,
 /area/groundbase/engineering/techstorage)
 "TE" = (
@@ -17035,6 +17707,16 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /turf/simulated/floor/outdoors/sidewalk/virgo3c,
 /area/groundbase/level1/northspur)
+"Um" = (
+/obj/structure/cable/yellow{
+	icon_state = "1-2"
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/structure/disposalpipe/segment,
+/obj/machinery/hologram/holopad,
+/turf/simulated/floor/tiled/dark,
+/area/groundbase/security/halls)
 "Up" = (
 /obj/machinery/atmospherics/pipe/manifold/visible/black{
 	dir = 1
@@ -17126,6 +17808,7 @@
 	},
 /obj/machinery/atmospherics/pipe/manifold4w/hidden/scrubbers,
 /obj/machinery/atmospherics/pipe/manifold4w/hidden/supply,
+/obj/machinery/hologram/holopad,
 /turf/simulated/floor/tiled/white,
 /area/groundbase/medical/lhallway)
 "UC" = (
@@ -17200,6 +17883,19 @@
 	},
 /turf/simulated/floor/carpet/gaycarpet,
 /area/groundbase/civilian/clown)
+"UO" = (
+/obj/machinery/button/remote/blast_door{
+	id = "Cafe";
+	name = "Cafe shutters";
+	pixel_x = -3;
+	pixel_y = 26
+	},
+/obj/machinery/light_switch{
+	pixel_x = 5;
+	pixel_y = 30
+	},
+/turf/simulated/floor/lino,
+/area/groundbase/civilian/cafe)
 "UP" = (
 /obj/structure/table/rack/steel,
 /obj/item/clothing/gloves/arm_guard/laserproof,
@@ -17218,6 +17914,13 @@
 "UQ" = (
 /turf/simulated/floor/tiled/white,
 /area/groundbase/medical/morgue)
+"UR" = (
+/obj/machinery/light_switch{
+	dir = 4;
+	pixel_x = -30
+	},
+/turf/simulated/floor/tiled/techfloor/grid,
+/area/groundbase/command/tcomms/computer)
 "US" = (
 /obj/structure/bed/chair/sofa/bench,
 /obj/effect/landmark/start/visitor,
@@ -17245,6 +17948,10 @@
 	icon_state = "2-4"
 	},
 /obj/machinery/alarm,
+/obj/machinery/light_switch{
+	dir = 4;
+	pixel_x = -30
+	},
 /turf/simulated/floor/tiled/dark,
 /area/groundbase/security/iaa2)
 "Va" = (
@@ -17319,6 +18026,11 @@
 "Vl" = (
 /obj/item/weapon/book/manual/rotary_electric_generator,
 /obj/structure/table/reinforced,
+/obj/item/device/radio/intercom{
+	dir = 1;
+	name = "Station Intercom (General)";
+	pixel_y = 24
+	},
 /turf/simulated/floor/tiled,
 /area/groundbase/engineering/engine)
 "Vm" = (
@@ -17628,6 +18340,13 @@
 	},
 /turf/simulated/floor/bluegrid,
 /area/groundbase/command/ai/robot)
+"Wb" = (
+/obj/machinery/light{
+	dir = 1
+	},
+/obj/structure/table/woodentable,
+/turf/simulated/floor/wood,
+/area/groundbase/civilian/cafe)
 "Wc" = (
 /obj/machinery/vending/tool,
 /obj/machinery/status_display{
@@ -17640,6 +18359,12 @@
 /obj/machinery/deployable/barrier,
 /turf/simulated/floor/tiled/dark,
 /area/groundbase/security/armory)
+"Wg" = (
+/obj/item/weapon/stool/padded{
+	dir = 8
+	},
+/turf/simulated/floor/lino,
+/area/groundbase/civilian/cafe)
 "Wh" = (
 /obj/machinery/button/remote/blast_door{
 	id = "GateShut";
@@ -17698,6 +18423,12 @@
 	},
 /turf/simulated/floor/tiled/techmaint,
 /area/groundbase/engineering/atmos)
+"Wp" = (
+/obj/machinery/light/small{
+	dir = 4
+	},
+/turf/simulated/floor/outdoors/grass/virgo3c,
+/area/groundbase/level1/northspur)
 "Wq" = (
 /obj/machinery/button/remote/blast_door{
 	dir = 8;
@@ -17808,9 +18539,20 @@
 	},
 /turf/simulated/floor,
 /area/groundbase/security/warden)
+"WG" = (
+/obj/machinery/light_switch{
+	dir = 8;
+	pixel_x = 30
+	},
+/turf/simulated/floor/tiled/techfloor/grid,
+/area/groundbase/command/ai/foyer)
 "WH" = (
 /turf/simulated/wall/r_wall,
 /area/groundbase/command/tcomms/computer)
+"WI" = (
+/obj/machinery/camera/network/civilian,
+/turf/simulated/floor/tiled,
+/area/groundbase/civilian/gateway)
 "WJ" = (
 /obj/machinery/computer/security{
 	dir = 8
@@ -17962,6 +18704,12 @@
 /obj/fiftyspawner/steel,
 /turf/simulated/floor/tiled,
 /area/groundbase/civilian/gateway)
+"Xb" = (
+/obj/machinery/light_switch{
+	pixel_y = 30
+	},
+/turf/simulated/floor/tiled/techfloor/grid,
+/area/groundbase/command/ai/upload)
 "Xc" = (
 /obj/item/weapon/stool/baystool/padded{
 	dir = 4
@@ -18145,6 +18893,13 @@
 	},
 /turf/simulated/floor/tiled,
 /area/groundbase/engineering/lobby)
+"Xu" = (
+/obj/structure/table/bench/padded,
+/obj/item/device/radio/intercom{
+	pixel_y = -24
+	},
+/turf/simulated/floor/tiled/dark,
+/area/groundbase/civilian/bar)
 "Xv" = (
 /obj/machinery/light{
 	dir = 1
@@ -18155,6 +18910,10 @@
 /obj/machinery/atmospherics/unary/vent_scrubber/on{
 	dir = 4
 	},
+/obj/item/device/radio/intercom{
+	dir = 8;
+	pixel_x = -24
+	},
 /turf/simulated/floor/tiled,
 /area/groundbase/engineering/lobby)
 "Xz" = (
@@ -18204,6 +18963,12 @@
 /obj/structure/disposalpipe/segment,
 /turf/simulated/floor/bmarble,
 /area/groundbase/engineering/lobby)
+"XE" = (
+/obj/machinery/light_switch{
+	pixel_y = 30
+	},
+/turf/simulated/floor/tiled,
+/area/groundbase/engineering/engine)
 "XF" = (
 /obj/machinery/atmospherics/unary/vent_scrubber/on{
 	dir = 4
@@ -18238,6 +19003,7 @@
 "XL" = (
 /obj/structure/table/reinforced,
 /obj/machinery/atmospherics/unary/vent_scrubber/on,
+/obj/random/coin/sometimes,
 /turf/simulated/floor/tiled,
 /area/groundbase/civilian/foodplace)
 "XN" = (
@@ -18289,6 +19055,9 @@
 /obj/effect/landmark{
 	name = "maint_pred"
 	},
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 5
+	},
 /turf/simulated/floor/virgo3c{
 	edge_blending_priority = -1;
 	outdoors = 0
@@ -18450,6 +19219,12 @@
 	},
 /turf/simulated/floor,
 /area/maintenance/groundbase/trashpit)
+"Yt" = (
+/obj/machinery/light/small{
+	dir = 4
+	},
+/turf/simulated/floor/outdoors/grass/virgo3c,
+/area/groundbase/level1/centsquare)
 "Yu" = (
 /obj/machinery/atmospherics/portables_connector{
 	dir = 8
@@ -18483,6 +19258,12 @@
 	outdoors = 0
 	},
 /area/maintenance/groundbase/level1/stunnel)
+"Yx" = (
+/obj/item/device/radio/intercom{
+	pixel_y = -24
+	},
+/turf/simulated/floor/wood,
+/area/groundbase/civilian/cafe)
 "Yy" = (
 /obj/structure/cable/yellow{
 	icon_state = "1-2"
@@ -18652,6 +19433,9 @@
 /obj/structure/cable/yellow{
 	icon_state = "4-8"
 	},
+/obj/structure/cable/yellow{
+	icon_state = "1-4"
+	},
 /turf/simulated/floor/outdoors/sidewalk/slab/virgo3c,
 /area/groundbase/level1/centsquare)
 "YX" = (
@@ -18791,6 +19575,10 @@
 /area/groundbase/engineering/ce)
 "Zr" = (
 /obj/structure/closet/secure_closet/medical2,
+/obj/machinery/light_switch{
+	dir = 1;
+	pixel_y = -30
+	},
 /turf/simulated/floor/tiled/white,
 /area/groundbase/medical/or1)
 "Zs" = (
@@ -18857,6 +19645,16 @@
 /obj/structure/dispenser/oxygen,
 /turf/simulated/floor/tiled,
 /area/groundbase/cargo/mining)
+"ZD" = (
+/obj/structure/cable{
+	icon_state = "1-2"
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/structure/disposalpipe/segment,
+/obj/machinery/hologram/holopad,
+/turf/simulated/floor/tiled,
+/area/groundbase/engineering/lobby)
 "ZE" = (
 /obj/machinery/door/firedoor,
 /obj/structure/grille,
@@ -20732,7 +21530,7 @@ WH
 lp
 cC
 lc
-Rt
+aV
 Rt
 uf
 qD
@@ -21300,7 +22098,7 @@ WH
 KC
 Sv
 zz
-JC
+om
 hH
 xx
 qD
@@ -21312,7 +22110,7 @@ IB
 IB
 hd
 Ha
-ql
+ja
 qD
 MO
 MO
@@ -21574,7 +22372,7 @@ fi
 Nu
 za
 Uv
-GG
+UR
 RZ
 GG
 CN
@@ -21876,7 +22674,7 @@ JT
 NF
 Zt
 XY
-Nq
+Xb
 Kw
 lL
 Kw
@@ -22374,7 +23172,7 @@ AZ
 hC
 HK
 Ud
-CC
+gQ
 hx
 eF
 UV
@@ -22742,7 +23540,7 @@ MO
 pj
 ht
 ut
-yA
+iE
 vV
 bo
 bE
@@ -23010,7 +23808,7 @@ WP
 nv
 sA
 Qj
-nn
+WG
 WP
 WP
 Qi
@@ -23177,7 +23975,7 @@ KR
 ut
 AA
 GF
-ut
+Xu
 pj
 MO
 MO
@@ -23291,11 +24089,11 @@ MO
 MO
 MO
 MO
-FF
+Sc
 lH
 LP
 lH
-FF
+IZ
 MO
 MO
 MO
@@ -23661,7 +24459,7 @@ Gk
 cj
 Dq
 rZ
-qs
+PS
 qs
 qs
 aO
@@ -24079,7 +24877,7 @@ cv
 px
 AN
 fY
-AN
+SR
 AN
 XW
 tS
@@ -24091,7 +24889,7 @@ Dk
 Ao
 yP
 Lm
-We
+Mq
 ZI
 XW
 Ol
@@ -24325,7 +25123,7 @@ MO
 FF
 FF
 Jh
-FF
+hD
 co
 MO
 AZ
@@ -25014,7 +25812,7 @@ MO
 pj
 ht
 ut
-yA
+Lp
 vV
 ht
 pj
@@ -25367,7 +26165,7 @@ lI
 iV
 zi
 jh
-on
+Um
 on
 tf
 on
@@ -25508,7 +26306,7 @@ Ic
 fw
 vv
 Hj
-Tk
+Ga
 Xj
 Tk
 jv
@@ -25640,7 +26438,7 @@ fm
 wl
 xr
 Oe
-ah
+Og
 Yh
 Ca
 Ml
@@ -26062,7 +26860,7 @@ Yf
 cB
 ij
 bp
-fm
+wY
 ZE
 iz
 IG
@@ -27449,7 +28247,7 @@ XS
 Mt
 ao
 ao
-ao
+dp
 ao
 MC
 KM
@@ -27484,7 +28282,7 @@ TA
 hj
 UU
 Uz
-ud
+DH
 yb
 CS
 ma
@@ -27729,7 +28527,7 @@ lE
 lE
 lE
 lE
-XS
+WI
 XS
 XS
 XS
@@ -29003,17 +29801,17 @@ Ul
 Ul
 Oz
 Oz
-Oz
-Oz
-Oz
-Oz
-Oz
-Oz
-Oz
-Oz
-Oz
-Oz
-Oz
+Om
+ay
+ay
+ay
+ay
+ay
+ay
+ay
+ay
+ay
+ay
 YW
 Oz
 Oz
@@ -29143,12 +29941,12 @@ tG
 tG
 tG
 tG
-tG
-Eb
-Eb
-Eb
+Wp
+Eb
+RA
 Eb
 Eb
+Yt
 Eb
 Eb
 Eb
@@ -29285,12 +30083,12 @@ tG
 tG
 tG
 tG
-qE
+hr
 EM
-Eb
-qE
-qE
-qE
+HI
+EM
+EM
+hr
 dk
 uR
 uR
@@ -29427,14 +30225,14 @@ tG
 tG
 qE
 qE
-qE
-qE
-qE
-qE
-qE
+hr
+qX
+xR
+xt
+SO
+hr
 dk
-dk
-KI
+yO
 bY
 KI
 dk
@@ -29569,12 +30367,12 @@ iW
 qE
 qE
 qE
-qE
-qE
-qE
-qE
-qE
-dk
+hr
+Wb
+DF
+RI
+np
+hr
 Oa
 Pb
 FR
@@ -29711,12 +30509,12 @@ qE
 qE
 qE
 qE
-qE
-qE
-qE
-qE
-qE
-dk
+hr
+mb
+DF
+vi
+Yx
+hr
 pi
 Pb
 vP
@@ -29853,12 +30651,12 @@ nM
 YQ
 YQ
 yu
-nb
-qE
-qE
-qE
-qE
-dk
+hr
+Lf
+KW
+pZ
+vi
+hr
 jS
 BL
 MI
@@ -29995,15 +30793,15 @@ Dz
 Is
 Ko
 Mu
-nb
-qE
-qE
-qE
-qE
-dk
+hr
+qV
+cH
+vi
+mL
+hr
 zT
 hv
-BS
+sg
 BS
 Pb
 dk
@@ -30128,7 +30926,7 @@ pP
 wB
 wB
 wB
-wB
+Ap
 jn
 IY
 Gu
@@ -30137,12 +30935,12 @@ nb
 ZG
 pK
 hM
-nb
-qE
-qE
-qE
-qE
-dk
+hr
+gb
+zu
+Rs
+gb
+hr
 bL
 Pb
 BS
@@ -30246,7 +31044,7 @@ eO
 Yq
 SB
 dH
-Mo
+yz
 Mo
 im
 uk
@@ -30268,7 +31066,7 @@ qE
 jn
 Lr
 Wi
-Wr
+Aa
 Wr
 kE
 JJ
@@ -30279,12 +31077,12 @@ ZO
 Kg
 XB
 bl
-nb
-qE
-qE
-qE
-qE
-dk
+hr
+UO
+Wg
+gW
+gW
+hr
 mV
 Pb
 Cr
@@ -30421,12 +31219,12 @@ nb
 to
 EV
 KA
-nb
-qE
-qE
-qE
-qE
-dk
+hr
+bV
+gW
+gW
+PH
+hr
 Vb
 Pb
 ll
@@ -30563,12 +31361,12 @@ nb
 rF
 Tc
 Te
-nb
-qE
-qE
-qE
-qE
-dk
+hr
+vo
+hF
+cw
+fj
+hr
 mw
 Pb
 CL
@@ -30708,13 +31506,13 @@ DQ
 DQ
 DQ
 DQ
-qE
-qE
+bb
+bb
 dk
 dk
-KI
+kB
 Fg
-KI
+kX
 dk
 dk
 Eb
@@ -31560,7 +32358,7 @@ gE
 QC
 wO
 DQ
-oi
+cZ
 mf
 uN
 Gd
@@ -31604,11 +32402,11 @@ Lt
 Lt
 Lt
 Lt
-hE
-hE
-hE
-hE
-hE
+kV
+un
+un
+un
+kV
 hE
 Lt
 Lt
@@ -31698,7 +32496,7 @@ HS
 DQ
 Tn
 QC
-QC
+Dx
 QC
 qA
 DQ
@@ -32147,7 +32945,7 @@ JP
 Am
 fT
 Vu
-fT
+ZD
 fT
 Vx
 Ks
@@ -32260,7 +33058,7 @@ oT
 Yp
 Ni
 jz
-wA
+qC
 ox
 wA
 DQ
@@ -32442,7 +33240,7 @@ iv
 sC
 kb
 Ty
-YV
+ov
 YV
 OY
 kJ
@@ -32454,7 +33252,7 @@ rN
 Fu
 RH
 aw
-ZF
+XE
 gJ
 eG
 Us
@@ -33153,7 +33951,7 @@ aP
 gk
 oR
 iq
-qN
+uX
 iJ
 qK
 Sm
@@ -33257,7 +34055,7 @@ CI
 eP
 UQ
 UQ
-UQ
+Ot
 UQ
 op
 CI
@@ -33401,7 +34199,7 @@ VE
 VE
 VE
 VE
-VE
+eB
 CI
 qE
 qE
@@ -33569,14 +34367,14 @@ xz
 YF
 tx
 bF
-Tm
+Dn
 Qm
 sd
 qN
 qN
 KB
 qN
-gr
+Sl
 oj
 qN
 qN
@@ -33590,7 +34388,7 @@ cU
 TL
 ej
 aw
-ZF
+Rw
 al
 UD
 wa
@@ -34378,7 +35176,7 @@ Ah
 Ah
 MK
 MK
-KT
+ra
 dF
 MK
 MK
@@ -34520,7 +35318,7 @@ Ah
 Ah
 MK
 MK
-KT
+ra
 MK
 MK
 MK
@@ -34662,7 +35460,7 @@ Ah
 Ah
 Ah
 MK
-KT
+ra
 MK
 MK
 MK
@@ -34804,7 +35602,7 @@ Ah
 Ah
 Ah
 Ah
-KT
+ra
 MK
 MK
 Ah
@@ -34946,7 +35744,7 @@ Ah
 Ah
 Ah
 MK
-KT
+ra
 MK
 MK
 Ah
@@ -35088,7 +35886,7 @@ MK
 MK
 MK
 MK
-KT
+ra
 MK
 MK
 Ah
@@ -35230,7 +36028,7 @@ qE
 qE
 MK
 MK
-KT
+ra
 MK
 MK
 Ah
@@ -35372,7 +36170,7 @@ qE
 qE
 MK
 MK
-KT
+ra
 MK
 Ah
 MK
@@ -35514,7 +36312,7 @@ qE
 qE
 qE
 MK
-KT
+ra
 MK
 MK
 MK
@@ -35653,7 +36451,7 @@ qE
 qE
 qE
 qE
-qE
+YG
 YG
 td
 OS
@@ -35796,9 +36594,9 @@ qE
 qE
 qE
 YG
-YG
-MK
-Os
+lx
+Pn
+dQ
 MK
 MK
 MK
@@ -35939,7 +36737,7 @@ qE
 qE
 YG
 Ie
-MK
+bJ
 Os
 MK
 MK
@@ -36081,9 +36879,9 @@ qE
 qE
 YG
 WU
-MK
+bJ
 Os
-MK
+bJ
 MK
 MK
 MK
@@ -36224,7 +37022,7 @@ qE
 YG
 YG
 MK
-MK
+bJ
 MK
 MK
 dF
@@ -36367,7 +37165,7 @@ tW
 MK
 RD
 MK
-MK
+bJ
 MK
 MK
 MK
@@ -37363,7 +38161,7 @@ uH
 uH
 uH
 uH
-uH
+Gf
 uH
 uH
 uH
diff --git a/maps/groundbase/gb-z2.dmm b/maps/groundbase/gb-z2.dmm
index 1720b53074c..d0ff482422c 100644
--- a/maps/groundbase/gb-z2.dmm
+++ b/maps/groundbase/gb-z2.dmm
@@ -63,6 +63,7 @@
 /obj/machinery/atmospherics/unary/vent_scrubber/on{
 	dir = 1
 	},
+/obj/machinery/light,
 /turf/simulated/floor/carpet/bcarpet,
 /area/groundbase/civilian/mime)
 "an" = (
@@ -175,6 +176,12 @@
 	},
 /turf/simulated/floor/tiled,
 /area/groundbase/science/xenobot)
+"aF" = (
+/obj/machinery/atm{
+	pixel_x = -32
+	},
+/turf/simulated/floor/tiled/dark,
+/area/groundbase/dorms)
 "aH" = (
 /obj/structure/table/glass,
 /obj/item/device/antibody_scanner,
@@ -217,6 +224,10 @@
 /obj/machinery/disposal,
 /obj/structure/bed/double/padded,
 /obj/item/weapon/bedsheet/clowndouble,
+/obj/machinery/light_switch{
+	dir = 4;
+	pixel_x = -30
+	},
 /turf/simulated/floor/wood,
 /area/groundbase/dorms/room4)
 "aO" = (
@@ -288,6 +299,10 @@
 	},
 /obj/effect/floor_decal/industrial/outline/blue,
 /obj/machinery/portable_atmospherics/canister/nitrogen,
+/obj/machinery/light_switch{
+	dir = 4;
+	pixel_x = -30
+	},
 /turf/simulated/floor/tiled,
 /area/groundbase/science/server)
 "aT" = (
@@ -324,6 +339,13 @@
 /obj/machinery/atmospherics/unary/vent_scrubber/on,
 /turf/simulated/floor/wood,
 /area/groundbase/dorms/room2)
+"aX" = (
+/obj/machinery/light_switch{
+	dir = 8;
+	pixel_x = 30
+	},
+/turf/simulated/floor/tiled,
+/area/rnd/xenobiology)
 "aY" = (
 /obj/machinery/papershredder,
 /obj/machinery/firealarm,
@@ -673,6 +695,13 @@
 /obj/structure/closet/l3closet/scientist,
 /turf/simulated/floor/tiled,
 /area/groundbase/science/xenobot)
+"bW" = (
+/obj/machinery/hologram/holopad,
+/turf/simulated/floor/tiled/virgo3c{
+	edge_blending_priority = -1;
+	outdoors = 0
+	},
+/area/groundbase/level2/nw)
 "bX" = (
 /turf/simulated/floor/outdoors/sidewalk/side/virgo3c,
 /area/groundbase/level2/nw)
@@ -848,6 +877,10 @@
 /obj/structure/cable/yellow{
 	icon_state = "4-8"
 	},
+/obj/machinery/light_switch{
+	pixel_x = 16;
+	pixel_y = 30
+	},
 /turf/simulated/floor/wood,
 /area/groundbase/civilian/kitchen/backroom)
 "cy" = (
@@ -1714,6 +1747,14 @@
 "fk" = (
 /turf/simulated/mineral/cave/virgo3c,
 /area/groundbase/level2/se)
+"fl" = (
+/obj/structure/closet/l3closet/scientist,
+/obj/machinery/light_switch{
+	dir = 8;
+	pixel_x = 30
+	},
+/turf/simulated/floor/tiled,
+/area/groundbase/science/xenobot)
 "fm" = (
 /obj/machinery/button/remote/airlock{
 	dir = 8;
@@ -1999,6 +2040,10 @@
 	dir = 1
 	},
 /obj/machinery/disposal,
+/obj/machinery/light_switch{
+	dir = 8;
+	pixel_x = 30
+	},
 /turf/simulated/floor/wood,
 /area/groundbase/dorms/room5)
 "fZ" = (
@@ -2156,6 +2201,9 @@
 /obj/structure/cable/yellow{
 	icon_state = "4-8"
 	},
+/obj/machinery/light_switch{
+	pixel_y = 30
+	},
 /turf/simulated/floor/carpet/blue,
 /area/groundbase/medical/psych)
 "gH" = (
@@ -2441,6 +2489,11 @@
 	pixel_x = 27;
 	pixel_y = 6
 	},
+/obj/machinery/light_switch{
+	dir = 8;
+	pixel_x = 30;
+	pixel_y = -3
+	},
 /turf/simulated/floor/tiled/eris/cafe,
 /area/groundbase/civilian/kitchen)
 "hx" = (
@@ -2473,6 +2526,11 @@
 	icon_state = "0-2"
 	},
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/machinery/light_switch{
+	dir = 4;
+	pixel_x = -30;
+	pixel_y = 10
+	},
 /turf/simulated/floor/tiled/dark,
 /area/groundbase/command/tcomms)
 "hA" = (
@@ -2637,6 +2695,9 @@
 	layer = 3.3;
 	pixel_y = -32
 	},
+/obj/machinery/atm{
+	pixel_x = 32
+	},
 /turf/simulated/floor/tiled/dark,
 /area/groundbase/civilian/bar)
 "hZ" = (
@@ -2955,6 +3016,11 @@
 	},
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/machinery/light_switch{
+	dir = 4;
+	pixel_x = -30;
+	pixel_y = 16
+	},
 /turf/simulated/floor/tiled,
 /area/groundbase/cargo/office)
 "iW" = (
@@ -3057,6 +3123,13 @@
 /obj/effect/landmark/vermin,
 /turf/simulated/floor/wood,
 /area/groundbase/civilian/library)
+"jl" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/structure/disposalpipe/segment,
+/obj/machinery/hologram/holopad,
+/turf/simulated/floor/tiled/white,
+/area/groundbase/medical/lobby)
 "jm" = (
 /obj/structure/table/woodentable,
 /obj/item/weapon/paper_bin{
@@ -3849,6 +3922,10 @@
 	},
 /obj/effect/landmark/start/chemist,
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/machinery/vending/wallmed2{
+	dir = 4;
+	pixel_x = -28
+	},
 /turf/simulated/floor/tiled/white,
 /area/groundbase/medical/Chemistry)
 "lI" = (
@@ -4212,6 +4289,7 @@
 /obj/machinery/atmospherics/unary/vent_scrubber/on{
 	dir = 1
 	},
+/obj/random/coin/sometimes,
 /turf/simulated/floor/tiled/dark,
 /area/groundbase/civilian/bar)
 "mN" = (
@@ -5278,6 +5356,10 @@
 /obj/machinery/atmospherics/unary/vent_pump/on{
 	dir = 4
 	},
+/obj/machinery/light_switch{
+	dir = 4;
+	pixel_x = -30
+	},
 /turf/simulated/floor/wood,
 /area/groundbase/dorms/room8)
 "qn" = (
@@ -5606,6 +5688,10 @@
 /obj/machinery/firealarm,
 /turf/simulated/floor/tiled,
 /area/groundbase/science/circuits)
+"rj" = (
+/obj/machinery/hologram/holopad,
+/turf/simulated/floor/tiled,
+/area/groundbase/cargo/office)
 "rk" = (
 /turf/simulated/wall,
 /area/groundbase/civilian/kitchen/backroom)
@@ -5635,6 +5721,9 @@
 /obj/item/paint_brush{
 	pixel_x = 4
 	},
+/obj/machinery/camera/network/civilian{
+	dir = 4
+	},
 /turf/simulated/floor/tiled/virgo3c{
 	edge_blending_priority = -1;
 	outdoors = 0
@@ -5792,6 +5881,10 @@
 	dir = 1
 	},
 /obj/machinery/disposal,
+/obj/machinery/light_switch{
+	dir = 8;
+	pixel_x = 30
+	},
 /turf/simulated/floor/wood,
 /area/groundbase/dorms/room3)
 "rN" = (
@@ -5805,6 +5898,9 @@
 /obj/machinery/alarm{
 	dir = 4
 	},
+/obj/machinery/light_switch{
+	pixel_y = 30
+	},
 /turf/simulated/floor/carpet/bcarpet,
 /area/groundbase/civilian/mime)
 "rP" = (
@@ -5952,6 +6048,10 @@
 	icon_state = "2-8"
 	},
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/machinery/light_switch{
+	dir = 8;
+	pixel_x = 30
+	},
 /turf/simulated/floor/wood,
 /area/groundbase/dorms/room1)
 "sx" = (
@@ -6136,6 +6236,16 @@
 	},
 /turf/simulated/floor/wood,
 /area/groundbase/civilian/kitchen/backroom)
+"sY" = (
+/obj/machinery/atmospherics/portables_connector{
+	dir = 8
+	},
+/obj/machinery/light_switch{
+	dir = 8;
+	pixel_x = 30
+	},
+/turf/simulated/floor/tiled,
+/area/groundbase/science/xenobot/storage)
 "sZ" = (
 /obj/structure/disposalpipe/segment{
 	dir = 4
@@ -6249,6 +6359,10 @@
 	},
 /turf/simulated/floor/tiled/white,
 /area/groundbase/medical/Chemistry)
+"tv" = (
+/obj/machinery/hologram/holopad,
+/turf/simulated/floor/tiled/white,
+/area/groundbase/medical/Chemistry)
 "tw" = (
 /obj/structure/disposalpipe/segment{
 	dir = 4
@@ -6586,6 +6700,10 @@
 /obj/structure/cable/yellow{
 	icon_state = "4-8"
 	},
+/obj/machinery/light_switch{
+	dir = 1;
+	pixel_y = -30
+	},
 /turf/simulated/floor/wood,
 /area/groundbase/command/captain)
 "uw" = (
@@ -7135,6 +7253,12 @@
 /obj/effect/landmark/start/medical,
 /turf/simulated/floor/tiled/white,
 /area/groundbase/medical/lobby)
+"wk" = (
+/obj/machinery/light_switch{
+	pixel_y = 30
+	},
+/turf/simulated/floor/tiled/dark,
+/area/groundbase/civilian/chapel)
 "wm" = (
 /obj/machinery/computer/supplycomp/control{
 	dir = 8
@@ -7196,11 +7320,22 @@
 	},
 /turf/simulated/floor/wood,
 /area/groundbase/dorms/room3)
+"wv" = (
+/obj/structure/cable/yellow{
+	icon_state = "4-8"
+	},
+/obj/machinery/hologram/holopad,
+/turf/simulated/floor/tiled/dark,
+/area/groundbase/civilian/bar)
 "ww" = (
 /obj/structure/cable/yellow{
 	icon_state = "1-2"
 	},
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/machinery/light_switch{
+	dir = 8;
+	pixel_x = 30
+	},
 /turf/simulated/floor/tiled,
 /area/groundbase/science/circuits)
 "wx" = (
@@ -7237,6 +7372,11 @@
 	},
 /turf/simulated/floor/tiled/dark,
 /area/groundbase/civilian/chapel)
+"wE" = (
+/obj/structure/table/woodentable,
+/obj/machinery/camera/network/civilian,
+/turf/simulated/floor/carpet,
+/area/groundbase/civilian/library)
 "wF" = (
 /obj/machinery/portable_atmospherics/hydroponics,
 /turf/simulated/floor/tiled,
@@ -7457,6 +7597,11 @@
 /obj/machinery/smartfridge/produce/persistent_lossy,
 /turf/simulated/floor/tiled/eris/cafe,
 /area/groundbase/civilian/kitchen)
+"xt" = (
+/obj/effect/landmark/vermin,
+/obj/machinery/hologram/holopad,
+/turf/simulated/floor/wood,
+/area/groundbase/civilian/library)
 "xu" = (
 /obj/structure/bed/chair/office/dark{
 	dir = 1
@@ -8018,6 +8163,10 @@
 /area/groundbase/civilian/janitor)
 "yY" = (
 /obj/structure/closet/l3closet/virology,
+/obj/machinery/light_switch{
+	dir = 8;
+	pixel_x = 30
+	},
 /turf/simulated/floor/tiled/white,
 /area/medical/virology)
 "za" = (
@@ -8176,6 +8325,7 @@
 /obj/effect/landmark{
 	name = "lightsout"
 	},
+/obj/machinery/hologram/holopad,
 /turf/simulated/floor/tiled/white,
 /area/groundbase/medical/triage)
 "zG" = (
@@ -8688,6 +8838,11 @@
 	edge_blending_priority = -1
 	},
 /area/groundbase/level2/westspur)
+"AX" = (
+/obj/structure/table/woodentable,
+/obj/random/coin/sometimes,
+/turf/simulated/floor/wood,
+/area/groundbase/civilian/library)
 "AY" = (
 /obj/structure/table/woodentable,
 /obj/item/weapon/storage/box/donkpockets,
@@ -8764,6 +8919,10 @@
 /obj/machinery/atmospherics/unary/vent_pump/on{
 	dir = 8
 	},
+/obj/machinery/light_switch{
+	dir = 8;
+	pixel_x = 30
+	},
 /turf/simulated/floor/wood,
 /area/groundbase/dorms/room7)
 "Bl" = (
@@ -9096,6 +9255,9 @@
 /area/groundbase/level2/nw)
 "Ck" = (
 /obj/structure/closet/secure_closet/hop2,
+/obj/machinery/light_switch{
+	pixel_y = 30
+	},
 /turf/simulated/floor/tiled,
 /area/groundbase/command/hop)
 "Cl" = (
@@ -9363,6 +9525,13 @@
 "Db" = (
 /turf/simulated/wall/r_wall,
 /area/groundbase/science/xenobot/storage)
+"Dc" = (
+/obj/machinery/light_switch{
+	pixel_x = 16;
+	pixel_y = 30
+	},
+/turf/simulated/floor/tiled/freezer/cold,
+/area/groundbase/civilian/kitchen/freezer)
 "Dd" = (
 /obj/structure/disposalpipe/segment,
 /turf/simulated/floor/outdoors/sidewalk/virgo3c,
@@ -10030,6 +10199,10 @@
 "EX" = (
 /obj/structure/closet/secure_closet/quartermaster,
 /obj/item/weapon/storage/backpack/dufflebag,
+/obj/machinery/light_switch{
+	dir = 1;
+	pixel_y = -30
+	},
 /turf/simulated/floor/wood,
 /area/groundbase/cargo/qm)
 "EY" = (
@@ -10301,6 +10474,7 @@
 /obj/effect/landmark{
 	name = "lightsout"
 	},
+/obj/machinery/hologram/holopad,
 /turf/simulated/floor/tiled/dark,
 /area/groundbase/civilian/bar)
 "FU" = (
@@ -11573,6 +11747,10 @@
 	icon_state = "2-4"
 	},
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/machinery/light_switch{
+	dir = 4;
+	pixel_x = -30
+	},
 /turf/simulated/floor/wood,
 /area/groundbase/dorms/room2)
 "JB" = (
@@ -11739,6 +11917,10 @@
 "JZ" = (
 /obj/machinery/disposal,
 /obj/structure/disposalpipe/trunk,
+/obj/machinery/light_switch{
+	dir = 4;
+	pixel_x = -30
+	},
 /turf/simulated/floor/tiled,
 /area/groundbase/civilian/hydroponics)
 "Kc" = (
@@ -12960,6 +13142,7 @@
 /obj/structure/cable/yellow{
 	icon_state = "1-2"
 	},
+/obj/machinery/hologram/holopad,
 /turf/simulated/floor/tiled/white,
 /area/groundbase/medical/lobby)
 "Nq" = (
@@ -13268,6 +13451,9 @@
 /obj/machinery/alarm{
 	dir = 4
 	},
+/obj/machinery/light_switch{
+	pixel_y = 30
+	},
 /turf/simulated/floor/tiled/white,
 /area/medical/virology)
 "On" = (
@@ -13461,6 +13647,10 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 9
 	},
+/obj/machinery/light_switch{
+	dir = 8;
+	pixel_x = 30
+	},
 /turf/simulated/floor/tiled,
 /area/groundbase/science/robotics)
 "OR" = (
@@ -13651,6 +13841,10 @@
 	dir = 1
 	},
 /obj/machinery/disposal,
+/obj/machinery/light_switch{
+	dir = 4;
+	pixel_x = -30
+	},
 /turf/simulated/floor/wood,
 /area/groundbase/dorms/room6)
 "Pv" = (
@@ -14177,6 +14371,10 @@
 /obj/item/weapon/flame/candle/candelabra,
 /obj/item/weapon/flame/candle/candelabra,
 /obj/item/weapon/flame/candle/candelabra,
+/obj/machinery/light_switch{
+	dir = 1;
+	pixel_y = -30
+	},
 /turf/simulated/floor/lino,
 /area/groundbase/civilian/chapel/office)
 "QR" = (
@@ -14244,6 +14442,7 @@
 /area/groundbase/science/rd)
 "Rb" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/machinery/hologram/holopad,
 /turf/simulated/floor/tiled/dark,
 /area/groundbase/civilian/chapel)
 "Rc" = (
@@ -14497,11 +14696,16 @@
 /turf/simulated/floor/carpet/blue,
 /area/groundbase/medical/psych)
 "RP" = (
-/obj/machinery/camera/network/civilian{
-	dir = 4
+/obj/structure/cable/yellow{
+	icon_state = "1-2"
 	},
-/turf/simulated/floor/wood,
-/area/groundbase/civilian/library)
+/obj/structure/disposalpipe/junction{
+	dir = 2;
+	icon_state = "pipe-j2"
+	},
+/obj/machinery/hologram/holopad,
+/turf/simulated/floor/tiled/dark,
+/area/groundbase/dorms)
 "RQ" = (
 /obj/structure/cable/yellow{
 	icon_state = "1-4"
@@ -14838,7 +15042,9 @@
 	name = "Library Desk Door";
 	req_access = list(37)
 	},
-/obj/machinery/camera/network/civilian,
+/obj/machinery/light_switch{
+	pixel_y = 30
+	},
 /turf/simulated/floor/carpet,
 /area/groundbase/civilian/library)
 "SJ" = (
@@ -14928,6 +15134,11 @@
 /obj/structure/disposalpipe/trunk{
 	dir = 4
 	},
+/obj/machinery/light_switch{
+	dir = 1;
+	pixel_x = 10;
+	pixel_y = -30
+	},
 /turf/simulated/floor/tiled/white,
 /area/groundbase/medical/Chemistry)
 "SR" = (
@@ -15009,6 +15220,10 @@
 /area/groundbase/civilian/chapel)
 "Td" = (
 /obj/machinery/photocopier,
+/obj/machinery/light_switch{
+	dir = 8;
+	pixel_x = 30
+	},
 /turf/simulated/floor/tiled/dark,
 /area/groundbase/command/bridge)
 "Tf" = (
@@ -15381,6 +15596,10 @@
 /obj/effect/landmark/start/chef,
 /turf/simulated/floor/tiled/freezer/cold,
 /area/groundbase/civilian/kitchen/freezer)
+"Ux" = (
+/obj/machinery/hologram/holopad,
+/turf/simulated/floor/tiled/dark,
+/area/groundbase/civilian/bar)
 "Uy" = (
 /obj/machinery/light{
 	dir = 4
@@ -15504,6 +15723,10 @@
 /area/groundbase/civilian/library)
 "US" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/machinery/light_switch{
+	dir = 8;
+	pixel_x = 30
+	},
 /turf/simulated/floor/tiled,
 /area/groundbase/civilian/janitor)
 "UT" = (
@@ -16056,6 +16279,10 @@
 /obj/machinery/atmospherics/unary/vent_scrubber/on{
 	dir = 4
 	},
+/obj/machinery/light_switch{
+	dir = 4;
+	pixel_x = -30
+	},
 /turf/simulated/floor/tiled,
 /area/groundbase/science/rd)
 "Wz" = (
@@ -16512,6 +16739,10 @@
 /obj/machinery/camera/network/research{
 	dir = 1
 	},
+/obj/machinery/light_switch{
+	dir = 1;
+	pixel_y = -30
+	},
 /turf/simulated/floor/tiled,
 /area/groundbase/science/rnd)
 "Yc" = (
@@ -16568,6 +16799,13 @@
 	edge_blending_priority = -1
 	},
 /area/groundbase/command/bridge)
+"Yj" = (
+/obj/machinery/light_switch{
+	dir = 4;
+	pixel_x = -30
+	},
+/turf/simulated/floor/wood,
+/area/groundbase/command/captainq)
 "Yl" = (
 /obj/structure/table/bench/padded,
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
@@ -16780,6 +17018,15 @@
 /obj/item/weapon/soap/nanotrasen,
 /turf/simulated/floor/tiled,
 /area/groundbase/civilian/janitor)
+"YZ" = (
+/obj/machinery/atm{
+	pixel_x = -32
+	},
+/turf/simulated/floor/tiled/virgo3c{
+	edge_blending_priority = -1;
+	outdoors = 0
+	},
+/area/groundbase/cargo/office)
 "Za" = (
 /obj/machinery/light,
 /turf/simulated/floor/wood,
@@ -19584,7 +19831,7 @@ OU
 Gp
 aJ
 JH
-xA
+bW
 fD
 TZ
 bY
@@ -20051,7 +20298,7 @@ EA
 Sn
 qY
 JM
-vs
+sY
 bB
 vs
 vs
@@ -21048,10 +21295,10 @@ BF
 lV
 bV
 kq
-bV
+fl
 lV
 ur
-ls
+aX
 MV
 ic
 rW
@@ -21248,7 +21495,7 @@ rP
 mo
 uQ
 CW
-RP
+MY
 IR
 AG
 kt
@@ -21265,7 +21512,7 @@ Ny
 Ny
 Ny
 Ny
-Ny
+Ux
 Ny
 Ny
 Ny
@@ -21572,7 +21819,7 @@ qA
 Vf
 uh
 JJ
-AF
+Dc
 AF
 AF
 kd
@@ -21813,11 +22060,11 @@ Wz
 rb
 CC
 rP
-Ak
+wE
 Ak
 cX
 zi
-WA
+AX
 XR
 MY
 MY
@@ -21970,7 +22217,7 @@ xE
 FF
 Wi
 mM
-Ny
+Ux
 YO
 Gl
 Gl
@@ -21980,7 +22227,7 @@ Gl
 Gl
 Gl
 Fp
-yh
+wv
 xS
 TN
 FF
@@ -22527,7 +22774,7 @@ rn
 cX
 cX
 MY
-jk
+xt
 wg
 MY
 MY
@@ -23356,7 +23603,7 @@ eC
 Mm
 Yp
 Ie
-Yp
+aF
 Mm
 cd
 uO
@@ -23784,7 +24031,7 @@ bE
 As
 pA
 Wu
-bE
+RP
 XK
 As
 Mq
@@ -24935,7 +25182,7 @@ df
 zG
 lI
 ME
-eD
+wk
 eD
 YH
 VS
@@ -27789,7 +28036,7 @@ AU
 Qi
 PJ
 nP
-nP
+YZ
 Kl
 Aw
 XJ
@@ -28508,7 +28755,7 @@ Vm
 Du
 jK
 gt
-DO
+jl
 DO
 qh
 mY
@@ -28634,7 +28881,7 @@ za
 za
 Vu
 qN
-Lc
+rj
 FR
 XU
 wm
@@ -30213,7 +30460,7 @@ vc
 XO
 Ur
 lL
-Ur
+tv
 uF
 sW
 Pn
@@ -31242,7 +31489,7 @@ Bo
 ia
 bP
 tL
-XW
+Yj
 ZO
 ia
 qK
diff --git a/maps/groundbase/gb-z3.dmm b/maps/groundbase/gb-z3.dmm
index a93ab7b5dd7..ad29f7ac467 100644
--- a/maps/groundbase/gb-z3.dmm
+++ b/maps/groundbase/gb-z3.dmm
@@ -192,6 +192,10 @@
 /obj/structure/cable/yellow{
 	icon_state = "0-2"
 	},
+/obj/machinery/light_switch{
+	pixel_x = 16;
+	pixel_y = 30
+	},
 /turf/simulated/floor/tiled/white,
 /area/groundbase/medical/patient2)
 "dQ" = (
@@ -239,6 +243,14 @@
 	},
 /turf/simulated/floor/tiled,
 /area/shuttle/groundbase/exploration)
+"eo" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/machinery/light_switch{
+	dir = 4;
+	pixel_x = -30
+	},
+/turf/simulated/floor/tiled/white,
+/area/groundbase/medical/paramedic)
 "ey" = (
 /obj/structure/table/rack,
 /obj/item/device/suit_cooling_unit{
@@ -252,6 +264,17 @@
 	},
 /turf/simulated/floor/tiled/white,
 /area/groundbase/medical/patient4)
+"eC" = (
+/obj/structure/bed/chair/backed_red{
+	dir = 4
+	},
+/obj/machinery/camera/network/civilian{
+	dir = 1
+	},
+/turf/simulated/floor/outdoors/sidewalk/slab/virgo3c{
+	outdoors = 0
+	},
+/area/groundbase/level3/escapepad)
 "eE" = (
 /obj/structure/cable/yellow{
 	icon_state = "4-8"
@@ -263,6 +286,15 @@
 /obj/effect/landmark/start/chemist,
 /turf/simulated/floor/tiled/virgo3c,
 /area/groundbase/medical/patio)
+"fy" = (
+/obj/structure/bed/chair/backed_red{
+	dir = 4
+	},
+/obj/machinery/camera/network/civilian,
+/turf/simulated/floor/outdoors/sidewalk/slab/virgo3c{
+	outdoors = 0
+	},
+/area/groundbase/level3/escapepad)
 "fz" = (
 /turf/simulated/wall,
 /area/groundbase/civilian/pilot)
@@ -783,6 +815,10 @@
 /obj/structure/cable/yellow{
 	icon_state = "0-2"
 	},
+/obj/machinery/light_switch{
+	pixel_x = 16;
+	pixel_y = 30
+	},
 /turf/simulated/floor/tiled/white,
 /area/groundbase/medical/patient4)
 "oQ" = (
@@ -1244,6 +1280,10 @@
 /obj/structure/cable/yellow{
 	icon_state = "0-2"
 	},
+/obj/machinery/light_switch{
+	pixel_x = -16;
+	pixel_y = 30
+	},
 /turf/simulated/floor/tiled/white,
 /area/groundbase/medical/patient1)
 "xp" = (
@@ -1258,6 +1298,14 @@
 	},
 /turf/simulated/floor/tiled/virgo3c,
 /area/groundbase/medical/patio)
+"xs" = (
+/obj/structure/railing/grey,
+/obj/machinery/light_switch{
+	dir = 1;
+	pixel_y = -30
+	},
+/turf/simulated/open,
+/area/groundbase/cargo/office)
 "xD" = (
 /obj/structure/cable/yellow{
 	icon_state = "1-2"
@@ -1271,6 +1319,9 @@
 /area/groundbase/medical/uhallway)
 "xH" = (
 /obj/structure/closet/secure_closet/explorer,
+/obj/machinery/camera/network/exploration{
+	dir = 1
+	},
 /turf/simulated/floor/tiled,
 /area/groundbase/exploration/equipment)
 "xI" = (
@@ -1415,6 +1466,10 @@
 /obj/machinery/alarm{
 	pixel_y = 28
 	},
+/obj/machinery/light_switch{
+	dir = 4;
+	pixel_x = -30
+	},
 /turf/simulated/floor/tiled,
 /area/shuttle/groundbase/exploration)
 "As" = (
@@ -1491,6 +1546,14 @@
 	},
 /turf/simulated/floor/tiled/white,
 /area/groundbase/medical/patient4)
+"CS" = (
+/obj/item/device/radio/intercom{
+	pixel_y = -24
+	},
+/turf/simulated/floor/outdoors/sidewalk/slab/virgo3c{
+	outdoors = 0
+	},
+/area/groundbase/level3/escapepad)
 "CU" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 4
@@ -1589,18 +1652,13 @@
 	req_access = list(62,43,67)
 	},
 /obj/item/device/bluespaceradio/tether_prelinked,
+/obj/machinery/camera/network/exploration,
 /turf/simulated/floor/tiled,
 /area/groundbase/exploration/equipment)
 "Ev" = (
-/obj/machinery/hologram/holopad,
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
-	dir = 4
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
-	dir = 8
-	},
-/turf/simulated/floor/carpet,
-/area/groundbase/medical/cmo)
+/obj/machinery/camera/network/cargo,
+/turf/simulated/floor/outdoors/sidewalk/slab/virgo3c,
+/area/groundbase/cargo/office)
 "EA" = (
 /obj/machinery/button/remote/airlock{
 	dir = 4;
@@ -1644,6 +1702,10 @@
 /obj/structure/cable/yellow{
 	icon_state = "0-2"
 	},
+/obj/machinery/light_switch{
+	pixel_x = -16;
+	pixel_y = 30
+	},
 /turf/simulated/floor/tiled/white,
 /area/groundbase/medical/patient3)
 "ER" = (
@@ -1756,6 +1818,10 @@
 	pixel_x = -4;
 	pixel_y = -6
 	},
+/obj/machinery/light_switch{
+	dir = 1;
+	pixel_y = -30
+	},
 /turf/simulated/floor/tiled,
 /area/groundbase/exploration/equipment)
 "Gb" = (
@@ -1951,12 +2017,29 @@
 /obj/machinery/vending/fitness,
 /turf/simulated/floor/tiled/virgo3c,
 /area/groundbase/medical/patio)
+"Jf" = (
+/obj/machinery/hologram/holopad,
+/turf/simulated/floor/tiled/virgo3c,
+/area/groundbase/medical/patio)
 "Jh" = (
 /obj/structure/cable/yellow{
 	icon_state = "4-8"
 	},
 /turf/simulated/floor/tiled,
 /area/shuttle/groundbase/exploration)
+"Jk" = (
+/obj/structure/table/rack/shelf,
+/obj/item/weapon/tank/oxygen,
+/obj/item/device/suit_cooling_unit,
+/obj/item/clothing/shoes/magboots,
+/obj/item/clothing/suit/space/void/pilot,
+/obj/item/clothing/head/helmet/space/void/pilot,
+/obj/machinery/light_switch{
+	dir = 8;
+	pixel_x = 30
+	},
+/turf/simulated/floor/tiled,
+/area/groundbase/civilian/pilot)
 "Jl" = (
 /obj/effect/floor_decal/industrial/warning{
 	dir = 4
@@ -2052,6 +2135,10 @@
 /obj/machinery/door/firedoor,
 /turf/simulated/floor,
 /area/groundbase/medical/uhallway)
+"LY" = (
+/obj/machinery/hologram/holopad,
+/turf/simulated/floor/tiled/white,
+/area/groundbase/medical/uhallway)
 "Mc" = (
 /obj/structure/bed/chair/office/light{
 	dir = 4
@@ -2199,6 +2286,12 @@
 	},
 /turf/simulated/floor/outdoors/sidewalk/slab/virgo3c,
 /area/groundbase/level3/nw)
+"Pd" = (
+/obj/item/device/radio/intercom{
+	pixel_y = -24
+	},
+/turf/simulated/floor/tiled/virgo3c,
+/area/groundbase/medical/patio)
 "Pf" = (
 /obj/machinery/mineral/equipment_vendor/survey,
 /turf/simulated/floor/tiled,
@@ -2292,6 +2385,12 @@
 /obj/machinery/status_display,
 /turf/simulated/wall,
 /area/groundbase/level3/escapepad)
+"Qr" = (
+/obj/machinery/hologram/holopad,
+/turf/simulated/floor/outdoors/sidewalk/slab/virgo3c{
+	outdoors = 0
+	},
+/area/groundbase/level3/escapepad)
 "QC" = (
 /obj/machinery/door/airlock/multi_tile/glass/polarized{
 	id_tag = null;
@@ -5550,7 +5649,7 @@ qO
 qO
 fz
 Zp
-Zp
+Jk
 zK
 Zp
 Zp
@@ -5841,13 +5940,13 @@ qO
 qO
 qO
 hl
-Ii
+fy
 Ii
 Ii
 ow
 Ii
 Ii
-Ii
+eC
 hl
 qO
 qO
@@ -5989,7 +6088,7 @@ ow
 ow
 ow
 ow
-ow
+CS
 hl
 Kr
 Kr
@@ -6412,7 +6511,7 @@ Qn
 Ii
 Ii
 Ii
-ow
+Qr
 ow
 ow
 ow
@@ -13778,7 +13877,7 @@ IS
 IS
 oK
 Px
-RY
+xs
 Sg
 gc
 Lf
@@ -14064,7 +14163,7 @@ Sg
 oK
 oK
 Sg
-Lf
+Ev
 Lf
 Lf
 Lf
@@ -14375,7 +14474,7 @@ HP
 WF
 aG
 Kl
-Ev
+Xl
 Kl
 wc
 nb
@@ -15220,7 +15319,7 @@ qT
 me
 Rh
 hN
-xX
+Jf
 OD
 xX
 Vl
@@ -15231,7 +15330,7 @@ DR
 VJ
 VJ
 eE
-yQ
+LY
 yQ
 LG
 IS
@@ -15506,7 +15605,7 @@ xX
 xX
 xX
 OD
-xX
+Pd
 Vm
 Vm
 Vm
@@ -15652,7 +15751,7 @@ xX
 Vm
 kQ
 sJ
-lF
+eo
 ym
 Zn
 No
diff --git a/maps/groundbase/groundbase_areas.dm b/maps/groundbase/groundbase_areas.dm
index 3849d28f730..97ada4062c8 100644
--- a/maps/groundbase/groundbase_areas.dm
+++ b/maps/groundbase/groundbase_areas.dm
@@ -19,6 +19,7 @@
 /area/groundbase/level1
 	name = "Rascal's Pass Level 1"
 	flags = AREA_FLAG_IS_NOT_PERSISTENT
+	sound_env = SOUND_ENVIRONMENT_MOUNTAINS
 
 /area/groundbase/level1/ne
 	name = "Northeast Rascal's Pass Level 1"
@@ -47,6 +48,7 @@
 /area/groundbase/level2
 	name = "Rascal's Pass Level 2"
 	flags = AREA_FLAG_IS_NOT_PERSISTENT
+	sound_env = SOUND_ENVIRONMENT_MOUNTAINS
 
 /area/groundbase/level2/ne
 	name = "Northeast Rascal's Pass Level 2"
@@ -76,6 +78,8 @@
 /area/groundbase/level3
 	name = "Rascal's Pass Level 3"
 	flags = AREA_FLAG_IS_NOT_PERSISTENT
+	sound_env = SOUND_ENVIRONMENT_MOUNTAINS
+
 /area/groundbase/level3/ne
 	name = "Northeast Rascal's Pass Level 3"
 /area/groundbase/level3/ne/open
@@ -101,8 +105,10 @@
 	holomap_color = HOLOMAP_AREACOLOR_SCIENCE
 	icon_state = "purwhisqu"
 	ambience = AMBIENCE_GENERIC
+	lightswitch = 0
 /area/groundbase/science/hall
 	name = "Science Hallway"
+	lightswitch = 1
 /area/groundbase/science/rnd
 	name = "Research and Development"
 /area/groundbase/science/robotics
@@ -115,12 +121,14 @@
 	name = "Circuits Workshop"
 /area/groundbase/science/xenohall
 	name = "Xeno Studies Hallway"
+	lightswitch = 1
 /area/groundbase/science/xenobot
 	name = "Xenobotany"
 /area/groundbase/science/xenobot/storage
 	name = "Xenobotany Storage"
 /area/groundbase/science/picnic
 	name = "Science Break Room"
+	lightswitch = 1
 
 /area/groundbase/command
 	name = "Command"
@@ -131,14 +139,18 @@
 	name = "Bridge"
 /area/groundbase/command/captain
 	name = "Captain's Office"
+	lightswitch = 0
 /area/groundbase/command/captainq
 	name = "Captain's Quarters"
+	lightswitch = 0
 /area/groundbase/command/hop
 	name = "Head of Personnel"
+	lightswitch = 0
 /area/groundbase/command/hall
 	name = "Command Hallway"
 /area/groundbase/command/meeting
 	name = "Command Meeting Room"
+	lightswitch = 0
 /area/groundbase/command/ai
 	name = "AI Core"
 	ambience = AMBIENCE_AI
@@ -160,18 +172,23 @@
 	holomap_color = HOLOMAP_AREACOLOR_SECURITY
 	icon_state = "redwhisqu"
 	ambience = AMBIENCE_GENERIC
+	lightswitch = 0
 /area/groundbase/security/lobby
 	name = "Security Lobby"
+	lightswitch = 1
 /area/groundbase/security/processing
 	name = "Security Processing"
 /area/groundbase/security/halls
 	name = "Security South Hallway"
+	lightswitch = 1
 /area/groundbase/security/halle
 	name = "Security East Hallway"
+	lightswitch = 1
 /area/groundbase/security/warden
 	name = "Warden's Office"
 /area/groundbase/security/armory
 	name = "Security Armory"
+	lightswitch = 1
 	ambience = AMBIENCE_HIGHSEC
 /area/groundbase/security/briefing
 	name = "Security Briefing Room"
@@ -189,21 +206,24 @@
 /area/prison/cell_block/gb
 	name = "Brig"
 
-
 /area/groundbase/medical
 	name = "Medical"
 	holomap_color = HOLOMAP_AREACOLOR_MEDICAL
 	icon_state = "cyawhisqu"
+	lightswitch = 0
 /area/groundbase/medical/lobby
 	name = "Medical Lobby"
+	lightswitch = 1
 /area/groundbase/medical/psych
 	name = "Psychiatrist's Office"
 /area/groundbase/medical/Chemistry
 	name = "Chemistry"
 /area/groundbase/medical/triage
 	name = "Medical Triage"
+	lightswitch = 1
 /area/groundbase/medical/lhallway
 	name = "Medical Lower Hallway"
+	lightswitch = 1
 /area/groundbase/medical/resleeving
 	name = "Resleeving"
 /area/groundbase/medical/autoresleeving
@@ -218,12 +238,14 @@
 	name = "Medical Office"
 /area/groundbase/medical/uhallway
 	name = "Medical Upper Hallway"
+	lightswitch = 1
 /area/groundbase/medical/cmo
 	name = "Chief Medical Officer's Office"
 /area/groundbase/medical/paramedic
 	name = "Paramedic Equipment Room"
 /area/groundbase/medical/patio
 	name = "Medical Break Room"
+	lightswitch = 1
 /area/groundbase/medical/patient1
 	name = "Medical Patient Room 1"
 /area/groundbase/medical/patient2
@@ -240,16 +262,20 @@
 	holomap_color = HOLOMAP_AREACOLOR_ENGINEERING
 	icon_state = "yelwhisqu"
 	ambience = AMBIENCE_ENGINEERING
+	lightswitch = 0
 /area/groundbase/engineering/lobby
 	name = "Engineering Lobby"
+	lightswitch = 1
 /area/groundbase/engineering/ce
 	name = "Chief Engineer's Office"
 /area/groundbase/engineering/workshop
 	name = "Engineering Workshop"
+	lightswitch = 1
 /area/groundbase/engineering/eva
 	name = "Engineering EVA"
 /area/groundbase/engineering/storage
 	name = "Engineering Storage"
+	lightswitch = 1
 /area/groundbase/engineering/techstorage
 	name = "Engineering Tech Storage"
 /area/groundbase/engineering/engine
@@ -259,16 +285,20 @@
 	ambience = AMBIENCE_ATMOS
 /area/groundbase/engineering/atmos/monitoring
 	name = "Atmospherics Monitoring"
+	lightswitch = 1
 
 /area/groundbase/cargo
 	name = "Cargo"
 	holomap_color = HOLOMAP_AREACOLOR_CARGO
 	icon_state = "orawhisqu"
 	ambience = AMBIENCE_HANGAR
+	lightswitch = 0
 /area/groundbase/cargo/office
 	name = "Cargo Office"
+	lightswitch = 1
 /area/groundbase/cargo/bay
 	name = "Cargo Bay"
+	lightswitch = 1
 /area/groundbase/cargo/bay/above
 	base_turf = /turf/simulated/open/virgo3c
 /area/groundbase/cargo/qm
@@ -277,22 +307,32 @@
 	name = "Mining"
 /area/maintenance/groundbase/trashpit
 	name = "Trash Pit"
+	lightswitch = 1
 
 /area/groundbase/civilian
 	name = "Civilian"
 	holomap_color = HOLOMAP_AREACOLOR_CIV
 	icon_state = "grewhisqu"
 	ambience = AMBIENCE_FOREBODING
+	lightswitch = 0
 /area/groundbase/civilian/arrivals
 	name = "Arrivals"
+	lightswitch = 1
 /area/groundbase/civilian/toolstorage
 	name = "Tool Storage"
+	lightswitch = 1
 /area/groundbase/civilian/bar
 	name = "Bar"
+	sound_env = LARGE_ENCLOSED
+	lightswitch = 1
+/area/groundbase/civilian/cafe
+	name = "Cafe"
+	sound_env = SMALL_SOFTFLOOR
 /area/groundbase/civilian/hydroponics
 	name = "Hydroponics"
 /area/groundbase/civilian/hydroponics/out
 	name = "Hydroponics Animal Pen"
+	lightswitch = 1
 /area/groundbase/civilian/kitchen
 	name = "Kitchen"
 /area/groundbase/civilian/kitchen/freezer
@@ -314,8 +354,10 @@
 	name = "Janitor's Closet"
 /area/groundbase/civilian/foodplace
 	name = "Uncle Grumslex's Snack Emporium"
+	lightswitch = 1
 /area/groundbase/civilian/apparel
 	name = "Crew Apparel Care"
+	lightswitch = 1
 /area/groundbase/civilian/clown
 	name = "Giggledome"
 /area/groundbase/civilian/mime
@@ -328,6 +370,7 @@
 	ambience = AMBIENCE_GENERIC
 /area/groundbase/exploration/equipment
 	name = "Exploration Equipment Room"
+	lightswitch = 0
 /area/groundbase/exploration/shuttlepad
 	name = "Exploration Shuttlepad"
 
@@ -341,25 +384,33 @@
 	limit_mob_size = FALSE
 	block_suit_sensors = TRUE
 	forbid_events = TRUE
-
 /area/groundbase/dorms/bathroom
 	name = "Dormitory Bathroom"
+	sound_env = SOUND_ENVIRONMENT_BATHROOM
 /area/groundbase/dorms/room1
 	name = "Dorm Room 1"
+	lightswitch = 0
 /area/groundbase/dorms/room2
 	name = "Dorm Room 2"
+	lightswitch = 0
 /area/groundbase/dorms/room3
 	name = "Dorm Room 3"
+	lightswitch = 0
 /area/groundbase/dorms/room4
 	name = "Dorm Room 4"
+	lightswitch = 0
 /area/groundbase/dorms/room5
 	name = "Dorm Room 5"
+	lightswitch = 0
 /area/groundbase/dorms/room6
 	name = "Dorm Room 6"
+	lightswitch = 0
 /area/groundbase/dorms/room7
 	name = "Dorm Room 7"
+	lightswitch = 0
 /area/groundbase/dorms/room8
 	name = "Dorm Room 8"
+	lightswitch = 0
 
 /area/maintenance/groundbase/substation
 	name = "Substation"