From 17864dc746c76a12a978eccae1e3e2d81958cb39 Mon Sep 17 00:00:00 2001 From: Aylong Date: Fri, 21 Jun 2024 21:03:25 +0300 Subject: [PATCH] Return 1 removed area, and replace 2 --- _maps/map_files220/stations/boxstation.dmm | 98 +++++++++---------- .../maps220/code/Station/station_areas.dm | 2 + 2 files changed, 51 insertions(+), 49 deletions(-) diff --git a/_maps/map_files220/stations/boxstation.dmm b/_maps/map_files220/stations/boxstation.dmm index 4a89fbc37b5b..8a5a3ff39a18 100644 --- a/_maps/map_files220/stations/boxstation.dmm +++ b/_maps/map_files220/stations/boxstation.dmm @@ -19149,7 +19149,7 @@ /obj/structure/rack, /obj/item/wrench, /turf/simulated/floor/plating, -/area/station/maintenance/maintcentral2) +/area/station/maintenance/maintcentral) "bua" = ( /obj/machinery/light/small/directional/north, /obj/item/rcs, @@ -21345,7 +21345,7 @@ /obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, /obj/effect/mapping_helpers/airlock/access/all/engineering/atmos, /turf/simulated/floor/plating, -/area/station/maintenance/maintcentral2) +/area/station/maintenance/maintcentral) "bEK" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -21771,7 +21771,7 @@ icon_state = "2-4" }, /turf/simulated/floor/plating, -/area/station/maintenance/maintcentral2) +/area/station/maintenance/maintcentral) "bGt" = ( /obj/structure/sign/directions/engineering{ pixel_y = -39 @@ -25664,7 +25664,7 @@ /turf/simulated/floor/plasteel{ icon_state = "darkblue" }, -/area/station/medical/ward) +/area/station/medical/surgery/observation) "bYd" = ( /obj/effect/decal/cleanable/blood/drip{ pixel_x = -4; @@ -25685,7 +25685,7 @@ dir = 4; icon_state = "darkbluecorners" }, -/area/station/medical/ward) +/area/station/medical/surgery/observation) "bYf" = ( /obj/machinery/atmospherics/pipe/simple/hidden/cyan{ dir = 4 @@ -27378,7 +27378,7 @@ /turf/simulated/floor/plasteel{ icon_state = "dark" }, -/area/station/medical/ward) +/area/station/medical/surgery/observation) "cen" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -27680,7 +27680,7 @@ /turf/simulated/floor/plasteel{ icon_state = "darkblue" }, -/area/station/medical/ward) +/area/station/medical/surgery/observation) "cfI" = ( /obj/effect/turf_decal/delivery/blue/hollow, /obj/machinery/sleeper, @@ -27727,7 +27727,7 @@ dir = 1; icon_state = "darkblue" }, -/area/station/medical/ward) +/area/station/medical/surgery/observation) "cfP" = ( /obj/structure/rack, /obj/effect/spawner/lootdrop/maintenance/two, @@ -28362,7 +28362,7 @@ /turf/simulated/floor/plasteel{ icon_state = "darkblue" }, -/area/station/medical/ward) +/area/station/medical/surgery/observation) "ciK" = ( /obj/machinery/disposal, /obj/structure/disposalpipe/trunk{ @@ -28395,7 +28395,7 @@ /turf/simulated/floor/plasteel{ icon_state = "darkblue" }, -/area/station/medical/ward) +/area/station/medical/surgery/observation) "ciQ" = ( /obj/structure/table, /obj/item/storage/belt/medical{ @@ -28424,7 +28424,7 @@ /turf/simulated/floor/plasteel{ icon_state = "darkblue" }, -/area/station/medical/ward) +/area/station/medical/surgery/observation) "ciX" = ( /obj/structure/chair, /turf/simulated/floor/plasteel{ @@ -28575,7 +28575,7 @@ /turf/simulated/floor/plasteel{ icon_state = "darkblue" }, -/area/station/medical/ward) +/area/station/medical/surgery/observation) "cjF" = ( /obj/structure/closet/firecloset, /turf/simulated/floor/plating, @@ -28774,7 +28774,7 @@ /turf/simulated/floor/plasteel{ icon_state = "darkblue" }, -/area/station/medical/ward) +/area/station/medical/surgery/observation) "ckB" = ( /obj/machinery/camera{ c_tag = "Medbay Hallway Center"; @@ -28923,7 +28923,7 @@ /turf/simulated/floor/plasteel{ icon_state = "dark" }, -/area/station/medical/ward) +/area/station/medical/surgery/observation) "ckX" = ( /obj/structure/table, /obj/item/folder/white, @@ -29874,7 +29874,7 @@ /turf/simulated/floor/plasteel{ icon_state = "dark" }, -/area/station/medical/ward) +/area/station/medical/surgery/observation) "cou" = ( /obj/structure/disposalpipe/segment/corner{ dir = 1 @@ -30631,12 +30631,12 @@ "crY" = ( /obj/effect/spawner/window/reinforced/grilled, /turf/simulated/floor/plating, -/area/station/medical/ward) +/area/station/medical/surgery/observation) "crZ" = ( /obj/effect/spawner/window/reinforced/grilled, /obj/structure/sign/examroom, /turf/simulated/floor/plating, -/area/station/medical/ward) +/area/station/medical/surgery/observation) "csa" = ( /obj/machinery/atmospherics/pipe/simple/hidden/cyan{ dir = 4 @@ -31221,7 +31221,7 @@ /turf/simulated/floor/plasteel{ icon_state = "dark" }, -/area/station/medical/ward) +/area/station/medical/surgery/observation) "cuh" = ( /obj/effect/decal/cleanable/cobweb2, /obj/structure/safe, @@ -31394,7 +31394,7 @@ /turf/simulated/floor/plasteel{ icon_state = "darkblue" }, -/area/station/medical/ward) +/area/station/medical/surgery/observation) "cuE" = ( /obj/structure/grille/broken, /turf/simulated/floor/plating, @@ -34183,7 +34183,7 @@ /obj/machinery/atmospherics/meter, /obj/machinery/light/small/directional/north, /turf/simulated/floor/plating, -/area/station/maintenance/maintcentral2) +/area/station/maintenance/maintcentral) "cFT" = ( /obj/structure/table/reinforced, /obj/machinery/door/firedoor, @@ -50282,7 +50282,7 @@ }, /obj/effect/spawner/lootdrop/maintenance, /turf/simulated/floor/plating, -/area/station/maintenance/maintcentral2) +/area/station/maintenance/maintcentral) "fko" = ( /obj/effect/turf_decal/stripes/corner{ dir = 1 @@ -52542,7 +52542,7 @@ dir = 8; icon_state = "darkblue" }, -/area/station/medical/ward) +/area/station/medical/surgery/observation) "fZD" = ( /obj/structure/table/reinforced, /obj/item/book/manual/wiki/sop_engineering{ @@ -52778,7 +52778,7 @@ /turf/simulated/floor/plasteel{ icon_state = "darkblue" }, -/area/station/medical/ward) +/area/station/medical/surgery/observation) "gff" = ( /obj/machinery/hologram/holopad, /obj/machinery/atmospherics/pipe/simple/visible/green{ @@ -55867,7 +55867,7 @@ dir = 1; icon_state = "darkblue" }, -/area/station/medical/ward) +/area/station/medical/surgery/observation) "hbq" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel{ @@ -55912,7 +55912,7 @@ dir = 1; icon_state = "darkbluecorners" }, -/area/station/medical/ward) +/area/station/medical/surgery/observation) "hcE" = ( /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 4 @@ -58249,7 +58249,7 @@ /turf/simulated/floor/plasteel{ icon_state = "darkblue" }, -/area/station/medical/ward) +/area/station/medical/surgery/observation) "hTu" = ( /obj/effect/spawner/window/reinforced/grilled, /obj/machinery/door/poddoor/preopen{ @@ -58568,7 +58568,7 @@ /turf/simulated/floor/plasteel{ icon_state = "darkblue" }, -/area/station/medical/ward) +/area/station/medical/surgery/observation) "hZH" = ( /obj/structure/closet/crate, /obj/item/stack/nanopaste, @@ -61260,7 +61260,7 @@ dir = 8; icon_state = "darkblue" }, -/area/station/medical/ward) +/area/station/medical/surgery/observation) "jdi" = ( /obj/effect/spawner/window/reinforced/polarized/grilled{ id = "qm" @@ -62454,7 +62454,7 @@ dir = 8 }, /turf/simulated/floor/plating, -/area/station/maintenance/maintcentral2) +/area/station/maintenance/maintcentral) "jza" = ( /turf/simulated/floor/plasteel{ dir = 1; @@ -66510,7 +66510,7 @@ dir = 1; icon_state = "darkblue" }, -/area/station/medical/ward) +/area/station/medical/surgery/observation) "kXD" = ( /obj/structure/chair/office/light{ dir = 4 @@ -67489,7 +67489,7 @@ /area/station/hallway/primary/aft) "lsh" = ( /turf/simulated/wall/r_wall, -/area/station/maintenance/maintcentral2) +/area/station/maintenance/maintcentral) "lsk" = ( /obj/structure/window/reinforced, /turf/simulated/floor/plasteel{ @@ -68595,7 +68595,7 @@ dir = 1; icon_state = "darkblue" }, -/area/station/medical/ward) +/area/station/medical/surgery/observation) "lLM" = ( /obj/structure/closet/crate/can, /obj/effect/spawner/lootdrop/maintenance/two, @@ -69800,7 +69800,7 @@ dir = 9; icon_state = "darkblue" }, -/area/station/medical/ward) +/area/station/medical/surgery/observation) "mev" = ( /obj/structure/window/reinforced{ dir = 4 @@ -72844,7 +72844,7 @@ /obj/machinery/atmospherics/binary/valve, /obj/machinery/alarm/directional/west, /turf/simulated/floor/plating, -/area/station/maintenance/maintcentral2) +/area/station/maintenance/maintcentral) "njM" = ( /obj/structure/sign/electricshock{ pixel_y = -32 @@ -79063,7 +79063,7 @@ /turf/simulated/floor/plasteel{ icon_state = "darkblue" }, -/area/station/medical/ward) +/area/station/medical/surgery/observation) "pou" = ( /obj/effect/spawner/window/reinforced/grilled, /obj/machinery/door/poddoor/shutters/preopen{ @@ -81220,7 +81220,7 @@ /turf/simulated/floor/plasteel{ icon_state = "darkblue" }, -/area/station/medical/ward) +/area/station/medical/surgery/observation) "qdQ" = ( /obj/structure/table/wood, /obj/item/flashlight/lamp/green{ @@ -81603,7 +81603,7 @@ }, /obj/effect/spawner/random_spawners/cobweb_left_frequent, /turf/simulated/floor/plating, -/area/station/maintenance/maintcentral2) +/area/station/maintenance/maintcentral) "qlt" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/disposalpipe/segment{ @@ -83431,7 +83431,7 @@ dir = 1; icon_state = "darkblue" }, -/area/station/medical/ward) +/area/station/medical/surgery/observation) "qNB" = ( /obj/machinery/disposal, /obj/machinery/light_switch/south, @@ -88573,7 +88573,7 @@ dir = 1; icon_state = "darkblue" }, -/area/station/medical/ward) +/area/station/medical/surgery/observation) "sHW" = ( /obj/machinery/door/airlock/welded, /obj/effect/mapping_helpers/airlock/autoname, @@ -88774,7 +88774,7 @@ /turf/simulated/floor/plasteel{ icon_state = "dark" }, -/area/station/medical/ward) +/area/station/medical/surgery/observation) "sNy" = ( /obj/structure/chair{ dir = 8 @@ -89470,7 +89470,7 @@ dir = 4; icon_state = "darkblue" }, -/area/station/medical/ward) +/area/station/medical/surgery/observation) "sZJ" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -91580,7 +91580,7 @@ dir = 1; icon_state = "darkblue" }, -/area/station/medical/ward) +/area/station/medical/surgery/observation) "tOs" = ( /obj/effect/spawner/random_spawners/cobweb_right_frequent, /turf/simulated/floor/plating, @@ -91826,7 +91826,7 @@ /turf/simulated/floor/plasteel{ icon_state = "dark" }, -/area/station/medical/ward) +/area/station/medical/surgery/observation) "tSu" = ( /obj/structure/table, /obj/item/clipboard, @@ -99888,7 +99888,7 @@ /turf/simulated/floor/plasteel{ icon_state = "dark" }, -/area/station/medical/ward) +/area/station/medical/surgery/observation) "wJv" = ( /obj/structure/chair, /obj/structure/sign/nosmoking_1{ @@ -99899,14 +99899,14 @@ dir = 1; icon_state = "darkblue" }, -/area/station/medical/ward) +/area/station/medical/surgery/observation) "wJK" = ( /obj/machinery/atmospherics/pipe/simple/visible{ dir = 5 }, /obj/machinery/atmospherics/portable/scrubber, /turf/simulated/floor/plating, -/area/station/maintenance/maintcentral2) +/area/station/maintenance/maintcentral) "wKx" = ( /obj/structure/flora/ausbushes/brflowers, /obj/structure/railing{ @@ -100296,7 +100296,7 @@ dir = 10; icon_state = "darkblue" }, -/area/station/medical/ward) +/area/station/medical/surgery/observation) "wQO" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/disposalpipe/segment{ @@ -101580,7 +101580,7 @@ /turf/simulated/floor/plasteel{ icon_state = "dark" }, -/area/station/medical/ward) +/area/station/medical/surgery/observation) "xoT" = ( /obj/effect/turf_decal/siding/white/corner{ dir = 1 @@ -104458,7 +104458,7 @@ /area/station/engineering/hallway) "ylO" = ( /turf/simulated/wall, -/area/station/medical/ward) +/area/station/medical/surgery/observation) "ylS" = ( /obj/machinery/computer/atmos_alert{ dir = 4 diff --git a/modular_ss220/maps220/code/Station/station_areas.dm b/modular_ss220/maps220/code/Station/station_areas.dm index 9364cf8eee7e..5b07af36edb1 100644 --- a/modular_ss220/maps220/code/Station/station_areas.dm +++ b/modular_ss220/maps220/code/Station/station_areas.dm @@ -100,6 +100,8 @@ name = "Атриум" icon_state = "bar" +/area/station/public/vacant_office/secondary + /* CentCom */ /area/centcom/ss220 name = "ЦК"