diff --git a/_maps/map_files/BoxStation/BoxStation.dmm b/_maps/map_files/BoxStation/BoxStation.dmm
index c9a2b5b3..ae71b494 100644
--- a/_maps/map_files/BoxStation/BoxStation.dmm
+++ b/_maps/map_files/BoxStation/BoxStation.dmm
@@ -2687,7 +2687,7 @@
 "baq" = (/obj/structure/table/wood,/obj/item/folder/blue,/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/turf/open/floor/wood,/area/security/vacantoffice)
 "bar" = (/obj/machinery/atmospherics/components/unary/tank/air{dir = 4},/turf/open/floor/plating,/area/maintenance/port)
 "bas" = (/obj/machinery/atmospherics/pipe/manifold/supply/hidden{dir = 4},/turf/open/floor/plating,/area/maintenance/port)
-"bat" = (/obj/structure/disposalpipe/segment,/obj/structure/cable{icon_state = "1-2"},/obj/machinery/power/apc{areastring = "/area/crew_quarters/toilet/locker"; dir = 4; name = "Locker Restrooms APC"; pixel_x = 27; pixel_y = 2},/obj/structure/cable{icon_state = "0-2"},/turf/open/floor/plating,/area/maintenance/port)
+"bat" = (/obj/structure/disposalpipe/segment,/obj/structure/cable{icon_state = "1-2"},/obj/machinery/power/apc{areastring = "/area/crew_quarters/fitness/sauna"; dir = 4; name = "Sauna APC"; pixel_x = 27; pixel_y = 2},/obj/structure/cable{icon_state = "0-2"},/turf/open/floor/plating,/area/maintenance/port)
 "bau" = (/obj/structure/toilet{dir = 4},/obj/machinery/light/small{dir = 8},/turf/open/floor/plasteel/freezer,/area/crew_quarters/toilet)
 "bav" = (/obj/machinery/atmospherics/components/unary/vent_scrubber/on{dir = 8},/turf/open/floor/plasteel/freezer,/area/crew_quarters/toilet)
 "bax" = (/obj/structure/rack,/obj/item/stack/sheet/cardboard,/obj/item/stack/rods/fifty,/turf/open/floor/plasteel,/area/quartermaster/warehouse)
@@ -3115,7 +3115,7 @@
 "biJ" = (/obj/effect/turf_decal/tile/red{dir = 1},/obj/effect/turf_decal/tile/red{dir = 4},/obj/machinery/light{dir = 1},/turf/open/floor/plasteel,/area/security/brig)
 "biK" = (/obj/structure/disposalpipe/segment{dir = 6},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 6},/obj/structure/cable{icon_state = "2-4"},/turf/open/floor/plating,/area/maintenance/fore/secondary)
 "biL" = (/obj/structure/disposalpipe/segment{dir = 4},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/structure/cable{icon_state = "4-8"},/turf/open/floor/plating,/area/maintenance/fore/secondary)
-"biM" = (/obj/structure/disposalpipe/segment{dir = 9},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 9},/obj/structure/cable{icon_state = "1-8"},/turf/open/floor/plating,/area/maintenance/fore/secondary)
+"biM" = (/obj/structure/disposalpipe/segment{dir = 9},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 9},/obj/structure/cable{icon_state = "1-8"},/obj/machinery/power/apc{areastring = "/area/crew_quarters/fitness/pool"; dir = 4; name = "Pool Area APC"; pixel_x = 27; pixel_y = 2},/obj/structure/cable{icon_state = "0-8"},/turf/open/floor/plating,/area/maintenance/fore/secondary)
 "biN" = (/turf/closed/wall,/area/crew_quarters/fitness/pool)
 "biO" = (/obj/effect/spawner/structure/window/reinforced,/obj/machinery/door/poddoor/shutters/preopen{id = "Gymshutter"; name = "Gym Window Shutter"},/turf/open/floor/plating,/area/crew_quarters/fitness/pool)
 "biP" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/effect/turf_decal/tile/red,/obj/effect/turf_decal/tile/red{dir = 8},/obj/machinery/light,/turf/open/floor/plasteel,/area/security/brig)
@@ -3713,7 +3713,7 @@
 "buw" = (/obj/machinery/airalarm{dir = 8; pixel_x = 24},/obj/machinery/light{dir = 4},/obj/effect/turf_decal/tile/red,/obj/effect/turf_decal/tile/red{dir = 4},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/open/floor/plasteel/dark,/area/security/checkpoint/medical)
 "bux" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 10},/turf/closed/wall,/area/security/checkpoint/medical)
 "buy" = (/obj/machinery/camera{c_tag = "Medbay Morgue"; dir = 8; network = list("ss13","medbay")},/obj/machinery/airalarm{dir = 8; pixel_x = 24},/turf/open/floor/plasteel/dark,/area/medical/morgue)
-"buz" = (/turf/open/floor/plating,/area/maintenance/department/medical/morgue)
+"buz" = (/obj/machinery/power/apc{areastring = "/area/hallway/primary/starboard"; dir = 8; name = "Central Primary Hallway APC"; pixel_x = -25; pixel_y = 1},/obj/structure/cable{icon_state = "0-4"},/turf/open/floor/plating,/area/maintenance/department/medical/morgue)
 "buA" = (/obj/structure/disposalpipe/segment,/obj/structure/cable{icon_state = "1-2"},/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/open/floor/plating,/area/maintenance/department/medical/morgue)
 "buB" = (/turf/open/floor/mech_bay_recharge_floor,/area/science/robotics/mechbay)
 "buC" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/turf/open/floor/circuit,/area/science/robotics/mechbay)
@@ -5833,7 +5833,7 @@
 "cjk" = (/obj/machinery/atmospherics/pipe/simple/general/visible{dir = 9},/turf/open/floor/plating,/area/maintenance/port/aft)
 "cjl" = (/turf/open/floor/wood,/area/maintenance/bar)
 "cjm" = (/obj/structure/mineral_door/wood,/turf/open/floor/wood,/area/maintenance/bar)
-"cjn" = (/obj/machinery/power/apc{areastring = "/area/storage/art"; dir = 1; name = "Maint bar"; pixel_y = 24},/obj/structure/cable{icon_state = "0-4"},/turf/open/floor/wood,/area/maintenance/bar)
+"cjn" = (/obj/machinery/power/apc{areastring = "/area/maintenance/bar"; dir = 1; name = "Maintenance Bar APC"; pixel_y = 24},/obj/structure/cable{icon_state = "0-4"},/turf/open/floor/wood,/area/maintenance/bar)
 "cjo" = (/obj/structure/cable{icon_state = "1-8"},/turf/open/floor/wood,/area/maintenance/bar)
 "cjp" = (/obj/machinery/vending/gato,/turf/open/floor/wood,/area/maintenance/bar)
 "cjq" = (/turf/open/floor/circuit/telecomms/mainframe,/area/tcommsat/server)
@@ -7420,6 +7420,7 @@
 "tbq" = (/obj/machinery/door/airlock{dir = 4; id_tag = "MaintDormShower"; name = "Maint Dorm"},/turf/open/floor/wood{icon_state = "wood-broken5"},/area/maintenance/port/fore)
 "the" = (/obj/effect/turf_decal/stripes/white/line{dir = 1; icon_state = "steel_decals9"},/obj/effect/turf_decal/stripes/white/line{dir = 4; icon_state = "steel_decals9"},/obj/effect/turf_decal/stripes/white/line{dir = 2; icon_state = "steel_decals9"},/obj/effect/turf_decal/stripes/white/line{dir = 8; icon_state = "steel_decals9"},/turf/open/floor/plasteel,/area/hallway/primary/central)
 "tjj" = (/obj/effect/decal/cleanable/dirt,/obj/machinery/iv_drip/feeding_tube,/turf/open/floor/plating,/area/maintenance/port/fore)
+"tmt" = (/obj/structure/disposalpipe/segment,/obj/structure/cable{icon_state = "1-2"},/obj/machinery/atmospherics/pipe/simple/supply/hidden,/obj/structure/cable{icon_state = "2-8"},/turf/open/floor/plating,/area/maintenance/department/medical/morgue)
 "tnQ" = (/obj/machinery/microwave,/obj/structure/table,/turf/open/floor/plasteel/cafeteria,/area/maintenance/port/fore)
 "tzP" = (/obj/structure/chair/sofa/right{dir = 4},/obj/effect/decal/cleanable/dirt,/turf/open/floor/plasteel/grimy,/area/maintenance/starboard/aft)
 "tDk" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/machinery/vending/tool,/turf/open/floor/plasteel,/area/engine/break_room)
@@ -7605,7 +7606,7 @@ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaRFatJaaebanauShUbaKXbqpayUbqqayUbqrayUayWaxBaxBayXayUbqsayUayYbezbeAbeAbdrbeBbeCbqtbeEbeFbdtbeGbeHbeIbeIbeJbeKaPlbfRbfRbfRaPlbfRbfRbfRaPlbqzbqAbeObePbeQbeObeRaZibeSbeTaZjbqBaZmaPjbeVbeWbeXbeXbeXbeXbeYbeZbeVbqCaIPbbZaZvbaJbfbbfcbfdbfebffbcQbfgbfhaXYbfibfjbfkbfkbfkbflbfmaYdbfnaCRbdUbdYbqDbfobpRbaWbfpaZDbnYaIPbjXbfvbfvbfvbfvbfvbfvbfvbfwbfxbfxbfxbqEbqFbqFbfwbqGbqGbqGberberberberberbfBbfBbfBbfCbfBbfBbfBbfBbqHbfGbqIbqJbfJbfJbfJbfKbfLbfLbfLbfLbfLbqKbqLbqLbqLbqMbqLbqNbqObqLbqLbqPbfSbfSbfSbfSbqQbmtbqRbqSbqSbqRaMybqTbqTaMzatJatJatJatJmoyaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabhrbclauSauSayUayUbqUayUaAbaRJayUaAcaAdbfXbfYayUaRJaAbayUauSaAaauSbdrbfZbgabgabgabgbbgcbgdbgebcnbqVbqWbggaPlbpObgjwixaPlbpObgjwixaPlbgkbglbgmbgnbgmbgmbrbbgpbgqaZkbgrbgsaZmbeUbgtbgubeVbgvbgwbgxbgyaPNbgAbrcbgCbrdaZvbgEaZvbgFbgGbgHbgIaXNaXObrebfrbbQbdTbfqbfsaCUaFAaFBbrfbrgbftaZBbrhbribftbrjbaWbgNaZDbnYaIPbrkbfvbrlbrmbrnbrobrpbfvbrqbrrbrrbrrbrsbrtbrtbrubrvbrwbrxbfDbfEbfFbryberbrzbrAbrBbrCbrAbrDbrEbfBbqHbrFbrGbrHbrIbrJbrKbrLbrMbrNbrObrPbfLbrQbrRbrQbfLbrSbrTbrSbfSkUVbrVbrUbfSbrWbrXbfSbrYbmtbrZbsabsbaSZaMyaMzaMzaMzaaaaaaatJaaaiWgaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaadaadaadaadayUbscayUayUayUayUayUayUbsdayUaadaadaadaaabdrbsebdrbsfbgabsgbshbdraRTbsiaPjbsjbskbsmbsmbsmbsmbsmbsmbsmbsmbsmbsobspbsqbsqbsqbsqbsqbsqaZmbsraZiaZmaZmbeVbssbstbsubsvbswbsxjdjbsybszbqCaIPbsAaZvbsBaZvaZvaZvaZvbgIbcQbsCaZvbsDaAxaAxaAyaHcaAzaAxaAxbsDaZDbgObbNbgPbgQbaWbpRbaWbsEaZDbnYaIPbjXbfvbsFbsGbsHbsHbsIbsJbrtbsKbrtbrtbrsbsLbrtbrtbrtbrtbsMbfDbsNbsObsPberbsQbrAbrAbsRbsQbsSbrAbfBbsTbsUbqIbsVbsWbsXbsYbsZbtabtbbtcbtdbtebtfbtgbthbfLbtibtjbtkbfSbgRbgSbgRbtlbgRbgRbfSqLmbmtaMyaMyaMyaMyaMyaaaatJaaeaaaaaaatJaaaiWgaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabtmaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaoBaaabdrbtnbtobtpbtqbtqbtrbtsbttbtuaPjbtvbtwbtxbtxbtxbtybtybtybtybtybtybtzbtAbsqbtBbtCbtDbtEbtFbtGbtHbtIbsqbtJbtKbtLbeVbeVbtMbtNbtObtPbtQbtRbtSbtTbbZbtUbtVbtWbtXbtYaZvbgJbtZaZvaZvaadaAxbuaaBsbubbucaBvaAxaadaZDaZDbudbpjbuebaWbufbugbuhaZDbnYaIPbjXbfvbuibsGbujbukbulbumbrtbunbuobupbuqburbusbusbutbrtbsMbfDbuubuvbuwbuxbsQbrAbrAbsRbsQbsSbuybfBbuzbuAbqIbuBbuCbuDbuEbuBbtabuFbuGbtcbtcbtcbtcbuHbfLbuIbuJbuKbfSbuLbgRbgRbuMbuNbuObfSqLmbuPbuQbuRbuSbuTaaeaaeaaeaaeatJatJatJatJiWgaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaoBaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabtmaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaoBaaabdrbtnbtobtpbtqbtqbtrbtsbttbtuaPjbtvbtwbtxbtxbtxbtybtybtybtybtybtybtzbtAbsqbtBbtCbtDbtEbtFbtGbtHbtIbsqbtJbtKbtLbeVbeVbtMbtNbtObtPbtQbtRbtSbtTbbZbtUbtVbtWbtXbtYaZvbgJbtZaZvaZvaadaAxbuaaBsbubbucaBvaAxaadaZDaZDbudbpjbuebaWbufbugbuhaZDbnYaIPbjXbfvbuibsGbujbukbulbumbrtbunbuobupbuqburbusbusbutbrtbsMbfDbuubuvbuwbuxbsQbrAbrAbsRbsQbsSbuybfBbuztmtbqIbuBbuCbuDbuEbuBbtabuFbuGbtcbtcbtcbtcbuHbfLbuIbuJbuKbfSbuLbgRbgRbuMbuNbuObfSqLmbuPbuQbuRbuSbuTaaeaaeaaeaaeatJatJatJatJiWgaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaoBaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabdrbuUbdrbuVbuWbuWbuXbdrbuYbuYaPjbuZbvabuZbuZbuZbvabuZaPjaPjbsqbsqbvbbvcbsqbvdbvdbvdbvdbvdbvdbvebvfbvgbvhbvibvjbvkbvlbvmbvnbvobswbvpbszbqCbvqbvrbvsbvtbvubvvbvwaZvbvxbvyaZvaadaadaAxbvzaCSbvAaFzbvBaAxaadaadaZDbvCbvDaZDaZDaZDaZDbvEaZDbvFaIPbvGbfvbvHbvIbvJbsHbsIbvKbrtbunbvLbvMbvNbvObvPbvQbvRbvSbsMberbvTbvUbvVbvWbsQbrAbrAbsRbsQbvXbvYbfBbvZbuAbqIbwabsWbwbbsYbwcbtabwdbwebwfbwgbwhbwibwjbfLbwkbuJbwlbfSbwmbwnbwobwpbwqbwrbfSqLmbuPbwsbwtbwtbwtatJaaaaaaaaeaaaaaaatJaaaatJaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaacaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaatJbdrbwubtobwvbuWbwwbwxbdraaaaaaatJaaaaaaaaaaaaaaaaaaaaaaaaaaabwybwzbwAbwBbwCbwDbvdbvdbvdbwEbvdbvdbwFbwGbwHbtPbwIbwJbtPbwKbwLbwMbswbwNbeVbwObwPbbfbtUbwQbwRbwRbwRbwRbwSbwTbwRaadaaaaAxaEnaHbaEobwUaEqaAxaaaaadaZDbwVbwWbwXbwYbwZaZDbxaaZDbxbaIPbxcbfvbxdbxebxfbxgbxhbfvbxibunbvLbxjbxkbrtbxlbxjbvRbxmbxnberbxobxpbxqbxrbxsbxsbxtbxubxvbxwbxvbxxbxybxzbqIbxAbxBbxCbxDbxEbxFbxGbxHbxIbxJbxKbxLaRhbfLbrSbxMbxNbfSbxObxPbxQbxRbgRbxSbfSbxTbxUbxVbwtbxWbwtatJatJaaabhraaaaaaatJaaaatJaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaatJbdrbxXbtobtobtobdrbdrbdraaaaaaatJaaaaaaaaaaaaaaaaaaaaaaaaaaabwybxYbxZbyabybcpacpacpacpabybbybbybbycbsqbydbyebyfbygbyhbyibeVbyjbswbykbeVbqCbylbjXbtUbtUbwRbymbynbyobcxbypbwRaaaaaaaAxaFybyqbyrbysaFCaAxaaaaaaaZDbytbpjbqDaZDbyuaZDbyvaZDbxbaIPbywbfvbyxbxebyybsHbyzbfvbqGamDbyAbyBbyCbrtbyDbyBaDybyEbqGberberbyFbyGbyHbyIbyJbyJbyJbyJbyKbyJbyJbyJbyLbyMbfIbfIbfIbfIbfIbyNbyObtcbyPbxLbxLbyQbyRbyNbySbyTbyUbyVbyWbyXbyYbyZbzabzbbfSbzcbfSbzdbzebzebzebzebzebzebzfatJatJatJatJiWgaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
diff --git a/_maps/map_files/KiloStation/KiloStation.dmm b/_maps/map_files/KiloStation/KiloStation.dmm
index eed4731b..de0bec8d 100644
--- a/_maps/map_files/KiloStation/KiloStation.dmm
+++ b/_maps/map_files/KiloStation/KiloStation.dmm
@@ -46289,6 +46289,9 @@
 /obj/structure/cable{
 	icon_state = "1-4"
 	},
+/obj/structure/cable{
+	icon_state = "2-4"
+	},
 /turf/open/floor/plasteel/yellowsiding{
 	dir = 8
 	},
@@ -47238,6 +47241,9 @@
 	},
 /obj/structure/disposalpipe/segment,
 /obj/machinery/atmospherics/pipe/simple/supply/hidden,
+/obj/structure/cable{
+	icon_state = "1-2"
+	},
 /turf/open/floor/plasteel/yellowsiding{
 	dir = 8
 	},
@@ -54366,6 +54372,12 @@
 /obj/machinery/atmospherics/pipe/simple/supply/hidden{
 	dir = 9
 	},
+/obj/machinery/power/apc{
+	areastring = "/area/crew_quarters/fitness/pool";
+	name = "Pool Area APC";
+	pixel_y = -23
+	},
+/obj/structure/cable,
 /turf/open/floor/plasteel/yellowsiding/corner{
 	dir = 1
 	},
@@ -76514,7 +76526,7 @@
 /obj/structure/table/wood,
 /obj/item/flashlight/lamp/green,
 /obj/machinery/power/apc{
-	areastring = "/area/maintenance/starboard/aft";
+	areastring = "/area/security/vacantoffice";
 	dir = 1;
 	name = "Vacant Office APC";
 	pixel_y = 23
diff --git a/_maps/map_files/MetaStation/MetaStation.dmm b/_maps/map_files/MetaStation/MetaStation.dmm
index 7354aa93..3ecd421b 100644
--- a/_maps/map_files/MetaStation/MetaStation.dmm
+++ b/_maps/map_files/MetaStation/MetaStation.dmm
@@ -332,7 +332,7 @@
 "agv" = (/obj/structure/cable/yellow{icon_state = "4-8"},/obj/machinery/camera{c_tag = "Fitness Room - Fore"},/obj/machinery/airalarm{pixel_y = 24},/obj/effect/turf_decal/tile/neutral{dir = 1},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/open/floor/plasteel,/area/crew_quarters/fitness/pool)
 "agw" = (/obj/structure/cable/yellow{icon_state = "4-8"},/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden,/turf/open/floor/plasteel,/area/crew_quarters/fitness/pool)
 "agx" = (/obj/structure/cable/yellow{icon_state = "4-8"},/obj/effect/turf_decal/tile/neutral{dir = 4},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/open/floor/plasteel,/area/crew_quarters/fitness/pool)
-"agy" = (/obj/machinery/light{dir = 1},/obj/machinery/power/apc{areastring = "/area/crew_quarters/fitness/recreation"; dir = 1; name = "Recreation Area APC"; pixel_y = 24},/obj/structure/cable/yellow{icon_state = "0-8"},/obj/effect/turf_decal/tile/neutral{dir = 4},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/open/floor/plasteel,/area/crew_quarters/fitness/pool)
+"agy" = (/obj/machinery/light{dir = 1},/obj/machinery/power/apc{areastring = "/area/crew_quarters/fitness/pool"; dir = 1; name = "Recreation Area APC"; pixel_y = 24},/obj/structure/cable/yellow{icon_state = "0-8"},/obj/effect/turf_decal/tile/neutral{dir = 4},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/open/floor/plasteel,/area/crew_quarters/fitness/pool)
 "agz" = (/obj/effect/turf_decal/tile/neutral{dir = 4},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/open/floor/plasteel,/area/crew_quarters/fitness/pool)
 "agA" = (/turf/closed/wall/r_wall,/area/maintenance/solars/port/fore)
 "agB" = (/obj/machinery/power/solar_control{id = "foreport"; name = "Port Bow Solar Control"},/obj/structure/cable{icon_state = "0-4"},/turf/open/floor/plating,/area/maintenance/solars/port/fore)
@@ -6607,7 +6607,7 @@
 "cyw" = (/obj/structure/closet/crate,/obj/item/stack/cable_coil,/obj/item/grenade/chem_grenade,/obj/item/flashlight,/obj/effect/spawner/lootdrop/maintenance{lootcount = 2; name = "2maintenance loot spawner"},/turf/open/floor/plating,/area/maintenance/port/aft)
 "cyx" = (/obj/structure/closet/crate,/obj/item/coin/silver,/obj/item/reagent_containers/spray/weedspray,/obj/item/paper,/obj/effect/spawner/lootdrop/maintenance{lootcount = 2; name = "2maintenance loot spawner"},/turf/open/floor/plating,/area/maintenance/port/aft)
 "cyy" = (/obj/effect/decal/cleanable/cobweb,/obj/machinery/power/apc{areastring = "/area/maintenance/port/aft"; dir = 1; name = "Port Quarter Maintenance APC"; pixel_y = 24},/obj/structure/cable/yellow{icon_state = "0-8"},/turf/open/floor/plating,/area/maintenance/port/aft)
-"cyz" = (/obj/machinery/power/apc{areastring = "/area/medical/patients_rooms/room_a"; dir = 8; name = "Psychologist Office"; pixel_x = -26},/obj/structure/cable/yellow{icon_state = "0-4"},/obj/machinery/light{dir = 8},/obj/effect/turf_decal/tile/blue{dir = 1},/obj/effect/turf_decal/tile/blue,/turf/open/floor/plasteel/white,/area/medical/psych)
+"cyz" = (/obj/machinery/power/apc{areastring = "/area/medical/psych"; dir = 8; name = "Psychologist Office APC"; pixel_x = -26},/obj/structure/cable/yellow{icon_state = "0-4"},/obj/machinery/light{dir = 8},/obj/effect/turf_decal/tile/blue{dir = 1},/obj/effect/turf_decal/tile/blue,/turf/open/floor/plasteel/white,/area/medical/psych)
 "cyA" = (/obj/structure/cable/yellow{icon_state = "2-8"},/turf/open/floor/carpet/blue,/area/medical/psych)
 "cyB" = (/obj/structure/chair/sofa/right{dir = 8},/obj/item/toy/plush/mothplushie/moffplush{name = "Mender Moff"; pixel_x = -3; pixel_y = 5},/obj/machinery/atmospherics/components/unary/vent_pump/on{dir = 4},/turf/open/floor/carpet/blue,/area/medical/psych)
 "cyC" = (/obj/structure/disposalpipe/segment,/obj/structure/cable/yellow{icon_state = "1-2"},/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/open/floor/plating,/area/maintenance/port/aft)
@@ -6865,9 +6865,9 @@
 "cDz" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/obj/structure/disposalpipe/segment,/obj/effect/turf_decal/delivery,/turf/open/floor/plasteel,/area/science/mixing)
 "cDA" = (/obj/structure/extinguisher_cabinet{pixel_x = 27},/obj/machinery/light_switch{pixel_y = 28},/turf/open/floor/plasteel/white,/area/science/mixing)
 "cDB" = (/turf/closed/wall/r_wall,/area/science/mixing)
-"cDC" = (/obj/structure/chair/comfy,/turf/open/floor/plasteel,/area/science/misc_lab)
-"cDD" = (/obj/structure/cable/yellow{icon_state = "1-2"},/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/open/floor/plasteel,/area/science/misc_lab)
-"cDE" = (/obj/structure/reagent_dispensers/water_cooler,/turf/open/floor/plasteel,/area/science/misc_lab)
+"cDC" = (/obj/structure/chair/comfy,/turf/open/floor/plasteel,/area/science/mixing)
+"cDD" = (/obj/structure/cable/yellow{icon_state = "1-2"},/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/open/floor/plasteel,/area/science/mixing)
+"cDE" = (/obj/structure/reagent_dispensers/water_cooler,/turf/open/floor/plasteel,/area/science/mixing)
 "cDF" = (/obj/effect/turf_decal/stripes/line{dir = 10},/turf/open/floor/plasteel,/area/science/circuit)
 "cDG" = (/obj/effect/turf_decal/stripes/line,/turf/open/floor/plasteel,/area/science/circuit)
 "cDH" = (/obj/effect/turf_decal/stripes/line{dir = 6},/turf/open/floor/plasteel,/area/science/circuit)
@@ -6912,8 +6912,8 @@
 "cEu" = (/obj/machinery/atmospherics/components/trinary/filter{dir = 8},/turf/open/floor/plasteel/white,/area/science/mixing)
 "cEv" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/obj/structure/disposalpipe/segment,/turf/open/floor/plasteel/white,/area/science/mixing)
 "cEw" = (/turf/open/floor/plasteel/white,/area/science/mixing)
-"cEx" = (/obj/structure/table/glass,/obj/machinery/camera/autoname{dir = 4},/turf/open/floor/plasteel,/area/science/misc_lab)
-"cEy" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 6},/turf/open/floor/plasteel,/area/science/misc_lab)
+"cEx" = (/obj/structure/table/glass,/obj/machinery/camera/autoname{dir = 4},/turf/open/floor/plasteel,/area/science/mixing)
+"cEy" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 6},/turf/open/floor/plasteel,/area/science/mixing)
 "cEz" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/obj/machinery/door/airlock/research/glass{dir = 8; name = "Circuitry Lab"; req_access_txt = "47"},/obj/machinery/door/firedoor,/turf/open/floor/plasteel,/area/science/circuit)
 "cEA" = (/obj/machinery/light_switch{pixel_y = -25},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/open/floor/plasteel/white,/area/science/circuit)
 "cEB" = (/obj/machinery/atmospherics/components/unary/vent_scrubber/on{dir = 8},/turf/open/floor/plasteel/white,/area/science/circuit)
@@ -6972,8 +6972,8 @@
 "cFC" = (/obj/machinery/holopad,/obj/effect/landmark/start/scientist,/obj/structure/disposalpipe/segment{dir = 4},/turf/open/floor/plasteel/white,/area/science/mixing)
 "cFD" = (/obj/structure/disposalpipe/segment{dir = 9},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/turf/open/floor/plasteel/white,/area/science/mixing)
 "cFE" = (/obj/structure/sign/warning/biohazard,/turf/closed/wall/r_wall,/area/science/mixing)
-"cFF" = (/obj/effect/landmark/blobstart,/obj/effect/turf_decal/stripes/corner{dir = 1},/obj/structure/chair/comfy{dir = 1},/turf/open/floor/plasteel,/area/science/misc_lab)
-"cFG" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/obj/machinery/light{dir = 4},/turf/open/floor/plasteel,/area/science/misc_lab)
+"cFF" = (/obj/effect/landmark/blobstart,/obj/effect/turf_decal/stripes/corner{dir = 1},/obj/structure/chair/comfy{dir = 1},/turf/open/floor/plasteel,/area/science/mixing)
+"cFG" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/obj/machinery/light{dir = 4},/turf/open/floor/plasteel,/area/science/mixing)
 "cFH" = (/obj/effect/turf_decal/stripes/line,/turf/closed/wall,/area/science/circuit)
 "cFJ" = (/obj/machinery/vending/cola/random,/turf/open/floor/carpet,/area/medical/medbay/aft)
 "cFK" = (/obj/machinery/holopad,/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 6},/turf/open/floor/carpet,/area/medical/medbay/aft)
@@ -7011,9 +7011,9 @@
 "cGq" = (/obj/machinery/atmospherics/pipe/manifold4w/scrubbers/hidden,/turf/open/floor/plasteel/white,/area/science/mixing)
 "cGr" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/obj/effect/turf_decal/delivery,/turf/open/floor/plasteel,/area/science/mixing)
 "cGs" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/obj/machinery/door/airlock/research{dir = 4; name = "Toxins Launch Room Access"; req_access_txt = "8"},/obj/machinery/door/poddoor/shutters/preopen{id = "toxins_blastdoor"; name = "biohazard containment shutters"},/obj/effect/turf_decal/delivery,/turf/open/floor/plasteel,/area/science/mixing)
-"cGt" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/obj/effect/turf_decal/stripes/line{dir = 8},/turf/open/floor/plasteel,/area/science/misc_lab)
-"cGu" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden,/obj/structure/cable/yellow{icon_state = "1-2"},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/open/floor/plasteel,/area/science/misc_lab)
-"cGv" = (/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{dir = 4},/obj/structure/sign/poster/official/random{pixel_x = 32},/turf/open/floor/plasteel,/area/science/misc_lab)
+"cGt" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/obj/effect/turf_decal/stripes/line{dir = 8},/turf/open/floor/plasteel,/area/science/mixing)
+"cGu" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden,/obj/structure/cable/yellow{icon_state = "1-2"},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/open/floor/plasteel,/area/science/mixing)
+"cGv" = (/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{dir = 4},/obj/structure/sign/poster/official/random{pixel_x = 32},/turf/open/floor/plasteel,/area/science/mixing)
 "cGw" = (/turf/closed/wall,/area/science/mixing)
 "cGx" = (/obj/machinery/camera{c_tag = "Toxins - Launch Area"; network = list("ss13","rd")},/obj/machinery/suit_storage_unit/rd,/obj/effect/turf_decal/bot{dir = 1},/turf/open/floor/plasteel{dir = 1},/area/science/mixing)
 "cGy" = (/obj/effect/turf_decal/bot{dir = 1},/turf/open/floor/plasteel{dir = 1},/area/science/mixing)
diff --git a/_maps/map_files/PubbyStation/PubbyStation.dmm b/_maps/map_files/PubbyStation/PubbyStation.dmm
index f6030cd2..24ed33d4 100644
--- a/_maps/map_files/PubbyStation/PubbyStation.dmm
+++ b/_maps/map_files/PubbyStation/PubbyStation.dmm
@@ -13572,6 +13572,16 @@
 	},
 /obj/machinery/atmospherics/pipe/simple/supply/hidden,
 /obj/item/cigbutt,
+/obj/machinery/power/apc{
+	dir = 8;
+	name = "Pool Area APC";
+	pixel_x = -24;
+	areastring = "/area/crew_quarters/fitness/pool"
+	},
+/obj/structure/cable{
+	icon_state = "0-2";
+	pixel_y = 1
+	},
 /turf/open/floor/plating,
 /area/maintenance/department/crew_quarters/dorms)
 "aAT" = (
@@ -45082,6 +45092,16 @@
 /obj/effect/turf_decal/tile/neutral{
 	dir = 8
 	},
+/obj/machinery/power/apc{
+	dir = 8;
+	name = "Monastery Asteroid APC";
+	pixel_x = -24;
+	areastring = "/area/chapel/asteroid/monastery"
+	},
+/obj/structure/cable{
+	icon_state = "0-2";
+	pixel_y = 1
+	},
 /turf/open/floor/plasteel/dark,
 /area/chapel/dock)
 "bOz" = (