From 68d45d0fc99f4234f1937d7252d9df5ef6763286 Mon Sep 17 00:00:00 2001
From: Kayleen <michab02@gmail.com>
Date: Wed, 19 Jun 2024 03:14:23 -0400
Subject: [PATCH 1/3] Various RP fixes

---
 maps/groundbase/rp-z1.dmm | 30 ++++++++++----
 maps/groundbase/rp-z2.dmm | 83 ++++++++++++++++++---------------------
 maps/groundbase/rp-z3.dmm | 57 +++++++++++++++++++--------
 3 files changed, 101 insertions(+), 69 deletions(-)

diff --git a/maps/groundbase/rp-z1.dmm b/maps/groundbase/rp-z1.dmm
index b98c52caec4..40da9d579b2 100644
--- a/maps/groundbase/rp-z1.dmm
+++ b/maps/groundbase/rp-z1.dmm
@@ -427,6 +427,12 @@
 /obj/machinery/light,
 /turf/simulated/floor/tiled,
 /area/groundbase/engineering/techstorage)
+"awp" = (
+/obj/machinery/camera/network/security{
+	dir = 4
+	},
+/turf/simulated/floor/tiled/dark,
+/area/groundbase/security/lobby)
 "awx" = (
 /turf/simulated/mineral/cave,
 /area/groundbase/unexplored/rock)
@@ -3446,6 +3452,7 @@
 "dfK" = (
 /obj/machinery/vending/assist,
 /obj/machinery/camera/network/civilian,
+/obj/machinery/firealarm,
 /turf/simulated/floor/tiled,
 /area/groundbase/civilian/toolstorage)
 "dfP" = (
@@ -6701,6 +6708,9 @@
 	dir = 4
 	},
 /obj/machinery/papershredder,
+/obj/machinery/camera/network/security{
+	dir = 8
+	},
 /turf/simulated/floor/tiled/dark,
 /area/groundbase/security/lobby)
 "gfi" = (
@@ -11049,9 +11059,6 @@
 /obj/machinery/recharger{
 	pixel_y = 5
 	},
-/obj/machinery/alarm{
-	dir = 8
-	},
 /turf/simulated/floor/tiled,
 /area/groundbase/civilian/toolstorage)
 "jUi" = (
@@ -12289,6 +12296,7 @@
 /obj/machinery/light{
 	dir = 8
 	},
+/obj/machinery/camera/network/security,
 /turf/simulated/floor/carpet/retro_red,
 /area/groundbase/security/breakroom)
 "kTx" = (
@@ -16156,6 +16164,7 @@
 /obj/effect/floor_decal/milspec/color/orange/half{
 	dir = 8
 	},
+/obj/structure/frame,
 /turf/simulated/floor/tiled,
 /area/groundbase/engineering/workshop)
 "oEM" = (
@@ -17007,7 +17016,15 @@
 /obj/effect/floor_decal/milspec/color/orange/half{
 	dir = 8
 	},
-/obj/structure/frame,
+/obj/structure/table/reinforced,
+/obj/item/weapon/storage/toolbox/electrical{
+	pixel_x = 1;
+	pixel_y = 6
+	},
+/obj/item/weapon/storage/toolbox/mechanical{
+	pixel_x = -2;
+	pixel_y = -1
+	},
 /turf/simulated/floor/tiled,
 /area/groundbase/engineering/workshop)
 "pjY" = (
@@ -20294,9 +20311,6 @@
 /obj/structure/symbol/sa{
 	pixel_y = 32
 	},
-/obj/machinery/firealarm{
-	dir = 4
-	},
 /obj/machinery/atmospherics/unary/vent_scrubber/on{
 	dir = 8
 	},
@@ -32143,7 +32157,7 @@ pjZ
 tLw
 gjX
 tLw
-tLw
+awp
 kLB
 ycp
 ycp
diff --git a/maps/groundbase/rp-z2.dmm b/maps/groundbase/rp-z2.dmm
index ff936b89017..800d22e1971 100644
--- a/maps/groundbase/rp-z2.dmm
+++ b/maps/groundbase/rp-z2.dmm
@@ -2097,6 +2097,9 @@
 	dir = 4
 	},
 /obj/structure/railing/grey,
+/obj/machinery/camera/network/security{
+	dir = 4
+	},
 /turf/simulated/open,
 /area/groundbase/security/hall2)
 "gE" = (
@@ -2405,13 +2408,10 @@
 /turf/simulated/floor/outdoors/grass/seasonal/notrees,
 /area/groundbase/level2/ne)
 "hO" = (
-/obj/machinery/computer/guestpass{
-	dir = 1;
-	pixel_y = -22
-	},
 /obj/effect/floor_decal/corner/paleblue{
 	dir = 10
 	},
+/obj/machinery/iv_drip,
 /turf/simulated/floor/tiled/white,
 /area/groundbase/medical/triage)
 "hP" = (
@@ -3947,6 +3947,10 @@
 /obj/effect/floor_decal/steeldecal/steel_decals10{
 	dir = 9
 	},
+/obj/machinery/light_switch{
+	dir = 8;
+	pixel_x = 30
+	},
 /turf/simulated/floor/tiled,
 /area/groundbase/science/xenoautopsy)
 "mU" = (
@@ -4072,10 +4076,12 @@
 /area/groundbase/civilian/chapel)
 "nq" = (
 /obj/machinery/light,
-/obj/machinery/iv_drip,
 /obj/effect/floor_decal/corner/paleblue{
 	dir = 10
 	},
+/obj/structure/filingcabinet/chestdrawer{
+	name = "Body Scans"
+	},
 /turf/simulated/floor/tiled/white,
 /area/groundbase/medical/triage)
 "nr" = (
@@ -5431,10 +5437,7 @@
 /obj/effect/floor_decal/milspec/color/purple/half{
 	dir = 4
 	},
-/turf/simulated/floor/tiled{
-	edge_blending_priority = -1;
-	outdoors = 1
-	},
+/turf/simulated/floor/tiled,
 /area/groundbase/science/hall)
 "rz" = (
 /obj/structure/table/bench/steel,
@@ -5608,9 +5611,6 @@
 /obj/machinery/atmospherics/pipe/manifold/hidden/supply{
 	dir = 8
 	},
-/obj/machinery/alarm{
-	dir = 4
-	},
 /turf/simulated/floor/tiled,
 /area/groundbase/science/xenoautopsy)
 "se" = (
@@ -5638,6 +5638,12 @@
 /obj/item/weapon/bedsheet/browndouble,
 /turf/simulated/floor/wood,
 /area/groundbase/dorms/room6)
+"sh" = (
+/obj/effect/floor_decal/milspec/color/purple/half{
+	dir = 8
+	},
+/turf/simulated/floor/tiled,
+/area/groundbase/science/hall)
 "si" = (
 /turf/simulated/floor/outdoors/newdirt{
 	outdoors = 0
@@ -5991,11 +5997,11 @@
 /obj/machinery/camera/network/medbay{
 	dir = 1
 	},
-/obj/machinery/iv_drip,
 /obj/effect/floor_decal/corner/paleblue{
 	dir = 10
 	},
 /obj/structure/disposalpipe/segment,
+/obj/machinery/iv_drip,
 /turf/simulated/floor/tiled/white,
 /area/groundbase/medical/triage)
 "tg" = (
@@ -8216,10 +8222,7 @@
 /obj/effect/floor_decal/milspec/color/purple/corner{
 	dir = 1
 	},
-/turf/simulated/floor/tiled{
-	edge_blending_priority = -1;
-	outdoors = 1
-	},
+/turf/simulated/floor/tiled,
 /area/groundbase/science/hall)
 "zV" = (
 /obj/machinery/atmospherics/unary/vent_scrubber/on,
@@ -9288,6 +9291,10 @@
 /obj/effect/floor_decal/corner/paleblue/full{
 	dir = 4
 	},
+/obj/machinery/computer/guestpass{
+	dir = 8;
+	pixel_x = 25
+	},
 /turf/simulated/floor/tiled/white,
 /area/groundbase/medical/triage)
 "Dj" = (
@@ -9816,10 +9823,7 @@
 /obj/machinery/atmospherics/unary/vent_pump/on{
 	dir = 1
 	},
-/turf/simulated/floor/tiled{
-	edge_blending_priority = -1;
-	outdoors = 1
-	},
+/turf/simulated/floor/tiled,
 /area/groundbase/science/xenoautopsy)
 "Fb" = (
 /obj/structure/cable/yellow{
@@ -10103,6 +10107,12 @@
 /obj/structure/flora/ausbushes/ywflowers,
 /turf/simulated/floor/outdoors/grass/seasonal/notrees,
 /area/groundbase/level2/ne)
+"Gd" = (
+/obj/machinery/camera/network/security{
+	dir = 4
+	},
+/turf/simulated/floor/tiled/eris/cafe,
+/area/groundbase/security/hall2)
 "Gg" = (
 /obj/machinery/alarm,
 /obj/structure/bed/double/padded,
@@ -10956,10 +10966,7 @@
 	pixel_x = 2;
 	pixel_y = 2
 	},
-/turf/simulated/floor/tiled{
-	edge_blending_priority = -1;
-	outdoors = 1
-	},
+/turf/simulated/floor/tiled,
 /area/groundbase/science/xenoautopsy)
 "ID" = (
 /obj/structure/bed/chair/backed_red{
@@ -11037,10 +11044,7 @@
 /obj/structure/cable/yellow{
 	icon_state = "4-8"
 	},
-/turf/simulated/floor/tiled{
-	edge_blending_priority = -1;
-	outdoors = 1
-	},
+/turf/simulated/floor/tiled,
 /area/groundbase/science/hall)
 "IQ" = (
 /obj/machinery/atmospherics/unary/vent_pump/on{
@@ -11385,10 +11389,7 @@
 /obj/machinery/atmospherics/unary/vent_scrubber/on{
 	dir = 1
 	},
-/turf/simulated/floor/tiled{
-	edge_blending_priority = -1;
-	outdoors = 1
-	},
+/turf/simulated/floor/tiled,
 /area/groundbase/science/xenoautopsy)
 "JJ" = (
 /obj/machinery/light/small{
@@ -13778,10 +13779,7 @@
 /obj/effect/floor_decal/milspec/color/purple/half{
 	dir = 9
 	},
-/turf/simulated/floor/tiled{
-	edge_blending_priority = -1;
-	outdoors = 1
-	},
+/turf/simulated/floor/tiled,
 /area/groundbase/science/hall)
 "QU" = (
 /obj/structure/table/bench/standard,
@@ -13885,10 +13883,7 @@
 	dir = 1
 	},
 /obj/machinery/vending/coffee,
-/turf/simulated/floor/tiled{
-	edge_blending_priority = -1;
-	outdoors = 1
-	},
+/turf/simulated/floor/tiled,
 /area/groundbase/science/hall)
 "Rl" = (
 /obj/structure/cable/yellow{
@@ -21946,7 +21941,7 @@ dl
 qi
 ZS
 NQ
-Lr
+Gd
 PM
 ob
 jP
@@ -24824,7 +24819,7 @@ mY
 pr
 jf
 QS
-cv
+sh
 zR
 zi
 By
@@ -24966,7 +24961,7 @@ mY
 Jd
 jf
 Rj
-mV
+ZN
 IP
 zi
 By
diff --git a/maps/groundbase/rp-z3.dmm b/maps/groundbase/rp-z3.dmm
index 8493bd9394f..3791ac91c65 100644
--- a/maps/groundbase/rp-z3.dmm
+++ b/maps/groundbase/rp-z3.dmm
@@ -418,6 +418,10 @@
 	},
 /turf/simulated/floor/tiled/dark,
 /area/groundbase/security/hall3)
+"fH" = (
+/obj/machinery/camera/network/security,
+/turf/simulated/floor/outdoors/sidewalk/slab,
+/area/groundbase/security/hall3)
 "fP" = (
 /obj/effect/floor_decal/spline/plain{
 	dir = 1
@@ -737,6 +741,13 @@
 	},
 /turf/simulated/floor/tiled,
 /area/shuttle/groundbase/exploration)
+"jg" = (
+/obj/machinery/light_switch{
+	dir = 4;
+	pixel_x = -30
+	},
+/turf/simulated/floor/tiled/white,
+/area/groundbase/medical/medicalshowers)
 "ji" = (
 /obj/structure/railing,
 /turf/simulated/open,
@@ -803,6 +814,12 @@
 	},
 /turf/simulated/floor/carpet,
 /area/groundbase/medical/cmo)
+"jO" = (
+/obj/machinery/camera/network/security{
+	dir = 8
+	},
+/turf/simulated/floor/outdoors/sidewalk/slab,
+/area/groundbase/security/hall3)
 "jY" = (
 /obj/machinery/power/apc{
 	dir = 1
@@ -1759,7 +1776,8 @@
 "tc" = (
 /obj/machinery/door/firedoor,
 /obj/machinery/door/airlock/multi_tile/metal{
-	name = "EMT Bay"
+	name = "EMT Bay";
+	req_one_access = list(5)
 	},
 /turf/simulated/floor/tiled/steel_ridged,
 /area/groundbase/medical/paramedic)
@@ -3181,12 +3199,14 @@
 /turf/simulated/floor/tiled/white,
 /area/groundbase/medical/patient2)
 "FF" = (
-/obj/structure/grille,
-/obj/structure/window/reinforced/full,
-/obj/machinery/door/airlock/glass,
-/obj/machinery/door/firedoor/glass,
-/turf/simulated/floor/plating,
-/area/groundbase/civilian/pilot)
+/obj/effect/floor_decal/milspec/color/red/half{
+	dir = 4
+	},
+/obj/machinery/camera/network/security{
+	dir = 8
+	},
+/turf/simulated/floor/tiled/dark,
+/area/groundbase/security/hall3)
 "FL" = (
 /obj/effect/floor_decal/corner/paleblue{
 	dir = 9
@@ -5294,6 +5314,9 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
 	dir = 8
 	},
+/obj/structure/cable/yellow{
+	icon_state = "4-8"
+	},
 /turf/simulated/floor/tiled/white,
 /area/groundbase/medical/uhallway)
 "YE" = (
@@ -9502,7 +9525,7 @@ XJ
 YE
 YE
 YE
-YE
+jO
 YE
 YE
 YE
@@ -10347,7 +10370,7 @@ PZ
 SD
 en
 Kj
-Xe
+FF
 Xe
 qB
 TQ
@@ -10641,7 +10664,7 @@ gh
 qj
 aZ
 TQ
-YE
+fH
 YE
 YE
 YE
@@ -11944,7 +11967,7 @@ rf
 rf
 rf
 rf
-rf
+nd
 nd
 nd
 nd
@@ -12086,7 +12109,6 @@ rf
 rf
 rf
 rf
-rf
 nd
 dy
 dy
@@ -12099,6 +12121,7 @@ dy
 dy
 dy
 dy
+dy
 nd
 rf
 rf
@@ -12228,7 +12251,6 @@ rf
 rf
 rf
 rf
-rf
 nd
 dy
 dy
@@ -12241,6 +12263,7 @@ dy
 dy
 dy
 dy
+dy
 nd
 rf
 rf
@@ -12370,7 +12393,6 @@ rf
 rf
 rf
 rf
-rf
 nd
 dy
 dy
@@ -12383,6 +12405,7 @@ dy
 dy
 dy
 dy
+dy
 nd
 rf
 rf
@@ -12513,7 +12536,7 @@ nd
 nd
 nd
 nd
-nd
+dy
 dy
 dy
 dy
@@ -19343,7 +19366,7 @@ YS
 Wy
 eG
 eG
-FF
+WZ
 WZ
 eG
 eG
@@ -21590,7 +21613,7 @@ Xa
 FW
 BU
 DA
-uc
+jg
 jG
 Sq
 Pv

From 3251484eba63be39d5a4af83c0f67a1c4d0c3c78 Mon Sep 17 00:00:00 2001
From: Kayleen <michab02@gmail.com>
Date: Wed, 19 Jun 2024 03:24:33 -0400
Subject: [PATCH 2/3] Update rp-z1.dmm

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

diff --git a/maps/groundbase/rp-z1.dmm b/maps/groundbase/rp-z1.dmm
index 40da9d579b2..68335651fbd 100644
--- a/maps/groundbase/rp-z1.dmm
+++ b/maps/groundbase/rp-z1.dmm
@@ -1684,6 +1684,18 @@
 	},
 /turf/simulated/floor/tiled/monotile,
 /area/groundbase/engineering/atmos)
+"bGt" = (
+/obj/fiftyspawner/rglass,
+/obj/fiftyspawner/rods,
+/obj/fiftyspawner/steel,
+/obj/fiftyspawner/steel,
+/obj/fiftyspawner/steel,
+/obj/item/stack/material/plasteel{
+	amount = 10
+	},
+/obj/structure/closet/walllocker_double/cargo/north,
+/turf/simulated/floor/tiled,
+/area/ai_monitored/storage/eva)
 "bGu" = (
 /obj/structure/disposalpipe/segment,
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
@@ -3848,18 +3860,6 @@
 /turf/simulated/floor/tiled,
 /area/ai_monitored/storage/eva)
 "dyu" = (
-/obj/fiftyspawner/rglass,
-/obj/fiftyspawner/rods,
-/obj/structure/closet/walllocker_double/cargo,
-/obj/fiftyspawner/steel,
-/obj/fiftyspawner/steel,
-/obj/fiftyspawner/steel,
-/obj/item/stack/material/plasteel{
-	amount = 10
-	},
-/obj/machinery/atmospherics/unary/vent_scrubber/on,
-/obj/structure/closet/walllocker_double/cargo,
-/obj/machinery/atmospherics/unary/vent_scrubber/on,
 /obj/machinery/atmospherics/unary/vent_scrubber/on,
 /turf/simulated/floor/tiled,
 /area/ai_monitored/storage/eva)
@@ -31185,7 +31185,7 @@ raF
 raF
 raF
 aEL
-cIf
+bGt
 cIf
 cIf
 cIf

From 007683713ae252cebc2b1b194e5a76f731da8cce Mon Sep 17 00:00:00 2001
From: Kayleen <michab02@gmail.com>
Date: Wed, 19 Jun 2024 03:52:54 -0400
Subject: [PATCH 3/3] Update rp-z1.dmm

---
 maps/groundbase/rp-z1.dmm | 24 ++++++++++++++----------
 1 file changed, 14 insertions(+), 10 deletions(-)

diff --git a/maps/groundbase/rp-z1.dmm b/maps/groundbase/rp-z1.dmm
index 68335651fbd..b91fc002155 100644
--- a/maps/groundbase/rp-z1.dmm
+++ b/maps/groundbase/rp-z1.dmm
@@ -9153,7 +9153,11 @@
 /obj/machinery/light{
 	dir = 1
 	},
-/turf/simulated/floor/outdoors/grass/seasonal/notrees_nomobs_lowsnow,
+/turf/simulated/floor/outdoors/grass/seasonal/notrees_nomobs_lowsnow{
+	grass_chance = 0;
+	outdoors = 0;
+	snow_chance = 0
+	},
 /area/groundbase/civilian/bar)
 "imG" = (
 /obj/structure/cable/yellow{
@@ -21788,7 +21792,11 @@
 "tbD" = (
 /obj/structure/table/glass,
 /obj/machinery/light,
-/turf/simulated/floor/outdoors/grass/seasonal/notrees_nomobs_lowsnow,
+/turf/simulated/floor/outdoors/grass/seasonal/notrees_nomobs_lowsnow{
+	grass_chance = 0;
+	outdoors = 0;
+	snow_chance = 0
+	},
 /area/groundbase/civilian/bar)
 "tbL" = (
 /obj/structure/cable/yellow{
@@ -26459,10 +26467,6 @@
 	},
 /turf/simulated/floor/tiled/freezer/cold,
 /area/groundbase/civilian/kitchen/freezer)
-"xoT" = (
-/obj/structure/table/glass,
-/turf/simulated/floor/outdoors/grass/seasonal/notrees_nomobs_lowsnow,
-/area/groundbase/civilian/bar)
 "xpn" = (
 /obj/machinery/atmospherics/portables_connector{
 	dir = 8
@@ -36399,13 +36403,13 @@ oeu
 bum
 neL
 dVI
-xoT
-xoT
+mDC
+mDC
 tbD
 bum
 imA
-xoT
-xoT
+mDC
+mDC
 bum
 pDQ
 inR