diff --git a/maps/southern_cross/southern_cross-3.dmm b/maps/southern_cross/southern_cross-3.dmm
index 54f399bbfd..8d118ac2ea 100644
--- a/maps/southern_cross/southern_cross-3.dmm
+++ b/maps/southern_cross/southern_cross-3.dmm
@@ -6,6 +6,8 @@
 "aaf" = (/obj/machinery/chemical_dispenser/bar_soft/full{dir = 8; pixel_x = 5},/obj/structure/table/marble,/turf/simulated/floor/tiled,/area/maintenance/thirddeck/aftport)
 "aag" = (/obj/structure/cable{d1 = 1; d2 = 4; icon_state = "1-4"},/obj/effect/landmark{name = "maint_pred"},/turf/simulated/floor/plating,/area/maintenance/thirddeck/dormsaft)
 "aah" = (/obj/effect/floor_decal/industrial/warning,/turf/simulated/floor/plating,/area/maintenance/thirddeck/dormsport)
+"aai" = (/obj/structure/cable/yellow,/obj/machinery/power/solar_control{auto_start = 2; dir = 1; id = "aftportsolar"; name = "Aft Port Solar Control"},/turf/simulated/floor/plating,/area/maintenance/solars/aftportsolar)
+"aaj" = (/obj/structure/cable/yellow,/obj/machinery/power/solar_control{auto_start = 2; dir = 1; id = "aftstarboardsolar"; name = "Aft Starboard Solar Control"},/turf/simulated/floor/plating,/area/maintenance/solars/aftstarboardsolar)
 "aav" = (/obj/structure/sign/directions/cryo{dir = 8},/obj/structure/sign/directions/medical{dir = 8; pixel_y = 6},/obj/structure/sign/directions/evac{dir = 8; pixel_y = -6},/turf/simulated/wall,/area/hallway/primary/thirddeck/aft)
 "aaM" = (/obj/structure/cable,/obj/item/device/radio/intercom{dir = 8; name = "Station Intercom (General)"; pixel_x = -21},/obj/machinery/power/apc{name = "south bump"; pixel_y = -24},/obj/structure/table/steel,/obj/item/stack/cable_coil/yellow,/obj/item/stack/cable_coil/yellow,/obj/item/stack/cable_coil/yellow,/obj/item/stack/cable_coil/yellow,/turf/simulated/floor/plating,/area/maintenance/solars/aftstarboardsolar)
 "abK" = (/obj/machinery/atmospherics/portables_connector{dir = 8},/obj/effect/floor_decal/industrial/outline/yellow,/obj/machinery/portable_atmospherics/canister/air/airlock,/obj/structure/sign/warning/airlock{pixel_y = 32},/turf/simulated/floor/plating,/area/maintenance/solars/aftportsolar)
@@ -223,7 +225,6 @@
 "cjC" = (/obj/effect/floor_decal/industrial/warning{dir = 8},/obj/machinery/atmospherics/pipe/manifold/hidden{dir = 4},/obj/random/junk,/turf/simulated/floor/plating,/area/maintenance/thirddeck/forestarboard)
 "ckl" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/effect/floor_decal/steeldecal/steel_decals4{dir = 10},/obj/effect/floor_decal/steeldecal/steel_decals4,/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/effect/floor_decal/industrial/warning/corner{dir = 1},/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{dir = 1},/obj/structure/cable/green{d1 = 1; d2 = 8; icon_state = "1-8"},/turf/simulated/floor/tiled/monotile,/area/hallway/primary/thirddeck/stationgateway)
 "cko" = (/obj/machinery/door/airlock{name = "Unisex Restrooms"},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/door/firedoor/glass,/turf/simulated/floor/tiled/freezer,/area/crew_quarters/sleep/vistor_room_3)
-"ckH" = (/obj/structure/cable/yellow,/obj/machinery/power/solar_control{auto_start = 2; id = "aftportsolar"; name = "Aft Port Solar Control"},/turf/simulated/floor/plating,/area/maintenance/solars/aftportsolar)
 "ckU" = (/obj/machinery/button/remote/airlock{id = "Dorms2"; name = "Bolt Control"; pixel_y = 29; specialfunctions = 4},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/effect/floor_decal/steeldecal/steel_decals4{dir = 10},/obj/effect/floor_decal/steeldecal/steel_decals4,/obj/structure/disposalpipe/segment{dir = 4},/turf/simulated/floor/wood,/area/crew_quarters/sleep/vistor_room_4)
 "clf" = (/obj/effect/floor_decal/borderfloor/corner{dir = 8},/obj/effect/floor_decal/corner/white/bordercorner{dir = 8},/obj/effect/floor_decal/corner/blue/bordercorner{dir = 8},/turf/simulated/floor/tiled,/area/hallway/primary/thirddeck/aftportcentral)
 "clr" = (/obj/machinery/computer/security/telescreen/entertainment{icon_state = "frame"; pixel_y = 32},/obj/structure/coatrack,/turf/simulated/floor/wood,/area/crew_quarters/sleep/vistor_room_13)
@@ -2074,7 +2075,6 @@
 "uTZ" = (/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 10},/turf/simulated/floor/carpet,/area/crew_quarters/heads/sc/hop/quarters)
 "uUU" = (/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/pipe/simple/hidden,/obj/structure/catwalk,/obj/random/junk,/turf/simulated/floor/plating,/area/maintenance/thirddeck/aftport)
 "uVF" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/random/junk,/turf/simulated/floor/plating,/area/maintenance/thirddeck/forestarboard)
-"uVO" = (/obj/structure/cable/yellow,/obj/machinery/power/solar_control{auto_start = 2; id = "aftstarboardsolar"; name = "Aft Starboard Solar Control"},/turf/simulated/floor/plating,/area/maintenance/solars/aftstarboardsolar)
 "uVP" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/structure/disposalpipe/segment{dir = 8; icon_state = "pipe-c"},/obj/effect/floor_decal/corner/green/diagonal,/obj/effect/floor_decal/steeldecal/steel_decals6{dir = 6},/turf/simulated/floor/tiled,/area/crew_quarters/coffee_shop)
 "uWq" = (/obj/structure/cable/green{d2 = 4; icon_state = "0-4"},/obj/structure/cable/green{d2 = 8; icon_state = "0-8"},/obj/machinery/power/smes/buildable{RCon_tag = "Substation - Command"},/turf/simulated/floor,/area/maintenance/substation/command)
 "uWT" = (/obj/machinery/atmospherics/unary/vent_pump/on{dir = 8},/obj/structure/disposalpipe/segment{dir = 4},/turf/simulated/floor/wood,/area/crew_quarters/sleep/vistor_room_7)
@@ -2501,7 +2501,7 @@ apcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcepgepgepgapcapcapcjhgjh
 apcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcaqjapcapcapcjhgjhgjhgjhgjhgjhgjhgjhgjhgjhgjhgjhgjhgjhgjhgjhgjhgjhgjhgjhgjhgjhgqIjcQEhWkjhgqIjcQEhWkjhgqIjcQEhWkjhgqIjcQEhWkjhgqIjcQEhWkjhgjhgjhgjhgjhgjhgoReffHffHffHkFgkEcvMAvMAvMAeryoPHmBUoXSouVxttmBUiYferyaryssCskahzZkpImTmmTmvJfmTmmTmdyycxoyfGiTYdXGflwuPGaQLekjklFrTmaQLcHmflwfDVfDVfDVnVnaSWcrAcrAcrAwzyjhgjhgjhgjhgjhgjhgnGlqAKxAPjhgnGlqAKxAPjhgnGlqAKxAPjhgnGlqAKxAPjhgnGlqAKxAPjhgjhgjhgjhgjhgjhgjhgjhgjhgjhgjhgjhgjhgjhgjhgjhgjhgapcapcapcaqjepgapcapcapcapcapcapcapcapcapcapcapcapcapcapcapc
 apcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcepgaqjaqjaqjjhgjhgjhgjhgjhgjhgjhgjhgjhgjhgjhgjhgjhgjhgjhgjhgjhgjhgjhgjhgjhgjhgjhgoTPjhgjhgjhgoTPjhgjhgjhgoTPjhgjhgjhgoTPjhgjhgjhgoTPjhgjhgjhgjhgacieMQwSIclNabKxXsoUkxJQhfirxMmojixEeryerytkItpfbdefMNcNDeryerysevmlOelxjnqgpluTYaMZeTGuiClsmivnjnqscAloIwPRflwflwdhUoltaYvrTmsvNflwflwquNmLZfxkhniijtskOxVftxmlRSkqEqOyuppjhgjhgjhgjhgnBdjhgjhgjhgnBdjhgjhgjhgnBdjhgjhgjhgnBdjhgjhgjhgnBdjhgjhgjhgjhgjhgjhgjhgjhgjhgjhgjhgjhgjhgjhgjhgjhgjhgjhgapcapcapcavHapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapc
 apcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcepgapcapcapcapcjhgjhgjhgjhgjhgjhgjhgjhgjhgjhgjhgjhgjhgjhgjhgjhgjhgjhglJdiXTiXTiXTvhtiXTiXTiXTvhtiXTiXTiXTvhtiXTiXTiXTvhtiXTiXTiXTvhtiXTiXTngUbHUtatdwYtyteGUbETkuznjYwLBbPDjgFtDdbCUdUIeryerydrlaiexamsudtZhapcapcapcapcfZdjnqsevnqEkxkbQVelxjnqjnqapcapcapcapceFCcKWdNIxdJoOkflwflwbSvwdVtbCsqklsVmFNctvwxUvmgccJkledqOrNCbTspzvgdrgdrcgtgdrgdrgdrcgtgdrgdrgdrcgtgdrgdrgdrcgtgdrgdrgdrcgtgdrgdrgdrtBwjhgjhgjhgjhgjhgjhgjhgjhgjhgjhgjhgjhgjhgjhgapcapcapcepgapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapc
-apcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcaqjapcapcapcapcapcapcapcapcaqjapcapcapcapcjhgjhgjhgjhgjhgjhgjhgjhgjhgjhgjhgjhgjhgoTPjhgjhgjhgoTPjhgjhgjhgoTPjhgjhgjhgoTPjhgjhgjhgoTPjhgjhgjhgjhgaciaciacioReckHdvDnSMxJQxSCiBngXZfozrbFkFgovxuhvuhvuhvuhvmNwjhgjhgjhgjhgjhgovxuhvuhvuhvuhvuhvmNwcITjhgjhgjhgjhgovxuhvuhvuhvuhvmNwaSWaJyrcweXgrcwcYlijtaaMdQiuVOwzyuppuppuppjhgjhgjhgjhgnBdjhgjhgjhgnBdjhgjhgjhgnBdjhgjhgjhgnBdjhgjhgjhgnBdjhgjhgjhgjhgjhgjhgjhgjhgjhgjhgjhgjhgjhgjhgjhgjhgjhgjhgapcapcapcepgapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapc
+apcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcaqjapcapcapcapcapcapcapcapcaqjapcapcapcapcjhgjhgjhgjhgjhgjhgjhgjhgjhgjhgjhgjhgjhgoTPjhgjhgjhgoTPjhgjhgjhgoTPjhgjhgjhgoTPjhgjhgjhgoTPjhgjhgjhgjhgaciaciacioReaaidvDnSMxJQxSCiBngXZfozrbFkFgovxuhvuhvuhvuhvmNwjhgjhgjhgjhgjhgovxuhvuhvuhvuhvuhvmNwcITjhgjhgjhgjhgovxuhvuhvuhvuhvmNwaSWaJyrcweXgrcwcYlijtaaMdQiaajwzyuppuppuppjhgjhgjhgjhgnBdjhgjhgjhgnBdjhgjhgjhgnBdjhgjhgjhgnBdjhgjhgjhgnBdjhgjhgjhgjhgjhgjhgjhgjhgjhgjhgjhgjhgjhgjhgjhgjhgjhgjhgapcapcapcepgapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapc
 apcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcepgavHaqjaqjapcapcapcapcapcaqjapcapcapcapcjhgjhgjhgjhgjhgjhgjhgjhgjhgjhgjhgjhgqIjqpohWkjhgqIjqpohWkjhgqIjqpohWkjhgqIjqpohWkjhgqIjqpohWkjhgjhgjhgjhgjhgjhgoReffHffHffHffHuRFmkbhlnrbzwKmkFgjhgjhgjhgjhgjhgjhgqWlqWlqWljhgjhgtUBorYorYorYorYorYtUBjhgjhgnwFnwFnwFjhgjhgjhgjhgjhgjhgaSWfUNmsercwmnqfEIcrAcrAcrAcrAwzyjhgjhgjhgjhgjhgjhgnGldyXxAPjhgnGldyXxAPjhgnGldyXxAPjhgnGldyXxAPjhgnGldyXxAPjhgjhgjhgjhgjhgjhgjhgjhgjhgjhgjhgjhgjhgjhgjhgjhgjhgaqjaqjaqjepgapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapc
 apcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcaqjapcapcapcapcjhgjhgjhgjhgjhgjhgjhgjhgjhgjhgjhgjhgqIjqpohWkjhgqIjqpohWkjhgqIjqpohWkjhgqIjqpohWkjhgqIjqpohWkjhgjhgjhgjhgjhgjhgqWlqWlxLPqWlqWlkFgkFglTVkFgkFgkFgqWlqjPqjPqjPqjPqWlqWlxLPqWljZfqWltUBqXtycNiApdgtxeLtUBnwFtNVnwFclBnwFnwFtNVtNVnwFtNVtNVaSWaSWaSWjtXaSWaSWnwFnwFclBnwFnwFjhgjhgjhgjhgjhgjhgnGldyXxAPjhgnGldyXxAPjhgnGldyXxAPjhgnGldyXxAPjhgnGldyXxAPjhgjhgjhgjhgjhgjhgjhgjhgjhgjhgjhgjhgjhgapcapcapcapcapcapcapcfXnapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapc
 apcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcavHepgepgfXnepgepgapcapcapcnSNnSNnSNnSNjhgjhgjhgjhgjhgjhgjhgjhgqIjqpohWkjhgqIjqpohWkjhgqIjqpohWkjhgqIjqpohWkjhgqIjqpohWkjhgjhgjhgjhgjhgjhgqjPizOvyueeAvyueeApmYrnGqQvmGOvyuiYlvyueeAoSLeeAshaxyNrdofxzhjcojztUBuNbvyltwrgXSaUttUBoNYcOccEwmglnPHlAxrzocOchihcOchihcOcxGvjGOrkUrEuhihthMhihcOcobFtNVjhgjhgjhgjhgjhgjhgnGldyXxAPjhgnGldyXxAPjhgnGldyXxAPjhgnGldyXxAPjhgnGldyXxAPjhgjhgjhgjhgjhgjhgjhgjhgjhgjhgjhgjhgjhgapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapc