diff --git a/maps/groundbase/gb-z1.dmm b/maps/groundbase/gb-z1.dmm
index 220df4f124..33381f7b71 100644
--- a/maps/groundbase/gb-z1.dmm
+++ b/maps/groundbase/gb-z1.dmm
@@ -2027,6 +2027,10 @@
 /area/groundbase/command/ai/hall)
 "fs" = (
 /obj/machinery/computer/timeclock/premade/east,
+/obj/machinery/computer/guestpass{
+	dir = 1;
+	pixel_y = -22
+	},
 /turf/simulated/floor/tiled,
 /area/groundbase/civilian/foodplace)
 "ft" = (
@@ -3384,6 +3388,10 @@
 /obj/machinery/light{
 	dir = 4
 	},
+/obj/machinery/computer/guestpass{
+	dir = 1;
+	pixel_y = -22
+	},
 /turf/simulated/floor/tiled,
 /area/groundbase/engineering/lobby)
 "jc" = (
@@ -3905,13 +3913,13 @@
 /turf/simulated/floor/tiled,
 /area/groundbase/civilian/gateway)
 "ks" = (
-/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
+/obj/structure/disposalpipe/segment,
+/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
 	dir = 8
 	},
-/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
+/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
 	dir = 4
 	},
-/obj/structure/disposalpipe/segment,
 /turf/simulated/floor/tiled/dark,
 /area/groundbase/security/halls)
 "kt" = (
@@ -4505,6 +4513,10 @@
 /obj/random/tech_supply,
 /obj/random/tech_supply,
 /obj/random/tech_supply,
+/obj/machinery/computer/guestpass{
+	dir = 8;
+	pixel_x = 25
+	},
 /turf/simulated/floor/tiled,
 /area/groundbase/civilian/toolstorage)
 "lH" = (
@@ -6398,6 +6410,13 @@
 "qN" = (
 /turf/simulated/floor/tiled,
 /area/groundbase/engineering/eva)
+"qO" = (
+/obj/machinery/computer/guestpass{
+	dir = 1;
+	pixel_y = -22
+	},
+/turf/simulated/floor/tiled/white,
+/area/groundbase/medical/lhallway)
 "qQ" = (
 /obj/structure/closet/secure_closet/security,
 /obj/item/device/holowarrant,
@@ -8380,6 +8399,15 @@
 	},
 /turf/simulated/floor/tiled/dark,
 /area/groundbase/security/halle)
+"vZ" = (
+/obj/machinery/alarm{
+	dir = 4
+	},
+/obj/machinery/computer/guestpass{
+	pixel_y = 24
+	},
+/turf/simulated/floor/tiled/dark,
+/area/groundbase/security/halls)
 "wa" = (
 /obj/effect/floor_decal/industrial/danger{
 	dir = 8
@@ -9038,6 +9066,10 @@
 /area/groundbase/medical/or2)
 "xD" = (
 /obj/effect/floor_decal/industrial/danger/corner,
+/obj/machinery/computer/guestpass{
+	dir = 4;
+	pixel_x = -25
+	},
 /turf/simulated/floor/tiled,
 /area/groundbase/engineering/engine)
 "xE" = (
@@ -12586,6 +12618,12 @@
 	},
 /turf/simulated/floor/lino,
 /area/groundbase/civilian/bar)
+"GZ" = (
+/obj/machinery/computer/guestpass{
+	pixel_y = 23
+	},
+/turf/simulated/floor/tiled/dark,
+/area/groundbase/civilian/bar)
 "Ha" = (
 /obj/machinery/holoplant,
 /obj/machinery/atmospherics/pipe/manifold/hidden/supply,
@@ -13752,6 +13790,10 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /obj/structure/disposalpipe/segment,
+/obj/machinery/light/floortube{
+	dir = 1;
+	pixel_y = 5
+	},
 /turf/simulated/floor/tiled/dark,
 /area/groundbase/civilian/bar)
 "JY" = (
@@ -15097,6 +15139,9 @@
 /area/groundbase/engineering/atmos)
 "Nl" = (
 /obj/effect/landmark/start/detective,
+/obj/machinery/computer/guestpass{
+	pixel_y = 24
+	},
 /turf/simulated/floor/tiled/dark,
 /area/groundbase/security/lobby)
 "Nm" = (
@@ -18363,6 +18408,10 @@
 /obj/item/weapon/stool/padded{
 	dir = 8
 	},
+/obj/machinery/light/floortube{
+	dir = 8;
+	pixel_x = -6
+	},
 /turf/simulated/floor/lino,
 /area/groundbase/civilian/cafe)
 "Wh" = (
@@ -18517,6 +18566,16 @@
 	outdoors = 0
 	},
 /area/maintenance/groundbase/level1/nwtunnel)
+"WC" = (
+/obj/structure/cable/yellow{
+	icon_state = "1-2"
+	},
+/obj/machinery/computer/guestpass{
+	dir = 1;
+	pixel_y = -22
+	},
+/turf/simulated/floor/tiled,
+/area/groundbase/civilian/gateway)
 "WD" = (
 /obj/machinery/door/firedoor,
 /obj/machinery/door/airlock/glass_medical{
@@ -25384,7 +25443,7 @@ MO
 MO
 MO
 pj
-ht
+GZ
 ht
 ht
 ht
@@ -26028,7 +26087,7 @@ Tk
 rY
 gC
 aR
-BY
+vZ
 SP
 Al
 aR
@@ -27968,7 +28027,7 @@ fC
 pB
 pB
 aG
-pB
+WC
 bh
 AZ
 AZ
@@ -30930,7 +30989,7 @@ Ap
 jn
 IY
 Gu
-wA
+qO
 nb
 ZG
 pK
diff --git a/maps/groundbase/gb-z2.dmm b/maps/groundbase/gb-z2.dmm
index d0ff482422..e33707e582 100644
--- a/maps/groundbase/gb-z2.dmm
+++ b/maps/groundbase/gb-z2.dmm
@@ -1100,6 +1100,14 @@
 	},
 /turf/simulated/floor/lino,
 /area/groundbase/civilian/chapel/office)
+"dg" = (
+/obj/structure/table/standard,
+/obj/machinery/computer/guestpass{
+	dir = 1;
+	pixel_y = -22
+	},
+/turf/simulated/floor/tiled/eris/cafe,
+/area/groundbase/civilian/kitchen)
 "dh" = (
 /obj/structure/bed/chair/sofa/corp/left,
 /obj/machinery/atmospherics/unary/vent_scrubber/on,
@@ -5793,6 +5801,13 @@
 	},
 /turf/simulated/floor/tiled/eris/cafe,
 /area/groundbase/civilian/kitchen)
+"ry" = (
+/obj/machinery/computer/guestpass{
+	dir = 1;
+	pixel_y = -22
+	},
+/turf/simulated/floor/tiled/white,
+/area/groundbase/medical/triage)
 "rA" = (
 /obj/structure/cable/yellow{
 	icon_state = "1-2"
@@ -7855,6 +7870,13 @@
 /obj/machinery/atmospherics/pipe/manifold/hidden/supply,
 /turf/simulated/floor/tiled,
 /area/rnd/xenobiology)
+"ya" = (
+/obj/machinery/computer/guestpass{
+	dir = 8;
+	pixel_x = 25
+	},
+/turf/simulated/floor/tiled,
+/area/groundbase/science/hall)
 "yb" = (
 /obj/machinery/door/firedoor,
 /turf/simulated/floor/tiled,
@@ -8841,6 +8863,10 @@
 "AX" = (
 /obj/structure/table/woodentable,
 /obj/random/coin/sometimes,
+/obj/item/device/flashlight/lamp/green{
+	pixel_x = 1;
+	pixel_y = 5
+	},
 /turf/simulated/floor/wood,
 /area/groundbase/civilian/library)
 "AY" = (
@@ -9641,6 +9667,9 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 4
 	},
+/obj/machinery/computer/guestpass{
+	pixel_y = 24
+	},
 /turf/simulated/floor/tiled,
 /area/groundbase/cargo/office)
 "Ds" = (
@@ -12766,6 +12795,16 @@
 /obj/machinery/vending/hydronutrients,
 /turf/simulated/floor/tiled,
 /area/groundbase/civilian/hydroponics)
+"Mp" = (
+/obj/structure/disposalpipe/segment,
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/machinery/computer/guestpass{
+	dir = 8;
+	pixel_x = 25
+	},
+/turf/simulated/floor/tiled/white,
+/area/groundbase/medical/lobby)
 "Mq" = (
 /obj/structure/cable/yellow{
 	icon_state = "1-2"
@@ -13165,6 +13204,9 @@
 /turf/simulated/floor/tiled/dark,
 /area/groundbase/civilian/chapel)
 "Nw" = (
+/obj/machinery/light/small{
+	dir = 8
+	},
 /turf/simulated/floor/outdoors/grass/virgo3c,
 /area/groundbase/medical/triage)
 "Nx" = (
@@ -13549,6 +13591,10 @@
 /area/groundbase/civilian/kitchen)
 "OA" = (
 /obj/structure/closet/secure_closet/hydroponics,
+/obj/machinery/computer/guestpass{
+	dir = 4;
+	pixel_x = -25
+	},
 /turf/simulated/floor/tiled,
 /area/groundbase/civilian/hydroponics)
 "OB" = (
@@ -15769,10 +15815,23 @@
 /turf/simulated/floor/tiled,
 /area/groundbase/science/circuits)
 "UY" = (
-/obj/machinery/light/bigfloorlamp,
-/obj/machinery/light/small,
-/turf/simulated/floor/outdoors/grass/virgo3c,
-/area/groundbase/medical/Chemistry)
+/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/disposalpipe/segment{
+	dir = 4
+	},
+/obj/machinery/computer/guestpass{
+	pixel_y = 23
+	},
+/turf/simulated/floor/tiled/dark,
+/area/groundbase/dorms)
 "Vb" = (
 /turf/simulated/floor/tiled,
 /area/groundbase/civilian/janitor)
@@ -16304,6 +16363,10 @@
 /area/groundbase/civilian/library)
 "WA" = (
 /obj/structure/table/woodentable,
+/obj/item/device/flashlight/lamp/green{
+	pixel_x = 1;
+	pixel_y = 5
+	},
 /turf/simulated/floor/wood,
 /area/groundbase/civilian/library)
 "WB" = (
@@ -16313,6 +16376,7 @@
 /turf/simulated/floor/tiled,
 /area/groundbase/science/rnd)
 "WD" = (
+/obj/machinery/light/small,
 /turf/simulated/floor/outdoors/grass/virgo3c,
 /area/medical/virology)
 "WE" = (
@@ -16581,10 +16645,14 @@
 /turf/simulated/floor/tiled,
 /area/groundbase/science/server)
 "XA" = (
-/obj/machinery/light/small,
-/obj/machinery/light/small,
-/turf/simulated/floor/outdoors/grass/virgo3c,
-/area/groundbase/medical/Chemistry)
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/machinery/computer/guestpass{
+	dir = 4;
+	pixel_x = -25
+	},
+/turf/simulated/floor/tiled/dark,
+/area/groundbase/civilian/bar)
 "XB" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /obj/machinery/atmospherics/pipe/manifold/hidden/supply{
@@ -21231,7 +21299,7 @@ Yl
 DZ
 PU
 Ea
-AK
+XA
 AK
 cl
 ib
@@ -22811,7 +22879,7 @@ qz
 VV
 GL
 Vf
-qQ
+dg
 rk
 Zi
 bl
@@ -23569,7 +23637,7 @@ eS
 oC
 Xl
 QL
-Vr
+ya
 nK
 OG
 OE
@@ -24452,7 +24520,7 @@ EU
 ZT
 uy
 eC
-pK
+UY
 hr
 AO
 Yp
@@ -28758,7 +28826,7 @@ gt
 jl
 DO
 qh
-mY
+Mp
 mY
 hs
 bv
@@ -30186,7 +30254,7 @@ ol
 ID
 ol
 nR
-nR
+ry
 cR
 to
 to
@@ -31164,8 +31232,8 @@ to
 to
 NC
 to
-UY
-XA
+vb
+UI
 sW
 sW
 ki
diff --git a/maps/groundbase/gb-z3.dmm b/maps/groundbase/gb-z3.dmm
index ad29f7ac46..eba6592a67 100644
--- a/maps/groundbase/gb-z3.dmm
+++ b/maps/groundbase/gb-z3.dmm
@@ -68,6 +68,18 @@
 /obj/structure/closet/secure_closet/pilot,
 /turf/simulated/floor/tiled,
 /area/groundbase/civilian/pilot)
+"bM" = (
+/obj/structure/cable/yellow{
+	icon_state = "1-2"
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/machinery/computer/guestpass{
+	dir = 8;
+	pixel_x = 25
+	},
+/turf/simulated/floor/tiled/white,
+/area/groundbase/medical/uhallway)
 "bS" = (
 /obj/structure/table/rack/shelf,
 /obj/item/weapon/tank/oxygen,
@@ -15469,7 +15481,7 @@ SJ
 VG
 EJ
 wB
-Ph
+bM
 HU
 DI
 qC
diff --git a/maps/groundbase/groundbase_areas.dm b/maps/groundbase/groundbase_areas.dm
index 97ada4062c..fa1662ff2a 100644
--- a/maps/groundbase/groundbase_areas.dm
+++ b/maps/groundbase/groundbase_areas.dm
@@ -218,6 +218,7 @@
 	name = "Psychiatrist's Office"
 /area/groundbase/medical/Chemistry
 	name = "Chemistry"
+	lightswitch = 1
 /area/groundbase/medical/triage
 	name = "Medical Triage"
 	lightswitch = 1
@@ -228,6 +229,7 @@
 	name = "Resleeving"
 /area/groundbase/medical/autoresleeving
 	name = "Auto-Resleeving"
+	lightswitch = 1
 /area/groundbase/medical/or1
 	name = "Medical Operating Room 1"
 /area/groundbase/medical/or2
@@ -328,13 +330,15 @@
 /area/groundbase/civilian/cafe
 	name = "Cafe"
 	sound_env = SMALL_SOFTFLOOR
+	lightswitch = 1
 /area/groundbase/civilian/hydroponics
 	name = "Hydroponics"
+	lightswitch = 1
 /area/groundbase/civilian/hydroponics/out
 	name = "Hydroponics Animal Pen"
-	lightswitch = 1
 /area/groundbase/civilian/kitchen
 	name = "Kitchen"
+	lightswitch = 1
 /area/groundbase/civilian/kitchen/freezer
 	name = "Kitchen Freezer"
 /area/groundbase/civilian/kitchen/backroom
@@ -342,6 +346,7 @@
 /area/groundbase/civilian/chapel
 	name = "Chapel"
 	ambience = AMBIENCE_CHAPEL
+	lightswitch = 1
 /area/groundbase/civilian/chapel/office
 	name = "Chaplain's Office"
 /area/groundbase/civilian/library