diff --git a/code/modules/planet/virgo3c_vr.dm b/code/modules/planet/virgo3c_vr.dm
index d3c37710d27..61fef30e80e 100644
--- a/code/modules/planet/virgo3c_vr.dm
+++ b/code/modules/planet/virgo3c_vr.dm
@@ -53,7 +53,7 @@ var/datum/planet/virgo3c/planet_virgo3c = null
 	var/min = 0
 
 	switch(sun_position)
-		if(0 to 0.475) // Night
+		if(0 to 0.3) // Night
 			low_brightness = 0.3
 			low_color = "#000066"
 
@@ -61,7 +61,7 @@ var/datum/planet/virgo3c/planet_virgo3c = null
 			high_color = "#66004D"
 			min = 0
 
-		if(0.475 to 0.50) // Twilight
+		if(0.3 to 0.35) // Twilight
 			low_brightness = 0.5
 			low_color = "#66004D"
 
@@ -69,7 +69,7 @@ var/datum/planet/virgo3c/planet_virgo3c = null
 			high_color = "#CC3300"
 			min = 0.40
 
-		if(0.50 to 0.525) // Sunrise/set
+		if(0.35 to 0.45) // Sunrise/set
 			low_brightness = 0.9
 			low_color = "#CC3300"
 
@@ -77,7 +77,7 @@ var/datum/planet/virgo3c/planet_virgo3c = null
 			high_color = "#FF9933"
 			min = 0.50
 
-		if(0.525 to 1.00) // Noon
+		if(0.45 to 1.00) // Noon
 			low_brightness = 3.0
 			low_color = "#DDDDDD"
 
diff --git a/maps/groundbase/gb-z1.dmm b/maps/groundbase/gb-z1.dmm
index bdea78e1772..a1ac0ffd563 100644
--- a/maps/groundbase/gb-z1.dmm
+++ b/maps/groundbase/gb-z1.dmm
@@ -241,7 +241,7 @@
 	pixel_x = 32
 	},
 /turf/simulated/floor/outdoors/grass/virgo3c,
-/area/groundbase/unexplored/outdoors)
+/area/groundbase/level1/se)
 "aE" = (
 /obj/machinery/shieldgen,
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
@@ -427,6 +427,9 @@
 	},
 /turf/simulated/floor/outdoors/newdirt/virgo3c,
 /area/groundbase/level1/centsquare)
+"bg" = (
+/turf/simulated/wall,
+/area/groundbase/civilian/womensrestroom)
 "bh" = (
 /obj/structure/cable/yellow{
 	icon_state = "1-8"
@@ -454,6 +457,13 @@
 /obj/structure/cable/yellow,
 /turf/simulated/floor/tiled/dark,
 /area/groundbase/medical/autoresleeving)
+"bm" = (
+/obj/machinery/door/airlock{
+	id_tag = "z1stall3";
+	name = "Women's Restroom Stall"
+	},
+/turf/simulated/floor/tiled/steel_ridged,
+/area/groundbase/civilian/womensrestroom)
 "bn" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /turf/simulated/floor/tiled,
@@ -646,6 +656,21 @@
 	},
 /turf/simulated/floor/tiled,
 /area/groundbase/civilian/apparel)
+"bM" = (
+/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
+	dir = 4
+	},
+/obj/structure/cable/yellow{
+	icon_state = "2-8"
+	},
+/obj/effect/floor_decal/corner/pink{
+	dir = 6
+	},
+/obj/structure/sign/painting/library_secure{
+	pixel_x = 30
+	},
+/turf/simulated/floor/tiled/white,
+/area/groundbase/civilian/womensrestroom)
 "bO" = (
 /obj/structure/table/bench/steel,
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
@@ -859,6 +884,23 @@
 	outdoors = 0
 	},
 /area/maintenance/groundbase/level1/nwtunnel)
+"cp" = (
+/obj/machinery/atmospherics/unary/vent_scrubber/on{
+	dir = 8
+	},
+/obj/effect/floor_decal/rust,
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/power/apc{
+	dir = 4
+	},
+/obj/structure/cable/yellow{
+	icon_state = "0-8"
+	},
+/obj/machinery/light/small{
+	dir = 1
+	},
+/turf/simulated/floor/tiled/asteroid_steel,
+/area/groundbase/civilian/mensrestroom)
 "cq" = (
 /obj/structure/table/standard,
 /obj/random/tech_supply,
@@ -1949,6 +1991,12 @@
 	},
 /turf/simulated/floor/tiled/steel_ridged,
 /area/groundbase/command/ai/hall)
+"fa" = (
+/obj/machinery/light/small{
+	dir = 4
+	},
+/turf/simulated/floor/outdoors/grass/virgo3c,
+/area/groundbase/civilian/mensrestroom)
 "fb" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /turf/simulated/floor/tiled/dark,
@@ -2019,6 +2067,18 @@
 	},
 /turf/simulated/floor,
 /area/maintenance/groundbase/substation/aiciv)
+"fl" = (
+/obj/structure/sink{
+	pixel_y = 20
+	},
+/obj/structure/mirror{
+	pixel_y = 37
+	},
+/obj/effect/floor_decal/corner/pink{
+	dir = 5
+	},
+/turf/simulated/floor/tiled/white,
+/area/groundbase/civilian/womensrestroom)
 "fm" = (
 /turf/simulated/floor/tiled/dark/virgo3c{
 	edge_blending_priority = -1;
@@ -2485,6 +2545,9 @@
 /obj/structure/railing/grey,
 /turf/simulated/floor/outdoors/sidewalk/slab/virgo3c,
 /area/groundbase/level1/northspur)
+"gu" = (
+/turf/simulated/floor/outdoors/grass/virgo3c,
+/area/groundbase/level1/se)
 "gv" = (
 /turf/simulated/wall/r_wall,
 /area/groundbase/security/hos)
@@ -2501,6 +2564,16 @@
 /obj/machinery/atmospherics/pipe/manifold/hidden/supply,
 /turf/simulated/floor/tiled,
 /area/groundbase/engineering/engine)
+"gy" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/machinery/alarm{
+	dir = 8
+	},
+/obj/effect/floor_decal/corner/pink{
+	dir = 6
+	},
+/turf/simulated/floor/tiled/white,
+/area/groundbase/civilian/womensrestroom)
 "gz" = (
 /turf/simulated/floor/tiled/dark,
 /area/groundbase/security/hos)
@@ -2758,6 +2831,16 @@
 	},
 /turf/simulated/floor/outdoors/grass/virgo3c,
 /area/groundbase/level1/centsquare)
+"hh" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/effect/floor_decal/corner/pink{
+	dir = 9
+	},
+/obj/structure/sign/painting/library_secure{
+	pixel_x = -30
+	},
+/turf/simulated/floor/tiled/white,
+/area/groundbase/civilian/womensrestroom)
 "hi" = (
 /obj/machinery/recharger/wallcharger{
 	pixel_x = 4;
@@ -5420,6 +5503,18 @@
 	},
 /turf/simulated/wall,
 /area/groundbase/medical/autoresleeving)
+"nN" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	dir = 6
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 6
+	},
+/obj/structure/cable/yellow{
+	icon_state = "2-4"
+	},
+/turf/simulated/floor/outdoors/sidewalk/slab/virgo3c,
+/area/groundbase/level1/se)
 "nO" = (
 /obj/machinery/suit_cycler,
 /turf/simulated/floor/tiled,
@@ -5431,6 +5526,18 @@
 /obj/structure/disposalpipe/segment,
 /turf/simulated/floor/tiled,
 /area/groundbase/engineering/workshop)
+"nQ" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	dir = 8
+	},
+/obj/structure/cable/yellow{
+	icon_state = "4-8"
+	},
+/turf/simulated/floor/tiled/white,
+/area/groundbase/civilian/womensrestroom)
 "nR" = (
 /obj/machinery/light{
 	dir = 4
@@ -5451,6 +5558,9 @@
 "nU" = (
 /obj/structure/table/reinforced,
 /obj/item/device/paicard,
+/obj/machinery/recharger{
+	pixel_y = 5
+	},
 /turf/simulated/floor/tiled,
 /area/groundbase/civilian/foodplace)
 "nV" = (
@@ -5774,6 +5884,13 @@
 	outdoors = 0
 	},
 /area/maintenance/groundbase/level1/nwtunnel)
+"oL" = (
+/obj/machinery/door/airlock{
+	id_tag = "z1stall1";
+	name = "Women's Restroom Stall"
+	},
+/turf/simulated/floor/tiled/steel_ridged,
+/area/groundbase/civilian/womensrestroom)
 "oM" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 4
@@ -5814,6 +5931,13 @@
 "oP" = (
 /turf/simulated/wall,
 /area/groundbase/level1/northspur)
+"oQ" = (
+/obj/structure/table/glass,
+/obj/machinery/recharger{
+	pixel_y = 5
+	},
+/turf/simulated/floor/tiled/dark,
+/area/groundbase/civilian/bar)
 "oR" = (
 /obj/machinery/light{
 	dir = 8
@@ -5979,6 +6103,17 @@
 	},
 /turf/simulated/floor/tiled/dark,
 /area/groundbase/security/halle)
+"po" = (
+/obj/structure/toilet,
+/obj/machinery/button/remote/airlock{
+	dir = 4;
+	id = "z1stall3";
+	pixel_x = -27;
+	specialfunctions = 4
+	},
+/obj/machinery/light/small,
+/turf/simulated/floor/tiled/white,
+/area/groundbase/civilian/womensrestroom)
 "pp" = (
 /mob/living/simple_mob/vore/alienanimals/catslug/custom/engislug{
 	ghostjoin = 1
@@ -6513,6 +6648,15 @@
 "qE" = (
 /turf/simulated/mineral/cave/virgo3c,
 /area/groundbase/level1/ne)
+"qF" = (
+/obj/structure/table/reinforced,
+/obj/machinery/cell_charger{
+	pixel_y = 7
+	},
+/obj/item/weapon/cell/high,
+/obj/item/weapon/cell/high,
+/turf/simulated/floor/tiled,
+/area/groundbase/cargo/mining)
 "qG" = (
 /obj/structure/disposalpipe/segment{
 	dir = 8;
@@ -6702,6 +6846,22 @@
 	},
 /turf/simulated/floor/tiled/dark,
 /area/groundbase/security/iaa1)
+"rg" = (
+/obj/structure/sink{
+	pixel_y = 20
+	},
+/obj/structure/mirror{
+	pixel_y = 37
+	},
+/obj/machinery/atmospherics/unary/vent_scrubber/on,
+/obj/machinery/light{
+	dir = 4
+	},
+/obj/effect/floor_decal/corner/pink/full{
+	dir = 1
+	},
+/turf/simulated/floor/tiled/white,
+/area/groundbase/civilian/womensrestroom)
 "rh" = (
 /obj/machinery/recharge_station,
 /obj/machinery/atmospherics/unary/vent_scrubber/on{
@@ -7110,6 +7270,9 @@
 	},
 /turf/simulated/floor/tiled/white,
 /area/groundbase/medical/equipment)
+"si" = (
+/turf/simulated/floor/outdoors/grass/virgo3c,
+/area/groundbase/civilian/womensrestroom)
 "sj" = (
 /obj/structure/cable/yellow{
 	icon_state = "0-4"
@@ -7123,6 +7286,27 @@
 	},
 /turf/simulated/floor,
 /area/groundbase/engineering/storage)
+"sk" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	dir = 8
+	},
+/obj/structure/mirror{
+	icon_state = "mirror_broke";
+	pixel_y = 37
+	},
+/obj/structure/sink/kitchen{
+	pixel_y = 16
+	},
+/obj/effect/floor_decal/rust,
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/cable/yellow{
+	icon_state = "4-8"
+	},
+/obj/machinery/firealarm{
+	dir = 1
+	},
+/turf/simulated/floor/tiled/asteroid_steel,
+/area/groundbase/civilian/mensrestroom)
 "sl" = (
 /obj/machinery/camera/network/engineering{
 	dir = 4
@@ -7171,6 +7355,17 @@
 	},
 /turf/simulated/floor/tiled/dark,
 /area/groundbase/security/lobby)
+"sr" = (
+/obj/structure/toilet,
+/obj/machinery/button/remote/airlock{
+	dir = 4;
+	id = "z1stall1";
+	pixel_x = -27;
+	specialfunctions = 4
+	},
+/obj/machinery/light/small,
+/turf/simulated/floor/tiled/white,
+/area/groundbase/civilian/womensrestroom)
 "ss" = (
 /obj/structure/cable{
 	icon_state = "1-2"
@@ -7387,6 +7582,7 @@
 /obj/structure/window/reinforced{
 	dir = 1
 	},
+/obj/structure/ore_box,
 /turf/simulated/floor/tiled,
 /area/groundbase/cargo/mining)
 "sR" = (
@@ -7518,6 +7714,9 @@
 	},
 /turf/simulated/floor/tiled,
 /area/groundbase/security/processing)
+"tj" = (
+/turf/simulated/wall,
+/area/groundbase/civilian/mensrestroom)
 "tk" = (
 /obj/structure/cable{
 	icon_state = "2-4"
@@ -7794,6 +7993,11 @@
 /obj/machinery/atmospherics/unary/vent_scrubber/on,
 /turf/simulated/floor/tiled/dark,
 /area/groundbase/security/armory)
+"tT" = (
+/turf/simulated/floor/outdoors/grass/virgo3c{
+	outdoors = 0
+	},
+/area/groundbase/unexplored/outdoors)
 "tU" = (
 /obj/machinery/mineral/stacking_unit_console{
 	density = 0;
@@ -7856,6 +8060,22 @@
 	},
 /turf/simulated/floor/tiled/dark,
 /area/groundbase/security/detective)
+"ue" = (
+/obj/machinery/door/airlock{
+	name = "Men's Restroom"
+	},
+/obj/machinery/door/firedoor,
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	dir = 8
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 4
+	},
+/obj/structure/cable/yellow{
+	icon_state = "4-8"
+	},
+/turf/simulated/floor/bmarble,
+/area/groundbase/civilian/mensrestroom)
 "uf" = (
 /obj/structure/table/standard,
 /obj/item/weapon/stock_parts/subspace/sub_filter,
@@ -8281,6 +8501,21 @@
 /obj/structure/stairs/spawner/east,
 /turf/simulated/floor/tiled/dark,
 /area/groundbase/civilian/bar)
+"vl" = (
+/obj/machinery/light/small,
+/obj/structure/toilet/prison{
+	dir = 4
+	},
+/obj/machinery/button/remote/airlock{
+	dir = 4;
+	id = "z1stall4";
+	pixel_x = -27;
+	specialfunctions = 4
+	},
+/obj/effect/floor_decal/rust,
+/obj/effect/decal/cleanable/dirt,
+/turf/simulated/floor/tiled/asteroid_steel,
+/area/groundbase/civilian/mensrestroom)
 "vm" = (
 /obj/machinery/smartfridge/drinks,
 /turf/simulated/floor/lino,
@@ -8308,6 +8543,18 @@
 "vq" = (
 /turf/simulated/floor/tiled,
 /area/groundbase/engineering/ce)
+"vr" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	dir = 8
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 4
+	},
+/obj/structure/cable/yellow{
+	icon_state = "4-8"
+	},
+/turf/simulated/floor/outdoors/sidewalk/side/virgo3c,
+/area/groundbase/civilian/mensrestroom)
 "vs" = (
 /obj/structure/cable/yellow{
 	icon_state = "1-2"
@@ -8484,6 +8731,23 @@
 	},
 /turf/simulated/floor/tiled/steel_ridged,
 /area/groundbase/security/halls)
+"vI" = (
+/obj/machinery/atmospherics/unary/vent_pump/on{
+	dir = 8
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	dir = 8
+	},
+/obj/effect/floor_decal/rust,
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/cable/yellow{
+	icon_state = "4-8"
+	},
+/obj/machinery/alarm{
+	pixel_y = 28
+	},
+/turf/simulated/floor/tiled/asteroid_steel,
+/area/groundbase/civilian/mensrestroom)
 "vJ" = (
 /obj/effect/landmark/arrivals,
 /turf/simulated/floor/tiled/techfloor,
@@ -8709,6 +8973,16 @@
 "wl" = (
 /turf/simulated/wall/r_wall,
 /area/groundbase/security/lobby)
+"wm" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/machinery/light{
+	dir = 4
+	},
+/obj/effect/floor_decal/corner/pink{
+	dir = 6
+	},
+/turf/simulated/floor/tiled/white,
+/area/groundbase/civilian/womensrestroom)
 "wn" = (
 /obj/structure/bed/chair/sofa/bench,
 /obj/effect/landmark/start/visitor,
@@ -9055,6 +9329,21 @@
 /obj/machinery/light,
 /turf/simulated/floor/bluegrid,
 /area/groundbase/command/ai/storage)
+"xe" = (
+/obj/machinery/light/small,
+/obj/structure/toilet/prison{
+	dir = 8
+	},
+/obj/machinery/button/remote/airlock{
+	dir = 4;
+	id = "z1stall4";
+	pixel_x = -27;
+	specialfunctions = 4
+	},
+/obj/effect/floor_decal/rust,
+/obj/effect/decal/cleanable/dirt,
+/turf/simulated/floor/tiled/asteroid_steel,
+/area/groundbase/civilian/mensrestroom)
 "xf" = (
 /obj/machinery/power/breakerbox/activated{
 	RCon_tag = "Engineering Substation Bypass"
@@ -9310,6 +9599,12 @@
 	},
 /turf/simulated/floor/lino,
 /area/groundbase/civilian/bar)
+"xF" = (
+/obj/effect/floor_decal/corner/pink{
+	dir = 10
+	},
+/turf/simulated/floor/tiled/white,
+/area/groundbase/civilian/womensrestroom)
 "xG" = (
 /obj/machinery/telecomms/processor/preset_one,
 /obj/machinery/atmospherics/pipe/simple/hidden/black{
@@ -9527,6 +9822,13 @@
 	},
 /turf/simulated/floor/bluegrid,
 /area/groundbase/command/ai/upload)
+"yk" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/effect/floor_decal/corner/pink{
+	dir = 9
+	},
+/turf/simulated/floor/tiled/white,
+/area/groundbase/civilian/womensrestroom)
 "yl" = (
 /obj/machinery/door/firedoor,
 /obj/machinery/door/airlock/engineering{
@@ -9796,6 +10098,18 @@
 	},
 /turf/simulated/floor/carpet/sblucarpet,
 /area/groundbase/security/iaa2)
+"yU" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	dir = 8
+	},
+/obj/structure/cable/yellow{
+	icon_state = "4-8"
+	},
+/turf/simulated/floor/outdoors/sidewalk/side/virgo3c,
+/area/groundbase/civilian/womensrestroom)
 "yV" = (
 /obj/machinery/station_map{
 	pixel_y = 32
@@ -9862,6 +10176,17 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /turf/simulated/floor/bmarble,
 /area/groundbase/civilian/toolstorage)
+"zc" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/machinery/power/apc{
+	dir = 4
+	},
+/obj/structure/cable/yellow,
+/obj/effect/floor_decal/corner/pink{
+	dir = 6
+	},
+/turf/simulated/floor/tiled/white,
+/area/groundbase/civilian/womensrestroom)
 "zd" = (
 /obj/structure/cable/yellow{
 	icon_state = "1-2"
@@ -10289,6 +10614,9 @@
 	pixel_x = 1;
 	pixel_y = -1
 	},
+/obj/machinery/recharger{
+	pixel_y = 5
+	},
 /turf/simulated/floor/tiled,
 /area/groundbase/civilian/gateway)
 "zZ" = (
@@ -10735,6 +11063,15 @@
 "Bh" = (
 /turf/unsimulated/wall/planetary/virgo3c,
 /area/groundbase/level1/se)
+"Bj" = (
+/obj/machinery/door/airlock{
+	id_tag = "z1stall5";
+	name = "Men's Restroom Stall"
+	},
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/floor_decal/rust,
+/turf/simulated/floor/tiled/steel_ridged,
+/area/groundbase/civilian/mensrestroom)
 "Bk" = (
 /turf/simulated/floor/outdoors/newdirt_nograss{
 	outdoors = 0
@@ -10829,6 +11166,14 @@
 	outdoors = 0
 	},
 /area/maintenance/groundbase/level1/nwtunnel)
+"Bv" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/structure/cable/yellow{
+	icon_state = "1-2"
+	},
+/turf/simulated/floor/outdoors/sidewalk/virgo3c,
+/area/groundbase/level1/se)
 "Bw" = (
 /obj/item/weapon/stool/padded{
 	dir = 4
@@ -11672,6 +12017,15 @@
 	},
 /turf/simulated/floor/outdoors/sidewalk/side/virgo3c,
 /area/groundbase/level1/northspur)
+"DB" = (
+/obj/machinery/door/airlock{
+	id_tag = "z1stall4";
+	name = "Men's Restroom Stall"
+	},
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/floor_decal/rust,
+/turf/simulated/floor/tiled/steel_ridged,
+/area/groundbase/civilian/mensrestroom)
 "DC" = (
 /obj/structure/bookcase,
 /obj/item/weapon/book/manual/security_space_law,
@@ -12319,6 +12673,19 @@
 	},
 /turf/simulated/floor/tiled,
 /area/groundbase/cargo/mining)
+"Fl" = (
+/obj/machinery/atmospherics/pipe/manifold/hidden/supply,
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	dir = 8
+	},
+/obj/structure/cable/yellow{
+	icon_state = "4-8"
+	},
+/obj/effect/floor_decal/corner/pink{
+	dir = 9
+	},
+/turf/simulated/floor/tiled/white,
+/area/groundbase/civilian/womensrestroom)
 "Fm" = (
 /obj/structure/cable{
 	icon_state = "2-4"
@@ -12750,6 +13117,18 @@
 	},
 /turf/simulated/floor/tiled/dark,
 /area/groundbase/security/armory)
+"Gt" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 10
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	dir = 8
+	},
+/obj/structure/cable/yellow{
+	icon_state = "4-8"
+	},
+/turf/simulated/floor/tiled/white,
+/area/groundbase/civilian/womensrestroom)
 "Gu" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
 	dir = 8
@@ -12876,6 +13255,18 @@
 	},
 /turf/simulated/floor,
 /area/maintenance/groundbase/substation/medcargo)
+"GM" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 10
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	dir = 10
+	},
+/obj/structure/cable/yellow{
+	icon_state = "2-8"
+	},
+/turf/simulated/floor/outdoors/sidewalk/slab/virgo3c,
+/area/groundbase/level1/centsquare)
 "GN" = (
 /obj/machinery/mech_recharger,
 /turf/simulated/floor/tiled/dark,
@@ -13318,6 +13709,16 @@
 /obj/structure/disposalpipe/trunk,
 /turf/simulated/floor/tiled/white,
 /area/groundbase/medical/lhallway)
+"HO" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/effect/floor_decal/corner/pink{
+	dir = 6
+	},
+/obj/structure/sign/painting/library_secure{
+	pixel_x = 30
+	},
+/turf/simulated/floor/tiled/white,
+/area/groundbase/civilian/womensrestroom)
 "HP" = (
 /obj/structure/disposalpipe/segment{
 	dir = 8;
@@ -13953,6 +14354,22 @@
 	outdoors = 0
 	},
 /area/groundbase/civilian/clown)
+"Jz" = (
+/obj/structure/sink{
+	pixel_y = 20
+	},
+/obj/structure/mirror{
+	pixel_y = 37
+	},
+/obj/machinery/atmospherics/unary/vent_pump/on,
+/obj/machinery/light{
+	dir = 8
+	},
+/obj/effect/floor_decal/corner/pink/full{
+	dir = 8
+	},
+/turf/simulated/floor/tiled/white,
+/area/groundbase/civilian/womensrestroom)
 "JA" = (
 /obj/machinery/computer/secure_data{
 	dir = 4
@@ -14369,6 +14786,21 @@
 /obj/structure/disposalpipe/segment,
 /turf/simulated/floor/tiled/steel_ridged,
 /area/groundbase/engineering/workshop)
+"Kt" = (
+/obj/machinery/door/airlock{
+	id_tag = "z1stall2";
+	name = "Women's Restroom Stall"
+	},
+/turf/simulated/floor/tiled/steel_ridged,
+/area/groundbase/civilian/womensrestroom)
+"Ku" = (
+/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/slab/virgo3c,
+/area/groundbase/level1/centsquare)
 "Kv" = (
 /obj/machinery/hologram/holopad,
 /turf/simulated/floor/tiled,
@@ -14452,6 +14884,18 @@
 	},
 /turf/simulated/floor/tiled,
 /area/groundbase/civilian/gateway)
+"KH" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	dir = 8
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 4
+	},
+/obj/structure/cable/yellow{
+	icon_state = "4-8"
+	},
+/turf/simulated/floor/outdoors/sidewalk/side/virgo3c,
+/area/groundbase/level1/se)
 "KI" = (
 /obj/random/vendorall,
 /turf/simulated/floor/tiled,
@@ -14564,11 +15008,10 @@
 /turf/simulated/floor/tiled/white,
 /area/groundbase/medical/equipment)
 "KZ" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
-	dir = 9
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
-	dir = 9
+/obj/machinery/atmospherics/pipe/manifold/hidden/supply,
+/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers,
+/obj/structure/cable/yellow{
+	icon_state = "1-4"
 	},
 /turf/simulated/floor/outdoors/sidewalk/slab/virgo3c,
 /area/groundbase/level1/centsquare)
@@ -15502,6 +15945,10 @@
 /area/groundbase/medical/or2)
 "Nj" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/universal,
+/obj/structure/table/reinforced,
+/obj/machinery/recharger{
+	pixel_y = 5
+	},
 /turf/simulated/floor/tiled,
 /area/groundbase/cargo/mining)
 "Nk" = (
@@ -16636,6 +17083,22 @@
 	},
 /turf/simulated/wall,
 /area/groundbase/civilian/bar)
+"Qp" = (
+/obj/machinery/door/firedoor,
+/obj/machinery/door/airlock{
+	name = "Women's Restroom"
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	dir = 8
+	},
+/obj/structure/cable/yellow{
+	icon_state = "4-8"
+	},
+/turf/simulated/floor/bmarble,
+/area/groundbase/civilian/womensrestroom)
 "Qq" = (
 /turf/simulated/wall/r_wall,
 /area/maintenance/groundbase/level1/swtunnel)
@@ -16701,6 +17164,18 @@
 	},
 /turf/simulated/floor,
 /area/maintenance/groundbase/trashpit)
+"QB" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 5
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	dir = 5
+	},
+/obj/structure/cable/yellow{
+	icon_state = "1-4"
+	},
+/turf/simulated/floor/outdoors/sidewalk/slab/virgo3c,
+/area/groundbase/level1/centsquare)
 "QC" = (
 /turf/simulated/floor/tiled/white,
 /area/groundbase/medical/equipment)
@@ -16816,6 +17291,17 @@
 /obj/machinery/pipedispenser/disposal,
 /turf/simulated/floor/tiled,
 /area/groundbase/engineering/atmos)
+"QV" = (
+/obj/structure/toilet,
+/obj/machinery/button/remote/airlock{
+	dir = 4;
+	id = "z1stall2";
+	pixel_x = -27;
+	specialfunctions = 4
+	},
+/obj/machinery/light/small,
+/turf/simulated/floor/tiled/white,
+/area/groundbase/civilian/womensrestroom)
 "QW" = (
 /obj/structure/cable{
 	icon_state = "1-2"
@@ -17994,6 +18480,18 @@
 	},
 /turf/simulated/floor/tiled/dark,
 /area/groundbase/security/lobby)
+"TK" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	dir = 8
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 4
+	},
+/obj/structure/cable/yellow{
+	icon_state = "4-8"
+	},
+/turf/simulated/floor/outdoors/sidewalk/side/virgo3c,
+/area/groundbase/level1/centsquare)
 "TL" = (
 /obj/structure/table/rack/steel,
 /obj/item/weapon/stock_parts/matter_bin,
@@ -18067,6 +18565,13 @@
 	},
 /turf/simulated/floor/tiled,
 /area/groundbase/security/processing)
+"TV" = (
+/obj/machinery/atmospherics/unary/vent_pump/on{
+	dir = 1
+	},
+/obj/effect/floor_decal/corner/pink/full,
+/turf/simulated/floor/tiled/white,
+/area/groundbase/civilian/womensrestroom)
 "TW" = (
 /obj/structure/cable{
 	icon_state = "4-8"
@@ -18127,6 +18632,19 @@
 	},
 /turf/simulated/floor/tiled/dark,
 /area/groundbase/security/equipment)
+"Ue" = (
+/obj/machinery/atmospherics/unary/vent_scrubber/on{
+	dir = 1
+	},
+/obj/machinery/light{
+	dir = 4
+	},
+/obj/effect/floor_decal/corner/pink/full{
+	dir = 4
+	},
+/obj/structure/flora/pottedplant/orientaltree,
+/turf/simulated/floor/tiled/white,
+/area/groundbase/civilian/womensrestroom)
 "Uf" = (
 /turf/simulated/wall,
 /area/groundbase/civilian/foodplace)
@@ -18142,6 +18660,14 @@
 	},
 /turf/simulated/floor/tiled/techfloor,
 /area/groundbase/command/ai/storage)
+"Uh" = (
+/obj/machinery/firealarm{
+	dir = 1
+	},
+/obj/effect/floor_decal/corner/pink/full,
+/obj/structure/flora/pottedplant/orientaltree,
+/turf/simulated/floor/tiled/white,
+/area/groundbase/civilian/womensrestroom)
 "Ui" = (
 /obj/effect/landmark{
 	name = "JoinLateCyborg"
@@ -18960,6 +19486,12 @@
 	outdoors = 0
 	},
 /area/groundbase/level1/nw)
+"Wy" = (
+/obj/machinery/light/small{
+	dir = 4
+	},
+/turf/simulated/floor/outdoors/grass/virgo3c,
+/area/groundbase/civilian/womensrestroom)
 "Wz" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
 	dir = 8
@@ -19022,6 +19554,21 @@
 	},
 /turf/simulated/floor/tiled/techfloor/grid,
 /area/groundbase/command/ai/foyer)
+"WH" = (
+/obj/structure/cable/yellow{
+	icon_state = "2-8"
+	},
+/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
+	dir = 4
+	},
+/obj/structure/cable/yellow{
+	icon_state = "1-8"
+	},
+/turf/simulated/floor/outdoors/sidewalk/slab/virgo3c,
+/area/groundbase/level1/centsquare)
 "WI" = (
 /obj/machinery/camera/network/civilian,
 /turf/simulated/floor/tiled,
@@ -19124,6 +19671,13 @@
 	},
 /turf/simulated/floor/tiled/white,
 /area/groundbase/medical/lhallway)
+"WT" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/effect/floor_decal/corner/pink{
+	dir = 8
+	},
+/turf/simulated/floor/tiled/white,
+/area/groundbase/civilian/womensrestroom)
 "WU" = (
 /obj/machinery/vending/fishing,
 /obj/machinery/light{
@@ -19913,6 +20467,9 @@
 /obj/structure/cable/yellow{
 	icon_state = "1-4"
 	},
+/obj/structure/cable/yellow{
+	icon_state = "2-4"
+	},
 /turf/simulated/floor/outdoors/sidewalk/slab/virgo3c,
 /area/groundbase/level1/centsquare)
 "YX" = (
@@ -24324,7 +24881,7 @@ ht
 KR
 GF
 GF
-GF
+oQ
 uF
 pj
 ce
@@ -28684,12 +29241,12 @@ MO
 MO
 MO
 MO
-eR
+tT
 tG
-tG
-tG
-Rn
-Rn
+WL
+WL
+WB
+WB
 Rn
 WB
 WB
@@ -30305,14 +30862,14 @@ ay
 ay
 ay
 YW
-Oz
-Oz
-Oz
-Oz
-Oz
-Oz
-Oz
-Oz
+ay
+ay
+ay
+ay
+ay
+ay
+ay
+ay
 KZ
 Eb
 Eb
@@ -30455,7 +31012,7 @@ eR
 eR
 eR
 Eb
-Zh
+TK
 Eb
 Eb
 Nv
@@ -30597,7 +31154,7 @@ eR
 eR
 eR
 Eb
-Zh
+TK
 Eb
 Eb
 Nv
@@ -30739,7 +31296,7 @@ eR
 eR
 eR
 Io
-Zh
+TK
 Eb
 Nv
 Eb
@@ -30881,7 +31438,7 @@ pc
 eR
 eR
 US
-Zh
+TK
 Lk
 Eb
 Eb
@@ -31023,12 +31580,12 @@ pc
 eR
 eR
 Hx
-OA
-Vs
-Vs
-Vs
-Vs
-OA
+GM
+ay
+ay
+ay
+ay
+QB
 Vs
 Vs
 Vs
@@ -31170,7 +31727,7 @@ Gv
 Ge
 Eb
 Eb
-Zh
+TK
 Eb
 Eb
 qI
@@ -31252,7 +31809,7 @@ pF
 oN
 SB
 dH
-Mo
+qF
 pF
 Go
 Mo
@@ -31312,7 +31869,7 @@ eR
 eR
 eR
 eR
-Zh
+TK
 Eb
 Eb
 Eb
@@ -31454,7 +32011,7 @@ eR
 eR
 eR
 eR
-Zh
+TK
 Eb
 Nv
 Eb
@@ -31596,7 +32153,7 @@ pc
 pc
 pc
 eR
-Zh
+TK
 Eb
 Nv
 Nv
@@ -31738,7 +32295,7 @@ pc
 pc
 eR
 eR
-Zh
+TK
 Eb
 Nv
 Nv
@@ -31880,7 +32437,7 @@ pc
 eR
 eR
 eR
-Zh
+TK
 Eb
 Eb
 Nv
@@ -32018,15 +32575,15 @@ pc
 eR
 eR
 pc
-eR
-eR
-eR
-eR
-OA
-OA
-Eb
-Eb
-Eb
+nN
+Bv
+Bv
+Bv
+WH
+Ku
+ay
+ay
+QB
 Nv
 Eb
 Eb
@@ -32159,17 +32716,17 @@ pc
 pc
 pc
 eR
-eR
-eR
-eR
-eR
+gu
+KH
+gu
+gu
 aD
 GQ
 Mj
 Eb
-Eb
-Eb
-Eb
+si
+yU
+Wy
 Eb
 Lt
 Lt
@@ -32301,24 +32858,24 @@ eR
 eR
 eR
 eR
-eR
-Eb
+fa
+vr
 Lt
 Lt
 ua
 IS
 IS
-ua
-Lt
-Lt
-Lt
-Lt
-Lt
-Lt
-Lt
-Lt
-Lt
-Lt
+bg
+bg
+Qp
+bg
+bg
+bg
+bg
+bg
+bg
+bg
+bg
 Lt
 Lt
 Lt
@@ -32443,24 +33000,24 @@ eR
 eR
 eR
 eR
-eR
-Lt
-Lt
-Lt
-Lt
-Lt
-Lt
-Lt
-Lt
-Lt
-Lt
-Lt
-Lt
-Lt
-Lt
-Lt
-Lt
-Lt
+tj
+ue
+tj
+tj
+tj
+ua
+ua
+bg
+Jz
+Fl
+Uh
+bg
+sr
+bg
+QV
+bg
+po
+bg
 Lt
 Lt
 Lt
@@ -32585,24 +33142,24 @@ eR
 eR
 eR
 eR
-eR
-Lt
-Lt
-Lt
-Lt
-Lt
-Lt
-Lt
-Lt
-Lt
-Lt
-Lt
-Lt
-Lt
-Lt
-Lt
+tj
+vI
+DB
+vl
+tj
 Lt
 Lt
+bg
+fl
+nQ
+xF
+bg
+oL
+bg
+Kt
+bg
+bm
+bg
 Lt
 Lt
 Lt
@@ -32727,24 +33284,24 @@ Eb
 Eb
 Eb
 Eb
+tj
+sk
+tj
+tj
+tj
 Lt
 Lt
-Lt
-Lt
-Lt
-Lt
-Lt
-Lt
-Lt
-Lt
-Lt
-Lt
-Lt
-Lt
-Lt
-Lt
-Lt
-Lt
+bg
+fl
+Gt
+WT
+hh
+yk
+hh
+yk
+hh
+TV
+bg
 Lt
 Lt
 Lt
@@ -32869,24 +33426,24 @@ Eb
 FE
 lZ
 lZ
+tj
+cp
+Bj
+xe
+tj
 Lt
 Lt
-Lt
-Lt
-Lt
-Lt
-Lt
-Lt
-Lt
-Lt
-Lt
-Lt
-Lt
-Lt
-Lt
-Lt
-Lt
-Lt
+bg
+rg
+bM
+zc
+HO
+wm
+HO
+gy
+HO
+Ue
+bg
 Lt
 Lt
 Lt
diff --git a/maps/groundbase/gb-z2.dmm b/maps/groundbase/gb-z2.dmm
index 5b085bdfb9d..eed9013bad8 100644
--- a/maps/groundbase/gb-z2.dmm
+++ b/maps/groundbase/gb-z2.dmm
@@ -45,14 +45,11 @@
 /turf/simulated/floor/outdoors/grass/virgo3c,
 /area/groundbase/science/picnic)
 "ai" = (
-/obj/machinery/firealarm{
-	dir = 4
+/obj/machinery/door/airlock{
+	id_tag = null;
+	name = "Bathroom"
 	},
-/obj/structure/disposalpipe/trunk{
-	dir = 8
-	},
-/obj/machinery/disposal,
-/turf/simulated/floor/wood,
+/turf/simulated/floor/tiled/steel_ridged,
 /area/groundbase/dorms/room2)
 "ak" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/cyan,
@@ -95,6 +92,8 @@
 /area/groundbase/level2/ne)
 "ar" = (
 /obj/machinery/light,
+/obj/structure/bed/double/padded,
+/obj/item/weapon/bedsheet/browndouble,
 /turf/simulated/floor/wood,
 /area/groundbase/dorms/room3)
 "as" = (
@@ -135,6 +134,7 @@
 "ax" = (
 /obj/structure/closet/secure_closet/personal,
 /obj/item/weapon/towel/random,
+/obj/item/weapon/storage/backpack,
 /turf/simulated/floor/wood,
 /area/groundbase/dorms/room7)
 "ay" = (
@@ -227,13 +227,10 @@
 /turf/simulated/floor/wood,
 /area/groundbase/command/captain)
 "aN" = (
-/obj/machinery/fitness/punching_bag/clown,
 /obj/structure/disposalpipe/trunk{
 	dir = 1
 	},
 /obj/machinery/disposal,
-/obj/structure/bed/double/padded,
-/obj/item/weapon/bedsheet/clowndouble,
 /obj/machinery/light_switch{
 	dir = 4;
 	pixel_x = -30
@@ -250,8 +247,8 @@
 /turf/simulated/floor/tiled,
 /area/groundbase/civilian/janitor)
 "aP" = (
-/obj/structure/bed/double/padded,
-/obj/item/weapon/bedsheet/clowndouble,
+/obj/structure/table/woodentable,
+/obj/machinery/microwave,
 /turf/simulated/floor/wood,
 /area/groundbase/dorms/room4)
 "aQ" = (
@@ -345,8 +342,8 @@
 /turf/simulated/floor/carpet,
 /area/groundbase/civilian/library)
 "aW" = (
-/obj/structure/bed/chair/sofa/corp/right,
 /obj/machinery/atmospherics/unary/vent_scrubber/on,
+/obj/structure/table/woodentable,
 /turf/simulated/floor/wood,
 /area/groundbase/dorms/room2)
 "aX" = (
@@ -395,10 +392,8 @@
 /turf/simulated/floor/reinforced,
 /area/rnd/xenobiology)
 "bc" = (
+/obj/structure/bed/chair/sofa/corp/right,
 /obj/machinery/atmospherics/unary/vent_scrubber/on,
-/obj/machinery/fitness/punching_bag/clown,
-/obj/structure/bed/double/padded,
-/obj/item/weapon/bedsheet/clowndouble,
 /turf/simulated/floor/wood,
 /area/groundbase/dorms/room4)
 "be" = (
@@ -466,7 +461,7 @@
 /area/rnd/xenobiology)
 "bk" = (
 /obj/structure/cable/yellow{
-	icon_state = "1-8"
+	icon_state = "1-2"
 	},
 /turf/simulated/floor/lino,
 /area/groundbase/civilian/chapel/office)
@@ -476,7 +471,7 @@
 "bn" = (
 /obj/machinery/door/airlock{
 	id_tag = null;
-	name = "Restroom"
+	name = "Unisex Restroom"
 	},
 /obj/structure/cable/yellow{
 	icon_state = "1-2"
@@ -833,14 +828,14 @@
 /turf/simulated/floor/tiled,
 /area/rnd/xenobiology)
 "co" = (
-/obj/machinery/power/apc{
-	dir = 8
+/obj/machinery/shower{
+	pixel_y = 16
 	},
-/obj/structure/cable/yellow{
-	icon_state = "0-4"
+/obj/structure/curtain/open/shower,
+/turf/simulated/floor/tiled{
+	icon_state = "techmaint"
 	},
-/turf/simulated/floor/wood,
-/area/groundbase/dorms/room3)
+/area/groundbase/dorms/room1)
 "cp" = (
 /obj/structure/filingcabinet/filingcabinet,
 /turf/simulated/floor/tiled,
@@ -902,6 +897,7 @@
 /turf/simulated/floor/tiled/dark,
 /area/groundbase/science/hall)
 "cA" = (
+/obj/machinery/vending/wardrobe/chapdrobe,
 /turf/simulated/floor/lino,
 /area/groundbase/civilian/chapel/office)
 "cB" = (
@@ -946,17 +942,14 @@
 /turf/simulated/floor/tiled/white,
 /area/medical/virology)
 "cI" = (
-/obj/structure/bed/double/padded,
-/obj/item/weapon/bedsheet/clowndouble,
-/obj/machinery/power/apc{
-	dir = 4;
-	nightshift_setting = 2
+/obj/machinery/shower{
+	pixel_y = 16
 	},
-/obj/structure/cable/yellow{
-	icon_state = "0-2"
+/obj/structure/curtain/open/shower,
+/turf/simulated/floor/tiled{
+	icon_state = "techmaint"
 	},
-/turf/simulated/floor/wood,
-/area/groundbase/dorms/room4)
+/area/groundbase/dorms/room2)
 "cK" = (
 /turf/simulated/floor/outdoors/grass/forest/virgo3c,
 /area/groundbase/unexplored/outdoors)
@@ -1091,14 +1084,8 @@
 /area/groundbase/science/robotics)
 "df" = (
 /obj/structure/table/woodentable,
-/obj/item/device/flashlight/lamp{
-	pixel_x = 2;
-	pixel_y = 7
-	},
-/obj/machinery/atmospherics/unary/vent_scrubber/on,
-/obj/machinery/alarm{
-	dir = 4
-	},
+/obj/item/weapon/reagent_containers/food/drinks/bottle/holywater,
+/obj/item/weapon/nullrod,
 /turf/simulated/floor/lino,
 /area/groundbase/civilian/chapel/office)
 "dg" = (
@@ -1238,6 +1225,15 @@
 	},
 /turf/simulated/floor/wood,
 /area/groundbase/dorms/room2)
+"dB" = (
+/obj/machinery/firealarm{
+	dir = 8
+	},
+/obj/structure/closet/secure_closet/personal,
+/obj/item/weapon/towel/random,
+/obj/item/weapon/storage/backpack,
+/turf/simulated/floor/wood,
+/area/groundbase/dorms/room5)
 "dE" = (
 /turf/simulated/open,
 /area/groundbase/cargo/office)
@@ -1482,11 +1478,22 @@
 /turf/simulated/floor/outdoors/grass/virgo3c,
 /area/groundbase/level2/ne)
 "eu" = (
-/obj/structure/sign/painting/chapel_secure{
-	pixel_y = 30
+/obj/effect/floor_decal/steeldecal/steel_decals10{
+	dir = 9
 	},
-/turf/simulated/floor/tiled/dark,
-/area/groundbase/civilian/chapel)
+/obj/effect/floor_decal/steeldecal/steel_decals10{
+	dir = 10
+	},
+/obj/machinery/light{
+	dir = 8
+	},
+/obj/machinery/door/window/southleft{
+	dir = 1;
+	name = "shower door";
+	req_access = null
+	},
+/turf/simulated/floor/tiled/white,
+/area/groundbase/dorms/room1)
 "ev" = (
 /obj/structure/cable/yellow{
 	icon_state = "4-8"
@@ -1633,16 +1640,9 @@
 /turf/simulated/open/virgo3c,
 /area/groundbase/level2/westspur)
 "eO" = (
-/obj/structure/table/woodentable,
-/obj/item/weapon/paper_bin{
-	pixel_x = -2;
-	pixel_y = 8
+/obj/structure/sign/painting/chapel_secure{
+	pixel_y = 30
 	},
-/obj/item/weapon/pen/blue{
-	pixel_x = 2;
-	pixel_y = 1
-	},
-/obj/machinery/atmospherics/unary/vent_pump/on,
 /turf/simulated/floor/lino,
 /area/groundbase/civilian/chapel/office)
 "eP" = (
@@ -1653,8 +1653,8 @@
 /turf/simulated/floor/tiled/white,
 /area/groundbase/medical/lobby)
 "eR" = (
-/obj/structure/bed/chair/sofa/corp/left,
 /obj/machinery/atmospherics/unary/vent_scrubber/on,
+/obj/structure/table/woodentable,
 /turf/simulated/floor/wood,
 /area/groundbase/dorms/room1)
 "eS" = (
@@ -1671,8 +1671,11 @@
 /turf/simulated/floor/tiled,
 /area/groundbase/science/xenobot)
 "eU" = (
+/obj/structure/cable/yellow{
+	icon_state = "1-4"
+	},
 /obj/structure/table/woodentable,
-/obj/machinery/microwave,
+/obj/random/donkpocketbox,
 /turf/simulated/floor/wood,
 /area/groundbase/dorms/room1)
 "eV" = (
@@ -1705,20 +1708,18 @@
 /area/medical/virology)
 "fb" = (
 /obj/structure/cable/yellow{
-	icon_state = "4-8"
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
-	dir = 9
+	icon_state = "1-8"
 	},
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 4
 	},
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	dir = 9
+	},
 /obj/structure/disposalpipe/segment{
 	dir = 2;
 	icon_state = "pipe-c"
 	},
-/obj/structure/bed/double/padded,
-/obj/item/weapon/bedsheet/clowndouble,
 /turf/simulated/floor/wood,
 /area/groundbase/dorms/room4)
 "fc" = (
@@ -1751,9 +1752,16 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /turf/simulated/floor/tiled,
 /area/groundbase/command/hop)
+"fh" = (
+/obj/machinery/firealarm,
+/turf/simulated/floor/tiled/dark,
+/area/groundbase/civilian/chapel)
 "fj" = (
+/obj/machinery/power/apc{
+	dir = 1
+	},
 /obj/structure/cable/yellow{
-	icon_state = "1-2"
+	icon_state = "0-2"
 	},
 /turf/simulated/floor/lino,
 /area/groundbase/civilian/chapel/office)
@@ -1832,6 +1840,12 @@
 	},
 /turf/simulated/floor/tiled,
 /area/groundbase/command/hop)
+"fv" = (
+/obj/structure/sign/painting/chapel_secure{
+	pixel_y = 30
+	},
+/turf/simulated/floor/tiled/dark,
+/area/groundbase/civilian/chapel)
 "fx" = (
 /obj/structure/cable/yellow{
 	icon_state = "0-4"
@@ -1903,6 +1917,7 @@
 /obj/machinery/light{
 	dir = 1
 	},
+/obj/machinery/atmospherics/unary/vent_pump/on,
 /turf/simulated/floor/wood,
 /area/groundbase/dorms/room6)
 "fI" = (
@@ -1991,9 +2006,12 @@
 /turf/simulated/floor/bmarble,
 /area/medical/virology)
 "fO" = (
-/obj/structure/disposalpipe/segment{
-	dir = 8;
-	icon_state = "pipe-c"
+/obj/structure/disposalpipe/trunk{
+	dir = 8
+	},
+/obj/machinery/disposal,
+/obj/machinery/firealarm{
+	dir = 4
 	},
 /turf/simulated/floor/wood,
 /area/groundbase/dorms/room2)
@@ -2112,13 +2130,16 @@
 	},
 /area/groundbase/cargo/office)
 "gq" = (
-/obj/structure/cable/yellow{
-	icon_state = "2-4"
+/obj/structure/table/woodentable,
+/obj/item/weapon/paper_bin{
+	pixel_x = -2;
+	pixel_y = 8
 	},
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
-	dir = 10
+/obj/item/weapon/pen/blue{
+	pixel_x = 2;
+	pixel_y = 1
 	},
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/machinery/atmospherics/unary/vent_pump/on,
 /turf/simulated/floor/lino,
 /area/groundbase/civilian/chapel/office)
 "gs" = (
@@ -2185,8 +2206,11 @@
 /turf/simulated/floor/tiled,
 /area/rnd/xenobiology)
 "gA" = (
-/obj/structure/disposalpipe/segment{
-	dir = 4
+/obj/structure/bed/chair/wood{
+	dir = 1
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	dir = 8
 	},
 /turf/simulated/floor/lino,
 /area/groundbase/civilian/chapel/office)
@@ -2272,13 +2296,14 @@
 "gP" = (
 /obj/machinery/button/remote/airlock{
 	dir = 4;
-	id = "dorm4";
+	id = "dorm6";
 	pixel_x = -27;
 	specialfunctions = 4
 	},
+/obj/structure/cable/yellow{
+	icon_state = "2-4"
+	},
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/obj/structure/bed/double/padded,
-/obj/item/weapon/bedsheet/clowndouble,
 /turf/simulated/floor/wood,
 /area/groundbase/dorms/room4)
 "gQ" = (
@@ -2298,6 +2323,9 @@
 /obj/machinery/disposal,
 /turf/simulated/floor/wood,
 /area/groundbase/civilian/library)
+"gS" = (
+/turf/simulated/floor/tiled/white,
+/area/groundbase/dorms/room8)
 "gT" = (
 /obj/machinery/firealarm,
 /obj/machinery/light{
@@ -3176,11 +3204,13 @@
 /turf/simulated/floor/wood,
 /area/groundbase/dorms/room5)
 "jq" = (
-/obj/machinery/alarm{
-	dir = 4
+/obj/structure/table/woodentable,
+/obj/random/donkpocketbox,
+/obj/structure/cable/yellow{
+	icon_state = "1-8"
 	},
-/turf/simulated/floor/tiled/dark,
-/area/groundbase/civilian/chapel)
+/turf/simulated/floor/wood,
+/area/groundbase/dorms/room2)
 "jr" = (
 /obj/structure/cable/yellow{
 	icon_state = "4-8"
@@ -3223,10 +3253,22 @@
 /turf/simulated/floor/tiled/freezer/cold,
 /area/groundbase/civilian/kitchen/freezer)
 "jx" = (
-/obj/structure/bed/chair/wood/wings,
-/obj/effect/landmark/start/chaplain,
-/turf/simulated/floor/lino,
-/area/groundbase/civilian/chapel/office)
+/obj/effect/floor_decal/steeldecal/steel_decals10{
+	dir = 9
+	},
+/obj/effect/floor_decal/steeldecal/steel_decals10{
+	dir = 10
+	},
+/obj/machinery/light{
+	dir = 4
+	},
+/obj/machinery/door/window/southleft{
+	dir = 1;
+	name = "shower door";
+	req_access = null
+	},
+/turf/simulated/floor/tiled/white,
+/area/groundbase/dorms/room2)
 "jy" = (
 /obj/machinery/gibber,
 /turf/simulated/floor/tiled/freezer/cold,
@@ -3698,6 +3740,13 @@
 	},
 /turf/simulated/floor/tiled/dark,
 /area/groundbase/civilian/chapel)
+"kX" = (
+/obj/structure/table/glass,
+/obj/machinery/recharger{
+	pixel_y = 5
+	},
+/turf/simulated/floor/tiled/dark,
+/area/groundbase/civilian/bar)
 "kY" = (
 /obj/machinery/power/apc{
 	dir = 8
@@ -3756,11 +3805,17 @@
 /turf/simulated/floor/tiled/dark,
 /area/groundbase/command/bridge)
 "le" = (
-/obj/structure/sign/painting/chapel_secure{
-	pixel_y = 30
+/obj/structure/sink{
+	pixel_y = 20
 	},
-/turf/simulated/floor/lino,
-/area/groundbase/civilian/chapel/office)
+/obj/structure/mirror{
+	pixel_y = 37
+	},
+/obj/machinery/alarm{
+	dir = 4
+	},
+/turf/simulated/floor/tiled/white,
+/area/groundbase/dorms/room1)
 "lf" = (
 /obj/structure/table/woodentable,
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
@@ -3949,10 +4004,12 @@
 /turf/simulated/floor/tiled/white,
 /area/groundbase/medical/Chemistry)
 "lI" = (
-/obj/structure/disposalpipe/trunk{
-	dir = 4
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	dir = 5
+	},
+/obj/machinery/firealarm{
+	dir = 8
 	},
-/obj/machinery/disposal,
 /turf/simulated/floor/lino,
 /area/groundbase/civilian/chapel/office)
 "lJ" = (
@@ -3974,6 +4031,9 @@
 /obj/machinery/light{
 	dir = 1
 	},
+/obj/machinery/recharger{
+	pixel_y = 5
+	},
 /turf/simulated/floor/tiled,
 /area/groundbase/science/rnd)
 "lL" = (
@@ -4073,6 +4133,10 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /turf/simulated/floor/tiled,
 /area/groundbase/science/server)
+"ma" = (
+/obj/machinery/photocopier,
+/turf/simulated/floor/lino,
+/area/groundbase/civilian/chapel/office)
 "mb" = (
 /obj/machinery/atmospherics/unary/vent_pump/on{
 	dir = 1
@@ -4089,6 +4153,23 @@
 /obj/machinery/recharge_station,
 /turf/simulated/floor/tiled/white,
 /area/groundbase/medical/lobby)
+"mf" = (
+/obj/effect/floor_decal/steeldecal/steel_decals10{
+	dir = 9
+	},
+/obj/effect/floor_decal/steeldecal/steel_decals10{
+	dir = 10
+	},
+/obj/machinery/light{
+	dir = 8
+	},
+/obj/machinery/door/window/southleft{
+	dir = 1;
+	name = "shower door";
+	req_access = null
+	},
+/turf/simulated/floor/tiled/white,
+/area/groundbase/dorms/room5)
 "mi" = (
 /obj/machinery/computer/med_data{
 	dir = 4
@@ -4296,8 +4377,14 @@
 /obj/machinery/recharge_station,
 /turf/simulated/floor/tiled,
 /area/groundbase/science/robotics)
+"mI" = (
+/obj/structure/toilet{
+	dir = 8
+	},
+/obj/machinery/light,
+/turf/simulated/floor/tiled/white,
+/area/groundbase/dorms/room8)
 "mJ" = (
-/obj/effect/landmark/start/chaplain,
 /turf/simulated/floor/lino,
 /area/groundbase/civilian/chapel/office)
 "mK" = (
@@ -4322,8 +4409,6 @@
 /turf/simulated/floor/tiled/dark,
 /area/groundbase/civilian/bar)
 "mN" = (
-/obj/item/weapon/bedsheet/browndouble,
-/obj/structure/bed/double/padded,
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 9
 	},
@@ -4360,10 +4445,8 @@
 /turf/simulated/floor/tiled/white,
 /area/groundbase/medical/lobby)
 "mU" = (
-/obj/structure/table/woodentable,
-/obj/machinery/microwave,
-/turf/simulated/floor/wood,
-/area/groundbase/dorms/room6)
+/turf/simulated/floor/tiled/white,
+/area/groundbase/dorms/room1)
 "mW" = (
 /obj/item/weapon/storage/box/botanydisk,
 /obj/structure/table/glass,
@@ -4496,9 +4579,7 @@
 /turf/simulated/floor/tiled,
 /area/groundbase/science/rd)
 "nv" = (
-/obj/structure/table/woodentable,
-/obj/machinery/microwave,
-/turf/simulated/floor/wood,
+/turf/simulated/floor/tiled/white,
 /area/groundbase/dorms/room2)
 "nw" = (
 /obj/machinery/vending/wardrobe/robodrobe,
@@ -4739,6 +4820,13 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /turf/simulated/floor/wood,
 /area/groundbase/medical/psych)
+"oj" = (
+/obj/structure/toilet{
+	dir = 8
+	},
+/obj/machinery/light,
+/turf/simulated/floor/tiled/white,
+/area/groundbase/dorms/room6)
 "ok" = (
 /obj/machinery/light,
 /obj/machinery/vending/blood,
@@ -4854,10 +4942,11 @@
 /turf/simulated/floor/tiled/steel_ridged,
 /area/groundbase/medical/lobby)
 "oE" = (
-/obj/machinery/firealarm{
-	dir = 8
+/obj/machinery/door/airlock{
+	id_tag = null;
+	name = "Bathroom"
 	},
-/turf/simulated/floor/wood,
+/turf/simulated/floor/tiled/steel_ridged,
 /area/groundbase/dorms/room3)
 "oF" = (
 /turf/simulated/floor/outdoors/newdirt/virgo3c{
@@ -4884,7 +4973,7 @@
 /area/groundbase/level2/nw)
 "oL" = (
 /obj/structure/table/woodentable,
-/obj/random/donkpocketbox,
+/obj/machinery/microwave,
 /turf/simulated/floor/wood,
 /area/groundbase/dorms/room3)
 "oM" = (
@@ -4941,8 +5030,6 @@
 /turf/simulated/floor/tiled/white,
 /area/medical/virology)
 "oU" = (
-/obj/item/weapon/bedsheet/browndouble,
-/obj/structure/bed/double/padded,
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 5
 	},
@@ -5095,6 +5182,9 @@
 	},
 /turf/simulated/floor/reinforced,
 /area/rnd/xenobiology)
+"pr" = (
+/turf/simulated/floor/tiled/white,
+/area/groundbase/dorms/room6)
 "ps" = (
 /obj/structure/railing/grey{
 	dir = 1
@@ -5259,10 +5349,35 @@
 	},
 /turf/simulated/floor/tiled/dark,
 /area/groundbase/command/hall)
+"pO" = (
+/obj/structure/sink{
+	dir = 4;
+	pixel_x = 11
+	},
+/obj/structure/mirror{
+	dir = 8;
+	pixel_x = 23
+	},
+/turf/simulated/floor/tiled/white,
+/area/groundbase/dorms/room7)
 "pP" = (
 /obj/machinery/transhuman/synthprinter,
 /turf/simulated/floor/tiled,
 /area/groundbase/science/robotics)
+"pU" = (
+/obj/machinery/door/firedoor,
+/obj/machinery/door/airlock{
+	name = "Chapel Office";
+	req_access = list(27)
+	},
+/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,
+/turf/simulated/floor/tiled/steel_ridged,
+/area/groundbase/civilian/chapel)
 "pV" = (
 /obj/structure/cable/yellow{
 	icon_state = "4-8"
@@ -5329,6 +5444,9 @@
 	dir = 4
 	},
 /obj/machinery/light,
+/obj/structure/closet/secure_closet/personal,
+/obj/item/weapon/towel/random,
+/obj/item/weapon/storage/backpack,
 /turf/simulated/floor/wood,
 /area/groundbase/dorms/room2)
 "qg" = (
@@ -5538,9 +5656,10 @@
 /turf/simulated/floor/wood,
 /area/groundbase/dorms/room8)
 "qJ" = (
+/obj/structure/cable/yellow{
+	icon_state = "4-8"
+	},
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/obj/structure/bed/double/padded,
-/obj/item/weapon/bedsheet/clowndouble,
 /turf/simulated/floor/wood,
 /area/groundbase/dorms/room4)
 "qK" = (
@@ -5658,8 +5777,17 @@
 /turf/simulated/floor/carpet,
 /area/groundbase/civilian/library)
 "rc" = (
+/obj/machinery/power/apc{
+	dir = 8
+	},
+/obj/structure/cable/yellow{
+	icon_state = "0-2"
+	},
 /obj/structure/table/woodentable,
-/obj/random/donkpocketbox,
+/obj/machinery/microwave,
+/obj/machinery/atmospherics/unary/vent_pump/on{
+	dir = 4
+	},
 /turf/simulated/floor/wood,
 /area/groundbase/dorms/room1)
 "rf" = (
@@ -5735,6 +5863,19 @@
 	outdoors = 0
 	},
 /area/groundbase/level2/nw)
+"rp" = (
+/obj/structure/closet/wardrobe/chaplain_black,
+/obj/item/weapon/storage/fancy/crayons,
+/obj/item/weapon/flame/candle/candelabra,
+/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)
 "rq" = (
 /obj/structure/cable/yellow{
 	icon_state = "4-8"
@@ -5825,9 +5966,17 @@
 /turf/simulated/floor/tiled,
 /area/groundbase/science/xenobot/storage)
 "rD" = (
-/obj/machinery/firealarm,
-/turf/simulated/floor/tiled/dark,
-/area/groundbase/civilian/chapel)
+/obj/structure/mirror{
+	pixel_y = 37
+	},
+/obj/structure/sink{
+	pixel_y = 20
+	},
+/obj/machinery/alarm{
+	dir = 8
+	},
+/turf/simulated/floor/tiled/white,
+/area/groundbase/dorms/room2)
 "rE" = (
 /obj/machinery/light/small{
 	dir = 1
@@ -5928,6 +6077,23 @@
 /obj/machinery/camera/network/civilian,
 /turf/simulated/floor/tiled,
 /area/groundbase/civilian/hydroponics)
+"rR" = (
+/obj/effect/floor_decal/steeldecal/steel_decals10{
+	dir = 9
+	},
+/obj/effect/floor_decal/steeldecal/steel_decals10{
+	dir = 10
+	},
+/obj/machinery/light{
+	dir = 4
+	},
+/obj/machinery/door/window/southleft{
+	dir = 1;
+	name = "shower door";
+	req_access = null
+	},
+/turf/simulated/floor/tiled/white,
+/area/groundbase/dorms/room6)
 "rT" = (
 /obj/machinery/camera/network/research/xenobio{
 	dir = 4
@@ -5948,6 +6114,12 @@
 	},
 /turf/simulated/floor/tiled,
 /area/rnd/xenobiology)
+"rX" = (
+/obj/structure/closet/secure_closet/personal,
+/obj/item/weapon/towel/random,
+/obj/item/weapon/storage/backpack,
+/turf/simulated/floor/wood,
+/area/groundbase/dorms/room8)
 "rZ" = (
 /obj/machinery/light,
 /turf/simulated/floor/tiled/white,
@@ -6024,8 +6196,9 @@
 /turf/simulated/floor/tiled,
 /area/groundbase/science/hall)
 "so" = (
-/obj/structure/bed/chair/sofa/corp,
 /obj/machinery/alarm,
+/obj/structure/bed/double/padded,
+/obj/item/weapon/bedsheet/browndouble,
 /turf/simulated/floor/wood,
 /area/groundbase/dorms/room2)
 "sp" = (
@@ -6052,6 +6225,18 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /turf/simulated/floor/tiled/dark,
 /area/groundbase/command/bridge)
+"st" = (
+/obj/machinery/shower{
+	pixel_y = 16
+	},
+/obj/structure/curtain/open/shower,
+/obj/structure/window/basic{
+	dir = 8
+	},
+/turf/simulated/floor/tiled{
+	icon_state = "techmaint"
+	},
+/area/groundbase/dorms/room8)
 "su" = (
 /obj/structure/railing/grey{
 	dir = 4
@@ -6066,9 +6251,11 @@
 	icon_state = "2-8"
 	},
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/obj/machinery/light_switch{
-	dir = 8;
-	pixel_x = 30
+/obj/machinery/light{
+	dir = 4
+	},
+/obj/structure/bed/chair/sofa/corp/right{
+	dir = 8
 	},
 /turf/simulated/floor/wood,
 /area/groundbase/dorms/room1)
@@ -6176,14 +6363,9 @@
 /turf/simulated/floor/wood,
 /area/groundbase/command/captain)
 "sL" = (
-/obj/structure/cable/yellow{
-	icon_state = "4-8"
-	},
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 4
 	},
-/obj/structure/bed/double/padded,
-/obj/item/weapon/bedsheet/clowndouble,
 /turf/simulated/floor/wood,
 /area/groundbase/dorms/room4)
 "sM" = (
@@ -6233,7 +6415,7 @@
 /turf/simulated/floor/tiled,
 /area/groundbase/science/xenobot)
 "sU" = (
-/obj/machinery/photocopier,
+/obj/effect/landmark/start/chaplain,
 /turf/simulated/floor/lino,
 /area/groundbase/civilian/chapel/office)
 "sV" = (
@@ -6502,15 +6684,11 @@
 	},
 /area/groundbase/level2/nw)
 "tP" = (
-/obj/structure/bed/double/padded,
-/obj/item/weapon/bedsheet/clowndouble,
-/obj/structure/cable/yellow{
-	icon_state = "1-8"
+/obj/machinery/door/airlock{
+	id_tag = null;
+	name = "Bathroom"
 	},
-/obj/machinery/firealarm{
-	dir = 4
-	},
-/turf/simulated/floor/wood,
+/turf/simulated/floor/tiled/steel_ridged,
 /area/groundbase/dorms/room4)
 "tQ" = (
 /obj/machinery/door/firedoor,
@@ -6617,6 +6795,9 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /turf/simulated/floor/wood,
 /area/groundbase/dorms/room3)
+"uf" = (
+/turf/simulated/floor/tiled/white,
+/area/groundbase/dorms/room7)
 "ug" = (
 /obj/structure/cable/yellow{
 	icon_state = "2-4"
@@ -6791,6 +6972,18 @@
 /obj/machinery/light,
 /turf/simulated/floor/tiled,
 /area/groundbase/science/rd)
+"uH" = (
+/obj/structure/sink{
+	dir = 8;
+	pixel_x = -12;
+	pixel_y = 2
+	},
+/obj/structure/mirror{
+	dir = 4;
+	pixel_x = -23
+	},
+/turf/simulated/floor/tiled/white,
+/area/groundbase/dorms/room8)
 "uI" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 6
@@ -6924,6 +7117,13 @@
 /obj/machinery/atmospherics/unary/vent_pump/on,
 /turf/simulated/floor/tiled,
 /area/groundbase/science/xenohall)
+"vi" = (
+/obj/machinery/light,
+/obj/structure/toilet{
+	dir = 4
+	},
+/turf/simulated/floor/tiled/white,
+/area/groundbase/dorms/room7)
 "vj" = (
 /obj/structure/bed/chair/comfy/blue{
 	dir = 4
@@ -6960,6 +7160,18 @@
 	},
 /turf/simulated/floor/bmarble,
 /area/groundbase/science/hall)
+"vq" = (
+/obj/machinery/shower{
+	pixel_y = 16
+	},
+/obj/structure/curtain/open/shower,
+/obj/structure/window/basic{
+	dir = 4
+	},
+/turf/simulated/floor/tiled{
+	icon_state = "techmaint"
+	},
+/area/groundbase/dorms/room7)
 "vr" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
@@ -6994,6 +7206,12 @@
 	},
 /turf/simulated/floor/tiled/dark,
 /area/groundbase/dorms)
+"vw" = (
+/obj/machinery/alarm{
+	dir = 8
+	},
+/turf/simulated/floor/tiled/white,
+/area/groundbase/dorms/room8)
 "vy" = (
 /obj/structure/railing/grey{
 	dir = 4
@@ -7063,6 +7281,15 @@
 	},
 /turf/simulated/floor/carpet,
 /area/groundbase/civilian/library)
+"vK" = (
+/obj/structure/closet/secure_closet/personal,
+/obj/item/weapon/towel/random,
+/obj/item/weapon/storage/backpack,
+/obj/machinery/firealarm{
+	dir = 4
+	},
+/turf/simulated/floor/wood,
+/area/groundbase/dorms/room6)
 "vL" = (
 /obj/machinery/door/firedoor,
 /obj/machinery/door/window/southright{
@@ -7266,11 +7493,12 @@
 /turf/simulated/floor/tiled/white,
 /area/groundbase/medical/lobby)
 "wk" = (
-/obj/machinery/light_switch{
-	pixel_y = 30
+/obj/machinery/light,
+/obj/structure/toilet{
+	dir = 4
 	},
-/turf/simulated/floor/tiled/dark,
-/area/groundbase/civilian/chapel)
+/turf/simulated/floor/tiled/white,
+/area/groundbase/dorms/room1)
 "wm" = (
 /obj/machinery/computer/supplycomp/control{
 	dir = 8
@@ -7286,6 +7514,10 @@
 	},
 /turf/simulated/floor/tiled,
 /area/groundbase/science/xenobot)
+"wo" = (
+/obj/structure/table/woodentable,
+/turf/simulated/floor/wood,
+/area/groundbase/dorms/room6)
 "wp" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
@@ -8028,13 +8260,19 @@
 /obj/structure/disposalpipe/segment{
 	dir = 4
 	},
+/obj/machinery/light_switch{
+	dir = 1;
+	pixel_y = -30
+	},
 /turf/simulated/floor/wood,
 /area/groundbase/dorms/room1)
 "yC" = (
-/obj/structure/table/woodentable,
-/obj/machinery/microwave,
-/turf/simulated/floor/wood,
-/area/groundbase/dorms/room5)
+/obj/structure/toilet{
+	dir = 8
+	},
+/obj/machinery/light,
+/turf/simulated/floor/tiled/white,
+/area/groundbase/dorms/room2)
 "yE" = (
 /obj/structure/cable/yellow{
 	icon_state = "4-8"
@@ -8333,11 +8571,14 @@
 /turf/simulated/floor/tiled/white,
 /area/groundbase/medical/triage)
 "zG" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
-	dir = 5
+/obj/structure/table/woodentable,
+/obj/item/device/flashlight/lamp{
+	pixel_x = 2;
+	pixel_y = 7
 	},
-/obj/machinery/firealarm{
-	dir = 8
+/obj/machinery/atmospherics/unary/vent_scrubber/on,
+/obj/machinery/alarm{
+	dir = 4
 	},
 /turf/simulated/floor/lino,
 /area/groundbase/civilian/chapel/office)
@@ -8853,7 +9094,17 @@
 /area/groundbase/civilian/library)
 "AY" = (
 /obj/structure/table/woodentable,
-/obj/random/donkpocketbox,
+/obj/machinery/microwave,
+/obj/machinery/atmospherics/unary/vent_pump/on{
+	dir = 8
+	},
+/obj/structure/cable/yellow{
+	icon_state = "0-2"
+	},
+/obj/machinery/power/apc{
+	dir = 4;
+	nightshift_setting = 2
+	},
 /turf/simulated/floor/wood,
 /area/groundbase/dorms/room2)
 "AZ" = (
@@ -8877,14 +9128,15 @@
 	},
 /turf/simulated/open,
 /area/groundbase/civilian/bar)
+"Bc" = (
+/turf/simulated/floor/tiled/white,
+/area/groundbase/dorms/room5)
 "Be" = (
-/obj/machinery/atmospherics/unary/vent_pump/on,
-/obj/structure/barricade/cutout/clown,
-/obj/structure/bed/double/padded,
-/obj/item/weapon/bedsheet/clowndouble,
+/obj/structure/bed/chair/sofa/corp/left,
 /obj/machinery/light{
 	dir = 1
 	},
+/obj/machinery/atmospherics/unary/vent_pump/on,
 /turf/simulated/floor/wood,
 /area/groundbase/dorms/room4)
 "Bf" = (
@@ -9031,10 +9283,9 @@
 /turf/simulated/floor/tiled/dark,
 /area/groundbase/civilian/chapel)
 "BC" = (
-/obj/structure/barricade/cutout/clown,
-/obj/structure/bed/double/padded,
-/obj/item/weapon/bedsheet/clowndouble,
 /obj/machinery/light,
+/obj/structure/bed/double/padded,
+/obj/item/weapon/bedsheet/browndouble,
 /turf/simulated/floor/wood,
 /area/groundbase/dorms/room4)
 "BD" = (
@@ -9140,12 +9391,14 @@
 /turf/simulated/open/virgo3c,
 /area/groundbase/level2/northspur)
 "BX" = (
-/obj/structure/disposalpipe/segment{
-	dir = 2;
-	icon_state = "pipe-c"
+/obj/machinery/shower{
+	pixel_y = 16
 	},
-/turf/simulated/floor/wood,
-/area/groundbase/dorms/room1)
+/obj/structure/curtain/open/shower,
+/turf/simulated/floor/tiled{
+	icon_state = "techmaint"
+	},
+/area/groundbase/dorms/room3)
 "BY" = (
 /obj/structure/mirror{
 	dir = 4;
@@ -9269,7 +9522,8 @@
 /turf/simulated/floor/tiled,
 /area/groundbase/command/hop)
 "Cl" = (
-/obj/structure/table/woodentable,
+/obj/structure/bed/chair/wood/wings,
+/obj/effect/landmark/start/chaplain,
 /turf/simulated/floor/lino,
 /area/groundbase/civilian/chapel/office)
 "Cq" = (
@@ -9551,14 +9805,9 @@
 /turf/simulated/floor/outdoors/newdirt/virgo3c,
 /area/groundbase/level2/ne)
 "Df" = (
-/obj/structure/cable/yellow{
-	icon_state = "4-8"
-	},
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 9
 	},
-/obj/structure/bed/double/padded,
-/obj/item/weapon/bedsheet/clowndouble,
 /turf/simulated/floor/wood,
 /area/groundbase/dorms/room4)
 "Dh" = (
@@ -9821,9 +10070,14 @@
 /turf/simulated/floor/tiled/white,
 /area/groundbase/medical/triage)
 "DN" = (
-/obj/machinery/vending/wardrobe/chapdrobe,
-/turf/simulated/floor/lino,
-/area/groundbase/civilian/chapel/office)
+/obj/machinery/shower{
+	pixel_y = 16
+	},
+/obj/structure/curtain/open/shower,
+/turf/simulated/floor/tiled{
+	icon_state = "techmaint"
+	},
+/area/groundbase/dorms/room4)
 "DO" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
@@ -9832,6 +10086,8 @@
 /area/groundbase/medical/lobby)
 "DP" = (
 /obj/machinery/light,
+/obj/structure/bed/double/padded,
+/obj/item/weapon/bedsheet/browndouble,
 /turf/simulated/floor/wood,
 /area/groundbase/dorms/room5)
 "DQ" = (
@@ -10111,16 +10367,28 @@
 /turf/simulated/open/virgo3c,
 /area/groundbase/level2/southwestspur)
 "EC" = (
-/obj/structure/bed/chair/sofa/corp,
 /obj/machinery/alarm,
+/obj/structure/bed/double/padded,
+/obj/item/weapon/bedsheet/browndouble,
 /turf/simulated/floor/wood,
 /area/groundbase/dorms/room1)
 "ED" = (
-/obj/structure/table/woodentable,
-/obj/item/weapon/reagent_containers/food/drinks/bottle/holywater,
-/obj/item/weapon/nullrod,
-/turf/simulated/floor/lino,
-/area/groundbase/civilian/chapel/office)
+/obj/effect/floor_decal/steeldecal/steel_decals10{
+	dir = 9
+	},
+/obj/effect/floor_decal/steeldecal/steel_decals10{
+	dir = 10
+	},
+/obj/machinery/light{
+	dir = 8
+	},
+/obj/machinery/door/window/southleft{
+	dir = 1;
+	name = "shower door";
+	req_access = null
+	},
+/turf/simulated/floor/tiled/white,
+/area/groundbase/dorms/room3)
 "EE" = (
 /obj/machinery/atmospherics/unary/vent_scrubber/on{
 	dir = 1
@@ -10138,8 +10406,6 @@
 /turf/simulated/floor/tiled,
 /area/groundbase/cargo/office)
 "EH" = (
-/obj/item/weapon/bedsheet/browndouble,
-/obj/structure/bed/double/padded,
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /turf/simulated/floor/wood,
 /area/groundbase/dorms/room1)
@@ -10167,8 +10433,7 @@
 /turf/simulated/floor/tiled,
 /area/groundbase/science/rnd)
 "EN" = (
-/obj/structure/bed/double/padded,
-/obj/item/weapon/bedsheet/clowndouble,
+/obj/structure/bed/chair/sofa/corp,
 /obj/machinery/alarm,
 /turf/simulated/floor/wood,
 /area/groundbase/dorms/room4)
@@ -10341,6 +10606,13 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /turf/simulated/floor/tiled/steel_ridged,
 /area/groundbase/command/hop)
+"Fr" = (
+/obj/machinery/light,
+/obj/structure/toilet{
+	dir = 4
+	},
+/turf/simulated/floor/tiled/white,
+/area/groundbase/dorms/room5)
 "Fs" = (
 /turf/simulated/floor/outdoors/newdirt/virgo3c{
 	outdoors = 0
@@ -10569,6 +10841,18 @@
 	},
 /turf/simulated/floor/tiled,
 /area/groundbase/cargo/office)
+"Gg" = (
+/obj/structure/sink{
+	pixel_y = 20
+	},
+/obj/structure/mirror{
+	pixel_y = 37
+	},
+/obj/machinery/alarm{
+	dir = 4
+	},
+/turf/simulated/floor/tiled/white,
+/area/groundbase/dorms/room5)
 "Gi" = (
 /obj/structure/reagent_dispensers/watertank,
 /obj/item/weapon/reagent_containers/glass/bucket,
@@ -10992,14 +11276,10 @@
 /turf/simulated/floor/outdoors/sidewalk/slab/virgo3c,
 /area/groundbase/level2/nw)
 "Ho" = (
-/obj/machinery/power/apc{
-	dir = 8
-	},
-/obj/structure/cable/yellow{
-	icon_state = "0-4"
-	},
+/obj/structure/table/woodentable,
+/obj/random/donkpocketbox,
 /turf/simulated/floor/wood,
-/area/groundbase/dorms/room5)
+/area/groundbase/dorms/room3)
 "Hp" = (
 /obj/machinery/door/firedoor,
 /obj/machinery/door/airlock/multi_tile/glass{
@@ -11016,6 +11296,10 @@
 	},
 /turf/simulated/floor/carpet,
 /area/groundbase/command/hop)
+"Ht" = (
+/obj/structure/table/woodentable,
+/turf/simulated/floor/wood,
+/area/groundbase/dorms/room5)
 "Hu" = (
 /obj/structure/disposalpipe/segment{
 	dir = 2;
@@ -11137,9 +11421,9 @@
 /turf/simulated/floor/outdoors/grass/virgo3c,
 /area/groundbase/civilian/hydroponics)
 "HI" = (
-/obj/structure/bed/double/padded,
-/obj/item/weapon/bedsheet/clowndouble,
-/obj/machinery/fitness/punching_bag/clown,
+/obj/structure/cable/yellow{
+	icon_state = "4-8"
+	},
 /turf/simulated/floor/wood,
 /area/groundbase/dorms/room4)
 "HJ" = (
@@ -11206,6 +11490,23 @@
 	},
 /turf/simulated/floor/tiled/white,
 /area/groundbase/medical/lobby)
+"HV" = (
+/obj/effect/floor_decal/steeldecal/steel_decals10{
+	dir = 9
+	},
+/obj/effect/floor_decal/steeldecal/steel_decals10{
+	dir = 10
+	},
+/obj/machinery/door/window/southleft{
+	dir = 1;
+	name = "shower door";
+	req_access = null
+	},
+/obj/machinery/alarm{
+	dir = 4
+	},
+/turf/simulated/floor/tiled/white,
+/area/groundbase/dorms/room7)
 "HX" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 4
@@ -11310,16 +11611,30 @@
 /turf/simulated/floor/carpet/bcarpet,
 /area/groundbase/civilian/mime)
 "Im" = (
-/obj/structure/closet/secure_closet/personal,
-/obj/item/weapon/towel/random,
+/obj/structure/table/woodentable,
+/obj/random/donkpocketbox,
+/obj/structure/cable/yellow{
+	icon_state = "0-8"
+	},
+/obj/machinery/power/apc{
+	dir = 4
+	},
 /turf/simulated/floor/wood,
-/area/groundbase/dorms/room3)
+/area/groundbase/dorms/room4)
 "In" = (
 /obj/structure/grille,
 /obj/structure/window/reinforced/full,
 /obj/machinery/door/firedoor,
 /turf/simulated/floor,
 /area/groundbase/civilian/hydroponics)
+"Io" = (
+/obj/structure/table/woodentable,
+/obj/random/donkpocketbox,
+/obj/machinery/power/apc{
+	dir = 8
+	},
+/turf/simulated/floor/wood,
+/area/groundbase/dorms/room5)
 "Ip" = (
 /obj/structure/cable/yellow{
 	icon_state = "4-8"
@@ -11431,6 +11746,13 @@
 	},
 /turf/simulated/floor/tiled,
 /area/groundbase/science/xenobot)
+"IF" = (
+/obj/structure/disposalpipe/trunk{
+	dir = 4
+	},
+/obj/machinery/disposal,
+/turf/simulated/floor/lino,
+/area/groundbase/civilian/chapel/office)
 "IH" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /turf/simulated/floor/tiled/white,
@@ -11489,6 +11811,12 @@
 	},
 /turf/simulated/floor/wood,
 /area/groundbase/civilian/library)
+"IS" = (
+/obj/structure/disposalpipe/segment{
+	dir = 4
+	},
+/turf/simulated/floor/lino,
+/area/groundbase/civilian/chapel/office)
 "IT" = (
 /obj/machinery/hologram/holopad,
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
@@ -11560,14 +11888,22 @@
 /turf/simulated/floor/tiled/dark,
 /area/groundbase/dorms)
 "IY" = (
-/obj/machinery/power/apc{
-	dir = 8
+/obj/effect/floor_decal/steeldecal/steel_decals10{
+	dir = 9
 	},
-/obj/structure/cable/yellow{
-	icon_state = "0-4"
+/obj/effect/floor_decal/steeldecal/steel_decals10{
+	dir = 10
 	},
-/turf/simulated/floor/wood,
-/area/groundbase/dorms/room1)
+/obj/machinery/light{
+	dir = 4
+	},
+/obj/machinery/door/window/southleft{
+	dir = 1;
+	name = "shower door";
+	req_access = null
+	},
+/turf/simulated/floor/tiled/white,
+/area/groundbase/dorms/room4)
 "IZ" = (
 /obj/structure/window/reinforced{
 	dir = 1
@@ -11749,6 +12085,9 @@
 	dir = 4;
 	pixel_x = -30
 	},
+/obj/structure/bed/chair/sofa/corp/left{
+	dir = 4
+	},
 /turf/simulated/floor/wood,
 /area/groundbase/dorms/room2)
 "JB" = (
@@ -11905,11 +12244,6 @@
 /turf/simulated/floor/tiled,
 /area/groundbase/civilian/hydroponics)
 "JY" = (
-/obj/structure/bed/double/padded,
-/obj/item/weapon/bedsheet/clowndouble,
-/obj/structure/cable/yellow{
-	icon_state = "4-8"
-	},
 /turf/simulated/floor/wood,
 /area/groundbase/dorms/room4)
 "JZ" = (
@@ -11921,9 +12255,18 @@
 	},
 /turf/simulated/floor/tiled,
 /area/groundbase/civilian/hydroponics)
+"Ka" = (
+/obj/structure/table/woodentable,
+/obj/random/donkpocketbox,
+/obj/structure/cable/yellow{
+	icon_state = "0-8"
+	},
+/obj/machinery/power/apc{
+	dir = 4
+	},
+/turf/simulated/floor/wood,
+/area/groundbase/dorms/room6)
 "Kc" = (
-/obj/item/weapon/bedsheet/browndouble,
-/obj/structure/bed/double/padded,
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 5
 	},
@@ -12017,7 +12360,7 @@
 /area/groundbase/cargo/office)
 "Kj" = (
 /obj/structure/table/woodentable,
-/obj/random/donkpocketbox,
+/obj/machinery/microwave,
 /turf/simulated/floor/wood,
 /area/groundbase/dorms/room5)
 "Kk" = (
@@ -12048,12 +12391,17 @@
 /turf/simulated/floor/outdoors/sidewalk/slab/virgo3c,
 /area/groundbase/cargo/bay)
 "Kn" = (
-/obj/structure/disposalpipe/segment{
-	dir = 4;
-	icon_state = "pipe-c"
+/obj/structure/sink{
+	pixel_y = 20
 	},
-/turf/simulated/floor/wood,
-/area/groundbase/dorms/room2)
+/obj/structure/mirror{
+	pixel_y = 37
+	},
+/obj/machinery/alarm{
+	dir = 4
+	},
+/turf/simulated/floor/tiled/white,
+/area/groundbase/dorms/room3)
 "Kp" = (
 /obj/machinery/recharge_station,
 /turf/simulated/floor/tiled/dark,
@@ -12109,11 +12457,8 @@
 /turf/simulated/floor/tiled/steel_ridged,
 /area/groundbase/command/bridge)
 "Kx" = (
-/obj/machinery/newscaster{
-	pixel_y = 28
-	},
-/turf/simulated/floor/tiled/dark,
-/area/groundbase/civilian/chapel)
+/turf/simulated/floor/tiled/white,
+/area/groundbase/dorms/room3)
 "Ky" = (
 /obj/structure/sink{
 	dir = 8;
@@ -12369,13 +12714,14 @@
 /obj/machinery/light{
 	dir = 1
 	},
+/obj/machinery/recharger{
+	pixel_y = 5
+	},
 /turf/simulated/floor/tiled,
 /area/groundbase/science/robotics)
 "Lp" = (
-/obj/structure/closet/secure_closet/personal,
-/obj/item/weapon/towel/random,
-/turf/simulated/floor/wood,
-/area/groundbase/dorms/room2)
+/turf/simulated/floor/tiled/white,
+/area/groundbase/dorms/room4)
 "Lq" = (
 /obj/structure/bed/chair/sofa/bench{
 	dir = 1
@@ -12640,7 +12986,7 @@
 /area/medical/virology)
 "LZ" = (
 /obj/structure/table/woodentable,
-/obj/random/donkpocketbox,
+/obj/machinery/microwave,
 /turf/simulated/floor/wood,
 /area/groundbase/dorms/room6)
 "Mb" = (
@@ -12782,14 +13128,11 @@
 /turf/simulated/floor/tiled/dark,
 /area/groundbase/dorms)
 "Mr" = (
-/obj/machinery/firealarm{
-	dir = 8
+/obj/machinery/door/airlock{
+	id_tag = null;
+	name = "Bathroom"
 	},
-/obj/structure/disposalpipe/trunk{
-	dir = 4
-	},
-/obj/machinery/disposal,
-/turf/simulated/floor/wood,
+/turf/simulated/floor/tiled/steel_ridged,
 /area/groundbase/dorms/room1)
 "Ms" = (
 /obj/machinery/portable_atmospherics/canister/oxygen,
@@ -13365,15 +13708,17 @@
 /turf/simulated/floor/tiled,
 /area/groundbase/science/hall)
 "NZ" = (
-/obj/machinery/power/apc{
-	dir = 4;
-	nightshift_setting = 2
+/obj/structure/mirror{
+	pixel_y = 37
 	},
-/obj/structure/cable/yellow{
-	icon_state = "0-8"
+/obj/structure/sink{
+	pixel_y = 20
 	},
-/turf/simulated/floor/wood,
-/area/groundbase/dorms/room6)
+/obj/machinery/alarm{
+	dir = 8
+	},
+/turf/simulated/floor/tiled/white,
+/area/groundbase/dorms/room4)
 "Oa" = (
 /obj/structure/disposalpipe/segment{
 	dir = 4
@@ -13563,15 +13908,12 @@
 /turf/simulated/floor/tiled,
 /area/groundbase/civilian/hydroponics)
 "OB" = (
-/obj/machinery/power/apc{
-	dir = 4;
-	nightshift_setting = 2
+/obj/machinery/light,
+/obj/structure/toilet{
+	dir = 4
 	},
-/obj/structure/cable/yellow{
-	icon_state = "0-8"
-	},
-/turf/simulated/floor/wood,
-/area/groundbase/dorms/room2)
+/turf/simulated/floor/tiled/white,
+/area/groundbase/dorms/room3)
 "OC" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
@@ -13670,8 +14012,12 @@
 /turf/simulated/floor/tiled,
 /area/groundbase/science/robotics)
 "OR" = (
-/obj/structure/table/woodentable,
-/obj/machinery/microwave,
+/obj/machinery/firealarm{
+	dir = 8
+	},
+/obj/structure/closet/secure_closet/personal,
+/obj/item/weapon/towel/random,
+/obj/item/weapon/storage/backpack,
 /turf/simulated/floor/wood,
 /area/groundbase/dorms/room3)
 "OS" = (
@@ -13841,10 +14187,8 @@
 /turf/simulated/floor/tiled/dark,
 /area/groundbase/command/hall)
 "Ps" = (
-/obj/structure/bed/chair/sofa/corp/right,
-/obj/machinery/atmospherics/unary/vent_pump/on,
-/obj/machinery/light{
-	dir = 1
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 10
 	},
 /turf/simulated/floor/wood,
 /area/groundbase/dorms/room1)
@@ -14015,6 +14359,9 @@
 	icon_state = "1-2"
 	},
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/structure/bed/chair/sofa/corp/left{
+	dir = 8
+	},
 /turf/simulated/floor/wood,
 /area/groundbase/dorms/room1)
 "PU" = (
@@ -14381,15 +14728,8 @@
 /turf/simulated/floor/tiled,
 /area/groundbase/science/xenobot)
 "QQ" = (
-/obj/structure/closet/wardrobe/chaplain_black,
-/obj/item/weapon/storage/fancy/crayons,
-/obj/item/weapon/flame/candle/candelabra,
-/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
+/obj/structure/cable/yellow{
+	icon_state = "1-8"
 	},
 /turf/simulated/floor/lino,
 /area/groundbase/civilian/chapel/office)
@@ -14700,9 +15040,9 @@
 /turf/simulated/floor/tiled/white,
 /area/groundbase/medical/triage)
 "RK" = (
-/obj,
-/turf/simulated/open/virgo3c,
-/area/groundbase/level2/northspur)
+/obj/structure/table/woodentable,
+/turf/simulated/floor/wood,
+/area/groundbase/dorms/room3)
 "RL" = (
 /turf/simulated/floor/outdoors/newdirt/virgo3c,
 /area/groundbase/level2/sw)
@@ -15344,9 +15684,12 @@
 /turf/simulated/floor/reinforced,
 /area/rnd/xenobiology)
 "Tx" = (
-/obj/structure/disposalpipe/segment{
-	dir = 1;
-	icon_state = "pipe-c"
+/obj/machinery/disposal,
+/obj/structure/disposalpipe/trunk{
+	dir = 4
+	},
+/obj/machinery/firealarm{
+	dir = 8
 	},
 /turf/simulated/floor/wood,
 /area/groundbase/dorms/room1)
@@ -15359,6 +15702,13 @@
 	},
 /turf/simulated/floor/tiled,
 /area/groundbase/science/circuits)
+"Tz" = (
+/obj/machinery/door/airlock{
+	id_tag = null;
+	name = "Bathroom"
+	},
+/turf/simulated/floor/tiled/steel_ridged,
+/area/groundbase/dorms/room7)
 "TB" = (
 /obj/structure/sign/painting/library_secure{
 	pixel_y = -30
@@ -15400,10 +15750,9 @@
 /turf/simulated/floor/outdoors/grass/virgo3c,
 /area/groundbase/cargo/bay)
 "TJ" = (
-/obj/structure/closet/secure_closet/personal,
-/obj/item/weapon/towel/random,
+/obj/structure/table/woodentable,
 /turf/simulated/floor/wood,
-/area/groundbase/dorms/room5)
+/area/groundbase/dorms/room4)
 "TL" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
@@ -15549,11 +15898,12 @@
 /turf/simulated/floor/reinforced,
 /area/rnd/xenobiology)
 "Uk" = (
-/obj/structure/bed/chair/sofa/corp/left,
-/obj/machinery/atmospherics/unary/vent_pump/on,
 /obj/machinery/light{
 	dir = 1
 	},
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 6
+	},
 /turf/simulated/floor/wood,
 /area/groundbase/dorms/room2)
 "Um" = (
@@ -15584,6 +15934,18 @@
 	},
 /turf/simulated/floor/tiled/eris/cafe,
 /area/groundbase/civilian/kitchen)
+"Uq" = (
+/obj/structure/mirror{
+	pixel_y = 37
+	},
+/obj/structure/sink{
+	pixel_y = 20
+	},
+/obj/machinery/alarm{
+	dir = 8
+	},
+/turf/simulated/floor/tiled/white,
+/area/groundbase/dorms/room6)
 "Ur" = (
 /turf/simulated/floor/tiled/white,
 /area/groundbase/medical/Chemistry)
@@ -15709,8 +16071,12 @@
 "UN" = (
 /obj/structure/closet/secure_closet/personal,
 /obj/item/weapon/towel/random,
+/obj/item/weapon/storage/backpack,
+/obj/machinery/firealarm{
+	dir = 4
+	},
 /turf/simulated/floor/wood,
-/area/groundbase/dorms/room6)
+/area/groundbase/dorms/room4)
 "UQ" = (
 /obj/machinery/door/blast/regular{
 	density = 0;
@@ -15893,10 +16259,11 @@
 /turf/simulated/floor/carpet,
 /area/groundbase/civilian/library)
 "Vq" = (
-/obj/machinery/firealarm{
-	dir = 8
+/obj/machinery/door/airlock{
+	id_tag = null;
+	name = "Bathroom"
 	},
-/turf/simulated/floor/wood,
+/turf/simulated/floor/tiled/steel_ridged,
 /area/groundbase/dorms/room5)
 "Vr" = (
 /turf/simulated/floor/tiled,
@@ -15951,6 +16318,9 @@
 	icon_state = "1-2"
 	},
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/structure/bed/chair/sofa/corp/right{
+	dir = 4
+	},
 /turf/simulated/floor/wood,
 /area/groundbase/dorms/room2)
 "Vz" = (
@@ -16073,14 +16443,12 @@
 /turf/simulated/floor/carpet,
 /area/groundbase/civilian/chapel)
 "VT" = (
-/obj/machinery/power/apc{
-	dir = 1
+/obj/structure/toilet{
+	dir = 8
 	},
-/obj/structure/cable/yellow{
-	icon_state = "0-2"
-	},
-/turf/simulated/floor/tiled/dark,
-/area/groundbase/civilian/chapel)
+/obj/machinery/light,
+/turf/simulated/floor/tiled/white,
+/area/groundbase/dorms/room4)
 "VV" = (
 /obj/structure/disposalpipe/segment{
 	dir = 1;
@@ -16089,12 +16457,7 @@
 /turf/simulated/floor/tiled/eris/cafe,
 /area/groundbase/civilian/kitchen)
 "VW" = (
-/obj/structure/bed/chair/wood{
-	dir = 1
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
-	dir = 8
-	},
+/obj/structure/table/woodentable,
 /turf/simulated/floor/lino,
 /area/groundbase/civilian/chapel/office)
 "VX" = (
@@ -16148,14 +16511,12 @@
 /area/groundbase/science/xenobot/storage)
 "Wa" = (
 /obj/structure/cable/yellow{
-	icon_state = "1-2"
+	icon_state = "2-4"
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	dir = 10
 	},
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/obj/structure/disposalpipe/segment{
-	dir = 2;
-	icon_state = "pipe-c"
-	},
 /turf/simulated/floor/lino,
 /area/groundbase/civilian/chapel/office)
 "Wb" = (
@@ -16495,14 +16856,14 @@
 /turf/simulated/floor/tiled/dark,
 /area/groundbase/civilian/chapel)
 "Xf" = (
-/obj/machinery/power/apc{
-	dir = 1
+/obj/machinery/shower{
+	pixel_y = 16
 	},
-/obj/structure/cable/yellow{
-	icon_state = "0-2"
+/obj/structure/curtain/open/shower,
+/turf/simulated/floor/tiled{
+	icon_state = "techmaint"
 	},
-/turf/simulated/floor/lino,
-/area/groundbase/civilian/chapel/office)
+/area/groundbase/dorms/room5)
 "Xg" = (
 /obj/structure/disposalpipe/segment,
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
@@ -16514,18 +16875,16 @@
 /turf/simulated/floor/tiled,
 /area/groundbase/cargo/office)
 "Xh" = (
-/obj/machinery/door/firedoor,
-/obj/machinery/door/airlock{
-	name = "Chapel Office";
-	req_access = list(27)
-	},
 /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,
-/turf/simulated/floor/tiled/steel_ridged,
+/obj/structure/disposalpipe/segment{
+	dir = 2;
+	icon_state = "pipe-c"
+	},
+/turf/simulated/floor/lino,
 /area/groundbase/civilian/chapel/office)
 "Xi" = (
 /obj/effect/floor_decal/chapel{
@@ -16555,6 +16914,13 @@
 /obj/item/weapon/cartridge/signal/science,
 /turf/simulated/floor/tiled,
 /area/groundbase/science/rd)
+"Xp" = (
+/obj/machinery/door/airlock{
+	id_tag = null;
+	name = "Bathroom"
+	},
+/turf/simulated/floor/tiled/steel_ridged,
+/area/groundbase/dorms/room8)
 "Xq" = (
 /obj/machinery/vending/nifsoft_shop,
 /turf/simulated/floor/tiled,
@@ -16684,6 +17050,9 @@
 /obj/structure/disposalpipe/segment,
 /turf/simulated/floor/tiled/dark,
 /area/groundbase/dorms)
+"XL" = (
+/turf/simulated/wall,
+/area/groundbase/dorms/room8)
 "XM" = (
 /obj/machinery/door/firedoor,
 /obj/machinery/door/airlock/glass_command{
@@ -16720,6 +17089,15 @@
 	},
 /turf/simulated/floor/wood,
 /area/groundbase/civilian/library)
+"XS" = (
+/obj/machinery/alarm{
+	pixel_y = 28
+	},
+/obj/machinery/light{
+	dir = 8
+	},
+/turf/simulated/floor/tiled/dark,
+/area/groundbase/civilian/chapel)
 "XT" = (
 /obj/effect/floor_decal/industrial/warning{
 	dir = 8
@@ -16920,6 +17298,9 @@
 	dir = 4
 	},
 /obj/machinery/light,
+/obj/structure/closet/secure_closet/personal,
+/obj/item/weapon/towel/random,
+/obj/item/weapon/storage/backpack,
 /turf/simulated/floor/wood,
 /area/groundbase/dorms/room1)
 "Yz" = (
@@ -16936,10 +17317,11 @@
 /turf/simulated/floor/tiled/eris/cafe,
 /area/groundbase/civilian/kitchen)
 "YF" = (
-/obj/machinery/firealarm{
-	dir = 4
+/obj/machinery/door/airlock{
+	id_tag = null;
+	name = "Bathroom"
 	},
-/turf/simulated/floor/wood,
+/turf/simulated/floor/tiled/steel_ridged,
 /area/groundbase/dorms/room6)
 "YG" = (
 /obj/effect/floor_decal/industrial/warning/corner{
@@ -17065,6 +17447,8 @@
 /area/groundbase/cargo/office)
 "Za" = (
 /obj/machinery/light,
+/obj/structure/bed/double/padded,
+/obj/item/weapon/bedsheet/browndouble,
 /turf/simulated/floor/wood,
 /area/groundbase/dorms/room6)
 "Zb" = (
@@ -17128,8 +17512,6 @@
 /turf/simulated/floor/carpet/deco,
 /area/groundbase/civilian/kitchen/backroom)
 "Zk" = (
-/obj/item/weapon/bedsheet/browndouble,
-/obj/structure/bed/double/padded,
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /turf/simulated/floor/wood,
 /area/groundbase/dorms/room2)
@@ -17231,10 +17613,14 @@
 /turf/simulated/floor/tiled/white,
 /area/groundbase/medical/lobby)
 "ZC" = (
-/obj/structure/closet/secure_closet/personal,
-/obj/item/weapon/towel/random,
-/turf/simulated/floor/wood,
-/area/groundbase/dorms/room1)
+/obj/machinery/shower{
+	pixel_y = 16
+	},
+/obj/structure/curtain/open/shower,
+/turf/simulated/floor/tiled{
+	icon_state = "techmaint"
+	},
+/area/groundbase/dorms/room6)
 "ZD" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 5
@@ -17296,8 +17682,11 @@
 /turf/simulated/wall/r_wall,
 /area/groundbase/science/xenobot)
 "ZM" = (
+/obj/machinery/power/apc{
+	dir = 1
+	},
 /obj/structure/cable/yellow{
-	icon_state = "1-2"
+	icon_state = "0-2"
 	},
 /turf/simulated/floor/tiled/dark,
 /area/groundbase/civilian/chapel)
@@ -21406,7 +21795,7 @@ Ny
 Ny
 LS
 LS
-LS
+kX
 LS
 LS
 Ny
@@ -22356,20 +22745,20 @@ fX
 xE
 xE
 xE
+Gk
+Gk
+Gk
+Gk
 xE
+kH
+kH
+kH
+kH
 xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
+CB
+CB
+CB
+CB
 xE
 xE
 xE
@@ -22496,22 +22885,22 @@ ON
 (37,1,1) = {"
 fX
 xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
+Gk
+Gk
+Gk
+le
+wk
+Gk
+kH
+kH
+Kn
+OB
+kH
+CB
+CB
+Gg
+Fr
+CB
 xE
 xE
 xE
@@ -22639,20 +23028,20 @@ ON
 fX
 xE
 Gk
+co
+eu
+mU
+mU
 Gk
-Gk
-Gk
-Gk
-Gk
+BX
+ED
+Kx
+Kx
 kH
-kH
-kH
-kH
-kH
-CB
-CB
-CB
-CB
+Xf
+mf
+Bc
+Bc
 CB
 xE
 xE
@@ -22781,20 +23170,20 @@ ON
 fX
 xE
 Gk
-eU
-IY
-Mr
-ZC
 Gk
-OR
-co
-oE
-Im
+Gk
+Mr
+Gk
+Gk
 kH
-yC
-Ho
+kH
+oE
+kH
+kH
+CB
+CB
 Vq
-TJ
+CB
 CB
 xE
 xE
@@ -22924,19 +23313,19 @@ fX
 xE
 Gk
 rc
-OJ
-BX
+eU
+VK
 Tx
 Gk
 oL
-wu
-kC
+Ho
 kC
+OR
 kH
 Kj
-Jh
-Ec
+Io
 Ec
+dB
 CB
 xE
 xE
@@ -23085,10 +23474,10 @@ jn
 jn
 jn
 jn
-xE
-bY
-bY
-xE
+jn
+jn
+jn
+jn
 rP
 Ce
 MY
@@ -23215,22 +23604,22 @@ Gk
 XD
 wu
 ky
-kC
+RK
 kH
 jp
 Jh
 LC
-Ec
+Ht
 CB
 GF
 kY
 cQ
 ax
 jn
-xE
-bY
-bY
-xE
+vq
+HV
+vi
+jn
 rP
 mG
 JF
@@ -23368,11 +23757,11 @@ VN
 xi
 ZU
 ZU
+Tz
+uf
+uf
+pO
 jn
-bY
-bY
-bY
-bY
 rP
 rP
 rP
@@ -23511,13 +23900,13 @@ xi
 mw
 rm
 jn
-bY
-Jc
-Jc
-bY
-Jc
-bY
-bY
+jn
+jn
+jn
+jn
+xE
+xE
+xE
 LT
 bX
 bY
@@ -23653,12 +24042,12 @@ lN
 sM
 ZU
 jn
-bY
-Jc
-Jc
-Jc
-Jc
-Jc
+xE
+xE
+xE
+xE
+xE
+xE
 Jc
 bY
 bX
@@ -23795,9 +24184,9 @@ Bj
 dI
 yy
 jn
-bY
-Jc
-Jc
+xE
+xE
+xE
 Jc
 Jc
 Jc
@@ -24090,12 +24479,12 @@ mm
 Da
 bY
 bY
-bY
-bY
-bY
-bY
-bY
-bY
+Jc
+Jc
+Jc
+Jc
+Jc
+Jc
 bY
 bY
 Vk
@@ -24233,7 +24622,7 @@ bY
 bY
 bY
 bY
-Jc
+bY
 bY
 bY
 bY
@@ -24365,7 +24754,7 @@ uk
 bN
 xE
 xE
-zs
+xE
 zs
 FN
 Rs
@@ -24507,9 +24896,9 @@ CE
 bN
 xE
 xE
+xE
 zs
-jq
-hy
+XS
 eD
 CZ
 lA
@@ -24647,10 +25036,10 @@ Uz
 jc
 jP
 bN
-xE
-xE
+bN
+bN
+bN
 zs
-VT
 ZM
 Qw
 ZP
@@ -24788,12 +25177,12 @@ qH
 Uz
 CE
 CE
-bN
-xE
-xE
+Xp
+gS
+gS
+uH
 zs
-rD
-eD
+fh
 Tc
 Ym
 wB
@@ -24917,25 +25306,25 @@ PV
 tV
 jC
 EN
-aP
+HI
 sL
-aP
+TJ
 dS
 Pq
 jQ
 aI
-zE
+wo
 LP
 nA
 HK
 RD
-CE
+rX
 bN
-xE
-xE
+st
+vw
+mI
 zs
-eu
-eD
+fv
 Ds
 Ib
 Qp
@@ -25073,10 +25462,10 @@ bN
 bN
 bN
 bN
-ME
-ME
-ME
-eD
+XL
+XL
+XL
+zs
 eD
 QZ
 RH
@@ -25196,29 +25585,29 @@ fX
 xE
 jC
 AY
-dz
-Kn
+jq
+PV
 fO
 jC
 aP
-aP
+Im
 JY
-aP
+UN
 dS
 LZ
-jQ
-zE
+Ka
 zE
+vK
 LP
 xE
 xE
+xE
 ME
-ED
 df
 zG
 lI
-ME
-wk
+IF
+zs
 eD
 YH
 VS
@@ -25337,30 +25726,30 @@ ON
 fX
 xE
 jC
-nv
-OB
-ai
-Lp
 jC
-HI
-cI
-tP
-HI
+jC
+ai
+jC
+jC
 dS
-mU
-NZ
+dS
+tP
+dS
+dS
+LP
+LP
 YF
-UN
+LP
 LP
 xE
 xE
+xE
 ME
-jx
 Cl
 VW
 gA
-ME
-eu
+IS
+zs
 eD
 YH
 Nj
@@ -25479,30 +25868,30 @@ ON
 fX
 xE
 jC
+cI
+jx
+nv
+nv
 jC
-jC
-jC
-jC
-jC
-dS
-dS
-dS
-dS
+DN
+IY
+Lp
+Lp
 dS
+ZC
+rR
+pr
+pr
 LP
-LP
-LP
-LP
-LP
+xE
 xE
 xE
 ME
-le
 eO
 gq
 Wa
 Xh
-Eh
+pU
 Eh
 Lg
 Rb
@@ -25620,31 +26009,31 @@ ON
 (59,1,1) = {"
 fX
 xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
+jC
+jC
+jC
+rD
+yC
+jC
+dS
+dS
+NZ
+VT
+dS
+LP
+LP
+Uq
+oj
+LP
 xE
 xE
 xE
 ME
-Xf
 fj
 bk
 QQ
-ME
-eD
+rp
+zs
 eD
 eD
 eD
@@ -25764,29 +26153,29 @@ fX
 xE
 xE
 xE
+jC
+jC
+jC
+jC
 xE
-xE
-xE
-xE
-xE
-xE
-xE
-xE
+dS
+dS
+dS
+dS
 VR
-VR
-VR
-VR
-xE
+LP
+LP
+LP
+LP
 bY
 bY
 bY
 ME
-DN
 cA
 mJ
 sU
-ME
-Kx
+ma
+zs
 zS
 eD
 eD
@@ -25922,12 +26311,12 @@ VR
 VR
 VR
 bY
+bY
 ME
 ME
 Iq
 Iq
 ME
-ME
 zs
 zs
 hM
@@ -26218,7 +26607,7 @@ bY
 bY
 bY
 bY
-bY
+Jc
 bY
 bY
 VR
@@ -26792,7 +27181,7 @@ VR
 VR
 VR
 VR
-RK
+VR
 VR
 VR
 bY
@@ -29531,7 +29920,7 @@ oH
 oH
 oH
 oH
-oH
+QD
 Bo
 Bo
 Qc
@@ -29673,7 +30062,7 @@ oH
 oH
 oH
 oH
-oH
+QD
 Bo
 Bo
 Bo
diff --git a/maps/groundbase/gb-z3.dmm b/maps/groundbase/gb-z3.dmm
index ea3c975eb13..9ee40f1fe3c 100644
--- a/maps/groundbase/gb-z3.dmm
+++ b/maps/groundbase/gb-z3.dmm
@@ -11163,7 +11163,7 @@ Zo
 Zo
 Zo
 Zo
-QD
+Zo
 QD
 QD
 QD
@@ -11297,11 +11297,12 @@ Zo
 Zo
 Zo
 Zo
+vs
 Kr
-Kr
-Kr
-Kr
+vs
+vs
 Zo
+vs
 Kr
 Kr
 Kr
@@ -11325,7 +11326,6 @@ QD
 QD
 QD
 QD
-QD
 Kr
 Kr
 Kr
@@ -11447,7 +11447,7 @@ Kr
 Kr
 Kr
 Kr
-QD
+Kr
 QD
 QD
 QD
diff --git a/maps/groundbase/groundbase_areas.dm b/maps/groundbase/groundbase_areas.dm
index b0cfd551910..6ca9108a44a 100644
--- a/maps/groundbase/groundbase_areas.dm
+++ b/maps/groundbase/groundbase_areas.dm
@@ -112,7 +112,7 @@
 /area/groundbase/science/rnd
 	name = "Research and Development"
 /area/groundbase/science/robotics
-	name = "Rocotics"
+	name = "Robotics"
 /area/groundbase/science/server
 	name = "Science Server Room"
 /area/groundbase/science/rd
@@ -370,6 +370,12 @@
 /area/groundbase/civilian/gameroom
 	name = "Gamatorium"
 	sound_env = SMALL_SOFTFLOOR
+/area/groundbase/civilian/mensrestroom
+	name = "Men's Restroom"
+	sound_env = SOUND_ENVIRONMENT_BATHROOM
+/area/groundbase/civilian/womensrestroom
+	name = "Women's Restroom"
+	sound_env = SOUND_ENVIRONMENT_BATHROOM
 
 /area/groundbase/exploration
 	name = "Exploration"