From 2e3826a28880edda8998792b758cea3c68f94fc7 Mon Sep 17 00:00:00 2001
From: VerySoft <a.roaming.shadow@gmail.com>
Date: Sun, 5 Nov 2023 16:07:02 -0500
Subject: [PATCH 1/3] RPV2 edits and fixes

---
 maps/groundbase/rp-z1.dmm | 373 +++++++++++++++++++++++++++-----------
 maps/groundbase/rp-z2.dmm | 335 +++++++++++++++++++++-------------
 maps/groundbase/rp-z3.dmm | 291 ++++++++++++++++++++---------
 3 files changed, 683 insertions(+), 316 deletions(-)

diff --git a/maps/groundbase/rp-z1.dmm b/maps/groundbase/rp-z1.dmm
index 35c62b998c8..749d5f8da43 100644
--- a/maps/groundbase/rp-z1.dmm
+++ b/maps/groundbase/rp-z1.dmm
@@ -142,9 +142,7 @@
 /obj/item/weapon/stool/baystool/padded{
 	dir = 8
 	},
-/turf/simulated/floor/outdoors/grass/seasonal/notrees_nomobs_lowsnow{
-	grass_chance = 0
-	},
+/turf/simulated/floor/outdoors/newdirt,
 /area/groundbase/civilian/bar)
 "akb" = (
 /obj/structure/disposalpipe/segment{
@@ -827,6 +825,25 @@
 /obj/machinery/atmospherics/unary/vent_scrubber/on,
 /turf/simulated/floor/tiled/dark,
 /area/groundbase/command/meeting)
+"ban" = (
+/obj/structure/sign/directions/medical{
+	dir = 4;
+	pixel_y = 41
+	},
+/obj/structure/sign/directions/engineering{
+	dir = 6;
+	pixel_y = 35
+	},
+/obj/structure/sign/directions/security{
+	dir = 8;
+	pixel_y = 29
+	},
+/obj/structure/sign/directions/science{
+	dir = 10;
+	pixel_y = 23
+	},
+/turf/simulated/floor/outdoors/grass/seasonal/notrees_nomobs,
+/area/groundbase/level1/se)
 "bat" = (
 /turf/simulated/floor/outdoors/grass/seasonal/notrees_nomobs,
 /area/groundbase/level1/nw)
@@ -1244,8 +1261,7 @@
 /area/groundbase/security/hos)
 "bwp" = (
 /obj/structure/table/bench/padded,
-/turf/simulated/floor/outdoors/grass/seasonal/notrees_nomobs_lowsnow{
-	grass_chance = 0;
+/turf/simulated/floor/outdoors/newdirt{
 	outdoors = 0
 	},
 /area/groundbase/civilian/bar)
@@ -2860,8 +2876,13 @@
 /turf/simulated/floor/outdoors/sidewalk,
 /area/groundbase/level2/sw)
 "cZl" = (
-/turf/simulated/floor/outdoors/grass/seasonal/notrees_nomobs,
-/area/space)
+/obj/structure/sign/directions/cryo{
+	dir = 8;
+	pixel_x = -32;
+	pixel_y = 4
+	},
+/turf/simulated/floor/outdoors/grass/seasonal,
+/area/groundbase/level1/nw)
 "cZU" = (
 /obj/structure/redgate,
 /turf/simulated/floor/reinforced,
@@ -3288,9 +3309,7 @@
 /obj/item/weapon/stool/baystool/padded{
 	dir = 1
 	},
-/turf/simulated/floor/outdoors/grass/seasonal/notrees_nomobs_lowsnow{
-	grass_chance = 0
-	},
+/turf/simulated/floor/outdoors/newdirt,
 /area/groundbase/civilian/bar)
 "dtn" = (
 /obj/structure/grille,
@@ -4009,15 +4028,12 @@
 	},
 /area/groundbase/level1/ne)
 "eku" = (
-/obj/structure/stairs/spawner/west,
-/obj/structure/cable/yellow{
-	icon_state = "0-4"
-	},
-/obj/structure/cable/yellow{
-	icon_state = "16-0"
+/obj/structure/sign/directions/dorms{
+	dir = 1;
+	pixel_y = 32
 	},
-/turf/simulated/floor/outdoors/sidewalk/side,
-/area/groundbase/level1/sw)
+/turf/simulated/floor/outdoors/grass/seasonal,
+/area/groundbase/level1/nw)
 "ekT" = (
 /obj/structure/bookcase,
 /obj/item/weapon/book/manual/security_space_law,
@@ -4744,9 +4760,19 @@
 /turf/simulated/floor/plating,
 /area/groundbase/engineering/storage)
 "eVe" = (
-/turf/simulated/floor/outdoors/newdirt{
-	outdoors = 0
+/obj/structure/sign/directions/security{
+	dir = 9;
+	pixel_y = 8
+	},
+/obj/structure/sign/directions/medical{
+	dir = 4;
+	pixel_y = 2
 	},
+/obj/structure/sign/directions/dorms{
+	dir = 1;
+	pixel_y = -4
+	},
+/turf/simulated/wall/r_wall,
 /area/groundbase/security/lobby)
 "eVP" = (
 /obj/machinery/atmospherics/omni/atmos_filter{
@@ -6644,11 +6670,21 @@
 /turf/simulated/floor/tiled,
 /area/groundbase/science/hall)
 "gXF" = (
-/obj/structure/sign/directions/evac{
-	dir = 8
+/obj/structure/sign/directions/bar{
+	pixel_x = -32;
+	pixel_y = 33
 	},
-/turf/simulated/wall,
-/area/groundbase/civilian/arrivals)
+/obj/structure/sign/directions/medical{
+	pixel_x = -32;
+	pixel_y = 39
+	},
+/obj/structure/sign/directions/command{
+	dir = 4;
+	pixel_x = -32;
+	pixel_y = 27
+	},
+/turf/simulated/floor/outdoors/grass/seasonal,
+/area/groundbase/level1/nw)
 "gYs" = (
 /obj/structure/table/reinforced,
 /obj/structure/cable/yellow{
@@ -7271,6 +7307,14 @@
 	},
 /turf/simulated/floor/tiled/techfloor/grid,
 /area/groundbase/command/tcomms/chamber)
+"hFT" = (
+/obj/structure/sign/directions/cryo{
+	dir = 1;
+	pixel_x = -32;
+	pixel_y = 4
+	},
+/turf/simulated/floor/outdoors/grass/seasonal/notrees_nomobs_lowsnow,
+/area/groundbase/level1/nw)
 "hGk" = (
 /obj/structure/cable/yellow{
 	icon_state = "4-8"
@@ -8849,6 +8893,29 @@
 /obj/item/weapon/stamp/rd,
 /turf/simulated/floor/tiled,
 /area/groundbase/science/rd)
+"jkY" = (
+/obj/structure/sign/directions/medical{
+	dir = 1;
+	pixel_x = 32;
+	pixel_y = 10
+	},
+/obj/structure/sign/directions/security{
+	dir = 8;
+	pixel_x = 32;
+	pixel_y = 4
+	},
+/obj/structure/sign/directions/engineering{
+	dir = 10;
+	pixel_x = 32;
+	pixel_y = -2
+	},
+/obj/structure/sign/directions/science{
+	dir = 8;
+	pixel_x = 32;
+	pixel_y = -8
+	},
+/turf/simulated/floor/outdoors/grass/seasonal,
+/area/groundbase/level1/ne)
 "jlk" = (
 /obj/item/device/aicard,
 /obj/structure/table/reinforced,
@@ -9407,9 +9474,7 @@
 /obj/item/weapon/stool/baystool/padded{
 	dir = 4
 	},
-/turf/simulated/floor/outdoors/grass/seasonal/notrees_nomobs_lowsnow{
-	grass_chance = 0
-	},
+/turf/simulated/floor/outdoors/newdirt,
 /area/groundbase/civilian/bar)
 "jTn" = (
 /obj/structure/cable/yellow{
@@ -9868,6 +9933,19 @@
 "ksX" = (
 /turf/simulated/floor/outdoors/grass/seasonal/notrees_nomobs,
 /area/groundbase/level1/ne)
+"ktK" = (
+/obj/structure/sign/directions/command{
+	dir = 4;
+	pixel_x = 32;
+	pixel_y = 10
+	},
+/obj/structure/sign/directions/library{
+	dir = 4;
+	pixel_x = 32;
+	pixel_y = 4
+	},
+/turf/simulated/floor/outdoors/grass/seasonal,
+/area/groundbase/level1/ne)
 "ktO" = (
 /obj/effect/floor_decal/steeldecal/steel_decals10{
 	dir = 8
@@ -11307,8 +11385,18 @@
 /turf/simulated/floor/carpet/blucarpet,
 /area/groundbase/command/captain)
 "lPx" = (
-/turf/simulated/floor/outdoors/grass/seasonal/notrees_nomobs,
-/area/groundbase/level2/nw)
+/obj/structure/sign/directions/bar{
+	dir = 8;
+	pixel_x = 32;
+	pixel_y = -2
+	},
+/obj/structure/sign/directions/cryo{
+	dir = 8;
+	pixel_x = 32;
+	pixel_y = 4
+	},
+/turf/simulated/floor/outdoors/grass/seasonal,
+/area/groundbase/level1/ne)
 "lPP" = (
 /obj/machinery/portable_atmospherics/canister/nitrogen,
 /obj/machinery/atmospherics/unary/vent_scrubber/on{
@@ -12010,8 +12098,7 @@
 "mDR" = (
 /obj/structure/table/bench/padded,
 /obj/effect/landmark/start/visitor,
-/turf/simulated/floor/outdoors/grass/seasonal/notrees_nomobs_lowsnow{
-	grass_chance = 0;
+/turf/simulated/floor/outdoors/newdirt{
 	outdoors = 0
 	},
 /area/groundbase/civilian/bar)
@@ -12980,6 +13067,14 @@
 	},
 /turf/simulated/floor/tiled,
 /area/groundbase/command/tcomms/foyer)
+"nDd" = (
+/obj/structure/sign/directions/bar{
+	dir = 9;
+	pixel_x = 32;
+	pixel_y = 33
+	},
+/turf/simulated/floor/outdoors/grass/seasonal,
+/area/groundbase/level1/nw)
 "nEi" = (
 /obj/structure/table/standard,
 /obj/random/tech_supply,
@@ -14196,6 +14291,24 @@
 	},
 /turf/simulated/floor/outdoors/sidewalk/side,
 /area/groundbase/level1/sw)
+"oYl" = (
+/obj/structure/sign/directions/science{
+	dir = 6;
+	pixel_x = -31;
+	pixel_y = -40
+	},
+/obj/structure/sign/directions/security{
+	dir = 9;
+	pixel_x = -31;
+	pixel_y = -34
+	},
+/obj/structure/sign/directions/medical{
+	dir = 4;
+	pixel_x = -31;
+	pixel_y = -28
+	},
+/turf/simulated/floor/outdoors/grass/seasonal,
+/area/groundbase/level1/nw)
 "oYG" = (
 /turf/simulated/wall/r_wall,
 /area/groundbase/level1/se)
@@ -14552,6 +14665,16 @@
 	},
 /turf/simulated/floor/tiled,
 /area/groundbase/engineering/workshop)
+"poN" = (
+/obj/structure/stairs/spawner/west,
+/obj/structure/cable/yellow{
+	icon_state = "0-4"
+	},
+/obj/structure/cable/yellow{
+	icon_state = "16-0"
+	},
+/turf/simulated/floor/outdoors/sidewalk/side,
+/area/groundbase/level1/sw)
 "poY" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 4
@@ -15788,6 +15911,10 @@
 "qxG" = (
 /turf/simulated/floor/tiled,
 /area/groundbase/science/robotics)
+"qyI" = (
+/obj/machinery/light,
+/turf/simulated/floor/tiled,
+/area/rnd/xenobiology)
 "qyS" = (
 /obj/machinery/door/window/southright{
 	dir = 1;
@@ -17681,6 +17808,19 @@
 	},
 /turf/simulated/floor/wood,
 /area/groundbase/civilian/gameroom)
+"scH" = (
+/obj/structure/sign/directions/bar{
+	dir = 9;
+	pixel_x = 32;
+	pixel_y = 33
+	},
+/obj/structure/sign/directions/cryo{
+	dir = 9;
+	pixel_x = 32;
+	pixel_y = 39
+	},
+/turf/simulated/floor/outdoors/grass/seasonal/notrees_nomobs,
+/area/groundbase/level1/ne)
 "sde" = (
 /obj/structure/cable/yellow{
 	icon_state = "4-8"
@@ -17898,8 +18038,8 @@
 /turf/simulated/floor,
 /area/groundbase/civilian/hydroponics)
 "soW" = (
-/turf/simulated/floor/outdoors/grass/seasonal,
-/area/space)
+/turf/simulated/floor/outdoors/newdirt,
+/area/groundbase/civilian/bar)
 "spE" = (
 /obj/machinery/door/airlock/command{
 	name = "Command Meeting Room"
@@ -18155,8 +18295,7 @@
 	pixel_y = -24
 	},
 /obj/structure/table/bench/padded,
-/turf/simulated/floor/outdoors/grass/seasonal/notrees_nomobs_lowsnow{
-	grass_chance = 0;
+/turf/simulated/floor/outdoors/newdirt{
 	outdoors = 0
 	},
 /area/groundbase/civilian/bar)
@@ -18944,6 +19083,14 @@
 	},
 /turf/simulated/floor/outdoors/newdirt_nograss,
 /area/groundbase/level1/ne)
+"tCG" = (
+/obj/structure/sign/directions/cryo{
+	dir = 1;
+	pixel_x = 32;
+	pixel_y = 7
+	},
+/turf/simulated/floor/outdoors/grass/seasonal/notrees_nomobs,
+/area/groundbase/level1/nw)
 "tDy" = (
 /obj/structure/cable/yellow{
 	icon_state = "4-8"
@@ -19229,6 +19376,10 @@
 /obj/machinery/atmospherics/unary/vent_scrubber/on,
 /turf/simulated/floor/tiled/dark,
 /area/groundbase/security/lobby)
+"tTz" = (
+/obj/structure/bed/chair/sofa/bench/right,
+/turf/simulated/floor/outdoors/grass/seasonal,
+/area/groundbase/level1/sw)
 "tUS" = (
 /turf/simulated/floor/outdoors/grass/seasonal/notrees_nomobs,
 /area/groundbase/civilian/clown)
@@ -20066,6 +20217,10 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /turf/simulated/floor/outdoors/sidewalk,
 /area/groundbase/civilian/bar)
+"uDX" = (
+/obj/structure/bed/chair/sofa/bench/left,
+/turf/simulated/floor/outdoors/grass/seasonal,
+/area/groundbase/level1/sw)
 "uFf" = (
 /obj/structure/cable/yellow{
 	icon_state = "1-2"
@@ -20797,6 +20952,14 @@
 	},
 /turf/simulated/floor/tiled/white,
 /area/groundbase/civilian/bar)
+"vCc" = (
+/obj/structure/sign/directions/dorms{
+	dir = 9;
+	pixel_x = 32;
+	pixel_y = -32
+	},
+/turf/simulated/floor/outdoors/grass/seasonal,
+/area/groundbase/level1/nw)
 "vCg" = (
 /obj/structure/bed/chair/backed_red,
 /obj/structure/cable/yellow{
@@ -21983,8 +22146,7 @@
 "wRI" = (
 /obj/structure/table/bench/padded,
 /obj/effect/landmark/start/entertainer,
-/turf/simulated/floor/outdoors/grass/seasonal/notrees_nomobs_lowsnow{
-	grass_chance = 0;
+/turf/simulated/floor/outdoors/newdirt{
 	outdoors = 0
 	},
 /area/groundbase/civilian/bar)
@@ -22915,8 +23077,7 @@
 "xOg" = (
 /obj/structure/table/bench/padded,
 /obj/effect/landmark/start/intern,
-/turf/simulated/floor/outdoors/grass/seasonal/notrees_nomobs_lowsnow{
-	grass_chance = 0;
+/turf/simulated/floor/outdoors/newdirt{
 	outdoors = 0
 	},
 /area/groundbase/civilian/bar)
@@ -26905,8 +27066,8 @@ gSA
 kZE
 dYB
 pSO
-soW
-soW
+oeu
+oeu
 noM
 noM
 noM
@@ -27047,8 +27208,8 @@ tzI
 kBc
 sOL
 pSO
-soW
-soW
+oeu
+oeu
 noM
 lUL
 tYV
@@ -27189,8 +27350,8 @@ qMY
 aKZ
 oye
 pSO
-soW
-soW
+oeu
+oeu
 noM
 hZz
 rhe
@@ -27236,7 +27397,7 @@ sfb
 sfb
 sfb
 sfb
-sfb
+tTz
 hVa
 sfb
 sfb
@@ -27331,8 +27492,8 @@ pSO
 qRy
 pSO
 pSO
-soW
-soW
+oeu
+oeu
 noM
 gWB
 rhe
@@ -27360,14 +27521,14 @@ sfb
 sfb
 xcj
 xcj
-rOt
+xcj
 awx
 awx
 awx
 awx
 rOt
 rOt
-rOt
+xcj
 xcj
 xcj
 sfb
@@ -27378,7 +27539,7 @@ sfb
 sfb
 sfb
 sfb
-sfb
+uDX
 hVa
 sfb
 sfb
@@ -27459,22 +27620,22 @@ eje
 rvc
 oeu
 oeu
-lPx
-lPx
-lPx
+bat
+bat
+bat
 pJX
 gmX
 pJX
-lPx
-lPx
 bat
-cZl
+bat
+bat
+bat
 tUS
 khz
 xOo
-soW
-soW
-soW
+oeu
+oeu
+oeu
 noM
 cnI
 xwt
@@ -27502,14 +27663,14 @@ nCj
 nCj
 nCj
 xQX
-rOt
+xcj
 rOt
 awx
 awx
 awx
 rOt
 rOt
-rOt
+xcj
 hKZ
 nCj
 nCj
@@ -27644,14 +27805,14 @@ sfb
 sfb
 xcj
 xcj
-rOt
+xcj
 rOt
 awx
 awx
 awx
 rOt
 rOt
-rOt
+xcj
 xcj
 xcj
 sfb
@@ -27880,7 +28041,7 @@ tpV
 tpV
 tpV
 tpV
-oeu
+eku
 hGk
 oeu
 oeu
@@ -28214,11 +28375,11 @@ uHI
 lKI
 jRi
 tJF
-sfb
-xcj
-eku
-xcj
-sfb
+rOt
+rOt
+rOt
+rOt
+rOt
 sfb
 sfb
 sfb
@@ -28356,11 +28517,11 @@ rPR
 jVm
 cSq
 tJF
-raF
-xcj
-iBv
-xcj
-sfb
+rOt
+rOt
+rOt
+rOt
+rOt
 sfb
 sfb
 sfb
@@ -28498,11 +28659,11 @@ bGv
 xRJ
 tRF
 tJF
-raF
-raF
-iBv
-sfb
-sfb
+rOt
+xcj
+xcj
+xcj
+rOt
 raF
 raF
 sfb
@@ -28640,11 +28801,11 @@ qCJ
 eSN
 dcE
 tJF
-raF
-raF
-iBv
-sfb
-raF
+rOt
+xcj
+poN
+xcj
+rOt
 raF
 sfb
 sfb
@@ -28741,7 +28902,7 @@ hGk
 oeu
 oeu
 egG
-oeu
+vCc
 oeu
 oeu
 oeu
@@ -28783,9 +28944,9 @@ vki
 tJF
 tJF
 raF
-sfb
+xcj
 iBv
-sfb
+xcj
 sfb
 sfb
 sfb
@@ -30300,7 +30461,7 @@ oeu
 oeu
 pDQ
 xKO
-pNw
+soW
 jTj
 jTj
 jTj
@@ -30760,7 +30921,7 @@ egG
 oeu
 oeu
 lKQ
-oeu
+oYl
 sfb
 sfb
 sfb
@@ -31216,8 +31377,8 @@ irW
 bfA
 gNV
 hxn
-iuu
-woB
+iwj
+qyI
 boq
 ffC
 eQS
@@ -31436,7 +31597,7 @@ oeu
 oeu
 pDQ
 nat
-pNw
+soW
 aix
 aix
 aix
@@ -31567,7 +31728,7 @@ egG
 rzp
 dcU
 dcU
-gXF
+rzp
 hoQ
 rzp
 dcU
@@ -31709,13 +31870,13 @@ egG
 oeu
 oeu
 oeu
-oeu
+cZl
 plG
 oeu
 oeu
 oeu
 oeu
-oeu
+gXF
 oeu
 oeu
 dVI
@@ -32297,7 +32458,7 @@ pDI
 pDI
 pDI
 rQn
-pDI
+hFT
 pDI
 pDI
 bat
@@ -32880,8 +33041,8 @@ lOz
 lOz
 kPC
 bat
-bat
-oeu
+tCG
+nDd
 tBm
 egG
 oeu
@@ -33082,7 +33243,7 @@ sfb
 sfb
 sfb
 sfb
-sfb
+tTz
 qUW
 sfb
 kUt
@@ -33224,7 +33385,7 @@ sfb
 sfb
 sfb
 sfb
-sfb
+uDX
 qUW
 sfb
 kUt
@@ -33742,7 +33903,7 @@ eiI
 eiI
 eiI
 eiI
-ksX
+scH
 fdO
 lFG
 kUt
@@ -34027,7 +34188,7 @@ qiX
 lJr
 bTX
 bTX
-fdO
+ban
 lFG
 kUt
 kUt
@@ -34558,9 +34719,9 @@ awx
 awx
 amy
 amy
-eiI
+lPx
 vSC
-eiI
+ktK
 eiI
 xxV
 eiI
@@ -37434,7 +37595,7 @@ amy
 amy
 amy
 eiI
-eiI
+jkY
 kKr
 hBH
 kKr
diff --git a/maps/groundbase/rp-z2.dmm b/maps/groundbase/rp-z2.dmm
index bc15912ad99..0783e72339e 100644
--- a/maps/groundbase/rp-z2.dmm
+++ b/maps/groundbase/rp-z2.dmm
@@ -2274,6 +2274,11 @@
 	dir = 4
 	},
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/machinery/light_switch{
+	dir = 4;
+	pixel_x = -24;
+	pixel_y = 10
+	},
 /turf/simulated/floor/tiled,
 /area/groundbase/command/hop)
 "iC" = (
@@ -2347,6 +2352,15 @@
 	},
 /turf/simulated/floor/reinforced,
 /area/rnd/xenobiology)
+"iO" = (
+/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
+	dir = 1
+	},
+/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
+	dir = 1
+	},
+/turf/simulated/floor/tiled,
+/area/groundbase/command/hop)
 "iP" = (
 /obj/machinery/atmospherics/pipe/manifold/hidden/supply,
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
@@ -3408,10 +3422,11 @@
 /turf/simulated/floor/tiled,
 /area/groundbase/cargo/office)
 "nc" = (
-/obj/structure/closet/secure_closet/hop,
-/obj/item/clothing/glasses/omnihud,
-/turf/simulated/floor/tiled,
-/area/groundbase/command/hop)
+/obj/structure/grille,
+/obj/structure/window/reinforced/full,
+/obj/machinery/door/firedoor,
+/turf/simulated/floor,
+/area/groundbase/civilian/library)
 "nd" = (
 /obj/structure/bookcase/bookcart,
 /obj/machinery/light{
@@ -4009,6 +4024,18 @@
 "pp" = (
 /turf/simulated/open,
 /area/groundbase/level2/se)
+"pq" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 4
+	},
+/obj/structure/cable/yellow{
+	icon_state = "4-8"
+	},
+/turf/simulated/floor/outdoors/sidewalk/side,
+/area/groundbase/level2/sw)
 "pr" = (
 /obj/machinery/light,
 /turf/simulated/floor/reinforced,
@@ -4729,7 +4756,7 @@
 /obj/structure/disposalpipe/segment,
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/turf/simulated/wall,
+/turf/simulated/floor/bmarble,
 /area/groundbase/civilian/chapel)
 "sg" = (
 /obj/machinery/light,
@@ -5093,6 +5120,19 @@
 	},
 /turf/simulated/floor/tiled/white,
 /area/groundbase/medical/Chemistry)
+"tv" = (
+/obj/structure/sign/directions/cryo{
+	dir = 8;
+	pixel_x = 32;
+	pixel_y = -26
+	},
+/obj/structure/sign/directions/bar{
+	dir = 8;
+	pixel_x = 32;
+	pixel_y = -32
+	},
+/turf/simulated/floor/outdoors/grass/seasonal,
+/area/groundbase/level2/ne)
 "tw" = (
 /obj/structure/sign/painting/library_private{
 	pixel_x = 32
@@ -6405,10 +6445,12 @@
 /turf/simulated/floor/tiled/dark,
 /area/groundbase/command/bridge)
 "xV" = (
-/obj/structure/closet/secure_closet/hop2,
-/obj/machinery/light_switch{
-	dir = 1;
-	pixel_y = -30
+/obj/structure/stairs/spawner/east,
+/obj/machinery/atmospherics/pipe/zpipe/up/scrubbers{
+	dir = 1
+	},
+/obj/machinery/atmospherics/pipe/zpipe/up/supply{
+	dir = 1
 	},
 /turf/simulated/floor/tiled,
 /area/groundbase/command/hop)
@@ -6803,6 +6845,11 @@
 	},
 /turf/simulated/floor/carpet/blue,
 /area/groundbase/medical/psych)
+"zA" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/turf/simulated/floor/tiled,
+/area/groundbase/command/hop)
 "zB" = (
 /obj/structure/bed/chair/office/dark,
 /obj/effect/landmark/start/chemist,
@@ -6872,10 +6919,20 @@
 /turf/simulated/floor/tiled/dark,
 /area/groundbase/security/hall2)
 "Ab" = (
-/obj/structure/filingcabinet/chestdrawer,
-/obj/machinery/power/apc,
-/turf/simulated/floor/tiled,
-/area/groundbase/command/hop)
+/obj/structure/sign/directions/command{
+	dir = 6;
+	pixel_y = 40
+	},
+/obj/structure/sign/directions/cargo{
+	dir = 4;
+	pixel_y = 34
+	},
+/obj/structure/sign/directions/medical{
+	dir = 4;
+	pixel_y = 28
+	},
+/turf/simulated/floor/outdoors/grass/seasonal,
+/area/groundbase/level2/ne)
 "Ac" = (
 /obj/structure/cable/yellow{
 	icon_state = "1-8"
@@ -6924,6 +6981,9 @@
 /area/groundbase/security/processing)
 "Aq" = (
 /obj/structure/closet/firecloset/full,
+/obj/machinery/camera/network/civilian{
+	dir = 1
+	},
 /turf/simulated/floor/wood,
 /area/groundbase/civilian/library)
 "As" = (
@@ -7483,11 +7543,14 @@
 /turf/simulated/wall/r_wall,
 /area/groundbase/dorms/room6)
 "Cl" = (
-/obj/machinery/camera/network/civilian{
-	dir = 8
+/obj/structure/sign/directions/cargo{
+	pixel_y = 29
 	},
-/turf/simulated/floor/wood,
-/area/groundbase/civilian/library)
+/obj/structure/sign/directions/medical{
+	pixel_y = 35
+	},
+/turf/simulated/floor/outdoors/grass/seasonal,
+/area/groundbase/level2/ne)
 "Cm" = (
 /obj/machinery/computer/supplycomp/control{
 	dir = 4
@@ -8586,7 +8649,7 @@
 /obj/structure/cable/yellow{
 	icon_state = "1-2"
 	},
-/turf/simulated/wall,
+/turf/simulated/floor/bmarble,
 /area/groundbase/civilian/chapel)
 "Hh" = (
 /obj/machinery/light,
@@ -9032,6 +9095,18 @@
 	},
 /turf/simulated/floor/tiled,
 /area/groundbase/cargo/office)
+"IN" = (
+/obj/structure/cable/yellow{
+	icon_state = "32-8"
+	},
+/obj/machinery/atmospherics/pipe/zpipe/down/supply{
+	dir = 8
+	},
+/obj/machinery/atmospherics/pipe/zpipe/down/scrubbers{
+	dir = 8
+	},
+/turf/simulated/floor/outdoors/sidewalk/slab,
+/area/groundbase/level2/sw)
 "IQ" = (
 /obj/machinery/atmospherics/unary/vent_pump/on{
 	dir = 1
@@ -9799,18 +9874,18 @@
 /turf/simulated/floor/tiled/white,
 /area/medical/virology)
 "Lw" = (
-/obj/structure/cable/yellow{
-	icon_state = "32-1"
-	},
 /obj/structure/disposalpipe/segment{
 	dir = 8;
 	icon_state = "pipe-c"
 	},
-/obj/machinery/atmospherics/pipe/zpipe/down/supply{
-	dir = 1
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 5
 	},
-/obj/machinery/atmospherics/pipe/zpipe/down/scrubbers{
-	dir = 1
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	dir = 5
+	},
+/obj/structure/cable/yellow{
+	icon_state = "1-4"
 	},
 /turf/simulated/floor/outdoors/sidewalk/slab,
 /area/groundbase/level2/sw)
@@ -12549,6 +12624,19 @@
 /obj/structure/disposalpipe/segment,
 /turf/simulated/floor/outdoors/sidewalk,
 /area/groundbase/level2/sw)
+"Vc" = (
+/obj/structure/sign/directions/medical{
+	dir = 10;
+	pixel_x = 32;
+	pixel_y = 38
+	},
+/obj/structure/sign/directions/cargo{
+	dir = 8;
+	pixel_x = 32;
+	pixel_y = 32
+	},
+/turf/simulated/floor/outdoors/grass/seasonal,
+/area/groundbase/level2/ne)
 "Ve" = (
 /obj/structure/cable/yellow{
 	icon_state = "32-8"
@@ -12848,6 +12936,7 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 10
 	},
+/obj/structure/filingcabinet/chestdrawer,
 /turf/simulated/floor/tiled,
 /area/groundbase/command/hop)
 "Ww" = (
@@ -16799,11 +16888,11 @@ TH
 TH
 TH
 TH
-TH
-TH
-TH
-TH
-TH
+Wf
+Wf
+Wf
+Wf
+Wf
 TH
 TH
 TH
@@ -16941,11 +17030,11 @@ TH
 TH
 TH
 TH
-TH
-TH
-TH
-TH
-TH
+Wf
+Wf
+Wf
+Wf
+Wf
 TH
 TH
 TH
@@ -17083,11 +17172,11 @@ TH
 TH
 TH
 TH
-TH
-TH
-TH
-TH
-TH
+Wf
+Wf
+Wf
+Wf
+Wf
 TH
 TH
 TH
@@ -18664,7 +18753,7 @@ gE
 bD
 Gu
 ma
-av
+pq
 av
 av
 av
@@ -18806,7 +18895,7 @@ sb
 LO
 gC
 ma
-av
+pq
 av
 av
 av
@@ -18948,7 +19037,7 @@ Ir
 Xp
 pl
 ma
-av
+IN
 av
 av
 av
@@ -20203,10 +20292,10 @@ mQ
 mQ
 mQ
 mQ
-TH
-TH
-TH
-TH
+Wf
+Wf
+Wf
+Wf
 TH
 TH
 TH
@@ -20345,10 +20434,10 @@ rB
 rB
 rB
 mQ
-TH
-TH
-TH
-TH
+Wf
+Wf
+Wf
+Wf
 TH
 TH
 TH
@@ -20487,10 +20576,10 @@ rB
 rB
 rB
 mQ
-TH
-TH
-TH
-TH
+Wf
+Wf
+Wf
+Wf
 TH
 TH
 TH
@@ -20629,10 +20718,10 @@ rB
 rB
 rB
 mQ
-TH
-TH
-TH
-TH
+Wf
+Wf
+Wf
+Wf
 TH
 TH
 TH
@@ -20771,10 +20860,10 @@ rB
 rB
 rB
 mQ
-TH
-TH
-TH
-TH
+Wf
+Wf
+Wf
+Wf
 TH
 TH
 TH
@@ -20913,10 +21002,10 @@ rB
 rB
 rB
 mQ
-TH
-TH
-TH
-TH
+Wf
+Wf
+Wf
+Wf
 TH
 TH
 TH
@@ -21055,10 +21144,10 @@ rB
 rB
 rB
 mQ
-TH
-TH
-TH
-TH
+Wf
+Wf
+Wf
+Wf
 TH
 TH
 TH
@@ -21197,10 +21286,10 @@ rB
 rB
 rB
 mQ
-TH
-TH
-TH
-TH
+Wf
+Wf
+Wf
+Wf
 TH
 TH
 TH
@@ -21339,10 +21428,10 @@ rB
 rB
 rB
 mQ
-TH
-TH
-TH
-TH
+Wf
+Wf
+Wf
+Wf
 TH
 TH
 TH
@@ -21481,10 +21570,10 @@ rB
 rB
 rB
 mQ
-TH
-TH
-TH
-TH
+Wf
+Wf
+Wf
+Wf
 TH
 TH
 TH
@@ -21623,10 +21712,10 @@ rB
 rB
 rB
 mQ
-TH
-TH
-TH
-TH
+Wf
+Wf
+Wf
+Wf
 TH
 TH
 TH
@@ -21765,10 +21854,10 @@ cZ
 cZ
 zu
 mQ
-TH
-TH
-TH
-TH
+Wf
+Wf
+Wf
+Wf
 TH
 TH
 TH
@@ -21907,10 +21996,10 @@ cZ
 cZ
 Sj
 mQ
-TH
-TH
-TH
-TH
+Wf
+Wf
+Wf
+Wf
 TH
 TH
 TH
@@ -22049,10 +22138,10 @@ xZ
 LT
 tJ
 mQ
-TH
-TH
-TH
-TH
+Wf
+Wf
+Wf
+Wf
 TH
 TH
 TH
@@ -22191,10 +22280,10 @@ mQ
 mQ
 mQ
 mQ
-TH
-TH
-TH
-TH
+Wf
+Wf
+Wf
+Wf
 TH
 TH
 TH
@@ -22333,10 +22422,10 @@ it
 it
 ua
 Wf
-TH
-TH
-TH
-TH
+Wf
+Wf
+Wf
+Wf
 TH
 TH
 TH
@@ -22475,10 +22564,10 @@ Wf
 Wf
 Wf
 Wf
-TH
-TH
-TH
-TH
+Wf
+Wf
+Wf
+Wf
 TH
 TH
 TH
@@ -26002,7 +26091,7 @@ Dt
 Ng
 Ng
 Vf
-Ng
+tv
 Ng
 Ng
 Ng
@@ -26141,7 +26230,7 @@ hD
 fi
 fi
 hD
-Ng
+Ab
 Ng
 Vf
 Ng
@@ -28422,7 +28511,7 @@ Yx
 gd
 cl
 gd
-nc
+Yx
 bL
 Ng
 Ng
@@ -28704,8 +28793,8 @@ GB
 Sp
 Yx
 Yx
-QB
-Yx
+iO
+zA
 xV
 bL
 Ng
@@ -28848,7 +28937,7 @@ rR
 EP
 QB
 Yx
-Ab
+bL
 bL
 Ng
 GR
@@ -29118,7 +29207,7 @@ ju
 GZ
 hm
 DN
-Cl
+DN
 OA
 tm
 Jg
@@ -29259,13 +29348,13 @@ gK
 gK
 gK
 gK
+nc
+nc
+nc
 gK
 gK
 gK
-gK
-gK
-gK
-Ng
+Cl
 Ng
 YF
 Ng
@@ -29865,7 +29954,7 @@ Ng
 Ng
 Ng
 Ng
-Ng
+Vc
 Rb
 Ng
 FE
diff --git a/maps/groundbase/rp-z3.dmm b/maps/groundbase/rp-z3.dmm
index aaead17c143..5f50f51eec1 100644
--- a/maps/groundbase/rp-z3.dmm
+++ b/maps/groundbase/rp-z3.dmm
@@ -166,6 +166,9 @@
 	outdoors = 1
 	},
 /area/groundbase/exploration/shuttlepad)
+"cE" = (
+/turf/simulated/floor/wood,
+/area/groundbase/command/hop)
 "cI" = (
 /obj/structure/table/glass,
 /obj/machinery/computer/med_data/laptop{
@@ -238,6 +241,10 @@
 	},
 /turf/simulated/floor/tiled/eris/dark/panels,
 /area/shuttle/groundbase/exploration)
+"fk" = (
+/obj/structure/bed/chair/comfy/blue,
+/turf/simulated/floor/wood,
+/area/groundbase/command/hop)
 "fn" = (
 /obj/structure/table/glass,
 /obj/item/weapon/paper_bin,
@@ -444,6 +451,11 @@
 	outdoors = 1
 	},
 /area/groundbase/medical/patio)
+"iD" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/turf/simulated/floor/wood,
+/area/groundbase/command/hop)
 "iZ" = (
 /obj/structure/cable/yellow{
 	icon_state = "4-8"
@@ -510,6 +522,13 @@
 /obj/structure/table/glass,
 /turf/simulated/floor/carpet,
 /area/groundbase/medical/cmo)
+"kb" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	dir = 6
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/turf/simulated/floor/wood,
+/area/groundbase/command/hop)
 "ke" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /turf/simulated/floor/tiled,
@@ -534,6 +553,9 @@
 	},
 /turf/simulated/floor/tiled/white,
 /area/groundbase/medical/uhallway)
+"kB" = (
+/turf/simulated/floor/outdoors/sidewalk/slab,
+/area/groundbase/command/hop)
 "kL" = (
 /obj/structure/cable/yellow{
 	icon_state = "1-2"
@@ -736,6 +758,10 @@
 	},
 /turf/simulated/floor/tiled/white,
 /area/groundbase/dorms/bathroom)
+"nP" = (
+/obj/structure/closet/secure_closet/hop2,
+/turf/simulated/floor/wood,
+/area/groundbase/command/hop)
 "nQ" = (
 /obj/structure/cable/cyan{
 	icon_state = "2-4"
@@ -806,6 +832,11 @@
 	outdoors = 1
 	},
 /area/groundbase/medical/patio)
+"oI" = (
+/obj/structure/closet/secure_closet/hop,
+/obj/item/clothing/glasses/omnihud,
+/turf/simulated/floor/carpet/sblucarpet,
+/area/groundbase/command/hop)
 "oJ" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
 	dir = 6
@@ -840,6 +871,15 @@
 /obj/structure/flora/pottedplant/minitree,
 /turf/simulated/floor/wood,
 /area/groundbase/medical/cmo)
+"pD" = (
+/obj/machinery/atmospherics/pipe/zpipe/down/scrubbers{
+	dir = 1
+	},
+/obj/machinery/atmospherics/pipe/zpipe/down/supply{
+	dir = 1
+	},
+/turf/simulated/floor/wood,
+/area/groundbase/command/hop)
 "pH" = (
 /obj/structure/table/glass,
 /obj/item/weapon/clipboard,
@@ -1133,6 +1173,12 @@
 "sY" = (
 /turf/simulated/floor/tiled/white,
 /area/groundbase/dorms/bathroom)
+"tb" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 5
+	},
+/turf/simulated/floor/carpet/sblucarpet,
+/area/groundbase/command/hop)
 "td" = (
 /obj/machinery/hologram/holopad,
 /turf/simulated/floor/tiled{
@@ -1175,6 +1221,9 @@
 	},
 /turf/simulated/floor/tiled,
 /area/shuttle/groundbase/exploration)
+"tK" = (
+/turf/simulated/floor/carpet/sblucarpet,
+/area/groundbase/command/hop)
 "tN" = (
 /obj/structure/cable/yellow{
 	icon_state = "1-2"
@@ -1443,6 +1492,16 @@
 	},
 /turf/simulated/floor/tiled/white,
 /area/groundbase/dorms/bathroom)
+"wF" = (
+/obj/item/weapon/bedsheet/hop,
+/obj/structure/bed/padded,
+/obj/structure/curtain/black,
+/obj/machinery/light/small{
+	dir = 8
+	},
+/obj/machinery/atmospherics/unary/vent_pump/on,
+/turf/simulated/floor/carpet/sblucarpet,
+/area/groundbase/command/hop)
 "wI" = (
 /obj/machinery/power/apc{
 	dir = 4
@@ -1670,6 +1729,12 @@
 /obj/structure/flora/pottedplant/small,
 /turf/simulated/floor/tiled/dark,
 /area/groundbase/level3/nw)
+"zV" = (
+/obj/machinery/light/small{
+	dir = 8
+	},
+/turf/simulated/floor/wood,
+/area/groundbase/command/hop)
 "Af" = (
 /turf/simulated/floor{
 	edge_blending_priority = -1;
@@ -1811,6 +1876,12 @@
 	},
 /turf/simulated/floor/tiled/white,
 /area/groundbase/medical/patient4)
+"Cr" = (
+/obj/structure/bed/chair/comfy/blue{
+	dir = 1
+	},
+/turf/simulated/floor/wood,
+/area/groundbase/command/hop)
 "Cx" = (
 /obj/effect/floor_decal/industrial/warning{
 	dir = 4
@@ -1980,6 +2051,12 @@
 /obj/machinery/door/firedoor,
 /turf/simulated/floor,
 /area/groundbase/cargo/office)
+"EC" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 10
+	},
+/turf/simulated/floor/wood,
+/area/groundbase/command/hop)
 "EL" = (
 /turf/simulated/floor/outdoors/sidewalk/slab,
 /area/groundbase/level3/ne)
@@ -2027,6 +2104,12 @@
 	},
 /turf/simulated/floor/tiled/white,
 /area/groundbase/medical/patient3)
+"Fd" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 4
+	},
+/turf/simulated/floor/carpet/sblucarpet,
+/area/groundbase/command/hop)
 "Fe" = (
 /obj/structure/bed/chair/office/dark{
 	dir = 1
@@ -2034,6 +2117,12 @@
 /obj/effect/landmark/start/iaa,
 /turf/simulated/floor/carpet/sblucarpet,
 /area/groundbase/level3/nw)
+"Fo" = (
+/obj/machinery/light/small{
+	dir = 4
+	},
+/turf/simulated/floor/wood,
+/area/groundbase/command/hop)
 "FC" = (
 /turf/simulated/wall,
 /area/groundbase/exploration/shuttlepad)
@@ -2256,6 +2345,15 @@
 	},
 /turf/simulated/floor/carpet,
 /area/groundbase/medical/cmo)
+"IP" = (
+/obj/machinery/alarm{
+	dir = 8
+	},
+/obj/machinery/light/small{
+	dir = 4
+	},
+/turf/simulated/floor/wood,
+/area/groundbase/command/hop)
 "IQ" = (
 /obj/structure/cable/yellow{
 	icon_state = "4-8"
@@ -2547,6 +2645,12 @@
 	outdoors = 1
 	},
 /area/groundbase/medical/patio)
+"Mk" = (
+/obj/structure/grille,
+/obj/structure/window/reinforced/full,
+/obj/machinery/door/firedoor,
+/turf/simulated/floor,
+/area/groundbase/command/hop)
 "Mm" = (
 /obj/structure/cable/yellow{
 	icon_state = "2-8"
@@ -2741,6 +2845,9 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /turf/simulated/floor/tiled/white,
 /area/groundbase/medical/paramedic)
+"Ph" = (
+/turf/simulated/wall/r_wall,
+/area/groundbase/command/hop)
 "Pv" = (
 /obj/structure/closet/secure_closet/paramedic,
 /obj/machinery/atmospherics/unary/vent_scrubber/on{
@@ -2778,6 +2885,9 @@
 "PJ" = (
 /turf/simulated/floor/outdoors/grass/seasonal/dark,
 /area/groundbase/level3/se)
+"PM" = (
+/turf/simulated/open,
+/area/groundbase/command/hop)
 "PS" = (
 /obj/effect/floor_decal/industrial/warning,
 /turf/simulated/floor/reinforced{
@@ -3169,6 +3279,13 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /turf/simulated/floor/tiled,
 /area/groundbase/civilian/pilot)
+"VT" = (
+/obj/structure/table/woodentable,
+/obj/machinery/atmospherics/unary/vent_scrubber/on{
+	dir = 8
+	},
+/turf/simulated/floor/wood,
+/area/groundbase/command/hop)
 "VU" = (
 /obj/effect/landmark/start/paramedic,
 /obj/structure/cable/yellow{
@@ -17639,13 +17756,13 @@ xF
 xF
 xF
 xF
-Af
-Af
-Af
-Af
-Af
-Af
-Af
+kB
+kB
+kB
+kB
+kB
+kB
+kB
 xF
 xF
 Af
@@ -17781,13 +17898,13 @@ xF
 xF
 xF
 xF
-Af
-Af
-Af
-Af
-Af
-Af
-Af
+kB
+kB
+kB
+kB
+kB
+kB
+kB
 xF
 xF
 Af
@@ -17923,13 +18040,13 @@ xF
 xF
 xF
 xF
-Af
-Af
-Af
-Af
-Af
-Af
-Af
+Ph
+Ph
+Mk
+Mk
+Mk
+Ph
+Ph
 xF
 xF
 Af
@@ -18065,13 +18182,13 @@ xF
 xF
 xF
 xF
-Af
-Af
-Af
-Af
-Af
-Af
-Af
+Mk
+wF
+tb
+oI
+nP
+zV
+Mk
 xF
 xF
 Af
@@ -18207,13 +18324,13 @@ xF
 xF
 xF
 xF
-Af
-Af
-Af
-Af
-Af
-Af
-Af
+Mk
+tK
+Fd
+tK
+cE
+PM
+Mk
 xF
 xF
 Af
@@ -18331,10 +18448,10 @@ LW
 aD
 aD
 aD
-xF
-xF
-xF
-xF
+Af
+Af
+Af
+Af
 aD
 aD
 aD
@@ -18349,13 +18466,13 @@ xF
 xF
 xF
 xF
-Af
-Af
-Af
-Af
-Af
-Af
-Af
+Mk
+tK
+Fd
+tK
+cE
+PM
+Mk
 xF
 xF
 Af
@@ -18471,28 +18588,17 @@ LW
 LW
 aD
 aD
-xF
-xF
-xF
-xF
-xF
-xF
 Af
 Af
 Af
-aD
-aD
 Af
 Af
 Af
 Af
 Af
-xF
-xF
-xF
-xF
-Af
 Af
+aD
+aD
 Af
 Af
 Af
@@ -18502,6 +18608,17 @@ xF
 xF
 xF
 xF
+Mk
+cE
+EC
+kb
+iD
+pD
+Mk
+xF
+xF
+xF
+xF
 xF
 xF
 CY
@@ -18633,13 +18750,13 @@ xF
 xF
 xF
 xF
-Af
-Af
-Af
-Af
-Af
-Af
-Af
+Mk
+IP
+fk
+VT
+Cr
+Fo
+Mk
 xF
 xF
 xF
@@ -18775,13 +18892,13 @@ xF
 xF
 xF
 xF
-Af
-Af
-Af
-Af
-Af
-Af
-Af
+Ph
+Ph
+Mk
+Mk
+Mk
+Ph
+Ph
 xF
 xF
 xF
@@ -18917,13 +19034,13 @@ xF
 xF
 xF
 xF
-Af
-Af
-Af
-Af
-Af
-Af
-Af
+kB
+kB
+kB
+kB
+kB
+kB
+kB
 xF
 xF
 xF
@@ -19059,13 +19176,13 @@ xF
 xF
 xF
 xF
-Af
-Af
-Af
-Af
-Af
-Af
-Af
+kB
+kB
+kB
+kB
+kB
+kB
+kB
 xF
 xF
 xF

From 00b966451f1228fa25870c38062166151d537056 Mon Sep 17 00:00:00 2001
From: VerySoft <a.roaming.shadow@gmail.com>
Date: Sun, 5 Nov 2023 16:44:13 -0500
Subject: [PATCH 2/3] 1644

---
 maps/groundbase/rp-z1.dmm | 354 +++++++++++++++++++-------------------
 1 file changed, 177 insertions(+), 177 deletions(-)

diff --git a/maps/groundbase/rp-z1.dmm b/maps/groundbase/rp-z1.dmm
index 749d5f8da43..857d3b6eae9 100644
--- a/maps/groundbase/rp-z1.dmm
+++ b/maps/groundbase/rp-z1.dmm
@@ -825,25 +825,6 @@
 /obj/machinery/atmospherics/unary/vent_scrubber/on,
 /turf/simulated/floor/tiled/dark,
 /area/groundbase/command/meeting)
-"ban" = (
-/obj/structure/sign/directions/medical{
-	dir = 4;
-	pixel_y = 41
-	},
-/obj/structure/sign/directions/engineering{
-	dir = 6;
-	pixel_y = 35
-	},
-/obj/structure/sign/directions/security{
-	dir = 8;
-	pixel_y = 29
-	},
-/obj/structure/sign/directions/science{
-	dir = 10;
-	pixel_y = 23
-	},
-/turf/simulated/floor/outdoors/grass/seasonal/notrees_nomobs,
-/area/groundbase/level1/se)
 "bat" = (
 /turf/simulated/floor/outdoors/grass/seasonal/notrees_nomobs,
 /area/groundbase/level1/nw)
@@ -1111,6 +1092,14 @@
 "boq" = (
 /turf/simulated/wall/r_wall,
 /area/rnd/xenobiology)
+"boW" = (
+/obj/structure/sign/directions/bar{
+	dir = 9;
+	pixel_x = 32;
+	pixel_y = 33
+	},
+/turf/simulated/floor/outdoors/grass/seasonal,
+/area/groundbase/level1/nw)
 "bpb" = (
 /obj/random/vendorall,
 /obj/machinery/light{
@@ -1259,12 +1248,6 @@
 /obj/machinery/atmospherics/unary/vent_scrubber/on,
 /turf/simulated/floor/carpet/sblucarpet,
 /area/groundbase/security/hos)
-"bwp" = (
-/obj/structure/table/bench/padded,
-/turf/simulated/floor/outdoors/newdirt{
-	outdoors = 0
-	},
-/area/groundbase/civilian/bar)
 "bxW" = (
 /obj/effect/floor_decal/industrial/danger,
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
@@ -3328,6 +3311,25 @@
 /obj/machinery/hologram/holopad,
 /turf/simulated/floor/tiled,
 /area/groundbase/engineering/lobby)
+"duA" = (
+/obj/structure/sign/directions/medical{
+	dir = 4;
+	pixel_y = 41
+	},
+/obj/structure/sign/directions/engineering{
+	dir = 6;
+	pixel_y = 35
+	},
+/obj/structure/sign/directions/security{
+	dir = 8;
+	pixel_y = 29
+	},
+/obj/structure/sign/directions/science{
+	dir = 10;
+	pixel_y = 23
+	},
+/turf/simulated/floor/outdoors/grass/seasonal/notrees_nomobs,
+/area/groundbase/level1/se)
 "dve" = (
 /obj/machinery/transhuman/synthprinter,
 /turf/simulated/floor/tiled,
@@ -4298,6 +4300,14 @@
 	},
 /turf/simulated/floor/tiled,
 /area/groundbase/science/rd)
+"eAs" = (
+/obj/structure/sign/directions/cryo{
+	dir = 1;
+	pixel_x = -32;
+	pixel_y = 4
+	},
+/turf/simulated/floor/outdoors/grass/seasonal/notrees_nomobs_lowsnow,
+/area/groundbase/level1/nw)
 "eAV" = (
 /obj/structure/table/bench/padded,
 /obj/effect/landmark/start/intern,
@@ -6301,6 +6311,16 @@
 	},
 /turf/simulated/floor/tiled/steel_ridged,
 /area/groundbase/science/xenohall)
+"gGP" = (
+/obj/structure/stairs/spawner/west,
+/obj/structure/cable/yellow{
+	icon_state = "0-4"
+	},
+/obj/structure/cable/yellow{
+	icon_state = "16-0"
+	},
+/turf/simulated/floor/outdoors/sidewalk/side,
+/area/groundbase/level1/sw)
 "gGX" = (
 /obj/structure/table/reinforced,
 /obj/item/weapon/tool/crowbar,
@@ -7307,14 +7327,6 @@
 	},
 /turf/simulated/floor/tiled/techfloor/grid,
 /area/groundbase/command/tcomms/chamber)
-"hFT" = (
-/obj/structure/sign/directions/cryo{
-	dir = 1;
-	pixel_x = -32;
-	pixel_y = 4
-	},
-/turf/simulated/floor/outdoors/grass/seasonal/notrees_nomobs_lowsnow,
-/area/groundbase/level1/nw)
 "hGk" = (
 /obj/structure/cable/yellow{
 	icon_state = "4-8"
@@ -8296,6 +8308,15 @@
 /obj/machinery/floodlight,
 /turf/simulated/floor/tiled,
 /area/groundbase/engineering/storage)
+"iEb" = (
+/obj/structure/table/bench/padded,
+/obj/item/device/radio/intercom{
+	pixel_y = -24
+	},
+/turf/simulated/floor/outdoors/newdirt{
+	outdoors = 0
+	},
+/area/groundbase/civilian/bar)
 "iEK" = (
 /obj/item/weapon/gun/projectile/shotgun/doublebarrel{
 	name = "chef's double-barreled shotgun"
@@ -8893,29 +8914,6 @@
 /obj/item/weapon/stamp/rd,
 /turf/simulated/floor/tiled,
 /area/groundbase/science/rd)
-"jkY" = (
-/obj/structure/sign/directions/medical{
-	dir = 1;
-	pixel_x = 32;
-	pixel_y = 10
-	},
-/obj/structure/sign/directions/security{
-	dir = 8;
-	pixel_x = 32;
-	pixel_y = 4
-	},
-/obj/structure/sign/directions/engineering{
-	dir = 10;
-	pixel_x = 32;
-	pixel_y = -2
-	},
-/obj/structure/sign/directions/science{
-	dir = 8;
-	pixel_x = 32;
-	pixel_y = -8
-	},
-/turf/simulated/floor/outdoors/grass/seasonal,
-/area/groundbase/level1/ne)
 "jlk" = (
 /obj/item/device/aicard,
 /obj/structure/table/reinforced,
@@ -9221,6 +9219,19 @@
 /obj/machinery/vending/wardrobe/hydrobe,
 /turf/simulated/floor/tiled,
 /area/groundbase/civilian/hydroponics)
+"jFr" = (
+/obj/structure/sign/directions/bar{
+	dir = 9;
+	pixel_x = 32;
+	pixel_y = 33
+	},
+/obj/structure/sign/directions/cryo{
+	dir = 9;
+	pixel_x = 32;
+	pixel_y = 39
+	},
+/turf/simulated/floor/outdoors/grass/seasonal/notrees_nomobs,
+/area/groundbase/level1/ne)
 "jGM" = (
 /obj/structure/noticeboard{
 	pixel_y = -32
@@ -9236,6 +9247,14 @@
 	},
 /turf/simulated/floor/tiled/dark,
 /area/groundbase/command/meeting)
+"jGQ" = (
+/obj/structure/sign/directions/dorms{
+	dir = 9;
+	pixel_x = 32;
+	pixel_y = -32
+	},
+/turf/simulated/floor/outdoors/grass/seasonal,
+/area/groundbase/level1/nw)
 "jHK" = (
 /obj/machinery/computer/atmoscontrol,
 /obj/machinery/power/apc{
@@ -9933,19 +9952,6 @@
 "ksX" = (
 /turf/simulated/floor/outdoors/grass/seasonal/notrees_nomobs,
 /area/groundbase/level1/ne)
-"ktK" = (
-/obj/structure/sign/directions/command{
-	dir = 4;
-	pixel_x = 32;
-	pixel_y = 10
-	},
-/obj/structure/sign/directions/library{
-	dir = 4;
-	pixel_x = 32;
-	pixel_y = 4
-	},
-/turf/simulated/floor/outdoors/grass/seasonal,
-/area/groundbase/level1/ne)
 "ktO" = (
 /obj/effect/floor_decal/steeldecal/steel_decals10{
 	dir = 8
@@ -10732,6 +10738,10 @@
 	},
 /turf/simulated/floor/tiled/eris/cafe,
 /area/groundbase/civilian/kitchen)
+"lkQ" = (
+/obj/structure/bed/chair/sofa/bench/right,
+/turf/simulated/floor/outdoors/grass/seasonal,
+/area/groundbase/level1/sw)
 "lkY" = (
 /obj/structure/cable/yellow{
 	icon_state = "1-2"
@@ -13067,14 +13077,6 @@
 	},
 /turf/simulated/floor/tiled,
 /area/groundbase/command/tcomms/foyer)
-"nDd" = (
-/obj/structure/sign/directions/bar{
-	dir = 9;
-	pixel_x = 32;
-	pixel_y = 33
-	},
-/turf/simulated/floor/outdoors/grass/seasonal,
-/area/groundbase/level1/nw)
 "nEi" = (
 /obj/structure/table/standard,
 /obj/random/tech_supply,
@@ -13748,6 +13750,10 @@
 	},
 /turf/simulated/floor/tiled/dark,
 /area/groundbase/command/meeting)
+"oww" = (
+/obj/structure/bed/chair/sofa/bench/left,
+/turf/simulated/floor/outdoors/grass/seasonal,
+/area/groundbase/level1/sw)
 "owy" = (
 /turf/simulated/floor/outdoors/newdirt,
 /area/groundbase/science/circuits)
@@ -14291,24 +14297,6 @@
 	},
 /turf/simulated/floor/outdoors/sidewalk/side,
 /area/groundbase/level1/sw)
-"oYl" = (
-/obj/structure/sign/directions/science{
-	dir = 6;
-	pixel_x = -31;
-	pixel_y = -40
-	},
-/obj/structure/sign/directions/security{
-	dir = 9;
-	pixel_x = -31;
-	pixel_y = -34
-	},
-/obj/structure/sign/directions/medical{
-	dir = 4;
-	pixel_x = -31;
-	pixel_y = -28
-	},
-/turf/simulated/floor/outdoors/grass/seasonal,
-/area/groundbase/level1/nw)
 "oYG" = (
 /turf/simulated/wall/r_wall,
 /area/groundbase/level1/se)
@@ -14665,16 +14653,6 @@
 	},
 /turf/simulated/floor/tiled,
 /area/groundbase/engineering/workshop)
-"poN" = (
-/obj/structure/stairs/spawner/west,
-/obj/structure/cable/yellow{
-	icon_state = "0-4"
-	},
-/obj/structure/cable/yellow{
-	icon_state = "16-0"
-	},
-/turf/simulated/floor/outdoors/sidewalk/side,
-/area/groundbase/level1/sw)
 "poY" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 4
@@ -14801,6 +14779,24 @@
 /obj/machinery/portable_atmospherics/canister/carbon_dioxide,
 /turf/simulated/floor/tiled,
 /area/groundbase/science/xenobot/storage)
+"psq" = (
+/obj/structure/sign/directions/science{
+	dir = 6;
+	pixel_x = -31;
+	pixel_y = -40
+	},
+/obj/structure/sign/directions/security{
+	dir = 9;
+	pixel_x = -31;
+	pixel_y = -34
+	},
+/obj/structure/sign/directions/medical{
+	dir = 4;
+	pixel_x = -31;
+	pixel_y = -28
+	},
+/turf/simulated/floor/outdoors/grass/seasonal,
+/area/groundbase/level1/nw)
 "psV" = (
 /obj/structure/disposalpipe/segment{
 	dir = 8;
@@ -15911,10 +15907,6 @@
 "qxG" = (
 /turf/simulated/floor/tiled,
 /area/groundbase/science/robotics)
-"qyI" = (
-/obj/machinery/light,
-/turf/simulated/floor/tiled,
-/area/rnd/xenobiology)
 "qyS" = (
 /obj/machinery/door/window/southright{
 	dir = 1;
@@ -16582,6 +16574,14 @@
 /obj/machinery/firealarm,
 /turf/simulated/floor/tiled/dark,
 /area/groundbase/medical/autoresleeving)
+"rdW" = (
+/obj/structure/sign/directions/cryo{
+	dir = 1;
+	pixel_x = 32;
+	pixel_y = 7
+	},
+/turf/simulated/floor/outdoors/grass/seasonal/notrees_nomobs,
+/area/groundbase/level1/nw)
 "red" = (
 /turf/simulated/floor{
 	edge_blending_priority = -1;
@@ -17761,6 +17761,19 @@
 	},
 /turf/simulated/floor/tiled/techmaint,
 /area/groundbase/engineering/atmos)
+"sah" = (
+/obj/structure/sign/directions/command{
+	dir = 4;
+	pixel_x = 32;
+	pixel_y = 10
+	},
+/obj/structure/sign/directions/library{
+	dir = 4;
+	pixel_x = 32;
+	pixel_y = 4
+	},
+/turf/simulated/floor/outdoors/grass/seasonal,
+/area/groundbase/level1/ne)
 "saD" = (
 /obj/structure/closet/firecloset/full,
 /turf/simulated/wall/r_wall,
@@ -17808,19 +17821,6 @@
 	},
 /turf/simulated/floor/wood,
 /area/groundbase/civilian/gameroom)
-"scH" = (
-/obj/structure/sign/directions/bar{
-	dir = 9;
-	pixel_x = 32;
-	pixel_y = 33
-	},
-/obj/structure/sign/directions/cryo{
-	dir = 9;
-	pixel_x = 32;
-	pixel_y = 39
-	},
-/turf/simulated/floor/outdoors/grass/seasonal/notrees_nomobs,
-/area/groundbase/level1/ne)
 "sde" = (
 /obj/structure/cable/yellow{
 	icon_state = "4-8"
@@ -18291,9 +18291,6 @@
 /turf/simulated/floor/outdoors/sidewalk,
 /area/groundbase/level1/sw)
 "sJE" = (
-/obj/item/device/radio/intercom{
-	pixel_y = -24
-	},
 /obj/structure/table/bench/padded,
 /turf/simulated/floor/outdoors/newdirt{
 	outdoors = 0
@@ -19083,14 +19080,6 @@
 	},
 /turf/simulated/floor/outdoors/newdirt_nograss,
 /area/groundbase/level1/ne)
-"tCG" = (
-/obj/structure/sign/directions/cryo{
-	dir = 1;
-	pixel_x = 32;
-	pixel_y = 7
-	},
-/turf/simulated/floor/outdoors/grass/seasonal/notrees_nomobs,
-/area/groundbase/level1/nw)
 "tDy" = (
 /obj/structure/cable/yellow{
 	icon_state = "4-8"
@@ -19376,10 +19365,6 @@
 /obj/machinery/atmospherics/unary/vent_scrubber/on,
 /turf/simulated/floor/tiled/dark,
 /area/groundbase/security/lobby)
-"tTz" = (
-/obj/structure/bed/chair/sofa/bench/right,
-/turf/simulated/floor/outdoors/grass/seasonal,
-/area/groundbase/level1/sw)
 "tUS" = (
 /turf/simulated/floor/outdoors/grass/seasonal/notrees_nomobs,
 /area/groundbase/civilian/clown)
@@ -19981,6 +19966,29 @@
 	},
 /turf/simulated/floor/tiled/dark,
 /area/groundbase/security/lobby)
+"urU" = (
+/obj/structure/sign/directions/medical{
+	dir = 1;
+	pixel_x = 32;
+	pixel_y = 10
+	},
+/obj/structure/sign/directions/security{
+	dir = 8;
+	pixel_x = 32;
+	pixel_y = 4
+	},
+/obj/structure/sign/directions/engineering{
+	dir = 10;
+	pixel_x = 32;
+	pixel_y = -2
+	},
+/obj/structure/sign/directions/science{
+	dir = 8;
+	pixel_x = 32;
+	pixel_y = -8
+	},
+/turf/simulated/floor/outdoors/grass/seasonal,
+/area/groundbase/level1/ne)
 "usq" = (
 /obj/structure/cable/yellow{
 	icon_state = "4-8"
@@ -20217,10 +20225,6 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /turf/simulated/floor/outdoors/sidewalk,
 /area/groundbase/civilian/bar)
-"uDX" = (
-/obj/structure/bed/chair/sofa/bench/left,
-/turf/simulated/floor/outdoors/grass/seasonal,
-/area/groundbase/level1/sw)
 "uFf" = (
 /obj/structure/cable/yellow{
 	icon_state = "1-2"
@@ -20952,14 +20956,6 @@
 	},
 /turf/simulated/floor/tiled/white,
 /area/groundbase/civilian/bar)
-"vCc" = (
-/obj/structure/sign/directions/dorms{
-	dir = 9;
-	pixel_x = 32;
-	pixel_y = -32
-	},
-/turf/simulated/floor/outdoors/grass/seasonal,
-/area/groundbase/level1/nw)
 "vCg" = (
 /obj/structure/bed/chair/backed_red,
 /obj/structure/cable/yellow{
@@ -23597,6 +23593,10 @@
 	},
 /turf/simulated/floor/tiled/dark,
 /area/groundbase/command/hall)
+"ylK" = (
+/obj/machinery/light,
+/turf/simulated/floor/tiled,
+/area/rnd/xenobiology)
 "ylR" = (
 /obj/structure/cable/orange{
 	icon_state = "1-4"
@@ -27397,7 +27397,7 @@ sfb
 sfb
 sfb
 sfb
-tTz
+lkQ
 hVa
 sfb
 sfb
@@ -27539,7 +27539,7 @@ sfb
 sfb
 sfb
 sfb
-uDX
+oww
 hVa
 sfb
 sfb
@@ -28803,7 +28803,7 @@ dcE
 tJF
 rOt
 xcj
-poN
+gGP
 xcj
 rOt
 raF
@@ -28902,7 +28902,7 @@ hGk
 oeu
 oeu
 egG
-vCc
+jGQ
 oeu
 oeu
 oeu
@@ -29752,7 +29752,7 @@ oeu
 pDQ
 pjP
 dVI
-bwp
+sJE
 wRI
 mDR
 pDQ
@@ -30038,14 +30038,14 @@ cLi
 dVI
 mDR
 xOg
-bwp
+sJE
 hkB
 dVI
 qbN
 dVI
-bwp
+sJE
 xgn
-bwp
+iEb
 pBY
 pBY
 pBY
@@ -30185,7 +30185,7 @@ dVI
 dVI
 pfZ
 dVI
-bwp
+sJE
 hzC
 sJE
 nCM
@@ -30327,9 +30327,9 @@ hoO
 fck
 vWm
 bYh
-bwp
+sJE
 mDC
-bwp
+sJE
 svD
 len
 gge
@@ -30921,7 +30921,7 @@ egG
 oeu
 oeu
 lKQ
-oYl
+psq
 sfb
 sfb
 sfb
@@ -31378,7 +31378,7 @@ bfA
 gNV
 hxn
 iwj
-qyI
+ylK
 boq
 ffC
 eQS
@@ -32308,13 +32308,13 @@ oeu
 pDQ
 neL
 dVI
-bwp
-bwp
-bwp
+sJE
+sJE
+sJE
 pDQ
-bwp
-bwp
-bwp
+sJE
+sJE
+sJE
 pDQ
 pDQ
 pDQ
@@ -32458,7 +32458,7 @@ pDI
 pDI
 pDI
 rQn
-hFT
+eAs
 pDI
 pDI
 bat
@@ -33041,8 +33041,8 @@ lOz
 lOz
 kPC
 bat
-tCG
-nDd
+rdW
+boW
 tBm
 egG
 oeu
@@ -33243,7 +33243,7 @@ sfb
 sfb
 sfb
 sfb
-tTz
+lkQ
 qUW
 sfb
 kUt
@@ -33385,7 +33385,7 @@ sfb
 sfb
 sfb
 sfb
-uDX
+oww
 qUW
 sfb
 kUt
@@ -33903,7 +33903,7 @@ eiI
 eiI
 eiI
 eiI
-scH
+jFr
 fdO
 lFG
 kUt
@@ -34188,7 +34188,7 @@ qiX
 lJr
 bTX
 bTX
-ban
+duA
 lFG
 kUt
 kUt
@@ -34721,7 +34721,7 @@ amy
 amy
 lPx
 vSC
-ktK
+sah
 eiI
 xxV
 eiI
@@ -37595,7 +37595,7 @@ amy
 amy
 amy
 eiI
-jkY
+urU
 kKr
 hBH
 kKr

From 8cba0c11b3b22f82063ddab74fd14f335d26f003 Mon Sep 17 00:00:00 2001
From: VerySoft <a.roaming.shadow@gmail.com>
Date: Sun, 5 Nov 2023 17:03:30 -0500
Subject: [PATCH 3/3] 1703

---
 maps/groundbase/rp-z2.dmm | 732 ++++++++++++++++++++++----------------
 maps/groundbase/rp-z3.dmm | 266 +++++++-------
 2 files changed, 558 insertions(+), 440 deletions(-)

diff --git a/maps/groundbase/rp-z2.dmm b/maps/groundbase/rp-z2.dmm
index 0783e72339e..b297d85c425 100644
--- a/maps/groundbase/rp-z2.dmm
+++ b/maps/groundbase/rp-z2.dmm
@@ -54,6 +54,12 @@
 	},
 /turf/simulated/floor/carpet,
 /area/groundbase/civilian/library)
+"ai" = (
+/obj/structure/railing,
+/turf/simulated/floor/bmarble{
+	outdoors = 1
+	},
+/area/groundbase/civilian/bar)
 "aj" = (
 /obj/structure/table/standard,
 /obj/item/weapon/tape_roll,
@@ -196,6 +202,18 @@
 	},
 /turf/simulated/floor/tiled,
 /area/ai_monitored/storage/eva)
+"aO" = (
+/obj/structure/railing,
+/obj/structure/railing{
+	dir = 8
+	},
+/obj/structure/bed/chair/backed_red{
+	dir = 4
+	},
+/turf/simulated/floor/bmarble{
+	outdoors = 1
+	},
+/area/groundbase/civilian/bar)
 "aP" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /turf/simulated/floor/lino,
@@ -1060,6 +1078,11 @@
 	},
 /turf/simulated/floor/tiled,
 /area/ai_monitored/storage/eva)
+"dF" = (
+/turf/simulated/floor/bmarble{
+	outdoors = 1
+	},
+/area/groundbase/civilian/bar)
 "dI" = (
 /obj/structure/table/steel,
 /obj/item/device/multitool,
@@ -5171,6 +5194,15 @@
 	},
 /turf/simulated/floor/wood,
 /area/groundbase/dorms/room1)
+"tD" = (
+/obj/structure/bed/chair/backed_red{
+	dir = 8
+	},
+/obj/structure/railing,
+/turf/simulated/floor/bmarble{
+	outdoors = 1
+	},
+/area/groundbase/civilian/bar)
 "tE" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 4
@@ -5297,12 +5329,11 @@
 /turf/simulated/floor/tiled,
 /area/rnd/xenobiology)
 "ua" = (
-/obj/structure/railing{
-	dir = 4
+/turf/simulated/floor{
+	edge_blending_priority = -1;
+	outdoors = 1
 	},
-/obj/structure/railing,
-/turf/simulated/floor/bmarble,
-/area/holodeck_control)
+/area/groundbase/level2/ne)
 "ub" = (
 /obj/machinery/computer/arcade{
 	dir = 4
@@ -5819,6 +5850,17 @@
 	},
 /turf/simulated/floor/tiled/white,
 /area/groundbase/medical/lobby)
+"vK" = (
+/obj/structure/railing{
+	dir = 8
+	},
+/obj/structure/bed/chair/backed_red{
+	dir = 4
+	},
+/turf/simulated/floor/bmarble{
+	outdoors = 1
+	},
+/area/groundbase/civilian/bar)
 "vN" = (
 /obj/structure/bookcase,
 /obj/item/weapon/book/manual/anomaly_spectroscopy,
@@ -7345,6 +7387,14 @@
 	},
 /turf/simulated/floor/tiled/dark,
 /area/groundbase/civilian/chapel)
+"BE" = (
+/obj/structure/bed/chair/backed_red{
+	dir = 8
+	},
+/turf/simulated/floor/bmarble{
+	outdoors = 1
+	},
+/area/groundbase/civilian/bar)
 "BG" = (
 /obj/machinery/computer/security{
 	dir = 8
@@ -8583,6 +8633,14 @@
 /obj/machinery/atmospherics/unary/vent_pump/on,
 /turf/simulated/floor/wood,
 /area/groundbase/dorms/room6)
+"GT" = (
+/obj/structure/railing{
+	dir = 8
+	},
+/turf/simulated/floor/bmarble{
+	outdoors = 1
+	},
+/area/groundbase/civilian/bar)
 "GU" = (
 /obj/structure/table/rack/shelf/steel,
 /obj/item/weapon/cell/device/weapon{
@@ -9058,6 +9116,15 @@
 /obj/item/weapon/tank/jetpack/carbondioxide,
 /turf/simulated/floor/tiled,
 /area/ai_monitored/storage/eva)
+"ID" = (
+/obj/structure/bed/chair/backed_red{
+	dir = 4
+	},
+/obj/structure/railing,
+/turf/simulated/floor/bmarble{
+	outdoors = 1
+	},
+/area/groundbase/civilian/bar)
 "IE" = (
 /obj/effect/floor_decal/steeldecal/steel_decals10{
 	dir = 9
@@ -9278,6 +9345,13 @@
 "Js" = (
 /turf/simulated/floor/tiled/white,
 /area/groundbase/dorms/room7)
+"Jt" = (
+/obj/structure/table/steel,
+/obj/structure/railing,
+/turf/simulated/floor/bmarble{
+	outdoors = 1
+	},
+/area/groundbase/civilian/bar)
 "Ju" = (
 /obj/structure/bed/chair{
 	dir = 8
@@ -9751,6 +9825,14 @@
 /obj/structure/filingcabinet/filingcabinet,
 /turf/simulated/floor/tiled,
 /area/groundbase/cargo/office)
+"KZ" = (
+/obj/structure/bed/chair/backed_red{
+	dir = 4
+	},
+/turf/simulated/floor/bmarble{
+	outdoors = 1
+	},
+/area/groundbase/civilian/bar)
 "La" = (
 /obj/effect/floor_decal/steeldecal/steel_decals10,
 /obj/structure/cable/yellow{
@@ -10174,6 +10256,13 @@
 /obj/structure/railing,
 /turf/simulated/floor/bmarble,
 /area/groundbase/civilian/bar)
+"MK" = (
+/obj/structure/railing,
+/obj/structure/table/steel,
+/turf/simulated/floor/bmarble{
+	outdoors = 1
+	},
+/area/groundbase/civilian/bar)
 "ML" = (
 /obj/item/weapon/storage/briefcase,
 /obj/item/weapon/storage/briefcase,
@@ -10608,6 +10697,12 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /turf/simulated/floor/outdoors/sidewalk,
 /area/groundbase/level2/ne)
+"Ou" = (
+/obj/structure/table/steel,
+/turf/simulated/floor/bmarble{
+	outdoors = 1
+	},
+/area/groundbase/civilian/bar)
 "Ov" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 4
@@ -11701,6 +11796,14 @@
 "RL" = (
 /turf/simulated/floor/carpet/blue,
 /area/groundbase/medical/psych)
+"RO" = (
+/obj/structure/railing{
+	dir = 4
+	},
+/turf/simulated/floor/bmarble{
+	outdoors = 1
+	},
+/area/groundbase/civilian/bar)
 "RP" = (
 /obj/machinery/button/remote/blast_door{
 	desc = "A remote control-switch for shutters.";
@@ -11750,6 +11853,15 @@
 	},
 /turf/simulated/floor/bmarble,
 /area/holodeck_control)
+"RZ" = (
+/obj/structure/railing{
+	dir = 4
+	},
+/obj/structure/railing,
+/turf/simulated/floor/bmarble{
+	outdoors = 1
+	},
+/area/groundbase/civilian/bar)
 "Sb" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /obj/structure/cable/yellow{
@@ -13911,11 +14023,11 @@ pt
 pt
 pt
 pt
-TH
-TH
-TH
-av
-av
+pt
+pt
+pt
+kO
+kO
 kO
 kO
 kO
@@ -18612,8 +18724,8 @@ Mn
 hM
 bB
 Lw
-av
-av
+MX
+MX
 av
 av
 av
@@ -18754,8 +18866,8 @@ bD
 Gu
 ma
 pq
-av
-av
+MX
+MX
 av
 av
 av
@@ -18896,8 +19008,8 @@ LO
 gC
 ma
 pq
-av
-av
+MX
+MX
 av
 av
 av
@@ -19038,8 +19150,8 @@ Xp
 pl
 ma
 IN
-av
-av
+MX
+MX
 av
 av
 av
@@ -19878,15 +19990,15 @@ TH
 TH
 TH
 TH
-av
-av
-av
-av
-av
-av
-av
-av
-av
+tL
+tL
+tL
+tL
+tL
+tL
+tL
+tL
+tL
 av
 av
 av
@@ -20020,15 +20132,15 @@ TH
 TH
 TH
 TH
-av
-av
-av
-av
-av
-av
-av
-av
-av
+tL
+tL
+tL
+tL
+tL
+tL
+tL
+tL
+tL
 av
 av
 av
@@ -20162,15 +20274,15 @@ TH
 TH
 TH
 TH
-av
-av
-av
-av
-av
-av
-av
-av
-av
+tL
+tL
+tL
+tL
+tL
+tL
+tL
+tL
+tL
 av
 av
 tL
@@ -20304,15 +20416,15 @@ TH
 TH
 TH
 TH
-av
-av
-av
-av
-av
-av
-av
-av
-av
+tL
+tL
+tL
+tL
+tL
+tL
+tL
+tL
+tL
 av
 av
 tL
@@ -20434,9 +20546,9 @@ rB
 rB
 rB
 mQ
-Wf
-Wf
-Wf
+vK
+GT
+aO
 Wf
 TH
 TH
@@ -20446,15 +20558,15 @@ TH
 TH
 TH
 TH
-av
-av
-av
-av
-av
-av
-av
-av
-av
+tL
+tL
+tL
+tL
+tL
+tL
+tL
+tL
+tL
 av
 av
 tL
@@ -20576,9 +20688,9 @@ rB
 rB
 rB
 mQ
-Wf
-Wf
-Wf
+Ou
+dF
+MK
 Wf
 TH
 TH
@@ -20588,15 +20700,15 @@ TH
 TH
 TH
 TH
-av
-av
-av
-av
-av
-av
-av
-av
-av
+tL
+tL
+tL
+tL
+tL
+tL
+tL
+tL
+tL
 av
 av
 tL
@@ -20718,9 +20830,9 @@ rB
 rB
 rB
 mQ
-Wf
-Wf
-Wf
+BE
+dF
+ai
 Wf
 TH
 TH
@@ -20730,15 +20842,15 @@ TH
 TH
 TH
 TH
-av
-av
-av
-av
-av
-av
-av
-av
-av
+tL
+tL
+tL
+tL
+tL
+tL
+tL
+tL
+tL
 av
 av
 tL
@@ -20860,9 +20972,9 @@ rB
 rB
 rB
 mQ
-Wf
-Wf
-Wf
+dF
+dF
+ai
 Wf
 TH
 TH
@@ -20872,15 +20984,15 @@ TH
 TH
 TH
 TH
-av
-av
-av
-av
-av
-av
-av
-av
-av
+tL
+tL
+tL
+tL
+tL
+tL
+tL
+tL
+tL
 av
 av
 tL
@@ -21002,9 +21114,9 @@ rB
 rB
 rB
 mQ
-Wf
-Wf
-Wf
+KZ
+dF
+ID
 Wf
 TH
 TH
@@ -21014,15 +21126,15 @@ TH
 TH
 TH
 TH
-av
-av
-av
-av
-av
-av
-av
-av
-av
+tL
+tL
+tL
+tL
+tL
+tL
+tL
+tL
+tL
 av
 av
 tL
@@ -21144,9 +21256,9 @@ rB
 rB
 rB
 mQ
-Wf
-Wf
-Wf
+Ou
+dF
+Jt
 Wf
 TH
 TH
@@ -21286,9 +21398,9 @@ rB
 rB
 rB
 mQ
-Wf
-Wf
-Wf
+BE
+dF
+tD
 Wf
 TH
 TH
@@ -21428,9 +21540,9 @@ rB
 rB
 rB
 mQ
-Wf
-Wf
-Wf
+dF
+dF
+ai
 Wf
 TH
 TH
@@ -21570,9 +21682,9 @@ rB
 rB
 rB
 mQ
-Wf
-Wf
-Wf
+KZ
+dF
+ID
 Wf
 TH
 TH
@@ -21650,7 +21762,7 @@ av
 av
 av
 av
-av
+kO
 "}
 (56,1,1) = {"
 pt
@@ -21712,9 +21824,9 @@ rB
 rB
 rB
 mQ
-Wf
-Wf
-Wf
+Ou
+dF
+Jt
 Wf
 TH
 TH
@@ -21792,7 +21904,7 @@ av
 av
 av
 av
-av
+kO
 "}
 (57,1,1) = {"
 pt
@@ -21854,9 +21966,9 @@ cZ
 cZ
 zu
 mQ
-Wf
-Wf
-Wf
+BE
+dF
+tD
 Wf
 TH
 TH
@@ -21934,7 +22046,7 @@ pp
 pp
 pp
 pp
-pp
+GH
 "}
 (58,1,1) = {"
 pt
@@ -21996,9 +22108,9 @@ cZ
 cZ
 Sj
 mQ
-Wf
-Wf
-Wf
+dF
+dF
+ai
 Wf
 TH
 TH
@@ -22076,7 +22188,7 @@ zJ
 zJ
 pp
 pp
-pp
+GH
 "}
 (59,1,1) = {"
 pt
@@ -22138,9 +22250,9 @@ xZ
 LT
 tJ
 mQ
-Wf
-Wf
-Wf
+dF
+dF
+ai
 Wf
 TH
 TH
@@ -22218,7 +22330,7 @@ zJ
 zJ
 zJ
 pp
-pp
+GH
 "}
 (60,1,1) = {"
 pt
@@ -22280,9 +22392,9 @@ mQ
 mQ
 mQ
 mQ
-Wf
-Wf
-Wf
+dF
+dF
+ai
 Wf
 TH
 TH
@@ -22420,11 +22532,11 @@ XQ
 zY
 it
 it
-ua
-Wf
-Wf
-Wf
-Wf
+it
+kq
+RO
+RO
+RZ
 Wf
 TH
 TH
@@ -23073,7 +23185,7 @@ kp
 GH
 "}
 (66,1,1) = {"
-TH
+pt
 TH
 TH
 TH
@@ -23215,7 +23327,7 @@ kp
 GH
 "}
 (67,1,1) = {"
-TH
+pt
 TH
 TH
 TH
@@ -23357,7 +23469,7 @@ kp
 GH
 "}
 (68,1,1) = {"
-TH
+pt
 TH
 TH
 TH
@@ -23407,17 +23519,17 @@ TH
 TH
 TH
 TH
-TH
-TH
-TH
-TH
-TH
-TH
-TH
-TH
-TH
-TH
-TH
+Wf
+Wf
+Wf
+Wf
+Wf
+Wf
+Wf
+Wf
+Wf
+Wf
+Wf
 TH
 TH
 TH
@@ -23499,7 +23611,7 @@ kp
 GH
 "}
 (69,1,1) = {"
-TH
+pt
 TH
 TH
 TH
@@ -23549,17 +23661,17 @@ TH
 TH
 TH
 TH
-TH
-TH
-TH
-TH
-TH
-TH
-TH
-TH
-TH
-TH
-TH
+Wf
+Wf
+Wf
+Wf
+Wf
+Wf
+Wf
+Wf
+Wf
+Wf
+Wf
 TH
 TH
 TH
@@ -23641,7 +23753,7 @@ kp
 GH
 "}
 (70,1,1) = {"
-bR
+ra
 bR
 bR
 bR
@@ -23691,17 +23803,17 @@ bR
 bR
 bR
 bR
-bR
-bR
-bR
-bR
-bR
-bR
-bR
-bR
-bR
-bR
-bR
+ua
+ua
+ua
+ua
+ua
+ua
+ua
+ua
+ua
+ua
+ua
 bR
 bR
 bR
@@ -23833,17 +23945,17 @@ bR
 bR
 bR
 bR
-bR
-bR
-bR
-bR
-bR
-bR
-bR
-bR
-bR
-bR
-bR
+ua
+ua
+ua
+ua
+ua
+ua
+ua
+ua
+ua
+ua
+ua
 bR
 bR
 bR
@@ -23975,17 +24087,17 @@ bR
 bR
 bR
 bR
-bR
-bR
-bR
-bR
-bR
-bR
-bR
-bR
-bR
-bR
-bR
+ua
+ua
+ua
+ua
+ua
+ua
+ua
+ua
+ua
+ua
+ua
 bR
 bR
 bR
@@ -24117,17 +24229,17 @@ bR
 bR
 bR
 bR
-bR
-bR
-bR
-bR
-bR
-bR
-bR
-bR
-bR
-bR
-bR
+ua
+ua
+ua
+ua
+ua
+ua
+ua
+ua
+ua
+ua
+ua
 bR
 bR
 bR
@@ -24259,17 +24371,17 @@ bR
 bR
 bR
 bR
-bR
-bR
-bR
-bR
-bR
-bR
-bR
-bR
-bR
-bR
-bR
+ua
+ua
+ua
+ua
+ua
+ua
+ua
+ua
+ua
+ua
+ua
 bR
 bR
 bR
@@ -24401,17 +24513,17 @@ bR
 bR
 bR
 bR
-bR
-bR
-bR
-bR
-bR
-bR
-bR
-bR
-bR
-bR
-bR
+ua
+ua
+ua
+ua
+ua
+ua
+ua
+ua
+ua
+ua
+ua
 bR
 bR
 bR
@@ -24543,17 +24655,17 @@ bR
 bR
 bR
 bR
-bR
-bR
-bR
-bR
-bR
-bR
-bR
-bR
-bR
-bR
-bR
+ua
+ua
+ua
+ua
+ua
+ua
+ua
+ua
+ua
+ua
+ua
 bR
 bR
 bR
@@ -24685,17 +24797,17 @@ bR
 bR
 bR
 bR
-bR
-bR
-bR
-bR
-bR
-bR
-bR
-bR
-bR
-bR
-bR
+ua
+ua
+ua
+ua
+ua
+ua
+ua
+ua
+ua
+ua
+ua
 bR
 bR
 bR
@@ -24827,17 +24939,17 @@ bR
 bR
 bR
 bR
-bR
-bR
-bR
-bR
-bR
-bR
-bR
-bR
-bR
-bR
-bR
+ua
+ua
+ua
+ua
+ua
+ua
+ua
+ua
+ua
+ua
+ua
 bR
 bR
 bR
@@ -24969,17 +25081,17 @@ bR
 bR
 bR
 bR
-bR
-bR
-bR
-bR
-bR
-bR
-bR
-bR
-bR
-bR
-bR
+ua
+ua
+ua
+ua
+ua
+ua
+ua
+ua
+ua
+ua
+ua
 bR
 bR
 bR
@@ -25111,17 +25223,17 @@ bR
 bR
 bR
 bR
-bR
-bR
-bR
-bR
-bR
-bR
-bR
-bR
-bR
-bR
-bR
+ua
+ua
+ua
+ua
+ua
+ua
+ua
+ua
+ua
+ua
+ua
 bR
 bR
 bR
@@ -25253,17 +25365,17 @@ bR
 bR
 bR
 bR
-bR
-bR
-bR
-bR
-bR
-bR
-bR
-bR
-bR
-bR
-bR
+ua
+ua
+ua
+ua
+ua
+ua
+ua
+ua
+ua
+ua
+ua
 bR
 bR
 bR
diff --git a/maps/groundbase/rp-z3.dmm b/maps/groundbase/rp-z3.dmm
index 5f50f51eec1..509d7cd0237 100644
--- a/maps/groundbase/rp-z3.dmm
+++ b/maps/groundbase/rp-z3.dmm
@@ -88,6 +88,12 @@
 	},
 /turf/simulated/floor/tiled,
 /area/shuttle/groundbase/exploration)
+"bR" = (
+/turf/simulated/floor{
+	edge_blending_priority = -1;
+	outdoors = 1
+	},
+/area/groundbase/level3/se)
 "bT" = (
 /obj/machinery/portable_atmospherics/canister/oxygen,
 /turf/simulated/floor/tiled,
@@ -3729,11 +3735,11 @@ cf
 cf
 cf
 cf
-PZ
-PZ
-PZ
-rf
-rf
+cf
+cf
+cf
+Ax
+Ax
 Ax
 Ax
 Ax
@@ -7991,18 +7997,18 @@ YE
 RZ
 PZ
 PZ
-PZ
-rf
-rf
-rf
-rf
-rf
-rf
-rf
-rf
-rf
-rf
-rf
+yx
+nd
+nd
+nd
+nd
+nd
+nd
+nd
+nd
+nd
+nd
+nd
 rf
 rf
 rf
@@ -8133,18 +8139,18 @@ YE
 RZ
 PZ
 PZ
-PZ
-rf
-rf
-rf
-rf
-rf
-rf
-rf
-rf
-rf
-rf
-rf
+yx
+nd
+nd
+nd
+nd
+nd
+nd
+nd
+nd
+nd
+nd
+nd
 rf
 rf
 rf
@@ -8275,18 +8281,18 @@ YE
 RZ
 PZ
 PZ
-PZ
-rf
-rf
-rf
-rf
-rf
-rf
-rf
-rf
-rf
-rf
-rf
+yx
+nd
+nd
+nd
+nd
+nd
+nd
+nd
+nd
+nd
+nd
+nd
 rf
 rf
 rf
@@ -8417,18 +8423,18 @@ YE
 RZ
 PZ
 PZ
-PZ
-rf
-rf
-rf
-rf
-rf
-rf
-rf
-rf
-rf
-rf
-rf
+yx
+nd
+nd
+nd
+nd
+nd
+nd
+nd
+nd
+nd
+nd
+nd
 rf
 rf
 rf
@@ -8559,18 +8565,18 @@ wB
 RZ
 PZ
 PZ
-PZ
-rf
-rf
-rf
-rf
-rf
-rf
-rf
-rf
-rf
-rf
-rf
+yx
+nd
+nd
+nd
+nd
+nd
+nd
+nd
+nd
+nd
+nd
+nd
 rf
 rf
 rf
@@ -8701,18 +8707,18 @@ YE
 RZ
 PZ
 PZ
-PZ
-rf
-rf
-rf
-rf
-rf
-rf
-rf
-rf
-rf
-rf
-rf
+yx
+nd
+nd
+nd
+nd
+nd
+nd
+nd
+nd
+nd
+nd
+nd
 rf
 rf
 rf
@@ -8843,18 +8849,18 @@ YE
 RZ
 PZ
 PZ
-PZ
-rf
-rf
-rf
-rf
-rf
-rf
-rf
-rf
-rf
-rf
-rf
+yx
+nd
+nd
+nd
+nd
+nd
+nd
+nd
+nd
+nd
+nd
+nd
 rf
 rf
 rf
@@ -8985,18 +8991,18 @@ YE
 RZ
 PZ
 PZ
-PZ
-rf
-rf
-rf
-rf
-rf
-rf
-rf
-rf
-rf
-rf
-rf
+yx
+nd
+nd
+nd
+nd
+nd
+nd
+nd
+nd
+nd
+nd
+nd
 rf
 rf
 rf
@@ -9131,14 +9137,14 @@ PZ
 rf
 rf
 rf
-rf
-rf
-rf
-rf
-rf
-rf
-rf
-rf
+nd
+nd
+nd
+nd
+nd
+nd
+nd
+nd
 rf
 rf
 rf
@@ -11468,7 +11474,7 @@ rf
 rf
 rf
 rf
-rf
+Ax
 "}
 (56,1,1) = {"
 cf
@@ -11610,7 +11616,7 @@ rf
 rf
 rf
 rf
-rf
+Ax
 "}
 (57,1,1) = {"
 cf
@@ -11752,7 +11758,7 @@ rf
 rf
 rf
 rf
-rf
+Ax
 "}
 (58,1,1) = {"
 cf
@@ -11894,7 +11900,7 @@ YS
 YS
 YS
 YS
-YS
+wb
 "}
 (59,1,1) = {"
 cf
@@ -12036,7 +12042,7 @@ YS
 YS
 YS
 YS
-YS
+wb
 "}
 (60,1,1) = {"
 cf
@@ -12891,7 +12897,7 @@ uK
 wb
 "}
 (66,1,1) = {"
-PZ
+cf
 PZ
 PZ
 PZ
@@ -13033,7 +13039,7 @@ uK
 wb
 "}
 (67,1,1) = {"
-PZ
+cf
 PZ
 PZ
 PZ
@@ -13175,7 +13181,7 @@ uK
 wb
 "}
 (68,1,1) = {"
-PZ
+cf
 PZ
 PZ
 PZ
@@ -13317,7 +13323,7 @@ uK
 wb
 "}
 (69,1,1) = {"
-PZ
+cf
 PZ
 PZ
 PZ
@@ -13459,7 +13465,7 @@ uK
 wb
 "}
 (70,1,1) = {"
-xF
+al
 xF
 xF
 xF
@@ -20787,8 +20793,8 @@ FW
 FW
 YS
 YS
-YS
-YS
+bR
+bR
 Wy
 Wy
 Wy
@@ -20929,8 +20935,8 @@ YS
 YS
 YS
 YS
-YS
-YS
+bR
+bR
 Wy
 Wy
 Wy
@@ -21071,7 +21077,7 @@ YS
 YS
 YS
 YS
-YS
+bR
 Wy
 Wy
 Wy
@@ -23425,12 +23431,12 @@ al
 al
 al
 al
-xF
-xF
-xF
-xF
-xF
-xF
+al
+al
+al
+al
+al
+al
 al
 al
 al