diff --git a/_maps/map_files/stations/boxstation.dmm b/_maps/map_files/stations/boxstation.dmm index 8da929d3558..ad4700d9ec2 100644 --- a/_maps/map_files/stations/boxstation.dmm +++ b/_maps/map_files/stations/boxstation.dmm @@ -2971,7 +2971,7 @@ /obj/machinery/power/tracker, /obj/structure/lattice/catwalk, /turf/space, -/area/station/engineering/solar/auxstarboard) +/area/station/engineering/solar/fore_starboard) "alG" = ( /obj/machinery/economy/vending/cigarette, /obj/machinery/status_display{ @@ -3379,7 +3379,7 @@ /obj/machinery/power/tracker, /obj/structure/lattice/catwalk, /turf/space, -/area/station/engineering/solar/auxport) +/area/station/engineering/solar/fore_port) "anb" = ( /obj/structure/chair{ dir = 4 @@ -3434,7 +3434,7 @@ /obj/structure/cable, /obj/structure/lattice/catwalk, /turf/space, -/area/station/engineering/solar/auxstarboard) +/area/station/engineering/solar/fore_starboard) "anu" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/stripes/red/line{ @@ -3541,7 +3541,7 @@ }, /obj/structure/lattice/catwalk, /turf/space, -/area/station/engineering/solar/auxport) +/area/station/engineering/solar/fore_port) "anH" = ( /turf/simulated/wall/r_wall, /area/station/security/main) @@ -4003,7 +4003,7 @@ }, /obj/structure/lattice/catwalk, /turf/space, -/area/station/engineering/solar/auxstarboard) +/area/station/engineering/solar/fore_starboard) "aoM" = ( /obj/structure/cable{ d1 = 4; @@ -4287,7 +4287,7 @@ }, /obj/structure/lattice/catwalk, /turf/space, -/area/station/engineering/solar/auxstarboard) +/area/station/engineering/solar/fore_starboard) "apo" = ( /obj/structure/grille/broken, /turf/space, @@ -4303,7 +4303,7 @@ /turf/simulated/floor/plasteel/airless{ icon_state = "solarpanel" }, -/area/station/engineering/solar/auxstarboard) +/area/station/engineering/solar/fore_starboard) "apq" = ( /obj/structure/cable{ d2 = 8; @@ -4315,7 +4315,7 @@ /turf/simulated/floor/plasteel/airless{ icon_state = "solarpanel" }, -/area/station/engineering/solar/auxstarboard) +/area/station/engineering/solar/fore_starboard) "apx" = ( /obj/effect/spawner/window/reinforced/grilled, /turf/simulated/floor/plating, @@ -4647,7 +4647,7 @@ "aqZ" = ( /obj/structure/lattice/catwalk, /turf/space, -/area/station/engineering/solar/auxstarboard) +/area/station/engineering/solar/fore_starboard) "ara" = ( /obj/structure/table/reinforced, /obj/item/folder{ @@ -4673,7 +4673,7 @@ /obj/structure/cable, /obj/structure/lattice/catwalk, /turf/space, -/area/station/engineering/solar/auxport) +/area/station/engineering/solar/fore_port) "ari" = ( /obj/structure/cable{ d1 = 1; @@ -4941,7 +4941,7 @@ }, /obj/structure/lattice/catwalk, /turf/space, -/area/station/engineering/solar/auxport) +/area/station/engineering/solar/fore_port) "arM" = ( /obj/structure/cable{ d1 = 4; @@ -4960,7 +4960,7 @@ }, /obj/structure/lattice/catwalk, /turf/space, -/area/station/engineering/solar/auxport) +/area/station/engineering/solar/fore_port) "arN" = ( /obj/structure/cable{ d2 = 8; @@ -4968,7 +4968,7 @@ }, /obj/structure/lattice/catwalk, /turf/space, -/area/station/engineering/solar/auxport) +/area/station/engineering/solar/fore_port) "arP" = ( /obj/structure/cable{ d1 = 4; @@ -5016,7 +5016,7 @@ }, /obj/structure/lattice/catwalk, /turf/space, -/area/station/engineering/solar/auxport) +/area/station/engineering/solar/fore_port) "arX" = ( /obj/structure/cable{ d2 = 2; @@ -5028,11 +5028,11 @@ /turf/simulated/floor/plasteel/airless{ icon_state = "solarpanel" }, -/area/station/engineering/solar/auxport) +/area/station/engineering/solar/fore_port) "asb" = ( /obj/structure/lattice/catwalk, /turf/space, -/area/station/engineering/solar/auxport) +/area/station/engineering/solar/fore_port) "asc" = ( /obj/effect/spawner/random_barrier/obstruction, /turf/simulated/floor/plating, @@ -5354,7 +5354,7 @@ }, /obj/structure/lattice/catwalk, /turf/space, -/area/station/engineering/solar/auxport) +/area/station/engineering/solar/fore_port) "asM" = ( /obj/structure/cable{ d1 = 2; @@ -5368,7 +5368,7 @@ }, /obj/structure/lattice/catwalk, /turf/space, -/area/station/engineering/solar/auxport) +/area/station/engineering/solar/fore_port) "asN" = ( /turf/simulated/floor/carpet, /area/station/legal/lawoffice) @@ -5737,7 +5737,7 @@ /turf/simulated/floor/plasteel/airless{ icon_state = "solarpanel" }, -/area/station/engineering/solar/auxport) +/area/station/engineering/solar/fore_port) "atG" = ( /turf/simulated/wall/r_wall, /area/station/maintenance/fore) @@ -6718,7 +6718,7 @@ }, /obj/structure/lattice/catwalk, /turf/space, -/area/station/engineering/solar/auxstarboard) +/area/station/engineering/solar/fore_starboard) "awR" = ( /obj/structure/cable{ d2 = 8; @@ -6726,7 +6726,7 @@ }, /obj/structure/lattice/catwalk, /turf/space, -/area/station/engineering/solar/auxstarboard) +/area/station/engineering/solar/fore_starboard) "awS" = ( /obj/machinery/shower{ dir = 8 @@ -6792,7 +6792,7 @@ }, /obj/structure/lattice/catwalk, /turf/space, -/area/station/engineering/solar/auxstarboard) +/area/station/engineering/solar/fore_starboard) "axr" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 9 @@ -7771,7 +7771,7 @@ "azU" = ( /obj/structure/sign/electricshock, /turf/simulated/wall, -/area/station/engineering/solar/auxstarboard) +/area/station/engineering/solar/fore_starboard) "azV" = ( /obj/structure/cable{ d1 = 4; @@ -8947,10 +8947,7 @@ name = "Fore Port Solar Control" }, /turf/simulated/floor/plating, -/area/station/maintenance/auxsolarport) -"aDw" = ( -/turf/simulated/wall/r_wall, -/area/station/maintenance/auxsolarport) +/area/station/maintenance/solar_maintenance/fore_port) "aDx" = ( /obj/structure/sign/vacuum/external{ pixel_x = 32 @@ -8962,7 +8959,7 @@ filled = 0.05 }, /turf/simulated/floor/plating, -/area/station/maintenance/auxsolarport) +/area/station/maintenance/solar_maintenance/fore_port) "aDz" = ( /obj/structure/rack, /obj/item/clothing/mask/cigarette/pipe, @@ -9298,7 +9295,7 @@ dir = 1 }, /turf/simulated/floor/plating, -/area/station/maintenance/auxsolarport) +/area/station/maintenance/solar_maintenance/fore_port) "aED" = ( /obj/machinery/power/terminal, /obj/machinery/light/small{ @@ -9309,7 +9306,7 @@ icon_state = "0-8" }, /turf/simulated/floor/plating, -/area/station/maintenance/auxsolarport) +/area/station/maintenance/solar_maintenance/fore_port) "aEE" = ( /obj/structure/cable{ d1 = 1; @@ -9317,7 +9314,7 @@ icon_state = "1-4" }, /turf/simulated/floor/plating, -/area/station/maintenance/auxsolarport) +/area/station/maintenance/solar_maintenance/fore_port) "aEF" = ( /obj/structure/table, /obj/item/paper_bin, @@ -9707,7 +9704,7 @@ shock_proof = 1 }, /turf/simulated/floor/plating, -/area/station/maintenance/auxsolarport) +/area/station/maintenance/solar_maintenance/fore_port) "aFR" = ( /obj/structure/cable{ d2 = 8; @@ -9715,7 +9712,7 @@ }, /obj/machinery/power/smes, /turf/simulated/floor/plating, -/area/station/maintenance/auxsolarport) +/area/station/maintenance/solar_maintenance/fore_port) "aFS" = ( /obj/structure/cable{ d1 = 2; @@ -9728,11 +9725,11 @@ icon_state = "2-4" }, /turf/simulated/floor/plating, -/area/station/maintenance/auxsolarport) +/area/station/maintenance/solar_maintenance/fore_port) "aFT" = ( /obj/effect/spawner/random_spawners/wall_rusted_maybe, /turf/simulated/wall/r_wall, -/area/station/maintenance/auxsolarport) +/area/station/maintenance/solar_maintenance/fore_port) "aFU" = ( /obj/structure/table, /obj/item/toy/figure/crew/detective, @@ -10029,7 +10026,7 @@ /area/station/public/arcade) "aGT" = ( /turf/simulated/wall/r_wall, -/area/station/maintenance/auxsolarstarboard) +/area/station/maintenance/solar_maintenance/fore_starboard) "aGU" = ( /obj/structure/cable{ d2 = 4; @@ -10039,7 +10036,7 @@ name = "Fore Starboard Solar Control" }, /turf/simulated/floor/plating, -/area/station/maintenance/auxsolarstarboard) +/area/station/maintenance/solar_maintenance/fore_starboard) "aGV" = ( /obj/structure/cable{ d1 = 1; @@ -10063,7 +10060,7 @@ pixel_y = 32 }, /turf/simulated/floor/plating, -/area/station/maintenance/auxsolarstarboard) +/area/station/maintenance/solar_maintenance/fore_starboard) "aGX" = ( /turf/simulated/wall, /area/station/maintenance/fsmaint) @@ -10108,11 +10105,11 @@ "aHg" = ( /obj/structure/sign/electricshock, /turf/simulated/wall/r_wall, -/area/station/maintenance/fpmaint2) +/area/station/maintenance/solar_maintenance/fore_port) "aHi" = ( /obj/effect/spawner/random_spawners/fungus_maybe, /turf/simulated/wall/r_wall, -/area/station/maintenance/fpmaint2) +/area/station/maintenance/solar_maintenance/fore_port) "aHj" = ( /obj/machinery/economy/vending/cigarette, /turf/simulated/floor/wood, @@ -10274,7 +10271,7 @@ icon_state = "1-4" }, /turf/simulated/floor/plating, -/area/station/maintenance/auxsolarstarboard) +/area/station/maintenance/solar_maintenance/fore_starboard) "aHJ" = ( /obj/structure/cable{ d2 = 8; @@ -10285,13 +10282,13 @@ dir = 4 }, /turf/simulated/floor/plating, -/area/station/maintenance/auxsolarstarboard) +/area/station/maintenance/solar_maintenance/fore_starboard) "aHK" = ( /obj/structure/chair/stool{ dir = 1 }, /turf/simulated/floor/plating, -/area/station/maintenance/auxsolarstarboard) +/area/station/maintenance/solar_maintenance/fore_starboard) "aHL" = ( /obj/structure/cable{ d1 = 4; @@ -10498,7 +10495,7 @@ icon_state = "2-8" }, /turf/simulated/floor/plating, -/area/station/maintenance/auxsolarstarboard) +/area/station/maintenance/solar_maintenance/fore_starboard) "aIB" = ( /obj/structure/cable{ d2 = 4; @@ -10508,7 +10505,7 @@ shock_proof = 1 }, /turf/simulated/floor/plating, -/area/station/maintenance/auxsolarstarboard) +/area/station/maintenance/solar_maintenance/fore_starboard) "aIC" = ( /obj/machinery/camera{ c_tag = "Fore Starboard Solars"; @@ -10520,7 +10517,7 @@ }, /obj/machinery/power/smes, /turf/simulated/floor/plating, -/area/station/maintenance/auxsolarstarboard) +/area/station/maintenance/solar_maintenance/fore_starboard) "aID" = ( /obj/structure/closet/wardrobe/mixed, /obj/item/clothing/shoes/jackboots, @@ -10841,7 +10838,7 @@ "aJH" = ( /obj/structure/sign/electricshock, /turf/simulated/wall/r_wall, -/area/station/maintenance/auxsolarstarboard) +/area/station/maintenance/solar_maintenance/fore_starboard) "aJI" = ( /obj/structure/closet/emcloset, /turf/simulated/floor/plating, @@ -28777,7 +28774,7 @@ }, /obj/effect/mapping_helpers/airlock/access/all/engineering/general, /turf/simulated/floor/plating, -/area/station/maintenance/auxsolarport) +/area/station/maintenance/solar_maintenance/fore_port) "bPd" = ( /obj/effect/turf_decal/stripes/line{ dir = 4 @@ -35666,7 +35663,7 @@ }, /obj/structure/lattice/catwalk, /turf/space, -/area/station/engineering/solar/port) +/area/station/engineering/solar/aft_port) "cpA" = ( /obj/effect/spawner/window/reinforced/polarized{ id = "med2" @@ -38312,7 +38309,7 @@ "cyO" = ( /obj/structure/lattice/catwalk, /turf/space, -/area/station/engineering/solar/port) +/area/station/engineering/solar/aft_port) "cyP" = ( /obj/effect/spawner/random_barrier/obstruction, /turf/simulated/floor/plating, @@ -42232,7 +42229,7 @@ }, /obj/structure/lattice/catwalk, /turf/space, -/area/station/engineering/solar/port) +/area/station/engineering/solar/aft_port) "cMC" = ( /obj/machinery/atmospherics/pipe/simple/hidden/cyan{ dir = 4 @@ -42520,7 +42517,7 @@ /turf/simulated/floor/plasteel/airless{ icon_state = "solarpanel" }, -/area/station/engineering/solar/port) +/area/station/engineering/solar/aft_port) "cNG" = ( /turf/simulated/floor/plating, /area/station/maintenance/assembly_line) @@ -42547,7 +42544,7 @@ /turf/simulated/floor/plasteel/airless{ icon_state = "solarpanel" }, -/area/station/engineering/solar/port) +/area/station/engineering/solar/aft_port) "cNO" = ( /obj/structure/chair/comfy/black{ dir = 4 @@ -42990,7 +42987,7 @@ /obj/structure/cable, /obj/structure/lattice/catwalk, /turf/space, -/area/station/engineering/solar/port) +/area/station/engineering/solar/aft_port) "cPA" = ( /obj/structure/table/reinforced, /obj/item/paper_bin, @@ -43017,7 +43014,7 @@ }, /obj/structure/lattice/catwalk, /turf/space, -/area/station/engineering/solar/port) +/area/station/engineering/solar/aft_port) "cPD" = ( /obj/machinery/atmospherics/pipe/manifold/visible/yellow, /turf/simulated/floor/plasteel, @@ -43044,7 +43041,7 @@ }, /obj/structure/lattice/catwalk, /turf/space, -/area/station/engineering/solar/port) +/area/station/engineering/solar/aft_port) "cPH" = ( /obj/structure/cable{ d2 = 8; @@ -43052,7 +43049,7 @@ }, /obj/structure/lattice/catwalk, /turf/space, -/area/station/engineering/solar/port) +/area/station/engineering/solar/aft_port) "cPI" = ( /obj/structure/cable{ d2 = 4; @@ -43060,7 +43057,7 @@ }, /obj/structure/lattice/catwalk, /turf/space, -/area/station/engineering/solar/port) +/area/station/engineering/solar/aft_port) "cPM" = ( /obj/structure/cable{ d1 = 1; @@ -43221,7 +43218,7 @@ }, /obj/structure/lattice/catwalk, /turf/space, -/area/station/engineering/solar/port) +/area/station/engineering/solar/aft_port) "cQr" = ( /obj/machinery/atmospherics/portable/canister/air, /turf/simulated/floor/plating, @@ -43481,7 +43478,7 @@ }, /obj/structure/lattice/catwalk, /turf/space, -/area/station/engineering/solar/port) +/area/station/engineering/solar/aft_port) "cRf" = ( /obj/machinery/atmospherics/pipe/simple/visible/green{ dir = 4 @@ -43625,7 +43622,7 @@ /area/station/maintenance/asmaint) "cRA" = ( /turf/simulated/wall/r_wall, -/area/station/maintenance/portsolar) +/area/station/maintenance/solar_maintenance/aft_port) "cRB" = ( /obj/structure/cable{ d2 = 8; @@ -43836,7 +43833,7 @@ }, /obj/structure/lattice/catwalk, /turf/space, -/area/station/engineering/solar/port) +/area/station/engineering/solar/aft_port) "cSl" = ( /obj/machinery/atmospherics/unary/vent_pump/on, /turf/simulated/floor/plasteel, @@ -44067,7 +44064,7 @@ /obj/machinery/atmospherics/unary/portables_connector, /obj/machinery/atmospherics/portable/canister/air, /turf/simulated/floor/plating, -/area/station/maintenance/portsolar) +/area/station/maintenance/solar_maintenance/aft_port) "cST" = ( /obj/structure/cable{ d2 = 2; @@ -44075,7 +44072,7 @@ }, /obj/machinery/power/smes, /turf/simulated/floor/plating, -/area/station/maintenance/portsolar) +/area/station/maintenance/solar_maintenance/aft_port) "cSU" = ( /turf/simulated/wall/r_wall, /area/station/engineering/control) @@ -44134,7 +44131,7 @@ dir = 1 }, /turf/simulated/floor/plating, -/area/station/maintenance/portsolar) +/area/station/maintenance/solar_maintenance/aft_port) "cTc" = ( /obj/machinery/atmospherics/pipe/simple/hidden/cyan{ dir = 4 @@ -44417,7 +44414,7 @@ "cTW" = ( /obj/structure/lattice/catwalk, /turf/space, -/area/station/engineering/solar/starboard) +/area/station/engineering/solar/aft_starboard) "cTX" = ( /obj/structure/cable{ d2 = 4; @@ -44446,7 +44443,7 @@ icon_state = "1-4" }, /turf/simulated/floor/plating, -/area/station/maintenance/portsolar) +/area/station/maintenance/solar_maintenance/aft_port) "cUe" = ( /obj/structure/cable{ d1 = 1; @@ -44454,7 +44451,7 @@ icon_state = "1-8" }, /turf/simulated/floor/plating, -/area/station/maintenance/portsolar) +/area/station/maintenance/solar_maintenance/aft_port) "cUf" = ( /obj/structure/cable{ d1 = 4; @@ -44684,7 +44681,7 @@ /area/station/supply/miningdock) "cVd" = ( /turf/simulated/floor/plating, -/area/station/maintenance/portsolar) +/area/station/maintenance/solar_maintenance/aft_port) "cVf" = ( /obj/structure/cable{ d1 = 1; @@ -44747,7 +44744,7 @@ name = "Aft Port Solar Control" }, /turf/simulated/floor/plating, -/area/station/maintenance/portsolar) +/area/station/maintenance/solar_maintenance/aft_port) "cVm" = ( /obj/machinery/camera{ c_tag = "Aft Port Solar Control"; @@ -44758,7 +44755,7 @@ shock_proof = 1 }, /turf/simulated/floor/plating, -/area/station/maintenance/portsolar) +/area/station/maintenance/solar_maintenance/aft_port) "cVo" = ( /obj/structure/cable{ d1 = 4; @@ -46049,7 +46046,7 @@ icon_state = "1-2" }, /turf/simulated/floor/plating, -/area/station/maintenance/auxsolarport) +/area/station/maintenance/solar_maintenance/fore_port) "dar" = ( /turf/simulated/wall/r_wall, /area/station/engineering/secure_storage) @@ -46934,7 +46931,7 @@ }, /obj/structure/lattice/catwalk, /turf/space, -/area/station/engineering/solar/starboard) +/area/station/engineering/solar/aft_starboard) "ddF" = ( /obj/structure/cable{ d1 = 1; @@ -46973,7 +46970,7 @@ /obj/structure/cable, /obj/structure/lattice/catwalk, /turf/space, -/area/station/engineering/solar/starboard) +/area/station/engineering/solar/aft_starboard) "ddP" = ( /obj/structure/cable{ d1 = 2; @@ -46987,7 +46984,7 @@ }, /obj/structure/lattice/catwalk, /turf/space, -/area/station/engineering/solar/starboard) +/area/station/engineering/solar/aft_starboard) "ddQ" = ( /obj/structure/cable{ d1 = 2; @@ -47006,7 +47003,7 @@ }, /obj/structure/lattice/catwalk, /turf/space, -/area/station/engineering/solar/starboard) +/area/station/engineering/solar/aft_starboard) "ddR" = ( /obj/structure/cable{ d2 = 8; @@ -47014,7 +47011,7 @@ }, /obj/structure/lattice/catwalk, /turf/space, -/area/station/engineering/solar/starboard) +/area/station/engineering/solar/aft_starboard) "ddT" = ( /obj/structure/cable{ d2 = 4; @@ -47022,7 +47019,7 @@ }, /obj/structure/lattice/catwalk, /turf/space, -/area/station/engineering/solar/starboard) +/area/station/engineering/solar/aft_starboard) "ddU" = ( /obj/structure/cable{ d1 = 1; @@ -47041,7 +47038,7 @@ }, /obj/structure/lattice/catwalk, /turf/space, -/area/station/engineering/solar/starboard) +/area/station/engineering/solar/aft_starboard) "dea" = ( /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 1 @@ -47064,7 +47061,7 @@ }, /obj/structure/lattice/catwalk, /turf/space, -/area/station/engineering/solar/starboard) +/area/station/engineering/solar/aft_starboard) "dec" = ( /obj/machinery/atmospherics/pipe/manifold/visible, /turf/simulated/floor/plasteel, @@ -47076,7 +47073,7 @@ }, /obj/structure/lattice/catwalk, /turf/space, -/area/station/engineering/solar/starboard) +/area/station/engineering/solar/aft_starboard) "dee" = ( /obj/structure/cable{ d1 = 4; @@ -47085,7 +47082,7 @@ }, /obj/structure/lattice/catwalk, /turf/space, -/area/station/engineering/solar/starboard) +/area/station/engineering/solar/aft_starboard) "def" = ( /obj/structure/cable{ d1 = 1; @@ -47104,13 +47101,13 @@ }, /obj/structure/lattice/catwalk, /turf/space, -/area/station/engineering/solar/starboard) +/area/station/engineering/solar/aft_starboard) "deg" = ( /obj/structure/cable, /obj/machinery/power/tracker, /obj/structure/lattice/catwalk, /turf/space, -/area/station/engineering/solar/starboard) +/area/station/engineering/solar/aft_starboard) "deh" = ( /obj/machinery/space_heater, /obj/structure/cable{ @@ -47252,7 +47249,7 @@ "deE" = ( /obj/structure/sign/electricshock, /turf/simulated/wall/r_wall, -/area/station/maintenance/starboardsolar) +/area/station/maintenance/solar_maintenance/aft_starboard) "deF" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/effect/turf_decal/stripes/line{ @@ -47318,7 +47315,7 @@ icon_state = "1-8" }, /turf/simulated/floor/plating, -/area/station/maintenance/starboardsolar) +/area/station/maintenance/solar_maintenance/aft_starboard) "deO" = ( /obj/structure/cable{ d2 = 4; @@ -47363,7 +47360,7 @@ shock_proof = 1 }, /turf/simulated/floor/plating, -/area/station/maintenance/starboardsolar) +/area/station/maintenance/solar_maintenance/aft_starboard) "deU" = ( /obj/machinery/atmospherics/pipe/simple/visible/yellow{ dir = 9 @@ -47397,7 +47394,7 @@ icon_state = "0-8" }, /turf/simulated/floor/plating, -/area/station/maintenance/starboardsolar) +/area/station/maintenance/solar_maintenance/aft_starboard) "dfa" = ( /obj/structure/cable{ d1 = 2; @@ -47405,7 +47402,7 @@ icon_state = "2-4" }, /turf/simulated/floor/plating, -/area/station/maintenance/starboardsolar) +/area/station/maintenance/solar_maintenance/aft_starboard) "dfb" = ( /obj/structure/chair/stool, /obj/machinery/camera{ @@ -47413,7 +47410,7 @@ dir = 4 }, /turf/simulated/floor/plating, -/area/station/maintenance/starboardsolar) +/area/station/maintenance/solar_maintenance/aft_starboard) "dfc" = ( /obj/structure/table, /obj/effect/spawner/lootdrop/maintenance, @@ -47446,7 +47443,7 @@ dir = 4 }, /turf/simulated/floor/plating, -/area/station/maintenance/starboardsolar) +/area/station/maintenance/solar_maintenance/aft_starboard) "dfn" = ( /obj/machinery/power/solar_control{ name = "Aft Starboard Solar Control"; @@ -47457,7 +47454,7 @@ icon_state = "0-4" }, /turf/simulated/floor/plating, -/area/station/maintenance/starboardsolar) +/area/station/maintenance/solar_maintenance/aft_starboard) "dfo" = ( /obj/machinery/atmospherics/pipe/manifold/visible/red{ dir = 4 @@ -47477,7 +47474,7 @@ }, /obj/machinery/atmospherics/portable/canister/air, /turf/simulated/floor/plating, -/area/station/maintenance/starboardsolar) +/area/station/maintenance/solar_maintenance/aft_starboard) "dfq" = ( /obj/machinery/atmospherics/pipe/simple/visible/green, /turf/simulated/wall/r_wall, @@ -48636,7 +48633,7 @@ /area/station/maintenance/asmaint) "djQ" = ( /turf/simulated/wall/r_wall, -/area/station/maintenance/starboardsolar) +/area/station/maintenance/solar_maintenance/aft_starboard) "djR" = ( /obj/machinery/turretid/stun{ control_area = "\improper AI Satellite Antechamber"; @@ -49930,7 +49927,7 @@ /turf/simulated/floor/plasteel/airless{ icon_state = "solarpanel" }, -/area/station/engineering/solar/starboard) +/area/station/engineering/solar/aft_starboard) "doi" = ( /obj/item/radio/intercom{ name = "north bump"; @@ -50018,7 +50015,7 @@ /turf/simulated/floor/plasteel/airless{ icon_state = "solarpanel" }, -/area/station/engineering/solar/starboard) +/area/station/engineering/solar/aft_starboard) "doH" = ( /obj/machinery/teleport/hub, /turf/simulated/floor/plating, @@ -54411,7 +54408,7 @@ /obj/effect/spawner/window/reinforced/grilled, /obj/effect/spawner/airlock/s_to_n, /turf/simulated/floor/plating, -/area/station/maintenance/auxsolarstarboard) +/area/station/maintenance/solar_maintenance/fore_starboard) "eXy" = ( /obj/machinery/alarm/directional/south, /obj/structure/table, @@ -55208,7 +55205,7 @@ "fnH" = ( /obj/effect/spawner/window/reinforced/grilled, /turf/simulated/floor/plating, -/area/station/maintenance/auxsolarstarboard) +/area/station/maintenance/solar_maintenance/fore_starboard) "fnP" = ( /obj/machinery/atmospherics/pipe/simple/hidden/cyan{ dir = 10 @@ -56272,7 +56269,7 @@ "fNh" = ( /obj/effect/spawner/window/reinforced/grilled, /turf/simulated/floor/plating, -/area/station/maintenance/starboardsolar) +/area/station/maintenance/solar_maintenance/aft_starboard) "fNM" = ( /obj/effect/spawner/random_barrier/possibly_welded_airlock, /obj/structure/cable{ @@ -58323,7 +58320,7 @@ dir = 9 }, /turf/simulated/floor/plating, -/area/station/maintenance/portsolar) +/area/station/maintenance/solar_maintenance/aft_port) "gOr" = ( /obj/machinery/atmospherics/pipe/simple/hidden/cyan, /obj/effect/decal/cleanable/dirt, @@ -59382,7 +59379,7 @@ dir = 5 }, /turf/simulated/floor/plating, -/area/station/maintenance/auxsolarport) +/area/station/maintenance/solar_maintenance/fore_port) "hoJ" = ( /obj/effect/spawner/random_spawners/fungus_probably, /turf/simulated/wall, @@ -60111,7 +60108,7 @@ }, /obj/effect/mapping_helpers/airlock/access/all/engineering/general, /turf/simulated/floor/plating, -/area/station/maintenance/auxsolarstarboard) +/area/station/maintenance/solar_maintenance/fore_starboard) "hHk" = ( /obj/structure/cable{ d1 = 1; @@ -63841,7 +63838,7 @@ }, /obj/effect/mapping_helpers/airlock/access/all/engineering/general, /turf/simulated/floor/plating, -/area/station/maintenance/portsolar) +/area/station/maintenance/solar_maintenance/aft_port) "jCu" = ( /obj/machinery/economy/vending/scidrobe, /turf/simulated/floor/plasteel{ @@ -64226,7 +64223,7 @@ icon_state = "1-2" }, /turf/simulated/floor/plating, -/area/station/maintenance/auxsolarstarboard) +/area/station/maintenance/solar_maintenance/fore_starboard) "jOA" = ( /obj/structure/reagent_dispensers/beerkeg/nuke{ name = "Nanotrasen-brand nuclear fizz-sion explosive" @@ -64757,7 +64754,7 @@ icon_state = "1-2" }, /turf/simulated/floor/plating, -/area/station/maintenance/starboardsolar) +/area/station/maintenance/solar_maintenance/aft_starboard) "kap" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -66850,7 +66847,7 @@ }, /obj/structure/lattice/catwalk, /turf/space, -/area/station/engineering/solar/auxport) +/area/station/engineering/solar/fore_port) "lbb" = ( /obj/machinery/disposal, /obj/machinery/firealarm/directional/east, @@ -68592,7 +68589,7 @@ icon_state = "4-8" }, /turf/simulated/floor/plating, -/area/station/maintenance/portsolar) +/area/station/maintenance/solar_maintenance/aft_port) "lQx" = ( /obj/effect/spawner/random_spawners/fungus_maybe, /turf/simulated/wall, @@ -71064,7 +71061,7 @@ /obj/effect/spawner/window/reinforced/grilled, /obj/effect/spawner/airlock/s_to_n, /turf/simulated/floor/plating, -/area/station/maintenance/auxsolarport) +/area/station/maintenance/solar_maintenance/fore_port) "neo" = ( /obj/effect/spawner/window/reinforced/tinted, /obj/machinery/atmospherics/pipe/simple/hidden/cyan{ @@ -71512,7 +71509,7 @@ icon_state = "4-8" }, /turf/simulated/floor/plating, -/area/station/maintenance/portsolar) +/area/station/maintenance/solar_maintenance/aft_port) "nuq" = ( /obj/machinery/atmospherics/unary/vent_pump/on, /turf/simulated/floor/plasteel, @@ -79212,7 +79209,7 @@ }, /obj/effect/mapping_helpers/airlock/access/all/engineering/general, /turf/simulated/floor/plating, -/area/station/maintenance/starboardsolar) +/area/station/maintenance/solar_maintenance/aft_starboard) "qUu" = ( /obj/machinery/light_switch{ dir = 4; @@ -81587,7 +81584,7 @@ "sdw" = ( /obj/effect/spawner/random_spawners/wall_rusted_maybe, /turf/simulated/wall/r_wall, -/area/station/maintenance/portsolar) +/area/station/maintenance/solar_maintenance/aft_port) "sem" = ( /obj/structure/morgue{ dir = 8 @@ -82301,7 +82298,7 @@ "swl" = ( /obj/effect/spawner/window/reinforced/grilled, /turf/simulated/floor/plating, -/area/station/maintenance/portsolar) +/area/station/maintenance/solar_maintenance/aft_port) "swy" = ( /obj/structure/disposalpipe/segment, /turf/simulated/floor/plating, @@ -82498,7 +82495,7 @@ dir = 5 }, /turf/simulated/floor/plating, -/area/station/maintenance/auxsolarstarboard) +/area/station/maintenance/solar_maintenance/fore_starboard) "sDL" = ( /obj/structure/cable{ d1 = 4; @@ -83159,7 +83156,7 @@ icon_state = "1-2" }, /turf/simulated/floor/plating, -/area/station/maintenance/starboardsolar) +/area/station/maintenance/solar_maintenance/aft_starboard) "sTQ" = ( /obj/effect/landmark/start/doctor, /obj/structure/railing{ @@ -84788,7 +84785,7 @@ icon_state = "1-2" }, /turf/simulated/floor/plating, -/area/station/maintenance/starboardsolar) +/area/station/maintenance/solar_maintenance/aft_starboard) "tNc" = ( /obj/structure/table/reinforced, /obj/item/reagent_containers/drinks/drinkingglass, @@ -86413,7 +86410,7 @@ }, /obj/effect/mapping_helpers/airlock/access/all/engineering/general, /turf/simulated/floor/plating, -/area/station/maintenance/auxsolarstarboard) +/area/station/maintenance/solar_maintenance/fore_starboard) "uDI" = ( /obj/effect/turf_decal/stripes/line{ dir = 9 @@ -86754,6 +86751,9 @@ icon_state = "darkpurple" }, /area/station/science/genetics) +"uQE" = ( +/turf/simulated/wall/r_wall, +/area/station/maintenance/solar_maintenance/fore_port) "uQX" = ( /obj/machinery/atmospherics/pipe/manifold/hidden, /obj/effect/landmark/spawner/rev, @@ -87842,7 +87842,7 @@ /obj/effect/spawner/window/reinforced/grilled, /obj/effect/spawner/airlock, /turf/simulated/floor/plating, -/area/station/maintenance/starboardsolar) +/area/station/maintenance/solar_maintenance/aft_starboard) "vsw" = ( /obj/effect/decal/cleanable/dirt, /obj/item/flag/rnd, @@ -92790,7 +92790,7 @@ icon_state = "1-2" }, /turf/simulated/floor/plating, -/area/station/maintenance/fpmaint2) +/area/station/maintenance/solar_maintenance/fore_port) "xRy" = ( /obj/structure/cable{ d1 = 1; @@ -92903,7 +92903,7 @@ /obj/effect/spawner/window/reinforced/grilled, /obj/effect/spawner/airlock/e_to_w, /turf/simulated/floor/plating, -/area/station/maintenance/portsolar) +/area/station/maintenance/solar_maintenance/aft_port) "xSH" = ( /obj/machinery/light/small, /turf/simulated/floor/plating, @@ -93961,7 +93961,7 @@ "ymb" = ( /obj/effect/spawner/window/reinforced/grilled, /turf/simulated/floor/plating, -/area/station/maintenance/auxsolarport) +/area/station/maintenance/solar_maintenance/fore_port) (1,1,1) = {" aaa @@ -107418,10 +107418,10 @@ aaa aab aaa ymb -aDw +uQE aFT -aDw -aSt +uQE +uQE aHM aIJ aKW @@ -107678,7 +107678,7 @@ nee aDu aEC aFQ -aSt +uQE aHU erj aGn @@ -108446,8 +108446,8 @@ aaa aab aaa ymb -aDw -aDw +uQE +uQE aFT aHi aRA diff --git a/_maps/map_files/stations/cerestation.dmm b/_maps/map_files/stations/cerestation.dmm index ba17f51236f..75f46d9fc10 100644 --- a/_maps/map_files/stations/cerestation.dmm +++ b/_maps/map_files/stations/cerestation.dmm @@ -3943,7 +3943,7 @@ }, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plating, -/area/station/maintenance/starboardsolar/aft) +/area/station/maintenance/solar_maintenance/aft_starboard) "azN" = ( /obj/machinery/light/small, /obj/machinery/firealarm/directional/south, @@ -4968,7 +4968,7 @@ icon_state = "1-2" }, /turf/space, -/area/station/engineering/solar/starboard/aft) +/area/station/engineering/solar/fore_starboard) "aIA" = ( /obj/machinery/mineral/equipment_vendor, /turf/simulated/floor/plasteel, @@ -5397,7 +5397,7 @@ /turf/simulated/floor/plasteel/airless{ icon_state = "solarpanel" }, -/area/station/engineering/solar/auxport) +/area/station/engineering/solar/fore_port) "aLQ" = ( /obj/machinery/door/airlock/command{ name = "Captain's Quarters" @@ -5583,7 +5583,7 @@ }, /obj/structure/lattice/catwalk, /turf/space, -/area/station/engineering/solar/auxport) +/area/station/engineering/solar/fore_port) "aNm" = ( /obj/structure/cable{ d2 = 8; @@ -5595,7 +5595,7 @@ /turf/simulated/floor/plasteel/airless{ icon_state = "solarpanel" }, -/area/station/engineering/solar/auxport) +/area/station/engineering/solar/fore_port) "aNo" = ( /obj/machinery/light{ dir = 4 @@ -7164,7 +7164,7 @@ }, /obj/structure/lattice/catwalk, /turf/space, -/area/station/engineering/solar/auxport) +/area/station/engineering/solar/fore_port) "aXd" = ( /obj/machinery/door/airlock/hatch, /obj/effect/mapping_helpers/airlock/autoname, @@ -7200,7 +7200,7 @@ icon_state = "0-4" }, /turf/space, -/area/station/engineering/solar/auxport) +/area/station/engineering/solar/fore_port) "aXj" = ( /obj/machinery/recharge_station, /obj/effect/turf_decal/stripes/line{ @@ -7219,7 +7219,7 @@ icon_state = "4-8" }, /turf/space, -/area/station/engineering/solar/auxport) +/area/station/engineering/solar/fore_port) "aXl" = ( /obj/structure/girder, /obj/structure/grille, @@ -14412,7 +14412,7 @@ }, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plating, -/area/station/maintenance/starboardsolar/aft) +/area/station/maintenance/solar_maintenance/aft_starboard) "bGx" = ( /obj/structure/bookcase/random{ name = "Forbidden Knowledge" @@ -15939,7 +15939,7 @@ "bNT" = ( /obj/structure/lattice/catwalk, /turf/space, -/area/station/engineering/solar/auxport) +/area/station/engineering/solar/fore_port) "bNU" = ( /obj/structure/lattice/catwalk, /obj/structure/cable{ @@ -15948,7 +15948,7 @@ icon_state = "2-8" }, /turf/space, -/area/space/nearstation) +/area/station/engineering/solar/fore_port) "bNY" = ( /obj/machinery/door/firedoor, /obj/structure/cable/orange{ @@ -15979,7 +15979,7 @@ }, /obj/structure/lattice/catwalk, /turf/space, -/area/station/engineering/solar/auxport) +/area/station/engineering/solar/fore_port) "bOg" = ( /obj/machinery/light/small{ dir = 4 @@ -17055,7 +17055,7 @@ icon_state = "1-2" }, /turf/space, -/area/space/nearstation) +/area/station/engineering/solar/fore_port) "bSm" = ( /obj/machinery/light/small{ dir = 8 @@ -17124,7 +17124,7 @@ }, /obj/structure/lattice/catwalk, /turf/space, -/area/station/engineering/solar/auxport) +/area/station/engineering/solar/fore_port) "bSB" = ( /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 4 @@ -18832,9 +18832,6 @@ }, /turf/simulated/floor/plating, /area/station/command/office/hop) -"cav" = ( -/turf/simulated/wall, -/area/station/maintenance/auxsolarport) "caw" = ( /turf/simulated/floor/plating/asteroid/ancient, /area/station/maintenance/gambling_den) @@ -19003,7 +19000,7 @@ dir = 1 }, /turf/simulated/floor/plating, -/area/station/maintenance/starboardsolar/aft) +/area/station/maintenance/solar_maintenance/aft_starboard) "ccF" = ( /obj/structure/table, /obj/item/storage/box/evidence, @@ -19160,7 +19157,7 @@ icon_state = "2-4" }, /turf/simulated/floor/plating, -/area/station/maintenance/auxsolarport) +/area/station/maintenance/solar_maintenance/fore_port) "cdD" = ( /obj/structure/cable{ d1 = 1; @@ -19168,7 +19165,7 @@ icon_state = "1-2" }, /turf/simulated/floor/plating, -/area/station/maintenance/auxsolarport) +/area/station/maintenance/solar_maintenance/fore_port) "cdF" = ( /obj/structure/cable/orange{ d1 = 1; @@ -19200,13 +19197,13 @@ /area/station/medical/patients_rooms) "cdJ" = ( /turf/simulated/floor/plating, -/area/station/maintenance/auxsolarport) +/area/station/maintenance/solar_maintenance/fore_port) "cdK" = ( /obj/machinery/light/small{ dir = 4 }, /turf/simulated/floor/plating, -/area/station/maintenance/auxsolarport) +/area/station/maintenance/solar_maintenance/fore_port) "cdL" = ( /obj/machinery/ai_status_display, /turf/simulated/wall, @@ -19220,7 +19217,7 @@ /obj/machinery/power/terminal, /obj/structure/cable, /turf/simulated/floor/plating, -/area/station/maintenance/auxsolarport) +/area/station/maintenance/solar_maintenance/fore_port) "cdT" = ( /turf/simulated/wall, /area/station/hallway/secondary/exit) @@ -19231,7 +19228,7 @@ }, /obj/structure/cable, /turf/simulated/floor/plating, -/area/station/maintenance/auxsolarport) +/area/station/maintenance/solar_maintenance/fore_port) "cdW" = ( /obj/structure/table, /obj/item/key/janitor{ @@ -19263,7 +19260,7 @@ icon_state = "0-4" }, /turf/simulated/floor/plating, -/area/station/maintenance/auxsolarport) +/area/station/maintenance/solar_maintenance/fore_port) "cei" = ( /obj/machinery/light{ dir = 8 @@ -20014,7 +20011,7 @@ icon_state = "2-8" }, /turf/simulated/floor/plating, -/area/station/maintenance/auxsolarport) +/area/station/maintenance/solar_maintenance/fore_port) "ciy" = ( /obj/machinery/door/airlock/maintenance{ name = "Command Asteroid Solars" @@ -20026,7 +20023,7 @@ icon_state = "1-2" }, /turf/simulated/floor/plating, -/area/station/maintenance/auxsolarport) +/area/station/maintenance/solar_maintenance/fore_port) "ciB" = ( /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 1 @@ -20515,7 +20512,7 @@ amount = 2 }, /turf/space, -/area/station/engineering/solar/starboard/aft) +/area/station/engineering/solar/aft_starboard) "cmo" = ( /obj/structure/disposalpipe/segment, /obj/machinery/door/firedoor, @@ -26659,7 +26656,7 @@ icon_state = "0-2" }, /turf/space, -/area/station/engineering/solar/starboard/aft) +/area/station/engineering/solar/aft_starboard) "cXJ" = ( /turf/simulated/wall/r_wall, /area/station/hallway/spacebridge/cargocom) @@ -27841,7 +27838,7 @@ /obj/effect/spawner/airlock/w_to_e, /obj/effect/spawner/window/reinforced/grilled, /turf/simulated/floor/plating, -/area/station/maintenance/portsolar) +/area/station/maintenance/solar_maintenance/aft) "dgO" = ( /obj/structure/girder, /obj/item/stack/sheet/metal, @@ -27921,7 +27918,7 @@ /turf/simulated/floor/plasteel/airless{ icon_state = "solarpanel" }, -/area/station/engineering/solar/starboard/aft) +/area/station/engineering/solar/aft_starboard) "dhu" = ( /obj/machinery/atmospherics/pipe/simple/hidden/universal{ dir = 4 @@ -27936,7 +27933,7 @@ /obj/structure/lattice/catwalk, /obj/structure/cable, /turf/space, -/area/station/engineering/solar/port) +/area/station/engineering/solar/aft) "dhy" = ( /obj/structure/disposaloutlet{ dir = 8 @@ -29582,7 +29579,7 @@ }, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plating, -/area/station/maintenance/starboardsolar) +/area/station/maintenance/solar_maintenance/fore_starboard) "dte" = ( /obj/structure/table/glass/reinforced, /obj/item/eftpos/register, @@ -31679,7 +31676,7 @@ /area/station/service/chapel) "dGU" = ( /turf/simulated/wall/r_wall, -/area/station/maintenance/starboardsolar/aft) +/area/station/maintenance/solar_maintenance/aft) "dHb" = ( /obj/machinery/light/small{ dir = 1 @@ -31893,7 +31890,7 @@ }, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plating, -/area/station/maintenance/auxsolarport) +/area/station/maintenance/solar_maintenance/fore_port) "dKK" = ( /obj/structure/disposalpipe/segment/corner{ dir = 8 @@ -31967,7 +31964,7 @@ dir = 9 }, /turf/simulated/floor/plating, -/area/station/maintenance/starboardsolar/aft) +/area/station/maintenance/solar_maintenance/aft_starboard) "dLh" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -32239,7 +32236,7 @@ "dOC" = ( /obj/effect/spawner/random_spawners/dirt_frequent, /turf/simulated/floor/plating, -/area/station/maintenance/starboardsolar) +/area/station/maintenance/solar_maintenance/fore_starboard) "dOJ" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/cyan{ level = 2 @@ -32845,6 +32842,14 @@ icon_state = "purple" }, /area/station/hallway/primary/aft/west) +"dWQ" = ( +/obj/structure/lattice/catwalk, +/obj/structure/cable{ + d2 = 4; + icon_state = "0-4" + }, +/turf/space, +/area/station/engineering/solar/aft_starboard) "dXx" = ( /turf/simulated/floor/plasteel{ dir = 4; @@ -33384,7 +33389,7 @@ dir = 1 }, /turf/simulated/floor/plating, -/area/station/maintenance/portsolar) +/area/station/maintenance/solar_maintenance/aft) "eil" = ( /obj/structure/disposaloutlet{ dir = 4 @@ -33660,7 +33665,7 @@ icon_state = "0-2" }, /turf/space, -/area/station/engineering/solar/starboard/aft) +/area/station/engineering/solar/fore_starboard) "emS" = ( /obj/machinery/door/airlock/maintenance{ name = "Fore Asteroid Maintenance Access" @@ -34404,7 +34409,7 @@ "eyH" = ( /obj/effect/spawner/window/reinforced/grilled, /turf/simulated/floor/plating, -/area/station/maintenance/starboardsolar/aft) +/area/station/maintenance/solar_maintenance/aft) "eyO" = ( /obj/structure/disposalpipe/segment, /obj/structure/cable{ @@ -35355,7 +35360,7 @@ /obj/item/solar_assembly, /obj/item/tracker_electronics, /turf/simulated/floor/plating, -/area/station/maintenance/starboardsolar/aft) +/area/station/maintenance/solar_maintenance/aft_starboard) "eMc" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -35397,7 +35402,7 @@ }, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plating, -/area/station/maintenance/auxsolarport) +/area/station/maintenance/solar_maintenance/fore_port) "eMR" = ( /obj/structure/cable/orange{ d1 = 4; @@ -35871,7 +35876,7 @@ /obj/machinery/atmospherics/unary/portables_connector, /obj/machinery/atmospherics/portable/canister/air, /turf/simulated/floor/plating, -/area/station/maintenance/starboardsolar/aft) +/area/station/maintenance/solar_maintenance/aft_starboard) "eWa" = ( /obj/structure/cable{ d1 = 4; @@ -36742,7 +36747,7 @@ /turf/simulated/floor/plasteel/airless{ icon_state = "solarpanel" }, -/area/station/engineering/solar/starboard/aft) +/area/station/engineering/solar/aft_starboard) "fms" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/visible/yellow{ @@ -37174,7 +37179,7 @@ }, /obj/effect/decal/cleanable/cobweb, /turf/simulated/floor/plating, -/area/station/maintenance/starboardsolar) +/area/station/maintenance/solar_maintenance/fore_starboard) "ful" = ( /turf/simulated/wall/r_wall, /area/station/turret_protected/ai_upload) @@ -38233,7 +38238,7 @@ "fMG" = ( /obj/structure/table, /turf/simulated/floor/plating, -/area/station/maintenance/starboardsolar) +/area/station/maintenance/solar_maintenance/fore_starboard) "fMH" = ( /obj/machinery/door/airlock/maintenance{ name = "Security SMES Access" @@ -38484,7 +38489,7 @@ icon_state = "0-4" }, /turf/space, -/area/station/engineering/solar/starboard/aft) +/area/station/engineering/solar/fore_starboard) "fPZ" = ( /obj/item/stack/ore/glass, /obj/effect/turf_decal/box, @@ -41863,7 +41868,7 @@ }, /obj/machinery/atmospherics/portable/canister/air, /turf/simulated/floor/plating, -/area/station/maintenance/starboardsolar) +/area/station/maintenance/solar_maintenance/fore_starboard) "gXL" = ( /obj/structure/closet/firecloset/full, /turf/simulated/floor/plating, @@ -43478,7 +43483,7 @@ }, /obj/machinery/power/smes, /turf/simulated/floor/plating, -/area/station/maintenance/portsolar) +/area/station/maintenance/solar_maintenance/aft) "hyo" = ( /obj/machinery/light{ dir = 4 @@ -44380,7 +44385,7 @@ "hLx" = ( /obj/effect/spawner/random_spawners/fungus_maybe, /turf/simulated/wall, -/area/station/maintenance/starboardsolar) +/area/station/maintenance/solar_maintenance/fore_starboard) "hLB" = ( /obj/structure/closet/secure_closet/quartermaster, /turf/simulated/floor/plasteel{ @@ -44468,7 +44473,7 @@ dir = 4 }, /turf/simulated/floor/plating, -/area/station/maintenance/portsolar) +/area/station/maintenance/solar_maintenance/aft) "hOa" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -45824,7 +45829,7 @@ icon_state = "1-8" }, /turf/space, -/area/station/engineering/solar/port) +/area/station/engineering/solar/aft) "igo" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 5 @@ -46521,6 +46526,9 @@ /obj/structure/closet/secure_closet/research_reagents, /turf/simulated/floor/engine, /area/station/science/misc_lab) +"iqA" = ( +/turf/simulated/wall/r_wall, +/area/station/maintenance/solar_maintenance/aft_starboard) "iqJ" = ( /obj/machinery/door/airlock/public/glass{ name = "Walkway" @@ -46878,7 +46886,7 @@ icon_state = "0-4" }, /turf/space, -/area/station/engineering/solar/auxport) +/area/station/engineering/solar/fore_port) "iuS" = ( /obj/machinery/door/airlock/command, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -47214,7 +47222,7 @@ /turf/simulated/floor/plasteel/airless{ icon_state = "solarpanel" }, -/area/station/engineering/solar/starboard/aft) +/area/station/engineering/solar/fore_starboard) "izY" = ( /obj/structure/cable/orange{ d1 = 1; @@ -47908,7 +47916,7 @@ }, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plating, -/area/station/maintenance/auxsolarport) +/area/station/maintenance/solar_maintenance/fore_port) "iKW" = ( /obj/structure/table/wood, /obj/item/lighter/zippo/blue{ @@ -49211,7 +49219,7 @@ icon_state = "4-8" }, /turf/space, -/area/station/engineering/solar/port) +/area/station/engineering/solar/aft) "jcm" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -50169,14 +50177,6 @@ icon_state = "asteroidplating" }, /area/station/maintenance/asmaint) -"jrJ" = ( -/obj/structure/cable{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/turf/simulated/floor/plating, -/area/station/maintenance/portsolar) "jrM" = ( /obj/machinery/door/airlock/maintenance{ name = "Port Asteroid Maintenance" @@ -52191,7 +52191,7 @@ /obj/machinery/atmospherics/portable/canister/air, /obj/machinery/atmospherics/unary/portables_connector, /turf/simulated/floor/plating, -/area/station/maintenance/portsolar) +/area/station/maintenance/solar_maintenance/aft) "jRW" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/camera{ @@ -52438,7 +52438,7 @@ }, /obj/structure/barricade/wooden, /turf/simulated/floor/plating, -/area/station/maintenance/starboardsolar/aft) +/area/station/maintenance/solar_maintenance/aft_starboard) "jVa" = ( /obj/machinery/conveyor/auto{ dir = 4 @@ -52753,7 +52753,7 @@ }, /obj/structure/cable, /turf/simulated/floor/plating, -/area/station/maintenance/portsolar) +/area/station/maintenance/solar_maintenance/aft) "kaY" = ( /obj/effect/turf_decal/stripes/asteroid/line{ dir = 8 @@ -53494,7 +53494,7 @@ /turf/simulated/floor/plasteel/airless{ icon_state = "solarpanel" }, -/area/station/engineering/solar/starboard/aft) +/area/station/engineering/solar/aft_starboard) "knI" = ( /obj/structure/table, /obj/item/book/manual/wiki/chef_recipes, @@ -54590,7 +54590,7 @@ /area/station/maintenance/apmaint) "kGR" = ( /turf/simulated/mineral/ancient/outer, -/area/station/maintenance/starboardsolar) +/area/station/maintenance/solar_maintenance/fore_starboard) "kHq" = ( /obj/structure/disposalpipe/segment, /obj/structure/cable/orange{ @@ -54950,7 +54950,7 @@ /obj/structure/lattice/catwalk, /obj/structure/cable, /turf/space, -/area/station/engineering/solar/starboard/aft) +/area/station/engineering/solar/aft_starboard) "kLV" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -56389,7 +56389,7 @@ }, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plating, -/area/station/maintenance/starboardsolar/aft) +/area/station/maintenance/solar_maintenance/aft_starboard) "lht" = ( /obj/structure/grille/broken, /obj/structure/disposalpipe/segment{ @@ -57813,10 +57813,6 @@ icon_state = "whiteblue" }, /area/station/medical/medbay) -"lAv" = ( -/obj/structure/lattice/catwalk, -/turf/space, -/area/station/engineering/solar/port) "lAy" = ( /obj/structure/chair/sofa/pew/right{ dir = 8 @@ -57843,7 +57839,7 @@ /area/station/hallway/spacebridge/sercom) "lBh" = ( /turf/simulated/mineral/ancient/outer, -/area/station/maintenance/auxsolarport) +/area/station/maintenance/solar_maintenance/fore_port) "lBr" = ( /obj/machinery/light/small{ dir = 8 @@ -58161,7 +58157,7 @@ icon_state = "1-2" }, /turf/space, -/area/station/engineering/solar/auxport) +/area/station/engineering/solar/fore_port) "lFB" = ( /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 4 @@ -58245,7 +58241,7 @@ }, /obj/machinery/atmospherics/portable/canister/air, /turf/simulated/floor/plating, -/area/station/maintenance/auxsolarport) +/area/station/maintenance/solar_maintenance/fore_port) "lHd" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -60126,7 +60122,7 @@ }, /obj/structure/lattice/catwalk, /turf/space, -/area/station/engineering/solar/starboard) +/area/station/engineering/solar/aft_starboard) "mle" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 9 @@ -60661,7 +60657,7 @@ icon_state = "4-8" }, /turf/simulated/floor/plating, -/area/station/maintenance/portsolar) +/area/station/maintenance/solar_maintenance/aft) "mtB" = ( /obj/structure/disposalpipe/segment/corner{ dir = 1 @@ -61722,7 +61718,7 @@ /obj/structure/lattice, /obj/item/wirecutters, /turf/space, -/area/station/engineering/solar/starboard/aft) +/area/station/engineering/solar/aft_starboard) "mLz" = ( /obj/machinery/atmospherics/binary/valve{ dir = 1; @@ -63819,7 +63815,7 @@ }, /obj/effect/spawner/random_spawners/dirt_frequent, /turf/simulated/floor/plating, -/area/station/maintenance/starboardsolar) +/area/station/maintenance/solar_maintenance/fore_starboard) "ntW" = ( /turf/simulated/floor/plasteel{ dir = 1; @@ -64487,7 +64483,7 @@ /turf/simulated/floor/plasteel/airless{ icon_state = "solarpanel" }, -/area/station/engineering/solar/starboard/aft) +/area/station/engineering/solar/fore_starboard) "nFy" = ( /obj/structure/cable{ d1 = 1; @@ -64883,7 +64879,7 @@ }, /obj/structure/cable, /turf/simulated/floor/plating, -/area/station/maintenance/starboardsolar/aft) +/area/station/maintenance/solar_maintenance/aft_starboard) "nLc" = ( /obj/machinery/light{ dir = 8 @@ -67166,7 +67162,7 @@ /area/station/security/brig) "owf" = ( /turf/simulated/wall, -/area/station/maintenance/starboardsolar) +/area/station/maintenance/solar_maintenance/fore_starboard) "owE" = ( /obj/effect/landmark/lightsout, /turf/simulated/floor/plasteel{ @@ -67297,7 +67293,7 @@ icon_state = "1-2" }, /turf/simulated/floor/plating, -/area/station/maintenance/starboardsolar) +/area/station/maintenance/solar_maintenance/fore_starboard) "oya" = ( /obj/effect/turf_decal/loading_area, /obj/effect/turf_decal/delivery/hollow, @@ -67309,10 +67305,6 @@ /obj/effect/spawner/random_barrier/obstruction, /turf/simulated/floor/plasteel, /area/station/maintenance/starboard) -"oyl" = ( -/obj/effect/spawner/window/reinforced/grilled, -/turf/simulated/floor/plating, -/area/station/maintenance/portsolar) "oyo" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/power/apc/directional/east, @@ -67616,6 +67608,14 @@ /obj/structure/sign/cargo, /turf/simulated/wall, /area/station/maintenance/apmaint) +"oEP" = ( +/obj/structure/cable{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/turf/simulated/floor/plating, +/area/station/maintenance/solar_maintenance/aft_starboard) "oEV" = ( /obj/structure/ore_box, /turf/simulated/floor/plating, @@ -67970,7 +67970,7 @@ name = "Aft Starboard Solar Access" }, /turf/simulated/floor/plating, -/area/station/maintenance/starboardsolar) +/area/station/maintenance/solar_maintenance/fore_starboard) "oLo" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/effect/turf_decal/loading_area{ @@ -68813,7 +68813,7 @@ }, /obj/structure/lattice/catwalk, /turf/space, -/area/station/engineering/solar/starboard/aft) +/area/station/engineering/solar/fore_starboard) "oXz" = ( /obj/effect/decal/cleanable/vomit, /turf/simulated/floor/plating{ @@ -68856,7 +68856,7 @@ icon_state = "0-8" }, /turf/simulated/floor/plating, -/area/station/maintenance/starboardsolar) +/area/station/maintenance/solar_maintenance/fore_starboard) "oYF" = ( /obj/structure/disposalpipe/segment, /obj/structure/cable{ @@ -69119,6 +69119,10 @@ }, /turf/simulated/floor/plating, /area/station/maintenance/apmaint) +"pbR" = ( +/obj/structure/lattice/catwalk, +/turf/space, +/area/station/engineering/solar/fore_starboard) "pbY" = ( /obj/structure/disposalpipe/segment{ color = "#954535" @@ -69179,7 +69183,7 @@ /turf/simulated/floor/plasteel/airless{ icon_state = "solarpanel" }, -/area/station/engineering/solar/port) +/area/station/engineering/solar/aft) "pdk" = ( /obj/structure/disposalpipe/junction/reversed{ dir = 1 @@ -69343,14 +69347,6 @@ icon_state = "darkbrown" }, /area/station/supply/storage) -"peG" = ( -/obj/structure/lattice/catwalk, -/obj/structure/cable{ - d2 = 4; - icon_state = "0-4" - }, -/turf/space, -/area/station/engineering/solar/port) "peQ" = ( /obj/machinery/light_switch{ dir = 4; @@ -69481,7 +69477,7 @@ icon_state = "1-2" }, /turf/space, -/area/station/engineering/solar/auxport) +/area/station/engineering/solar/fore_port) "phZ" = ( /obj/machinery/door/airlock/maintenance{ name = "Medbay SMES Access" @@ -69749,7 +69745,7 @@ "plQ" = ( /obj/effect/spawner/random_spawners/wall_rusted_always, /turf/simulated/wall, -/area/station/maintenance/starboardsolar/aft) +/area/station/maintenance/solar_maintenance/aft_starboard) "pmA" = ( /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 8 @@ -69783,7 +69779,7 @@ pixel_x = 32 }, /turf/simulated/floor/plating, -/area/station/maintenance/starboardsolar/aft) +/area/station/maintenance/solar_maintenance/aft_starboard) "pnd" = ( /obj/effect/turf_decal/stripes/line{ dir = 10 @@ -70009,7 +70005,7 @@ "ppV" = ( /obj/effect/spawner/random_spawners/wall_rusted_always, /turf/simulated/wall, -/area/station/maintenance/starboardsolar) +/area/station/maintenance/solar_maintenance/fore_starboard) "pqi" = ( /obj/structure/disposalpipe/segment, /obj/machinery/hologram/holopad, @@ -70134,7 +70130,7 @@ "psw" = ( /obj/effect/spawner/window/reinforced/grilled, /turf/simulated/floor/plating, -/area/station/maintenance/auxsolarport) +/area/station/maintenance/solar_maintenance/fore_port) "psE" = ( /obj/structure/girder, /obj/structure/grille, @@ -70475,7 +70471,7 @@ /turf/simulated/floor/plasteel/airless{ icon_state = "solarpanel" }, -/area/station/engineering/solar/port) +/area/station/engineering/solar/aft) "pwN" = ( /obj/structure/disposalpipe/segment, /obj/structure/cable{ @@ -72129,7 +72125,7 @@ /turf/simulated/floor/plasteel/airless{ icon_state = "solarpanel" }, -/area/station/engineering/solar/starboard/aft) +/area/station/engineering/solar/aft_starboard) "pWc" = ( /obj/machinery/light/small{ dir = 1 @@ -73172,7 +73168,7 @@ }, /obj/structure/lattice/catwalk, /turf/space, -/area/station/engineering/solar/starboard/aft) +/area/station/engineering/solar/aft_starboard) "qke" = ( /obj/effect/landmark/spawner/xeno, /turf/simulated/floor/plating, @@ -73857,7 +73853,7 @@ icon_state = "0-8" }, /turf/space, -/area/station/engineering/solar/port) +/area/station/engineering/solar/aft) "quI" = ( /turf/simulated/wall/r_wall, /area/station/science/explab/chamber) @@ -74532,7 +74528,7 @@ icon_state = "0-8" }, /turf/space, -/area/station/engineering/solar/starboard/aft) +/area/station/engineering/solar/fore_starboard) "qFS" = ( /obj/structure/closet/emcloset, /obj/structure/disposalpipe/segment, @@ -75000,7 +74996,7 @@ "qMm" = ( /obj/effect/spawner/window/reinforced/grilled, /turf/simulated/floor/plating, -/area/station/maintenance/starboardsolar) +/area/station/maintenance/solar_maintenance/fore_starboard) "qMs" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -75298,7 +75294,7 @@ icon_state = "4-8" }, /turf/simulated/floor/plating, -/area/station/maintenance/portsolar) +/area/station/maintenance/solar_maintenance/aft) "qRD" = ( /obj/effect/spawner/random_spawners/grille_maybe, /turf/simulated/floor/plating, @@ -75597,7 +75593,7 @@ "qWL" = ( /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plating, -/area/station/maintenance/starboardsolar) +/area/station/maintenance/solar_maintenance/fore_starboard) "qWM" = ( /obj/machinery/light{ dir = 4 @@ -76051,9 +76047,6 @@ /obj/machinery/ai_status_display, /turf/simulated/mineral/ancient, /area/station/legal/courtroom) -"rfn" = ( -/turf/simulated/wall/r_wall, -/area/station/maintenance/portsolar) "rfq" = ( /obj/structure/cable{ d1 = 1; @@ -76639,7 +76632,7 @@ }, /obj/structure/lattice/catwalk, /turf/space, -/area/station/engineering/solar/starboard/aft) +/area/station/engineering/solar/fore_starboard) "rrj" = ( /obj/machinery/door/airlock/maintenance{ name = "Medbay SMES Access" @@ -77968,7 +77961,7 @@ icon_state = "2-8" }, /turf/space, -/area/station/engineering/solar/port) +/area/station/engineering/solar/aft) "rNE" = ( /obj/structure/grille/broken, /turf/simulated/floor/plating, @@ -79313,7 +79306,7 @@ dir = 1 }, /turf/simulated/floor/plating, -/area/station/maintenance/portsolar) +/area/station/maintenance/solar_maintenance/aft) "shU" = ( /turf/simulated/mineral/ancient/outer, /area/station/maintenance/disposal/north) @@ -79484,7 +79477,7 @@ "skB" = ( /obj/structure/lattice/catwalk, /turf/space, -/area/station/engineering/solar/starboard/aft) +/area/station/engineering/solar/aft) "skF" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -79705,7 +79698,7 @@ icon_state = "1-2" }, /turf/space, -/area/station/engineering/solar/port) +/area/station/engineering/solar/aft) "snX" = ( /obj/structure/cable/orange{ d1 = 4; @@ -79740,6 +79733,10 @@ icon_state = "chapel" }, /area/station/service/chapel) +"sox" = ( +/obj/effect/spawner/window/reinforced/grilled, +/turf/simulated/floor/plating, +/area/station/maintenance/solar_maintenance/aft_starboard) "soK" = ( /obj/structure/closet, /obj/item/pickaxe, @@ -80799,7 +80796,7 @@ pixel_y = 7 }, /turf/simulated/floor/plating, -/area/station/maintenance/starboardsolar) +/area/station/maintenance/solar_maintenance/fore_starboard) "sCF" = ( /obj/structure/cable/orange{ d1 = 1; @@ -82692,7 +82689,7 @@ "tgI" = ( /obj/structure/lattice, /turf/space, -/area/station/engineering/solar/starboard/aft) +/area/station/engineering/solar/aft_starboard) "tgP" = ( /obj/structure/sign/securearea{ desc = "A warning sign which reads 'EXTERNAL AIRLOCK'"; @@ -82793,7 +82790,7 @@ dir = 9 }, /turf/simulated/floor/plating, -/area/station/maintenance/starboardsolar) +/area/station/maintenance/solar_maintenance/fore_starboard) "thH" = ( /obj/structure/cable{ d1 = 4; @@ -83732,7 +83729,7 @@ /area/station/science/xenobiology) "tvV" = ( /turf/simulated/mineral/ancient, -/area/station/maintenance/starboardsolar) +/area/station/maintenance/solar_maintenance/fore_starboard) "twa" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/power/apc/important/directional/east, @@ -84182,7 +84179,7 @@ "tCG" = ( /obj/effect/spawner/random_spawners/wall_rusted_maybe, /turf/simulated/wall, -/area/station/maintenance/starboardsolar) +/area/station/maintenance/solar_maintenance/fore_starboard) "tCV" = ( /obj/item/kirbyplants/plant22, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -84609,7 +84606,7 @@ icon_state = "1-8" }, /turf/simulated/floor/plating, -/area/station/maintenance/portsolar) +/area/station/maintenance/solar_maintenance/aft) "tKj" = ( /obj/structure/cable{ d1 = 4; @@ -85161,7 +85158,7 @@ }, /obj/structure/lattice/catwalk, /turf/space, -/area/station/engineering/solar/starboard/aft) +/area/station/engineering/solar/aft_starboard) "tVb" = ( /obj/machinery/door/airlock/security/glass{ id_tag = "cell1"; @@ -85475,7 +85472,7 @@ icon_state = "4-8" }, /turf/space, -/area/station/engineering/solar/port) +/area/station/engineering/solar/aft) "tYu" = ( /obj/machinery/door/airlock/maintenance{ name = "Port Asteroid Maintenance" @@ -86631,7 +86628,7 @@ }, /obj/item/stack/cable_coil/random, /turf/space, -/area/station/engineering/solar/starboard/aft) +/area/station/engineering/solar/fore_starboard) "uqt" = ( /obj/machinery/light/small, /turf/simulated/floor/plating, @@ -86871,7 +86868,7 @@ icon_state = "2-8" }, /turf/space, -/area/station/engineering/solar/port) +/area/station/engineering/solar/aft) "utB" = ( /obj/structure/disposalpipe/trunk, /obj/machinery/disposal/deliveryChute{ @@ -86996,7 +86993,7 @@ }, /obj/structure/lattice/catwalk, /turf/space, -/area/station/engineering/solar/starboard/aft) +/area/station/engineering/solar/fore_starboard) "uvM" = ( /obj/machinery/light/small{ dir = 8 @@ -87222,7 +87219,7 @@ dir = 4 }, /turf/simulated/floor/plating, -/area/station/maintenance/starboardsolar) +/area/station/maintenance/solar_maintenance/fore_starboard) "uxY" = ( /obj/structure/disposalpipe/junction{ dir = 1 @@ -87315,7 +87312,7 @@ icon_state = "1-4" }, /turf/space, -/area/station/engineering/solar/starboard/aft) +/area/station/engineering/solar/fore_starboard) "uyI" = ( /obj/item/key/security{ pixel_x = -6; @@ -88357,7 +88354,7 @@ icon_state = "2-8" }, /turf/space, -/area/station/engineering/solar/auxport) +/area/station/engineering/solar/fore_port) "uPi" = ( /obj/machinery/hologram/holopad, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -89329,7 +89326,7 @@ icon_state = "0-8" }, /turf/space, -/area/station/engineering/solar/starboard/aft) +/area/station/engineering/solar/fore_starboard) "vbY" = ( /obj/structure/cable/orange{ d1 = 4; @@ -89404,7 +89401,7 @@ icon_state = "0-4" }, /turf/simulated/floor/plating, -/area/station/maintenance/starboardsolar) +/area/station/maintenance/solar_maintenance/fore_starboard) "vcx" = ( /obj/machinery/light_switch{ pixel_y = 24; @@ -91129,7 +91126,7 @@ }, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plating, -/area/station/maintenance/auxsolarport) +/area/station/maintenance/solar_maintenance/fore_port) "vDL" = ( /obj/machinery/sleeper{ dir = 1 @@ -92257,7 +92254,7 @@ icon_state = "4-8" }, /turf/simulated/floor/plating, -/area/station/maintenance/starboardsolar/aft) +/area/station/maintenance/solar_maintenance/aft) "vUn" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -93488,7 +93485,7 @@ icon_state = "2-8" }, /turf/space, -/area/station/engineering/solar/port) +/area/station/engineering/solar/aft) "wmA" = ( /obj/machinery/disposal, /obj/structure/disposalpipe/trunk{ @@ -95887,6 +95884,9 @@ "wRF" = ( /turf/simulated/floor/engine, /area/station/science/misc_lab) +"wSc" = ( +/turf/simulated/wall, +/area/station/maintenance/solar_maintenance/fore_port) "wSh" = ( /obj/machinery/door/firedoor, /obj/machinery/door/airlock/glass, @@ -96130,7 +96130,7 @@ "wVu" = ( /obj/effect/spawner/airlock/s_to_n, /turf/simulated/wall, -/area/station/maintenance/starboardsolar) +/area/station/maintenance/solar_maintenance/fore_starboard) "wVD" = ( /obj/machinery/power/smes/engineering, /obj/structure/cable/orange, @@ -97402,7 +97402,7 @@ }, /obj/effect/spawner/random_spawners/dirt_frequent, /turf/simulated/floor/plating, -/area/station/maintenance/starboardsolar) +/area/station/maintenance/solar_maintenance/fore_starboard) "xrm" = ( /obj/structure/disposalpipe/segment/corner{ dir = 4 @@ -97793,7 +97793,7 @@ /obj/effect/spawner/airlock/e_to_w, /obj/effect/spawner/window/reinforced/grilled, /turf/simulated/floor/plating, -/area/station/maintenance/starboardsolar/aft) +/area/station/maintenance/solar_maintenance/aft_starboard) "xxt" = ( /obj/structure/cable{ d1 = 2; @@ -98245,7 +98245,7 @@ /obj/effect/spawner/airlock/s_to_n, /obj/effect/spawner/window/reinforced/grilled, /turf/simulated/floor/plating, -/area/station/maintenance/auxsolarport) +/area/station/maintenance/solar_maintenance/fore_port) "xCd" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -98411,7 +98411,7 @@ icon_state = "1-4" }, /turf/simulated/floor/plating, -/area/station/maintenance/portsolar) +/area/station/maintenance/solar_maintenance/aft) "xEp" = ( /turf/space, /area/shuttle/gamma/station) @@ -98825,7 +98825,11 @@ icon_state = "0-4" }, /turf/space, -/area/station/engineering/solar/starboard/aft) +/area/station/engineering/solar/aft) +"xJR" = ( +/obj/structure/lattice/catwalk, +/turf/space, +/area/station/engineering/solar/aft_starboard) "xJW" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -99438,7 +99442,7 @@ }, /obj/structure/lattice/catwalk, /turf/space, -/area/station/engineering/solar/starboard/aft) +/area/station/engineering/solar/fore_starboard) "xUb" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -100006,7 +100010,7 @@ icon_state = "4-8" }, /turf/space, -/area/station/engineering/solar/port) +/area/station/engineering/solar/aft) "ycI" = ( /obj/structure/cable{ d1 = 1; @@ -100761,7 +100765,7 @@ /obj/structure/cable, /obj/effect/spawner/random_spawners/dirt_frequent, /turf/simulated/floor/plating, -/area/station/maintenance/starboardsolar) +/area/station/maintenance/solar_maintenance/fore_starboard) (1,1,1) = {" rNK @@ -110585,11 +110589,11 @@ rNK rNK rNK rNK -cav -cav -sji -sji -sji +wSc +wSc +wSc +wSc +wSc deW aCz sUK @@ -129236,11 +129240,11 @@ wIq eOu mvF wIq -cGd -rfn +dGU +dGU mtz -rfn -rfn +dGU +dGU plk khY stN @@ -129493,11 +129497,11 @@ wIq wIq wIq wIq -rfn +dGU hyd tJW shP -rfn +dGU sHB lvB jRo @@ -129750,11 +129754,11 @@ rWw rWw rWw tTD -rfn +dGU eii xEi hNu -rfn +dGU iwD bxf aOi @@ -130007,11 +130011,11 @@ rNK rNK rNK lzH -rfn +dGU jRK qRt kaD -rfn +dGU raX flr flr @@ -130264,11 +130268,11 @@ rNK rNK rNK lzH -oyl -oyl -jrJ +eyH +eyH +vUb dgL -oyl +eyH lzH rNK rNK @@ -130522,9 +130526,9 @@ rNK rNK lzH lzH -oyl -jrJ -oyl +eyH +vUb +eyH lzH lzH rNK @@ -130779,9 +130783,9 @@ rNK rNK rNK lzH -oyl -jrJ -oyl +eyH +vUb +eyH lzH rNK rNK @@ -131040,18 +131044,18 @@ lzH utz snQ dhv -lAv -lAv -lAv -peG -lAv -lAv -lAv -peG -lAv -lAv -lAv -peG +skB +skB +skB +xJM +skB +skB +skB +xJM +skB +skB +skB +xJM lzH lzH ejE @@ -137686,15 +137690,15 @@ rNK rNK cmn tgI -skB -skB -skB +xJR +xJR +xJR cXC qkc qkc kLA tUG -skB +xJR rNK rNK rNK @@ -137945,7 +137949,7 @@ pVK pVK pVK tgI -xJM +dWQ tgI knD pVK @@ -138715,8 +138719,8 @@ rNK rNK rNK rNK -eyH -vUb +sox +oEP xxg bhO bhO @@ -138972,9 +138976,9 @@ rNK rNK rNK rNK -eyH -vUb -eyH +sox +oEP +sox bhO bhO bhO @@ -139228,11 +139232,11 @@ rNK rNK rNK bhO -eyH -eyH -vUb -eyH -eyH +sox +sox +oEP +sox +sox bhO hUU hUU @@ -139485,7 +139489,7 @@ rNK rNK aXn bhO -dGU +iqA eVY dLb nKY @@ -139999,11 +140003,11 @@ bhO bhO bhO bhO -dGU +iqA pnb eLX bGk -dGU +iqA pue mJk mJk @@ -140256,8 +140260,8 @@ bhO bhO bhO bhO -dGU -dGU +iqA +iqA plQ plQ plQ @@ -149659,7 +149663,7 @@ nFa nFa nFa nFa -skB +pbR nFa nFa nFa @@ -150430,7 +150434,7 @@ lzH lzH lzH lzH -skB +pbR lzH lzH lzH @@ -150687,7 +150691,7 @@ nFa nFa nFa nFa -skB +pbR nFa nFa nFa @@ -151458,7 +151462,7 @@ lzH lzH lzH lzH -skB +pbR lzH lzH lzH @@ -151715,7 +151719,7 @@ nFa nFa nFa nFa -skB +pbR nFa nFa nFa @@ -152486,7 +152490,7 @@ lzH lzH lzH lzH -skB +pbR lzH lzH lzH @@ -152743,7 +152747,7 @@ nFa nFa nFa nFa -skB +pbR nFa nFa nFa @@ -153514,7 +153518,7 @@ rNK rNK rNK rNK -skB +pbR rNK rNK rNK @@ -153771,7 +153775,7 @@ nFa nFa nFa nFa -skB +pbR nFa nFa nFa @@ -154542,7 +154546,7 @@ lzH lzH lzH lzH -skB +pbR lzH lzH lzH @@ -154799,7 +154803,7 @@ nFa nFa nFa nFa -skB +pbR nFa nFa nFa diff --git a/_maps/map_files/stations/deltastation.dmm b/_maps/map_files/stations/deltastation.dmm index 9ca07f38bc2..90ba1744be3 100644 --- a/_maps/map_files/stations/deltastation.dmm +++ b/_maps/map_files/stations/deltastation.dmm @@ -34,7 +34,7 @@ icon_state = "1-2" }, /turf/space, -/area/station/engineering/solar/auxstarboard) +/area/station/engineering/solar/fore_starboard) "abD" = ( /obj/structure/railing{ dir = 1 @@ -74,7 +74,7 @@ /turf/simulated/floor/plasteel/airless{ icon_state = "solarpanel" }, -/area/station/engineering/solar/auxstarboard) +/area/station/engineering/solar/fore_starboard) "acf" = ( /obj/structure/lattice/catwalk, /obj/structure/cable{ @@ -88,7 +88,7 @@ icon_state = "2-4" }, /turf/space, -/area/station/engineering/solar/auxstarboard) +/area/station/engineering/solar/fore_starboard) "acg" = ( /obj/structure/lattice/catwalk, /obj/structure/cable{ @@ -107,7 +107,7 @@ icon_state = "4-8" }, /turf/space, -/area/station/engineering/solar/auxstarboard) +/area/station/engineering/solar/fore_starboard) "ach" = ( /obj/structure/lattice/catwalk, /obj/structure/cable{ @@ -115,12 +115,12 @@ icon_state = "0-8" }, /turf/space, -/area/station/engineering/solar/auxstarboard) +/area/station/engineering/solar/fore_starboard) "aci" = ( /obj/structure/lattice/catwalk, /obj/structure/cable, /turf/space, -/area/station/engineering/solar/auxstarboard) +/area/station/engineering/solar/fore_starboard) "acj" = ( /obj/structure/lattice/catwalk, /obj/structure/cable{ @@ -128,7 +128,7 @@ icon_state = "0-4" }, /turf/space, -/area/station/engineering/solar/auxstarboard) +/area/station/engineering/solar/fore_starboard) "aco" = ( /obj/structure/lattice/catwalk, /obj/structure/cable{ @@ -147,7 +147,7 @@ icon_state = "4-8" }, /turf/space, -/area/station/engineering/solar/auxstarboard) +/area/station/engineering/solar/fore_starboard) "acp" = ( /obj/machinery/power/tracker, /obj/structure/cable{ @@ -157,7 +157,7 @@ /turf/simulated/floor/plasteel/airless{ icon_state = "solarpanel" }, -/area/station/engineering/solar/auxstarboard) +/area/station/engineering/solar/fore_starboard) "acC" = ( /obj/effect/spawner/window/reinforced, /turf/simulated/floor/plating, @@ -175,7 +175,7 @@ icon_state = "2-8" }, /turf/space, -/area/station/engineering/solar/auxstarboard) +/area/station/engineering/solar/fore_starboard) "acF" = ( /obj/structure/lattice/catwalk, /turf/space, @@ -188,7 +188,7 @@ /turf/simulated/floor/plasteel/airless{ icon_state = "solarpanel" }, -/area/station/engineering/solar/auxstarboard) +/area/station/engineering/solar/fore_starboard) "acJ" = ( /obj/docking_port/stationary{ dheight = 9; @@ -228,7 +228,7 @@ "adg" = ( /obj/structure/lattice/catwalk, /turf/space, -/area/station/engineering/solar/auxstarboard) +/area/station/engineering/solar/fore_starboard) "adh" = ( /obj/structure/lattice/catwalk, /obj/structure/cable{ @@ -526,7 +526,7 @@ /area/station/hallway/secondary/entry/east) "afg" = ( /turf/simulated/wall/r_wall, -/area/station/maintenance/auxsolarstarboard) +/area/station/maintenance/solar_maintenance/fore_starboard) "afh" = ( /obj/effect/turf_decal/stripes/line{ dir = 1 @@ -577,7 +577,7 @@ dir = 9 }, /turf/simulated/floor/plating, -/area/station/maintenance/auxsolarstarboard) +/area/station/maintenance/solar_maintenance/fore_starboard) "afx" = ( /obj/machinery/power/smes, /obj/machinery/light/small{ @@ -591,7 +591,7 @@ dir = 1 }, /turf/simulated/floor/plating, -/area/station/maintenance/auxsolarstarboard) +/area/station/maintenance/solar_maintenance/fore_starboard) "afy" = ( /obj/machinery/camera{ c_tag = "Fore Starboard Solars"; @@ -603,7 +603,7 @@ dir = 5 }, /turf/simulated/floor/plating, -/area/station/maintenance/auxsolarstarboard) +/area/station/maintenance/solar_maintenance/fore_starboard) "afz" = ( /obj/structure/table/reinforced, /obj/item/storage/belt/utility, @@ -667,7 +667,7 @@ dir = 8 }, /turf/simulated/floor/plating, -/area/station/maintenance/auxsolarstarboard) +/area/station/maintenance/solar_maintenance/fore_starboard) "afO" = ( /obj/machinery/conveyor{ dir = 4; @@ -691,7 +691,7 @@ icon_state = "0-4" }, /turf/simulated/floor/plating, -/area/station/maintenance/auxsolarstarboard) +/area/station/maintenance/solar_maintenance/fore_starboard) "agd" = ( /obj/machinery/light{ dir = 8 @@ -2561,7 +2561,7 @@ /turf/simulated/floor/plasteel/airless{ icon_state = "solarpanel" }, -/area/station/engineering/solar/auxport) +/area/station/engineering/solar/fore_port) "apG" = ( /turf/simulated/wall, /area/station/maintenance/electrical_shop) @@ -3527,7 +3527,7 @@ /turf/simulated/floor/plasteel/airless{ icon_state = "solarpanel" }, -/area/station/engineering/solar/auxport) +/area/station/engineering/solar/fore_port) "asi" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 8 @@ -3841,7 +3841,7 @@ icon_state = "1-4" }, /turf/space, -/area/station/engineering/solar/auxport) +/area/station/engineering/solar/fore_port) "asW" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -3886,7 +3886,7 @@ icon_state = "4-8" }, /turf/space, -/area/station/engineering/solar/auxport) +/area/station/engineering/solar/fore_port) "atb" = ( /obj/structure/lattice/catwalk, /obj/structure/cable{ @@ -3894,12 +3894,12 @@ icon_state = "0-8" }, /turf/space, -/area/station/engineering/solar/auxport) +/area/station/engineering/solar/fore_port) "atc" = ( /obj/structure/lattice/catwalk, /obj/structure/cable, /turf/space, -/area/station/engineering/solar/auxport) +/area/station/engineering/solar/fore_port) "atd" = ( /turf/simulated/wall/r_wall, /area/station/engineering/controlroom) @@ -4144,7 +4144,7 @@ icon_state = "0-4" }, /turf/space, -/area/station/engineering/solar/auxport) +/area/station/engineering/solar/fore_port) "atL" = ( /obj/structure/lattice/catwalk, /obj/structure/cable{ @@ -4163,7 +4163,7 @@ icon_state = "4-8" }, /turf/space, -/area/station/engineering/solar/auxport) +/area/station/engineering/solar/fore_port) "atM" = ( /obj/structure/cable{ d1 = 4; @@ -4234,7 +4234,7 @@ icon_state = "2-8" }, /turf/space, -/area/station/engineering/solar/auxport) +/area/station/engineering/solar/fore_port) "atV" = ( /obj/structure/chair/stool{ dir = 1 @@ -4278,11 +4278,11 @@ /turf/simulated/floor/plasteel/airless{ icon_state = "solarpanel" }, -/area/station/engineering/solar/auxport) +/area/station/engineering/solar/fore_port) "atZ" = ( /obj/structure/lattice/catwalk, /turf/space, -/area/station/engineering/solar/auxport) +/area/station/engineering/solar/fore_port) "aua" = ( /obj/structure/rack, /obj/item/flashlight, @@ -7998,7 +7998,7 @@ icon_state = "0-2" }, /turf/space, -/area/station/engineering/solar/auxport) +/area/station/engineering/solar/fore_port) "aEc" = ( /obj/structure/lattice/catwalk, /obj/structure/cable{ @@ -8007,7 +8007,7 @@ icon_state = "1-2" }, /turf/space, -/area/station/engineering/solar/auxport) +/area/station/engineering/solar/fore_port) "aEe" = ( /obj/machinery/light{ dir = 8 @@ -8189,7 +8189,7 @@ dir = 10 }, /turf/simulated/floor/plating, -/area/station/maintenance/auxsolarstarboard) +/area/station/maintenance/solar_maintenance/fore_starboard) "aEF" = ( /turf/simulated/floor/plasteel{ dir = 4; @@ -9077,9 +9077,6 @@ icon_state = "neutralfull" }, /area/station/security/permabrig) -"aGY" = ( -/turf/simulated/wall/r_wall, -/area/station/maintenance/auxsolarport) "aGZ" = ( /turf/simulated/wall/r_wall, /area/station/maintenance/incinerator) @@ -9559,7 +9556,7 @@ dir = 9 }, /turf/simulated/floor/plating, -/area/station/maintenance/auxsolarport) +/area/station/maintenance/solar_maintenance/fore_port) "aIr" = ( /obj/machinery/power/smes, /obj/machinery/light/small{ @@ -9573,7 +9570,7 @@ dir = 1 }, /turf/simulated/floor/plating, -/area/station/maintenance/auxsolarport) +/area/station/maintenance/solar_maintenance/fore_port) "aIs" = ( /obj/machinery/camera{ c_tag = "Port Fore Solars"; @@ -9592,7 +9589,7 @@ dir = 5 }, /turf/simulated/floor/plating, -/area/station/maintenance/auxsolarport) +/area/station/maintenance/solar_maintenance/fore_port) "aIt" = ( /obj/machinery/disposal, /obj/structure/sign/deathsposal{ @@ -10014,7 +10011,7 @@ }, /obj/effect/landmark/spawner/nukedisc_respawn, /turf/simulated/floor/plating, -/area/station/maintenance/auxsolarport) +/area/station/maintenance/solar_maintenance/fore_port) "aJK" = ( /obj/machinery/light, /obj/effect/turf_decal/stripes/line, @@ -10036,7 +10033,7 @@ dir = 4 }, /turf/simulated/floor/plating, -/area/station/maintenance/auxsolarport) +/area/station/maintenance/solar_maintenance/fore_port) "aJN" = ( /obj/structure/disposalpipe/segment, /obj/structure/cable{ @@ -10529,12 +10526,12 @@ dir = 10 }, /turf/simulated/floor/plating, -/area/station/maintenance/auxsolarport) +/area/station/maintenance/solar_maintenance/fore_port) "aKZ" = ( /obj/machinery/alarm/directional/south, /obj/effect/turf_decal/stripes/line, /turf/simulated/floor/plating, -/area/station/maintenance/auxsolarport) +/area/station/maintenance/solar_maintenance/fore_port) "aLa" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -10564,7 +10561,7 @@ dir = 6 }, /turf/simulated/floor/plating, -/area/station/maintenance/auxsolarport) +/area/station/maintenance/solar_maintenance/fore_port) "aLd" = ( /obj/machinery/atmospherics/pipe/simple/visible{ dir = 5 @@ -14063,7 +14060,7 @@ /obj/machinery/alarm/directional/south, /obj/effect/turf_decal/stripes/line, /turf/simulated/floor/plating, -/area/station/maintenance/auxsolarstarboard) +/area/station/maintenance/solar_maintenance/fore_starboard) "aUt" = ( /obj/machinery/power/solar_control{ dir = 8; @@ -14074,7 +14071,7 @@ dir = 6 }, /turf/simulated/floor/plating, -/area/station/maintenance/auxsolarstarboard) +/area/station/maintenance/solar_maintenance/fore_starboard) "aUv" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -30801,13 +30798,6 @@ "bLt" = ( /turf/simulated/floor/carpet, /area/station/security/detective) -"bLu" = ( -/obj/machinery/computer/med_data{ - dir = 8 - }, -/obj/machinery/requests_console/directional/east, -/turf/simulated/floor/carpet, -/area/station/security/detective) "bLv" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -50630,7 +50620,7 @@ /area/station/medical/reception) "cPC" = ( /turf/simulated/wall/r_wall, -/area/station/maintenance/starboardsolar) +/area/station/maintenance/solar_maintenance/aft_starboard) "cPD" = ( /obj/structure/railing{ dir = 4 @@ -51088,7 +51078,7 @@ dir = 9 }, /turf/simulated/floor/plating, -/area/station/maintenance/starboardsolar) +/area/station/maintenance/solar_maintenance/aft_starboard) "cRg" = ( /obj/item/kirbyplants, /turf/simulated/floor/plasteel{ @@ -51167,7 +51157,7 @@ dir = 1 }, /turf/simulated/floor/plating, -/area/station/maintenance/starboardsolar) +/area/station/maintenance/solar_maintenance/aft_starboard) "cRD" = ( /turf/simulated/wall/mineral/titanium, /area/shuttle/pod_2) @@ -51557,7 +51547,7 @@ dir = 8 }, /turf/simulated/floor/plating, -/area/station/maintenance/starboardsolar) +/area/station/maintenance/solar_maintenance/aft_starboard) "cSN" = ( /obj/structure/lattice/catwalk, /obj/structure/cable{ @@ -51565,7 +51555,7 @@ icon_state = "0-8" }, /turf/space, -/area/station/engineering/solar/starboard) +/area/station/engineering/solar/aft_starboard) "cSO" = ( /obj/structure/rack, /obj/item/storage/belt/medical, @@ -51837,7 +51827,7 @@ "cTN" = ( /obj/structure/lattice/catwalk, /turf/space, -/area/station/engineering/solar/starboard) +/area/station/engineering/solar/aft_starboard) "cTO" = ( /obj/structure/chair/office/light{ dir = 4 @@ -52412,7 +52402,7 @@ dir = 10 }, /turf/simulated/floor/plating, -/area/station/maintenance/starboardsolar) +/area/station/maintenance/solar_maintenance/aft_starboard) "cWa" = ( /obj/machinery/camera{ c_tag = "Port Hallway South" @@ -53079,7 +53069,7 @@ icon_state = "1-2" }, /turf/space, -/area/station/engineering/solar/starboard) +/area/station/engineering/solar/aft_starboard) "cZb" = ( /obj/machinery/sleeper{ dir = 4 @@ -53426,7 +53416,7 @@ /turf/simulated/floor/plasteel/airless{ icon_state = "solarpanel" }, -/area/station/engineering/solar/starboard) +/area/station/engineering/solar/aft_starboard) "dal" = ( /obj/structure/cable{ d1 = 1; @@ -53551,7 +53541,7 @@ icon_state = "2-4" }, /turf/space, -/area/station/engineering/solar/starboard) +/area/station/engineering/solar/aft_starboard) "daA" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -53575,7 +53565,7 @@ icon_state = "4-8" }, /turf/space, -/area/station/engineering/solar/starboard) +/area/station/engineering/solar/aft_starboard) "daD" = ( /obj/effect/spawner/random_spawners/wall_rusted_always, /turf/simulated/wall, @@ -53605,7 +53595,7 @@ icon_state = "0-4" }, /turf/space, -/area/station/engineering/solar/starboard) +/area/station/engineering/solar/aft_starboard) "daI" = ( /obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel{ @@ -53683,7 +53673,7 @@ icon_state = "4-8" }, /turf/space, -/area/station/engineering/solar/starboard) +/area/station/engineering/solar/aft_starboard) "daW" = ( /turf/simulated/floor/plasteel{ dir = 4; @@ -53704,7 +53694,7 @@ /turf/simulated/floor/plasteel/airless{ icon_state = "solarpanel" }, -/area/station/engineering/solar/starboard) +/area/station/engineering/solar/aft_starboard) "dbd" = ( /obj/structure/table/glass, /obj/item/storage/box/beakers{ @@ -53729,7 +53719,7 @@ /obj/structure/lattice/catwalk, /obj/structure/cable, /turf/space, -/area/station/engineering/solar/starboard) +/area/station/engineering/solar/aft_starboard) "dbp" = ( /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plating, @@ -60583,7 +60573,7 @@ }, /obj/effect/landmark/spawner/nukedisc_respawn, /turf/simulated/floor/plating, -/area/station/maintenance/starboardsolar) +/area/station/maintenance/solar_maintenance/aft_starboard) "dGw" = ( /turf/simulated/wall, /area/station/medical/virology) @@ -61832,7 +61822,7 @@ icon_state = "2-8" }, /turf/space, -/area/station/engineering/solar/starboard) +/area/station/engineering/solar/aft_starboard) "dOO" = ( /turf/simulated/floor/plating, /area/station/maintenance/apmaint) @@ -61934,7 +61924,7 @@ /area/station/engineering/hardsuitstorage) "dPq" = ( /turf/simulated/wall/r_wall, -/area/station/maintenance/portsolar) +/area/station/maintenance/solar_maintenance/aft_port) "dPr" = ( /obj/structure/cable{ d1 = 2; @@ -62182,7 +62172,7 @@ dir = 9 }, /turf/simulated/floor/plating, -/area/station/maintenance/portsolar) +/area/station/maintenance/solar_maintenance/aft_port) "dQa" = ( /obj/machinery/power/smes, /obj/machinery/light/small{ @@ -62196,7 +62186,7 @@ dir = 1 }, /turf/simulated/floor/plating, -/area/station/maintenance/portsolar) +/area/station/maintenance/solar_maintenance/aft_port) "dQb" = ( /obj/structure/sign/electricshock, /turf/simulated/wall/r_wall, @@ -62317,7 +62307,7 @@ "dQB" = ( /obj/structure/lattice/catwalk, /turf/space, -/area/station/engineering/solar/port) +/area/station/engineering/solar/aft_port) "dQC" = ( /obj/machinery/field/generator{ anchored = 1; @@ -62369,7 +62359,7 @@ }, /obj/effect/landmark/spawner/nukedisc_respawn, /turf/simulated/floor/plating, -/area/station/maintenance/portsolar) +/area/station/maintenance/solar_maintenance/aft_port) "dQN" = ( /obj/structure/table/reinforced, /obj/item/stack/packageWrap, @@ -62503,7 +62493,7 @@ dir = 4 }, /turf/simulated/floor/plating, -/area/station/maintenance/portsolar) +/area/station/maintenance/solar_maintenance/aft_port) "dRc" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -62587,12 +62577,12 @@ dir = 10 }, /turf/simulated/floor/plating, -/area/station/maintenance/portsolar) +/area/station/maintenance/solar_maintenance/aft_port) "dRp" = ( /obj/machinery/alarm/directional/south, /obj/effect/turf_decal/stripes/line, /turf/simulated/floor/plating, -/area/station/maintenance/portsolar) +/area/station/maintenance/solar_maintenance/aft_port) "dRq" = ( /obj/machinery/power/apc/directional/south, /obj/structure/cable, @@ -62600,7 +62590,7 @@ dir = 6 }, /turf/simulated/floor/plating, -/area/station/maintenance/portsolar) +/area/station/maintenance/solar_maintenance/aft_port) "dRr" = ( /obj/effect/turf_decal/stripes/line{ dir = 10 @@ -63219,7 +63209,7 @@ /turf/simulated/floor/plasteel/airless{ icon_state = "solarpanel" }, -/area/station/engineering/solar/port) +/area/station/engineering/solar/aft_port) "dTY" = ( /obj/structure/closet/coffin, /obj/machinery/light/small{ @@ -63254,6 +63244,13 @@ icon_state = "cult" }, /area/station/service/chapel/office) +"dUf" = ( +/obj/machinery/computer/med_data{ + dir = 8 + }, +/obj/machinery/requests_console/directional/east, +/turf/simulated/floor/carpet, +/area/station/security/detective) "dUi" = ( /obj/item/kirbyplants, /obj/structure/cable{ @@ -63564,7 +63561,7 @@ /turf/simulated/floor/plasteel/airless{ icon_state = "solarpanel" }, -/area/station/engineering/solar/port) +/area/station/engineering/solar/aft_port) "dVo" = ( /obj/item/kirbyplants, /obj/structure/cable{ @@ -63635,7 +63632,7 @@ /turf/simulated/floor/plasteel/airless{ icon_state = "solarpanel" }, -/area/station/engineering/solar/port) +/area/station/engineering/solar/aft_port) "dWf" = ( /obj/docking_port/stationary{ dheight = 9; @@ -63944,7 +63941,7 @@ dir = 5 }, /turf/simulated/floor/plating, -/area/station/maintenance/portsolar) +/area/station/maintenance/solar_maintenance/aft_port) "dXI" = ( /obj/structure/chair/wood{ dir = 4 @@ -64178,7 +64175,7 @@ icon_state = "0-4" }, /turf/space, -/area/station/engineering/solar/port) +/area/station/engineering/solar/aft_port) "dYJ" = ( /obj/structure/lattice/catwalk, /obj/structure/cable{ @@ -64187,7 +64184,7 @@ icon_state = "4-8" }, /turf/space, -/area/station/engineering/solar/port) +/area/station/engineering/solar/aft_port) "dYL" = ( /obj/structure/lattice/catwalk, /obj/structure/cable{ @@ -64201,7 +64198,7 @@ icon_state = "1-4" }, /turf/space, -/area/station/engineering/solar/port) +/area/station/engineering/solar/aft_port) "dYM" = ( /obj/structure/lattice/catwalk, /obj/structure/cable{ @@ -64220,7 +64217,7 @@ icon_state = "4-8" }, /turf/space, -/area/station/engineering/solar/port) +/area/station/engineering/solar/aft_port) "dYN" = ( /obj/structure/lattice/catwalk, /obj/structure/cable{ @@ -64228,7 +64225,7 @@ icon_state = "0-8" }, /turf/space, -/area/station/engineering/solar/port) +/area/station/engineering/solar/aft_port) "dYO" = ( /obj/structure/lattice/catwalk, /obj/structure/cable{ @@ -64247,7 +64244,7 @@ icon_state = "4-8" }, /turf/space, -/area/station/engineering/solar/port) +/area/station/engineering/solar/aft_port) "dYP" = ( /obj/structure/lattice/catwalk, /obj/structure/cable{ @@ -64261,7 +64258,7 @@ icon_state = "2-8" }, /turf/space, -/area/station/engineering/solar/port) +/area/station/engineering/solar/aft_port) "dYR" = ( /obj/structure/lattice/catwalk, /obj/structure/cable{ @@ -64269,7 +64266,7 @@ icon_state = "0-2" }, /turf/space, -/area/station/engineering/solar/port) +/area/station/engineering/solar/aft_port) "dYS" = ( /obj/structure/lattice/catwalk, /obj/structure/cable{ @@ -64278,7 +64275,7 @@ icon_state = "1-2" }, /turf/space, -/area/station/engineering/solar/port) +/area/station/engineering/solar/aft_port) "dYT" = ( /obj/structure/window/reinforced{ dir = 4 @@ -65304,7 +65301,7 @@ icon_state = "0-2" }, /turf/space, -/area/station/engineering/solar/starboard) +/area/station/engineering/solar/aft_starboard) "exy" = ( /turf/simulated/floor/plasteel{ dir = 8; @@ -66518,7 +66515,7 @@ dir = 5 }, /turf/simulated/floor/plating, -/area/station/maintenance/starboardsolar) +/area/station/maintenance/solar_maintenance/aft_starboard) "ffG" = ( /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 4 @@ -66983,7 +66980,7 @@ dir = 8 }, /turf/simulated/floor/plating, -/area/station/maintenance/starboardsolar) +/area/station/maintenance/solar_maintenance/aft_starboard) "frp" = ( /obj/structure/flora/ausbushes/sunnybush, /obj/structure/flora/ausbushes/lavendergrass, @@ -68545,7 +68542,7 @@ "gmT" = ( /obj/effect/spawner/window/reinforced/grilled, /turf/simulated/floor/plating, -/area/station/maintenance/auxsolarport) +/area/station/maintenance/solar_maintenance/fore_port) "gng" = ( /turf/simulated/floor/plasteel{ icon_state = "neutralfull" @@ -73052,7 +73049,7 @@ /obj/effect/spawner/window/reinforced/grilled, /obj/effect/spawner/airlock/e_to_w, /turf/simulated/floor/plating, -/area/station/maintenance/auxsolarport) +/area/station/maintenance/solar_maintenance/fore_port) "iYX" = ( /obj/machinery/atmospherics/pipe/simple/visible/yellow{ dir = 4 @@ -73673,7 +73670,7 @@ "jtb" = ( /obj/effect/spawner/window/reinforced/grilled, /turf/simulated/floor/plating, -/area/station/maintenance/starboardsolar) +/area/station/maintenance/solar_maintenance/aft_starboard) "jtD" = ( /obj/machinery/light_switch{ dir = 1; @@ -73915,7 +73912,7 @@ icon_state = "4-8" }, /turf/simulated/floor/plating, -/area/station/maintenance/auxsolarport) +/area/station/maintenance/solar_maintenance/fore_port) "jCU" = ( /obj/structure/sign/poster/official/random{ pixel_y = 32 @@ -73945,7 +73942,7 @@ /obj/effect/spawner/window/reinforced/grilled, /obj/effect/spawner/airlock/w_to_e, /turf/simulated/floor/plating, -/area/station/maintenance/auxsolarstarboard) +/area/station/maintenance/solar_maintenance/fore_starboard) "jEI" = ( /obj/machinery/atmospherics/unary/vent_pump/high_volume{ autolink_id = "engines_vent"; @@ -78269,6 +78266,9 @@ icon_state = "neutralfull" }, /area/station/hallway/primary/starboard/west) +"mgS" = ( +/turf/simulated/wall/r_wall, +/area/station/maintenance/solar_maintenance/fore_port) "mhf" = ( /obj/machinery/atmospherics/pipe/simple/visible/purple{ dir = 4 @@ -81149,7 +81149,7 @@ "nKk" = ( /obj/effect/spawner/window/reinforced/grilled, /turf/simulated/floor/plating, -/area/station/maintenance/portsolar) +/area/station/maintenance/solar_maintenance/aft_port) "nKs" = ( /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 8 @@ -81714,7 +81714,7 @@ dir = 5 }, /turf/simulated/floor/plating, -/area/station/maintenance/starboardsolar) +/area/station/maintenance/solar_maintenance/aft_starboard) "oei" = ( /turf/simulated/wall, /area/station/security/interrogation) @@ -81739,7 +81739,7 @@ "ofi" = ( /obj/effect/spawner/window/reinforced/grilled, /turf/simulated/floor/plating, -/area/station/maintenance/auxsolarstarboard) +/area/station/maintenance/solar_maintenance/fore_starboard) "ofu" = ( /turf/simulated/wall, /area/station/hallway/primary/central/west) @@ -82452,7 +82452,7 @@ /obj/effect/turf_decal/delivery, /obj/effect/mapping_helpers/airlock/access/all/engineering/general, /turf/simulated/floor/plating, -/area/station/maintenance/portsolar) +/area/station/maintenance/solar_maintenance/aft_port) "ozw" = ( /turf/simulated/floor/plasteel{ icon_state = "whitepurple" @@ -84195,7 +84195,7 @@ dir = 8 }, /turf/simulated/floor/plasteel, -/area/station/maintenance/portsolar) +/area/station/maintenance/solar_maintenance/aft_port) "pzQ" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 9 @@ -84479,7 +84479,7 @@ icon_state = "4-8" }, /turf/simulated/floor/plasteel, -/area/station/maintenance/auxsolarport) +/area/station/maintenance/solar_maintenance/fore_port) "pGk" = ( /obj/structure/flora/ausbushes/lavendergrass, /obj/structure/railing{ @@ -84603,7 +84603,7 @@ dir = 5 }, /turf/simulated/floor/plating, -/area/station/maintenance/auxsolarstarboard) +/area/station/maintenance/solar_maintenance/fore_starboard) "pIY" = ( /obj/structure/cable{ d2 = 2; @@ -85259,7 +85259,7 @@ icon_state = "4-8" }, /turf/simulated/floor/plating, -/area/station/maintenance/portsolar) +/area/station/maintenance/solar_maintenance/aft_port) "qbI" = ( /turf/simulated/floor/plasteel{ dir = 8; @@ -86042,7 +86042,7 @@ /obj/effect/turf_decal/delivery, /obj/effect/mapping_helpers/airlock/access/all/engineering/general, /turf/simulated/floor/plating, -/area/station/maintenance/starboardsolar) +/area/station/maintenance/solar_maintenance/aft_starboard) "qFT" = ( /obj/structure/table/wood, /obj/item/clipboard, @@ -86101,7 +86101,7 @@ icon_state = "0-8" }, /turf/space, -/area/station/engineering/solar/auxstarboard) +/area/station/engineering/solar/fore_starboard) "qHE" = ( /obj/machinery/newscaster{ dir = 1; @@ -86599,7 +86599,7 @@ dir = 4 }, /turf/simulated/floor/plasteel, -/area/station/maintenance/starboardsolar) +/area/station/maintenance/solar_maintenance/aft_starboard) "qWs" = ( /obj/machinery/computer/arcade{ dir = 1 @@ -87390,7 +87390,7 @@ /turf/simulated/floor/plasteel/airless{ icon_state = "solarpanel" }, -/area/station/engineering/solar/starboard) +/area/station/engineering/solar/aft_starboard) "rod" = ( /turf/simulated/floor/plasteel/white, /area/station/medical/cryo) @@ -87592,7 +87592,7 @@ /obj/effect/spawner/window/reinforced/grilled, /obj/effect/spawner/airlock/e_to_w, /turf/simulated/floor/plating, -/area/station/maintenance/portsolar) +/area/station/maintenance/solar_maintenance/aft_port) "rtU" = ( /obj/machinery/door/firedoor, /obj/machinery/door/airlock/atmos/glass{ @@ -88561,7 +88561,7 @@ dir = 8 }, /turf/simulated/floor/plating, -/area/station/maintenance/portsolar) +/area/station/maintenance/solar_maintenance/aft_port) "rXR" = ( /obj/machinery/door/window/brigdoor{ dir = 8; @@ -90493,7 +90493,7 @@ dir = 6 }, /turf/simulated/floor/plating, -/area/station/maintenance/starboardsolar) +/area/station/maintenance/solar_maintenance/aft_starboard) "sQa" = ( /obj/structure/closet, /obj/effect/decal/cleanable/dirt, @@ -90721,7 +90721,7 @@ /obj/effect/turf_decal/delivery, /obj/effect/mapping_helpers/airlock/access/all/engineering/construction, /turf/simulated/floor/plating, -/area/station/maintenance/auxsolarport) +/area/station/maintenance/solar_maintenance/fore_port) "sVv" = ( /obj/structure/grille, /turf/simulated/floor/plating, @@ -90740,7 +90740,7 @@ icon_state = "4-8" }, /turf/space, -/area/station/engineering/solar/starboard) +/area/station/engineering/solar/aft_starboard) "sWn" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -92301,7 +92301,7 @@ icon_state = "4-8" }, /turf/simulated/floor/plating, -/area/station/maintenance/auxsolarstarboard) +/area/station/maintenance/solar_maintenance/fore_starboard) "tSM" = ( /obj/machinery/sparker{ id = "testigniter"; @@ -92738,7 +92738,7 @@ /obj/effect/spawner/window/reinforced/grilled, /obj/effect/spawner/airlock/w_to_e, /turf/simulated/floor/plating, -/area/station/maintenance/starboardsolar) +/area/station/maintenance/solar_maintenance/aft_starboard) "uec" = ( /obj/machinery/door_control{ id = "cmoofficedoor"; @@ -93232,7 +93232,7 @@ dir = 8 }, /turf/simulated/floor/plating, -/area/station/maintenance/auxsolarport) +/area/station/maintenance/solar_maintenance/fore_port) "upW" = ( /obj/machinery/firealarm/directional/north, /turf/simulated/floor/plasteel{ @@ -93494,7 +93494,7 @@ }, /obj/effect/turf_decal/stripes/line, /turf/simulated/floor/plating, -/area/station/maintenance/starboardsolar) +/area/station/maintenance/solar_maintenance/aft_starboard) "uBQ" = ( /obj/effect/landmark/start/atmospheric, /turf/simulated/floor/plasteel, @@ -93573,7 +93573,7 @@ icon_state = "0-8" }, /turf/simulated/floor/plating, -/area/station/maintenance/auxsolarstarboard) +/area/station/maintenance/solar_maintenance/fore_starboard) "uEh" = ( /obj/structure/cable{ d1 = 4; @@ -94827,7 +94827,7 @@ icon_state = "4-8" }, /turf/simulated/floor/plasteel, -/area/station/maintenance/auxsolarstarboard) +/area/station/maintenance/solar_maintenance/fore_starboard) "vtq" = ( /obj/item/radio/intercom{ name = "north bump"; @@ -94944,7 +94944,7 @@ /obj/effect/turf_decal/delivery, /obj/effect/mapping_helpers/airlock/access/all/engineering/general, /turf/simulated/floor/plating, -/area/station/maintenance/auxsolarstarboard) +/area/station/maintenance/solar_maintenance/fore_starboard) "vzs" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 4 @@ -98162,7 +98162,7 @@ dir = 4 }, /turf/simulated/floor/plating, -/area/station/maintenance/portsolar) +/area/station/maintenance/solar_maintenance/aft_port) "xnA" = ( /obj/machinery/door/airlock/maintenance{ name = "Library Maintenance" @@ -120743,7 +120743,7 @@ gmT gmT jCQ gmT -aGZ +mgS aGZ aPm aGZ @@ -120996,11 +120996,11 @@ tOF tOF abj aaa -aGY +mgS aIq upI aKY -aGZ +mgS aNU aPn aQM @@ -121253,11 +121253,11 @@ abj abj abj abj -aGY +mgS aIr aJI aKZ -aGZ +mgS aNV wfj aQN @@ -121510,11 +121510,11 @@ abj aaa aaa abj -aGY +mgS aIs aJM aLc -aGZ +mgS ibb aPp aQO @@ -121767,11 +121767,11 @@ abj aaa aaa abj -aGY -aGY +mgS +mgS pGi -aGY -aGZ +mgS +mgS aNV vMl aQN @@ -148531,7 +148531,7 @@ aaa bLn bHP dMA -bLu +dUf bNu nXf bLn diff --git a/_maps/map_files/stations/metastation.dmm b/_maps/map_files/stations/metastation.dmm index e4d8a467ef4..a4ec0e7aaed 100644 --- a/_maps/map_files/stations/metastation.dmm +++ b/_maps/map_files/stations/metastation.dmm @@ -67,7 +67,7 @@ icon_state = "1-2" }, /turf/simulated/floor/plating/airless, -/area/station/engineering/solar/auxport) +/area/station/engineering/solar/fore_port) "abW" = ( /turf/simulated/wall/r_wall, /area/station/security/permabrig) @@ -135,7 +135,7 @@ icon_state = "1-2" }, /turf/simulated/floor/plating/airless, -/area/station/engineering/solar/auxstarboard) +/area/station/engineering/solar/fore_starboard) "acI" = ( /obj/item/seeds/wheat/rice, /obj/item/seeds/wheat/rice, @@ -191,7 +191,7 @@ "adj" = ( /obj/structure/cable, /turf/simulated/floor/plating/airless, -/area/station/engineering/solar/auxstarboard) +/area/station/engineering/solar/fore_starboard) "adk" = ( /obj/effect/spawner/window/reinforced/grilled, /turf/simulated/floor/plating, @@ -243,7 +243,7 @@ icon_state = "1-2" }, /turf/space, -/area/station/engineering/solar/auxstarboard) +/area/station/engineering/solar/fore_starboard) "adM" = ( /obj/structure/table, /obj/machinery/cell_charger, @@ -306,7 +306,7 @@ "aee" = ( /obj/structure/lattice/catwalk, /turf/space, -/area/station/engineering/solar/auxstarboard) +/area/station/engineering/solar/fore_starboard) "aef" = ( /obj/structure/lattice/catwalk, /turf/space, @@ -468,7 +468,7 @@ icon_state = "2-8" }, /turf/space, -/area/station/engineering/solar/auxstarboard) +/area/station/engineering/solar/fore_starboard) "afH" = ( /turf/simulated/wall/mineral/titanium, /area/shuttle/pod_3) @@ -504,7 +504,7 @@ /turf/simulated/floor/plasteel/airless{ icon_state = "solarpanel" }, -/area/station/engineering/solar/auxstarboard) +/area/station/engineering/solar/fore_starboard) "agg" = ( /obj/structure/cable/green{ icon_state = "0-10" @@ -545,7 +545,7 @@ /turf/simulated/floor/plasteel/airless{ icon_state = "solarpanel" }, -/area/station/engineering/solar/auxstarboard) +/area/station/engineering/solar/fore_starboard) "agw" = ( /obj/structure/chair{ dir = 1 @@ -579,7 +579,7 @@ /area/station/maintenance/fore) "agH" = ( /turf/simulated/floor/plating/airless, -/area/station/engineering/solar/auxstarboard) +/area/station/engineering/solar/fore_starboard) "agK" = ( /obj/machinery/door/poddoor{ id_tag = "ToxinsVenting"; @@ -591,7 +591,7 @@ "agM" = ( /obj/structure/lattice/catwalk, /turf/space, -/area/station/engineering/solar/auxport) +/area/station/engineering/solar/fore_port) "agY" = ( /obj/structure/closet/secure_closet/detective, /obj/item/restraints/handcuffs, @@ -789,7 +789,7 @@ icon_state = "4-8" }, /turf/simulated/floor/plating/airless, -/area/station/engineering/solar/auxport) +/area/station/engineering/solar/fore_port) "aiR" = ( /obj/structure/cable{ d1 = 2; @@ -797,7 +797,7 @@ icon_state = "2-8" }, /turf/simulated/floor/plating/airless, -/area/station/engineering/solar/auxport) +/area/station/engineering/solar/fore_port) "aiY" = ( /turf/simulated/wall, /area/station/public/arcade) @@ -888,9 +888,6 @@ /obj/effect/landmark/damageturf, /turf/simulated/floor/plating, /area/station/maintenance/disposal) -"ajB" = ( -/turf/simulated/wall/r_wall, -/area/station/maintenance/auxsolarport) "ajC" = ( /obj/structure/cable{ d2 = 4; @@ -900,7 +897,7 @@ name = "Fore Port Solar Control" }, /turf/simulated/floor/plating, -/area/station/maintenance/auxsolarport) +/area/station/maintenance/solar_maintenance/fore_port) "ajD" = ( /mob/living/simple_animal/mouse, /obj/effect/decal/cleanable/dirt, @@ -918,7 +915,7 @@ }, /obj/machinery/power/apc/directional/west, /turf/simulated/floor/plating, -/area/station/maintenance/auxsolarport) +/area/station/maintenance/solar_maintenance/fore_port) "ajJ" = ( /obj/structure/lattice/catwalk, /obj/structure/cable{ @@ -937,7 +934,7 @@ icon_state = "2-4" }, /turf/space, -/area/station/engineering/solar/auxport) +/area/station/engineering/solar/fore_port) "ajL" = ( /obj/structure/cable, /obj/effect/spawner/window/reinforced/grilled, @@ -950,7 +947,7 @@ icon_state = "1-2" }, /turf/simulated/floor/plating, -/area/station/maintenance/auxsolarport) +/area/station/maintenance/solar_maintenance/fore_port) "ajO" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 8 @@ -1065,7 +1062,7 @@ dir = 1 }, /turf/simulated/floor/plating, -/area/station/maintenance/auxsolarport) +/area/station/maintenance/solar_maintenance/fore_port) "akw" = ( /obj/effect/landmark/spawner/xeno, /obj/structure/cable{ @@ -1074,7 +1071,7 @@ icon_state = "1-4" }, /turf/simulated/floor/plating, -/area/station/maintenance/auxsolarport) +/area/station/maintenance/solar_maintenance/fore_port) "akx" = ( /obj/structure/cable{ d2 = 8; @@ -1089,7 +1086,7 @@ pixel_x = 28 }, /turf/simulated/floor/plating, -/area/station/maintenance/auxsolarport) +/area/station/maintenance/solar_maintenance/fore_port) "aky" = ( /turf/simulated/wall/r_wall, /area/station/maintenance/fpmaint) @@ -1240,7 +1237,7 @@ }, /obj/effect/turf_decal/stripes/line, /turf/simulated/floor/plating, -/area/station/maintenance/auxsolarport) +/area/station/maintenance/solar_maintenance/fore_port) "alw" = ( /obj/structure/cable{ d2 = 8; @@ -1248,7 +1245,7 @@ }, /obj/machinery/power/smes, /turf/simulated/floor/plating, -/area/station/maintenance/auxsolarport) +/area/station/maintenance/solar_maintenance/fore_port) "alx" = ( /obj/structure/table, /obj/item/stack/medical/ointment{ @@ -1562,7 +1559,7 @@ dir = 8 }, /turf/simulated/floor/plating, -/area/station/maintenance/auxsolarport) +/area/station/maintenance/solar_maintenance/fore_port) "ann" = ( /turf/simulated/floor/plasteel{ dir = 4; @@ -1574,9 +1571,6 @@ /obj/effect/spawner/lootdrop/maintenance, /turf/simulated/floor/plating, /area/station/maintenance/fore) -"ans" = ( -/turf/simulated/wall/r_wall, -/area/station/maintenance/auxsolarstarboard) "anv" = ( /obj/machinery/door/poddoor/preopen{ id_tag = "Disposal Exit"; @@ -1695,7 +1689,7 @@ dir = 1 }, /turf/simulated/floor/plating, -/area/station/maintenance/auxsolarport) +/area/station/maintenance/solar_maintenance/fore_port) "anN" = ( /obj/structure/morgue{ dir = 2 @@ -1789,7 +1783,7 @@ /turf/simulated/floor/plasteel/airless{ icon_state = "solarpanel" }, -/area/station/engineering/solar/auxport) +/area/station/engineering/solar/fore_port) "aon" = ( /obj/effect/decal/cleanable/fungus, /turf/simulated/wall, @@ -2361,7 +2355,7 @@ icon_state = "1-2" }, /turf/simulated/floor/plating, -/area/station/maintenance/auxsolarstarboard) +/area/station/maintenance/solar_maintenance/fore_starboard) "arD" = ( /obj/structure/disposaloutlet{ dir = 4 @@ -2398,7 +2392,7 @@ /obj/structure/lattice/catwalk, /obj/structure/cable, /turf/space, -/area/station/engineering/solar/auxport) +/area/station/engineering/solar/fore_port) "arJ" = ( /obj/structure/chair{ dir = 8 @@ -2441,7 +2435,7 @@ }, /obj/machinery/power/apc/directional/west, /turf/simulated/floor/plating, -/area/station/maintenance/auxsolarstarboard) +/area/station/maintenance/solar_maintenance/fore_starboard) "arU" = ( /obj/effect/landmark/spawner/xeno, /turf/simulated/floor/plating, @@ -2612,7 +2606,7 @@ "asU" = ( /obj/effect/spawner/random_spawners/wall_rusted_probably, /turf/simulated/wall/r_wall, -/area/station/maintenance/auxsolarstarboard) +/area/station/maintenance/solar_maintenance/fore_starboard) "asV" = ( /obj/machinery/economy/vending/detdrobe, /turf/simulated/floor/plasteel{ @@ -2708,7 +2702,7 @@ /turf/simulated/floor/plasteel/airless{ icon_state = "solarpanel" }, -/area/station/engineering/solar/port) +/area/station/engineering/solar/aft_port) "atk" = ( /obj/structure/cable{ d1 = 4; @@ -2907,7 +2901,7 @@ dir = 1 }, /turf/simulated/floor/plating, -/area/station/maintenance/auxsolarstarboard) +/area/station/maintenance/solar_maintenance/fore_starboard) "atW" = ( /obj/machinery/light, /obj/machinery/economy/vending/cola, @@ -2925,7 +2919,7 @@ /obj/machinery/atmospherics/portable/canister/air, /obj/effect/decal/cleanable/cobweb2, /turf/simulated/floor/plating, -/area/station/maintenance/auxsolarstarboard) +/area/station/maintenance/solar_maintenance/fore_starboard) "aub" = ( /obj/item/book/manual/random, /obj/machinery/atmospherics/pipe/simple/hidden/cyan{ @@ -2994,7 +2988,7 @@ dir = 1 }, /turf/simulated/floor/plating, -/area/station/maintenance/auxsolarstarboard) +/area/station/maintenance/solar_maintenance/fore_starboard) "auk" = ( /obj/effect/landmark/spawner/xeno, /obj/structure/cable{ @@ -3003,7 +2997,7 @@ icon_state = "1-4" }, /turf/simulated/floor/plating, -/area/station/maintenance/auxsolarstarboard) +/area/station/maintenance/solar_maintenance/fore_starboard) "aul" = ( /obj/structure/cable{ d2 = 8; @@ -3018,7 +3012,7 @@ pixel_x = 28 }, /turf/simulated/floor/plating, -/area/station/maintenance/auxsolarstarboard) +/area/station/maintenance/solar_maintenance/fore_starboard) "aup" = ( /obj/structure/lattice, /obj/structure/grille/broken, @@ -3060,7 +3054,7 @@ icon_state = "0-2" }, /turf/simulated/floor/plating/airless, -/area/station/engineering/solar/auxstarboard) +/area/station/engineering/solar/fore_starboard) "auw" = ( /obj/machinery/light/small{ dir = 8 @@ -3386,7 +3380,7 @@ }, /obj/machinery/power/smes, /turf/simulated/floor/plating, -/area/station/maintenance/auxsolarstarboard) +/area/station/maintenance/solar_maintenance/fore_starboard) "avN" = ( /obj/machinery/porta_turret/ai_turret, /obj/machinery/computer/security/telescreen/minisat{ @@ -3520,7 +3514,7 @@ }, /obj/effect/landmark/damageturf, /turf/simulated/floor/plating, -/area/station/maintenance/portsolar) +/area/station/maintenance/solar_maintenance/aft_port) "awf" = ( /obj/machinery/light, /obj/effect/landmark/spawner/xeno, @@ -4148,7 +4142,7 @@ "ayA" = ( /obj/structure/sign/electricshock, /turf/simulated/wall/r_wall, -/area/station/maintenance/fsmaint) +/area/station/maintenance/solar_maintenance/fore_starboard) "ayB" = ( /obj/structure/reagent_dispensers/watertank, /turf/simulated/floor/plating, @@ -4400,7 +4394,7 @@ icon_state = "1-2" }, /turf/simulated/floor/plating/airless, -/area/station/maintenance/starboardsolar) +/area/station/maintenance/solar_maintenance/aft_starboard) "azC" = ( /obj/item/radio/intercom/department/security{ pixel_y = 28 @@ -4703,7 +4697,7 @@ icon_state = "0-4" }, /turf/space, -/area/station/engineering/solar/starboard) +/area/station/engineering/solar/aft_starboard) "aAX" = ( /obj/machinery/disposal, /obj/structure/disposalpipe/trunk{ @@ -4734,7 +4728,7 @@ /turf/simulated/floor/plasteel/airless{ icon_state = "solarpanel" }, -/area/station/engineering/solar/starboard) +/area/station/engineering/solar/aft_starboard) "aBs" = ( /obj/structure/lattice/catwalk, /obj/structure/cable{ @@ -4748,7 +4742,7 @@ icon_state = "2-4" }, /turf/space, -/area/station/engineering/solar/auxport) +/area/station/engineering/solar/fore_port) "aBu" = ( /obj/structure/cable{ d1 = 4; @@ -5597,7 +5591,7 @@ /turf/simulated/floor/plasteel/airless{ icon_state = "solarpanel" }, -/area/station/engineering/solar/auxport) +/area/station/engineering/solar/fore_port) "aED" = ( /obj/machinery/economy/vending/shoedispenser, /obj/machinery/alarm/directional/east, @@ -5929,7 +5923,7 @@ /turf/simulated/floor/plasteel/airless{ icon_state = "solarpanel" }, -/area/station/engineering/solar/auxport) +/area/station/engineering/solar/fore_port) "aGl" = ( /obj/structure/chair{ dir = 4 @@ -9691,7 +9685,7 @@ icon_state = "1-4" }, /turf/space, -/area/station/engineering/solar/auxport) +/area/station/engineering/solar/fore_port) "aSJ" = ( /obj/machinery/atmospherics/pipe/simple/hidden/cyan{ dir = 4 @@ -18638,7 +18632,7 @@ icon_state = "0-4" }, /turf/simulated/floor/plating/airless, -/area/station/engineering/solar/auxport) +/area/station/engineering/solar/fore_port) "brp" = ( /obj/machinery/light, /turf/simulated/floor/mineral/titanium/blue, @@ -22055,7 +22049,7 @@ /area/station/service/bar) "bAC" = ( /turf/simulated/floor/plating/airless, -/area/station/engineering/solar/auxport) +/area/station/engineering/solar/fore_port) "bAE" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -24026,7 +24020,7 @@ icon_state = "1-4" }, /turf/simulated/floor/plating/airless, -/area/station/engineering/solar/auxport) +/area/station/engineering/solar/fore_port) "bHK" = ( /obj/structure/cable{ d1 = 1; @@ -25615,7 +25609,7 @@ /turf/simulated/floor/plasteel/airless{ icon_state = "solarpanel" }, -/area/station/engineering/solar/starboard) +/area/station/engineering/solar/aft_starboard) "bNK" = ( /obj/structure/closet/crate/hydroponics/prespawned, /obj/item/shovel/spade, @@ -25762,7 +25756,7 @@ icon_state = "2-8" }, /turf/simulated/floor/plating/airless, -/area/station/engineering/solar/auxstarboard) +/area/station/engineering/solar/fore_starboard) "bOn" = ( /obj/structure/lattice/catwalk, /obj/machinery/atmospherics/unary/outlet_injector/on, @@ -25904,7 +25898,7 @@ dir = 8 }, /turf/simulated/floor/plating, -/area/station/maintenance/portsolar) +/area/station/maintenance/solar_maintenance/aft_port) "bOM" = ( /obj/structure/chair{ dir = 1 @@ -26898,7 +26892,7 @@ icon_state = "2-4" }, /turf/space, -/area/station/engineering/solar/port) +/area/station/engineering/solar/aft_port) "bSx" = ( /obj/machinery/kitchen_machine/candy_maker, /obj/machinery/light_switch{ @@ -27108,7 +27102,7 @@ pixel_y = -28 }, /turf/simulated/floor/plating, -/area/station/maintenance/portsolar) +/area/station/maintenance/solar_maintenance/aft_port) "bTl" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -27422,7 +27416,7 @@ icon_state = "1-4" }, /turf/simulated/floor/plating/airless, -/area/station/engineering/solar/auxstarboard) +/area/station/engineering/solar/fore_starboard) "bUy" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/cable{ @@ -27940,7 +27934,7 @@ }, /obj/effect/turf_decal/stripes/line, /turf/simulated/floor/plating, -/area/station/maintenance/starboardsolar) +/area/station/maintenance/solar_maintenance/aft_starboard) "bWm" = ( /obj/structure/rack, /obj/item/storage/box, @@ -28412,7 +28406,7 @@ icon_state = "1-2" }, /turf/simulated/floor/plating, -/area/station/maintenance/portsolar) +/area/station/maintenance/solar_maintenance/aft_port) "bXK" = ( /obj/machinery/atmospherics/pipe/simple/hidden/universal, /obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, @@ -29187,7 +29181,7 @@ /turf/simulated/floor/plasteel/airless{ icon_state = "solarpanel" }, -/area/station/engineering/solar/port) +/area/station/engineering/solar/aft_port) "caL" = ( /obj/machinery/firealarm/directional/north, /obj/effect/turf_decal/stripes/corner{ @@ -29841,7 +29835,7 @@ /obj/structure/lattice/catwalk, /obj/item/stack/rods/ten, /turf/space, -/area/station/engineering/solar/auxport) +/area/station/engineering/solar/fore_port) "ccW" = ( /obj/structure/cable{ d1 = 1; @@ -31103,7 +31097,7 @@ icon_state = "0-4" }, /turf/simulated/floor/plating/airless, -/area/station/engineering/solar/port) +/area/station/engineering/solar/aft_port) "chy" = ( /turf/simulated/floor/plating, /area/station/maintenance/aft) @@ -31772,7 +31766,7 @@ icon_state = "1-2" }, /turf/simulated/floor/plating/airless, -/area/station/engineering/solar/starboard) +/area/station/engineering/solar/aft_starboard) "cjZ" = ( /obj/machinery/alarm/directional/south, /turf/simulated/floor/plasteel{ @@ -31801,7 +31795,7 @@ /obj/machinery/atmospherics/unary/portables_connector, /obj/machinery/atmospherics/portable/canister/air, /turf/simulated/floor/plating, -/area/station/maintenance/portsolar) +/area/station/maintenance/solar_maintenance/aft_port) "cke" = ( /obj/structure/cable{ d2 = 8; @@ -31818,7 +31812,7 @@ /turf/simulated/floor/plasteel/airless{ icon_state = "solarpanel" }, -/area/station/engineering/solar/auxstarboard) +/area/station/engineering/solar/fore_starboard) "ckf" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel{ @@ -31993,7 +31987,7 @@ icon_state = "1-4" }, /turf/simulated/floor/plating/airless, -/area/station/engineering/solar/port) +/area/station/engineering/solar/aft_port) "ckN" = ( /obj/structure/rack, /obj/effect/spawner/lootdrop/maintenance/two, @@ -32407,7 +32401,7 @@ /obj/effect/turf_decal/stripes/line, /obj/effect/mapping_helpers/airlock/access/all/engineering/general, /turf/simulated/floor/plating, -/area/station/maintenance/starboardsolar) +/area/station/maintenance/solar_maintenance/aft_starboard) "cmK" = ( /obj/structure/lattice, /obj/machinery/atmospherics/pipe/simple/visible/green, @@ -32983,7 +32977,7 @@ icon_state = "1-4" }, /turf/space, -/area/station/engineering/solar/auxstarboard) +/area/station/engineering/solar/fore_starboard) "coU" = ( /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -33020,7 +33014,7 @@ }, /obj/effect/mapping_helpers/airlock/access/all/engineering/general, /turf/simulated/floor/plating, -/area/station/maintenance/portsolar) +/area/station/maintenance/solar_maintenance/aft_port) "cpq" = ( /obj/machinery/atmospherics/binary/pump, /turf/simulated/wall/r_wall, @@ -33140,7 +33134,7 @@ icon_state = "2-8" }, /turf/simulated/floor/plating, -/area/station/maintenance/portsolar) +/area/station/maintenance/solar_maintenance/aft_port) "cpM" = ( /obj/structure/cable{ d1 = 1; @@ -34077,7 +34071,7 @@ /turf/simulated/floor/plasteel/airless{ icon_state = "solarpanel" }, -/area/station/engineering/solar/port) +/area/station/engineering/solar/aft_port) "ctK" = ( /obj/structure/filingcabinet/chestdrawer/autopsy, /obj/structure/window/reinforced{ @@ -34293,7 +34287,7 @@ icon_state = "0-4" }, /turf/simulated/floor/plating, -/area/station/maintenance/starboardsolar) +/area/station/maintenance/solar_maintenance/aft_starboard) "cur" = ( /obj/structure/cable{ d2 = 4; @@ -34302,7 +34296,7 @@ /turf/simulated/floor/plasteel/airless{ icon_state = "solarpanel" }, -/area/station/engineering/solar/starboard) +/area/station/engineering/solar/aft_starboard) "cut" = ( /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -34518,7 +34512,7 @@ /turf/simulated/floor/plasteel/airless{ icon_state = "solarpanel" }, -/area/station/engineering/solar/port) +/area/station/engineering/solar/aft_port) "cva" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -34781,7 +34775,7 @@ icon_state = "1-4" }, /turf/space, -/area/station/engineering/solar/port) +/area/station/engineering/solar/aft_port) "cwi" = ( /obj/effect/turf_decal/stripes/line, /obj/machinery/door_control{ @@ -35219,7 +35213,7 @@ icon_state = "0-2" }, /turf/simulated/floor/plating/airless, -/area/station/engineering/solar/auxstarboard) +/area/station/engineering/solar/fore_starboard) "cyd" = ( /obj/structure/rack, /obj/item/seeds/cannabis, @@ -35385,7 +35379,7 @@ icon_state = "4-8" }, /turf/space, -/area/station/engineering/solar/starboard) +/area/station/engineering/solar/aft_starboard) "cyM" = ( /obj/machinery/power/apc/directional/east, /obj/structure/cable{ @@ -35664,7 +35658,7 @@ /obj/machinery/power/tracker, /obj/structure/cable, /turf/simulated/floor/plating/airless, -/area/station/engineering/solar/starboard) +/area/station/engineering/solar/aft_starboard) "czX" = ( /obj/machinery/light/small, /turf/simulated/floor/engine, @@ -36384,7 +36378,7 @@ /turf/simulated/floor/plasteel/airless{ icon_state = "solarpanel" }, -/area/station/engineering/solar/auxstarboard) +/area/station/engineering/solar/fore_starboard) "cCQ" = ( /obj/structure/extinguisher_cabinet{ name = "east bump"; @@ -37048,7 +37042,7 @@ /turf/simulated/floor/plasteel/airless{ icon_state = "solarpanel" }, -/area/station/engineering/solar/port) +/area/station/engineering/solar/aft_port) "cFm" = ( /turf/simulated/floor/mech_bay_recharge_floor, /area/station/science/robotics/chargebay) @@ -37136,7 +37130,7 @@ pixel_x = 32 }, /turf/simulated/floor/plating, -/area/station/maintenance/starboardsolar) +/area/station/maintenance/solar_maintenance/aft_starboard) "cFO" = ( /obj/effect/spawner/window/reinforced, /turf/simulated/floor/plating, @@ -37361,7 +37355,7 @@ "cGt" = ( /obj/structure/cable, /turf/simulated/floor/plating/airless, -/area/station/engineering/solar/starboard) +/area/station/engineering/solar/aft_starboard) "cGv" = ( /obj/structure/lattice/catwalk, /obj/structure/cable{ @@ -37369,7 +37363,7 @@ icon_state = "0-8" }, /turf/space, -/area/station/engineering/solar/starboard) +/area/station/engineering/solar/aft_starboard) "cGw" = ( /obj/effect/spawner/window/reinforced, /turf/simulated/floor/plating, @@ -38173,7 +38167,7 @@ icon_state = "0-4" }, /turf/simulated/floor/plating, -/area/station/maintenance/starboardsolar) +/area/station/maintenance/solar_maintenance/aft_starboard) "cJn" = ( /turf/simulated/floor/plasteel{ icon_state = "chapel" @@ -38664,7 +38658,7 @@ dir = 1 }, /turf/simulated/floor/plating, -/area/station/maintenance/portsolar) +/area/station/maintenance/solar_maintenance/aft_port) "cLg" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -38964,7 +38958,7 @@ pixel_y = -32 }, /turf/simulated/floor/plating, -/area/station/maintenance/portsolar) +/area/station/maintenance/solar_maintenance/aft_port) "cMF" = ( /obj/structure/table/wood, /obj/item/reagent_containers/drinks/bottle/holywater{ @@ -39193,7 +39187,7 @@ /obj/machinery/power/smes, /obj/structure/cable, /turf/simulated/floor/plating, -/area/station/maintenance/portsolar) +/area/station/maintenance/solar_maintenance/aft_port) "cNw" = ( /obj/structure/closet/wardrobe/white, /obj/effect/spawner/lootdrop/maintenance, @@ -39351,7 +39345,7 @@ icon_state = "0-2" }, /turf/simulated/floor/plating/airless, -/area/station/engineering/solar/starboard) +/area/station/engineering/solar/aft_starboard) "cNS" = ( /obj/machinery/door/firedoor, /turf/simulated/floor/plasteel{ @@ -39996,7 +39990,7 @@ /area/station/hallway/secondary/exit) "cQJ" = ( /turf/simulated/wall/r_wall, -/area/station/maintenance/disposal) +/area/station/maintenance/solar_maintenance/fore_port) "cQK" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -40068,7 +40062,7 @@ /area/station/hallway/secondary/exit) "cQW" = ( /turf/simulated/wall/r_wall, -/area/station/maintenance/starboardsolar) +/area/station/maintenance/solar_maintenance/aft_starboard) "cRc" = ( /obj/structure/closet/crate, /obj/effect/spawner/lootdrop/maintenance, @@ -40387,7 +40381,7 @@ dir = 4 }, /turf/simulated/floor/plating, -/area/station/maintenance/starboardsolar) +/area/station/maintenance/solar_maintenance/aft_starboard) "cSy" = ( /obj/structure/sign/securearea{ desc = "A warning sign which reads 'KEEP CLEAR OF DOCKING AREA'."; @@ -40812,7 +40806,7 @@ /area/station/science/toxins/test) "cUm" = ( /turf/simulated/wall, -/area/station/maintenance/portsolar) +/area/station/maintenance/solar_maintenance/aft_port) "cUq" = ( /obj/item/kirbyplants, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -41129,7 +41123,7 @@ icon_state = "4-8" }, /turf/space, -/area/station/engineering/solar/starboard) +/area/station/engineering/solar/aft_starboard) "cVr" = ( /obj/structure/closet/crate/engineering, /obj/item/solar_assembly, @@ -41153,7 +41147,7 @@ }, /obj/machinery/power/apc/directional/east, /turf/simulated/floor/plating, -/area/station/maintenance/starboardsolar) +/area/station/maintenance/solar_maintenance/aft_starboard) "cVw" = ( /obj/structure/chair/sofa/pew/left, /turf/simulated/floor/plasteel{ @@ -41448,7 +41442,7 @@ icon_state = "4-8" }, /turf/space, -/area/station/engineering/solar/starboard) +/area/station/engineering/solar/aft_starboard) "cXa" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -41835,7 +41829,7 @@ /turf/simulated/floor/plasteel/airless{ icon_state = "solarpanel" }, -/area/station/engineering/solar/starboard) +/area/station/engineering/solar/aft_starboard) "cZf" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -41936,7 +41930,7 @@ dir = 1 }, /turf/simulated/floor/plating, -/area/station/maintenance/starboardsolar) +/area/station/maintenance/solar_maintenance/aft_starboard) "cZD" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/closet/emcloset, @@ -42410,7 +42404,7 @@ icon_state = "2-8" }, /turf/space, -/area/station/engineering/solar/auxstarboard) +/area/station/engineering/solar/fore_starboard) "dcj" = ( /obj/structure/chair/sofa/left, /obj/effect/spawner/lootdrop/maintenance, @@ -42435,7 +42429,7 @@ icon_state = "4-8" }, /turf/space, -/area/station/engineering/solar/starboard) +/area/station/engineering/solar/aft_starboard) "dcs" = ( /obj/machinery/atmospherics/unary/portables_connector{ dir = 8 @@ -42624,7 +42618,7 @@ icon_state = "2-8" }, /turf/simulated/floor/plating, -/area/station/maintenance/starboardsolar) +/area/station/maintenance/solar_maintenance/aft_starboard) "ddG" = ( /obj/machinery/atmospherics/portable/canister/toxins, /obj/effect/turf_decal/delivery/red/hollow, @@ -44793,7 +44787,7 @@ "dPW" = ( /obj/effect/spawner/window/reinforced/grilled, /turf/simulated/floor/plating, -/area/station/maintenance/auxsolarstarboard) +/area/station/maintenance/solar_maintenance/fore_starboard) "dPX" = ( /obj/machinery/door/firedoor, /turf/simulated/floor/plasteel{ @@ -45021,7 +45015,7 @@ }, /obj/effect/mapping_helpers/airlock/autoname, /turf/simulated/floor/plating, -/area/station/maintenance/starboardsolar) +/area/station/maintenance/solar_maintenance/aft_starboard) "dUF" = ( /obj/effect/spawner/window/reinforced/grilled, /obj/effect/spawner/airlock/e_to_w, @@ -45780,7 +45774,7 @@ icon_state = "0-8" }, /turf/simulated/floor/plating/airless, -/area/station/engineering/solar/port) +/area/station/engineering/solar/aft_port) "emO" = ( /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 8 @@ -45821,7 +45815,7 @@ icon_state = "2-4" }, /turf/space, -/area/station/engineering/solar/auxport) +/area/station/engineering/solar/fore_port) "eow" = ( /obj/machinery/atmospherics/pipe/manifold/visible, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -45853,7 +45847,7 @@ icon_state = "2-8" }, /turf/space, -/area/station/engineering/solar/auxport) +/area/station/engineering/solar/fore_port) "epn" = ( /obj/machinery/atmospherics/pipe/manifold/visible/yellow{ dir = 4 @@ -47929,7 +47923,7 @@ }, /obj/item/stack/rods/ten, /turf/space, -/area/station/engineering/solar/auxport) +/area/station/engineering/solar/fore_port) "fho" = ( /obj/structure/closet/secure_closet/roboticist, /turf/simulated/floor/plasteel{ @@ -48573,7 +48567,7 @@ /turf/simulated/floor/plasteel/airless{ icon_state = "solarpanel" }, -/area/station/engineering/solar/port) +/area/station/engineering/solar/aft_port) "ftz" = ( /obj/machinery/alarm/directional/north, /turf/simulated/floor/plasteel{ @@ -49265,7 +49259,7 @@ dir = 4 }, /turf/simulated/floor/plating, -/area/station/maintenance/starboardsolar) +/area/station/maintenance/solar_maintenance/aft_starboard) "fFX" = ( /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 4 @@ -49425,7 +49419,7 @@ }, /obj/effect/mapping_helpers/airlock/autoname, /turf/simulated/floor/plating, -/area/station/maintenance/auxsolarport) +/area/station/maintenance/solar_maintenance/fore_port) "fJd" = ( /obj/machinery/door/airlock/security/glass{ name = "Brig" @@ -51130,7 +51124,7 @@ }, /obj/effect/mapping_helpers/airlock/autoname, /turf/simulated/floor/plating, -/area/station/maintenance/auxsolarstarboard) +/area/station/maintenance/solar_maintenance/fore_starboard) "gxn" = ( /obj/machinery/atmospherics/pipe/simple/hidden{ dir = 4 @@ -51365,6 +51359,9 @@ /obj/machinery/alarm/directional/north, /turf/simulated/floor/mineral/tranquillite, /area/station/service/mime) +"gDl" = ( +/turf/simulated/wall/r_wall, +/area/station/maintenance/solar_maintenance/fore_starboard) "gDu" = ( /obj/machinery/atmospherics/pipe/simple/visible/green{ dir = 4 @@ -52320,7 +52317,7 @@ /turf/simulated/floor/plasteel/airless{ icon_state = "solarpanel" }, -/area/station/engineering/solar/auxport) +/area/station/engineering/solar/fore_port) "gVB" = ( /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -52553,7 +52550,7 @@ /obj/effect/spawner/airlock/s_to_n, /obj/effect/spawner/window/reinforced/grilled, /turf/simulated/floor/plating, -/area/station/maintenance/auxsolarport) +/area/station/maintenance/solar_maintenance/fore_port) "hbc" = ( /obj/machinery/atmospherics/unary/tank/air, /turf/simulated/floor/plating, @@ -52567,7 +52564,7 @@ icon_state = "0-4" }, /turf/simulated/floor/plating, -/area/station/maintenance/auxsolarstarboard) +/area/station/maintenance/solar_maintenance/fore_starboard) "hbB" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/cable{ @@ -53333,7 +53330,7 @@ icon_state = "0-8" }, /turf/simulated/floor/plating/airless, -/area/station/engineering/solar/auxport) +/area/station/engineering/solar/fore_port) "hpR" = ( /obj/structure/plasticflaps{ opacity = 1 @@ -53878,7 +53875,7 @@ icon_state = "1-4" }, /turf/space, -/area/station/engineering/solar/auxport) +/area/station/engineering/solar/fore_port) "hDr" = ( /obj/effect/turf_decal/stripes/line, /obj/machinery/r_n_d/circuit_imprinter, @@ -55090,7 +55087,7 @@ icon_state = "1-2" }, /turf/space, -/area/station/engineering/solar/port) +/area/station/engineering/solar/aft_port) "hZZ" = ( /obj/structure/cable{ d1 = 1; @@ -56846,7 +56843,7 @@ "iMJ" = ( /obj/effect/spawner/window/reinforced/grilled, /turf/simulated/floor/plating, -/area/station/maintenance/auxsolarport) +/area/station/maintenance/solar_maintenance/fore_port) "iMW" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 5 @@ -59327,7 +59324,7 @@ icon_state = "2-8" }, /turf/space, -/area/station/engineering/solar/auxstarboard) +/area/station/engineering/solar/fore_starboard) "jRf" = ( /obj/machinery/atmospherics/unary/vent_scrubber/on, /turf/simulated/floor/plasteel{ @@ -59412,7 +59409,7 @@ icon_state = "0-2" }, /turf/space, -/area/station/engineering/solar/auxport) +/area/station/engineering/solar/fore_port) "jSC" = ( /obj/effect/turf_decal/delivery, /obj/machinery/camera{ @@ -61276,7 +61273,7 @@ /turf/simulated/floor/plasteel/airless{ icon_state = "solarpanel" }, -/area/station/engineering/solar/auxport) +/area/station/engineering/solar/fore_port) "kIP" = ( /obj/effect/spawner/window/reinforced, /obj/machinery/atmospherics/pipe/simple/visible/yellow, @@ -61323,7 +61320,7 @@ icon_state = "1-2" }, /turf/space, -/area/station/engineering/solar/auxport) +/area/station/engineering/solar/fore_port) "kLd" = ( /obj/structure/window/reinforced{ dir = 1 @@ -62511,7 +62508,7 @@ /area/station/hallway/primary/central/north) "lio" = ( /turf/simulated/floor/plating/airless, -/area/station/engineering/solar/port) +/area/station/engineering/solar/aft_port) "liK" = ( /obj/structure/cable{ d1 = 1; @@ -64259,7 +64256,7 @@ /area/station/engineering/atmos) "lSh" = ( /turf/simulated/wall/r_wall, -/area/station/maintenance/portsolar) +/area/station/maintenance/solar_maintenance/aft_port) "lSn" = ( /obj/structure/window/reinforced{ dir = 1 @@ -64336,7 +64333,7 @@ "lVp" = ( /obj/effect/spawner/random_spawners/wall_rusted_maybe, /turf/simulated/wall/r_wall, -/area/station/maintenance/asmaint) +/area/station/maintenance/solar_maintenance/aft_starboard) "lVy" = ( /obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel{ @@ -65630,7 +65627,7 @@ /turf/simulated/floor/plasteel/airless{ icon_state = "solarpanel" }, -/area/station/engineering/solar/auxport) +/area/station/engineering/solar/fore_port) "mzF" = ( /obj/structure/cable{ d1 = 4; @@ -65764,7 +65761,7 @@ /area/station/service/bar) "mBn" = ( /turf/simulated/floor/plating/airless, -/area/station/engineering/solar/starboard) +/area/station/engineering/solar/aft_starboard) "mBr" = ( /obj/item/radio/intercom{ name = "west bump"; @@ -66717,7 +66714,7 @@ }, /obj/effect/mapping_helpers/airlock/access/all/engineering/general, /turf/simulated/floor/plating, -/area/station/maintenance/auxsolarstarboard) +/area/station/maintenance/solar_maintenance/fore_starboard) "mVB" = ( /obj/structure/cable{ d1 = 1; @@ -67485,7 +67482,7 @@ /turf/simulated/floor/plasteel/airless{ icon_state = "solarpanel" }, -/area/station/engineering/solar/port) +/area/station/engineering/solar/aft_port) "nic" = ( /turf/simulated/floor/plasteel{ icon_state = "cafeteria" @@ -68547,7 +68544,7 @@ /obj/effect/spawner/airlock/s_to_n, /obj/effect/spawner/window/reinforced/grilled, /turf/simulated/floor/plating, -/area/station/maintenance/auxsolarstarboard) +/area/station/maintenance/solar_maintenance/fore_starboard) "nEJ" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -69801,7 +69798,7 @@ /obj/effect/spawner/airlock/e_to_w/long, /obj/effect/spawner/window/reinforced/grilled, /turf/simulated/floor/plating, -/area/station/maintenance/portsolar) +/area/station/maintenance/solar_maintenance/aft_port) "ohK" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/hidden/cyan, @@ -69845,7 +69842,7 @@ /turf/simulated/floor/plasteel/airless{ icon_state = "solarpanel" }, -/area/station/engineering/solar/port) +/area/station/engineering/solar/aft_port) "ojt" = ( /obj/machinery/door/airlock/maintenance, /obj/effect/mapping_helpers/airlock/autoname, @@ -70205,7 +70202,7 @@ icon_state = "2-8" }, /turf/space, -/area/station/engineering/solar/auxport) +/area/station/engineering/solar/fore_port) "ovR" = ( /obj/structure/bookcase{ name = "bookcase (Adult)" @@ -72363,7 +72360,7 @@ icon_state = "1-2" }, /turf/simulated/floor/plating, -/area/station/maintenance/starboardsolar) +/area/station/maintenance/solar_maintenance/aft_starboard) "pre" = ( /obj/structure/chair{ dir = 1 @@ -72824,7 +72821,7 @@ "pBu" = ( /obj/effect/spawner/window/reinforced/grilled, /turf/simulated/floor/plating, -/area/station/maintenance/portsolar) +/area/station/maintenance/solar_maintenance/aft_port) "pBB" = ( /obj/structure/sign/directions/engineering{ dir = 4; @@ -74342,7 +74339,7 @@ icon_state = "0-4" }, /turf/space, -/area/station/engineering/solar/auxstarboard) +/area/station/engineering/solar/fore_starboard) "qfR" = ( /obj/machinery/porta_turret/ai_turret, /turf/simulated/floor/plasteel{ @@ -74977,7 +74974,7 @@ /obj/effect/spawner/airlock/long, /obj/effect/spawner/window/reinforced/grilled, /turf/simulated/floor/plating, -/area/station/maintenance/starboardsolar) +/area/station/maintenance/solar_maintenance/aft_starboard) "quY" = ( /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 1 @@ -80224,7 +80221,7 @@ icon_state = "4-8" }, /turf/simulated/floor/plating, -/area/station/maintenance/portsolar) +/area/station/maintenance/solar_maintenance/aft_port) "sFS" = ( /obj/structure/cable{ d1 = 4; @@ -80349,7 +80346,7 @@ icon_state = "0-4" }, /turf/simulated/floor/plating/airless, -/area/station/engineering/solar/port) +/area/station/engineering/solar/aft_port) "sHK" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 5 @@ -81002,7 +80999,7 @@ }, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plating, -/area/station/maintenance/auxsolarstarboard) +/area/station/maintenance/solar_maintenance/fore_starboard) "sVD" = ( /obj/structure/mirror{ pixel_y = -34 @@ -83181,7 +83178,7 @@ dir = 1 }, /turf/simulated/floor/plating, -/area/station/maintenance/auxsolarport) +/area/station/maintenance/solar_maintenance/fore_port) "tWl" = ( /obj/machinery/atmospherics/pipe/simple/hidden, /turf/simulated/floor/plasteel{ @@ -84128,7 +84125,7 @@ icon_state = "1-8" }, /turf/space, -/area/station/engineering/solar/auxport) +/area/station/engineering/solar/fore_port) "uqN" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/closet/crate/medical, @@ -87123,7 +87120,7 @@ icon_state = "1-8" }, /turf/space, -/area/station/engineering/solar/auxport) +/area/station/engineering/solar/fore_port) "vIz" = ( /obj/structure/cable{ d1 = 4; @@ -88550,7 +88547,7 @@ /obj/effect/mapping_helpers/airlock/access/all/engineering/general, /obj/effect/mapping_helpers/airlock/autoname, /turf/simulated/floor/plating, -/area/station/maintenance/portsolar) +/area/station/maintenance/solar_maintenance/aft_port) "wsN" = ( /obj/effect/landmark/start/research_director, /turf/simulated/floor/plasteel{ @@ -91062,7 +91059,7 @@ "xwJ" = ( /obj/effect/spawner/window/reinforced/grilled, /turf/simulated/floor/plating, -/area/station/maintenance/starboardsolar) +/area/station/maintenance/solar_maintenance/aft_starboard) "xxa" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 6 @@ -92771,7 +92768,7 @@ icon_state = "0-4" }, /turf/simulated/floor/plating/airless, -/area/station/engineering/solar/auxport) +/area/station/engineering/solar/fore_port) "yhT" = ( /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 8 @@ -110812,7 +110809,7 @@ bZU bZU bZU bZU -cfc +lSh pBu sFP pBu @@ -111069,7 +111066,7 @@ deH cPA jWJ xPl -cfc +lSh ckd bOL cMD @@ -111220,9 +111217,9 @@ aaa aaa aaa iMJ -ajB -ajB -ajB +cQJ +cQJ +cQJ cQJ anB akt @@ -111480,7 +111477,7 @@ hal ajC akv ajE -aky +cQJ anC fuy pxf @@ -111583,7 +111580,7 @@ bZU bZU bZU cwO -cfc +lSh cpL bXI cNv @@ -111840,10 +111837,10 @@ rbo bZU vCt cwO -cfc -cfc -cfc -cfc +lSh +lSh +lSh +lSh lSh aaa aaa @@ -111994,7 +111991,7 @@ iMJ anm akx alw -aky +cQJ xrZ bmq bmr @@ -112248,10 +112245,10 @@ laH laH laH iMJ -ajB -ajB -ajB -aky +cQJ +cQJ +cQJ +cQJ aky uaH aky @@ -130340,7 +130337,7 @@ ifq nyp vQo dSx -bdN +cQW cQW cQW cQW @@ -130597,7 +130594,7 @@ cJk cPc cNf fbQ -bdN +cQW cJm fFW cuq @@ -131111,7 +131108,7 @@ cPc cPc nnA bBg -bdN +cQW cVr cSx cFJ @@ -136928,9 +136925,9 @@ aaa aaa dPW asU -ans -ans -aBZ +gDl +gDl +gDl azr avg dAH @@ -137187,7 +137184,7 @@ nEz hbr auj arT -aBZ +gDl heC avA avA @@ -137955,10 +137952,10 @@ aaa abq aaa dPW -ans -ans +gDl +gDl asU -aBZ +gDl dKL bfb cbc diff --git a/code/game/area/areas/ruins/space_areas.dm b/code/game/area/areas/ruins/space_areas.dm index 7dc1950d8c3..21d25870fa6 100644 --- a/code/game/area/areas/ruins/space_areas.dm +++ b/code/game/area/areas/ruins/space_areas.dm @@ -108,11 +108,11 @@ /area/ruin/space/derelict/solar_control name = "\improper Derelict Solar Control" - icon_state = "GENsolar" + icon_state = "general_solar_control" /area/ruin/space/derelict/se_solar name = "\improper Derelict South East Solars" - icon_state = "GENsolar" + icon_state = "general_solars" /area/ruin/space/derelict/crew_quarters name = "\improper Derelict Crew Quarters" diff --git a/code/game/area/ss13_areas/engineering_areas.dm b/code/game/area/ss13_areas/engineering_areas.dm index 20e24d2c893..71c05c7f5d0 100644 --- a/code/game/area/ss13_areas/engineering_areas.dm +++ b/code/game/area/ss13_areas/engineering_areas.dm @@ -78,31 +78,47 @@ //Solars /area/station/engineering/solar + name = "\improper Solar Array" + icon_state = "general_solars" requires_power = FALSE valid_territory = FALSE dynamic_lighting = DYNAMIC_LIGHTING_IFSTARLIGHT ambientsounds = ENGINEERING_SOUNDS sound_environment = SOUND_AREA_SPACE -/area/station/engineering/solar/auxport - name = "\improper Fore Port Solar Array" - icon_state = "FPsolars" +/area/station/engineering/solar/fore + name = "\improper Fore Solar Array" + icon_state = "fore_solars" -/area/station/engineering/solar/auxstarboard - name = "\improper Fore Starboard Solar Array" - icon_state = "FSsolars" +/area/station/engineering/solar/fore_starboard + name = "\improper Fore-Starboard Solar Array" + icon_state = "fore_starboard_solars" + +/area/station/engineering/solar/fore_port + name = "\improper Fore-Port Solar Array" + icon_state = "fore_port_solars" + +/area/station/engineering/solar/aft + name = "\improper Aft Solar Array" + icon_state = "aft_solars" + +/area/station/engineering/solar/aft_starboard + name = "\improper Aft-Starboard Solar Array" + icon_state = "aft_starboard_solars" + +/area/station/engineering/solar/aft_port + name = "\improper Aft-Port Solar Array" + icon_state = "aft_port_solars" /area/station/engineering/solar/starboard name = "\improper Starboard Solar Array" - icon_state = "Ssolars" - -/area/station/engineering/solar/starboard/aft - name = "\improper Aft Starboard Solar Array" - icon_state = "ASsolars" + icon_state = "starboard_solars" /area/station/engineering/solar/port - name = "\improper Aft Port Solar Array" - icon_state = "APsolars" + name = "\improper Port Solar Array" + icon_state = "port_solars" + +// Other /area/station/engineering/secure_storage name = "Engineering Secure Storage" diff --git a/code/game/area/ss13_areas/maintenance_areas.dm b/code/game/area/ss13_areas/maintenance_areas.dm index c2e3256b3a0..e6585764e4d 100644 --- a/code/game/area/ss13_areas/maintenance_areas.dm +++ b/code/game/area/ss13_areas/maintenance_areas.dm @@ -129,25 +129,43 @@ name = "Gambling Den" icon_state = "yellow" -/area/station/maintenance/auxsolarport - name = "\improper Fore Port Solar Maintenance" - icon_state = "FPctrl" +// Solars -/area/station/maintenance/starboardsolar +/area/station/maintenance/solar_maintenance + name = "\improper Solar Maintenance" + icon_state = "general_solar_control" + +/area/station/maintenance/solar_maintenance/fore + name = "\improper Fore Solar Maintenance" + icon_state = "fore_solar_control" + +/area/station/maintenance/solar_maintenance/fore_starboard + name = "\improper Fore-Starboard Solar Maintenance" + icon_state = "fore_starboard_solar_control" + +/area/station/maintenance/solar_maintenance/fore_port + name = "\improper Fore-Port Solar Maintenance" + icon_state = "fore_port_solar_control" + +/area/station/maintenance/solar_maintenance/aft + name = "\improper Aft Solar Maintenance" + icon_state = "aft_solar_control" + +/area/station/maintenance/solar_maintenance/aft_starboard + name = "\improper Aft-Starboard Solar Maintenance" + icon_state = "aft_starboard_solar_control" + +/area/station/maintenance/solar_maintenance/aft_port + name = "\improper Aft-Port Solar Maintenance" + icon_state = "aft_port_solar_control" + +/area/station/maintenance/solar_maintenance/starboard name = "\improper Starboard Solar Maintenance" - icon_state = "ASctrl" + icon_state = "starboard_solar_control" -/area/station/maintenance/starboardsolar/aft - name = "\improper Aft Starboard Solar Maintenance" - icon_state = "ASctrl" - -/area/station/maintenance/portsolar - name = "\improper Aft Port Solar Maintenance" - icon_state = "APctrl" - -/area/station/maintenance/auxsolarstarboard - name = "\improper Fore Starboard Solar Maintenance" - icon_state = "FSctrl" +/area/station/maintenance/solar_maintenance/port + name = "\improper Port Solar Maintenance" + icon_state = "port_solar_control" /// Derelict Assembly Line /area/station/maintenance/assembly_line diff --git a/icons/turf/areas.dmi b/icons/turf/areas.dmi index 4b8c267a149..00a5708f15e 100755 Binary files a/icons/turf/areas.dmi and b/icons/turf/areas.dmi differ