diff --git a/_maps/map_files/MetaStation/MetaStation.dmm b/_maps/map_files/MetaStation/MetaStation.dmm index 7354aa93..3ecd421b 100644 --- a/_maps/map_files/MetaStation/MetaStation.dmm +++ b/_maps/map_files/MetaStation/MetaStation.dmm @@ -332,7 +332,7 @@ "agv" = (/obj/structure/cable/yellow{icon_state = "4-8"},/obj/machinery/camera{c_tag = "Fitness Room - Fore"},/obj/machinery/airalarm{pixel_y = 24},/obj/effect/turf_decal/tile/neutral{dir = 1},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/open/floor/plasteel,/area/crew_quarters/fitness/pool) "agw" = (/obj/structure/cable/yellow{icon_state = "4-8"},/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden,/turf/open/floor/plasteel,/area/crew_quarters/fitness/pool) "agx" = (/obj/structure/cable/yellow{icon_state = "4-8"},/obj/effect/turf_decal/tile/neutral{dir = 4},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/open/floor/plasteel,/area/crew_quarters/fitness/pool) -"agy" = (/obj/machinery/light{dir = 1},/obj/machinery/power/apc{areastring = "/area/crew_quarters/fitness/recreation"; dir = 1; name = "Recreation Area APC"; pixel_y = 24},/obj/structure/cable/yellow{icon_state = "0-8"},/obj/effect/turf_decal/tile/neutral{dir = 4},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/open/floor/plasteel,/area/crew_quarters/fitness/pool) +"agy" = (/obj/machinery/light{dir = 1},/obj/machinery/power/apc{areastring = "/area/crew_quarters/fitness/pool"; dir = 1; name = "Recreation Area APC"; pixel_y = 24},/obj/structure/cable/yellow{icon_state = "0-8"},/obj/effect/turf_decal/tile/neutral{dir = 4},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/open/floor/plasteel,/area/crew_quarters/fitness/pool) "agz" = (/obj/effect/turf_decal/tile/neutral{dir = 4},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/open/floor/plasteel,/area/crew_quarters/fitness/pool) "agA" = (/turf/closed/wall/r_wall,/area/maintenance/solars/port/fore) "agB" = (/obj/machinery/power/solar_control{id = "foreport"; name = "Port Bow Solar Control"},/obj/structure/cable{icon_state = "0-4"},/turf/open/floor/plating,/area/maintenance/solars/port/fore) @@ -6607,7 +6607,7 @@ "cyw" = (/obj/structure/closet/crate,/obj/item/stack/cable_coil,/obj/item/grenade/chem_grenade,/obj/item/flashlight,/obj/effect/spawner/lootdrop/maintenance{lootcount = 2; name = "2maintenance loot spawner"},/turf/open/floor/plating,/area/maintenance/port/aft) "cyx" = (/obj/structure/closet/crate,/obj/item/coin/silver,/obj/item/reagent_containers/spray/weedspray,/obj/item/paper,/obj/effect/spawner/lootdrop/maintenance{lootcount = 2; name = "2maintenance loot spawner"},/turf/open/floor/plating,/area/maintenance/port/aft) "cyy" = (/obj/effect/decal/cleanable/cobweb,/obj/machinery/power/apc{areastring = "/area/maintenance/port/aft"; dir = 1; name = "Port Quarter Maintenance APC"; pixel_y = 24},/obj/structure/cable/yellow{icon_state = "0-8"},/turf/open/floor/plating,/area/maintenance/port/aft) -"cyz" = (/obj/machinery/power/apc{areastring = "/area/medical/patients_rooms/room_a"; dir = 8; name = "Psychologist Office"; pixel_x = -26},/obj/structure/cable/yellow{icon_state = "0-4"},/obj/machinery/light{dir = 8},/obj/effect/turf_decal/tile/blue{dir = 1},/obj/effect/turf_decal/tile/blue,/turf/open/floor/plasteel/white,/area/medical/psych) +"cyz" = (/obj/machinery/power/apc{areastring = "/area/medical/psych"; dir = 8; name = "Psychologist Office APC"; pixel_x = -26},/obj/structure/cable/yellow{icon_state = "0-4"},/obj/machinery/light{dir = 8},/obj/effect/turf_decal/tile/blue{dir = 1},/obj/effect/turf_decal/tile/blue,/turf/open/floor/plasteel/white,/area/medical/psych) "cyA" = (/obj/structure/cable/yellow{icon_state = "2-8"},/turf/open/floor/carpet/blue,/area/medical/psych) "cyB" = (/obj/structure/chair/sofa/right{dir = 8},/obj/item/toy/plush/mothplushie/moffplush{name = "Mender Moff"; pixel_x = -3; pixel_y = 5},/obj/machinery/atmospherics/components/unary/vent_pump/on{dir = 4},/turf/open/floor/carpet/blue,/area/medical/psych) "cyC" = (/obj/structure/disposalpipe/segment,/obj/structure/cable/yellow{icon_state = "1-2"},/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/open/floor/plating,/area/maintenance/port/aft) @@ -6865,9 +6865,9 @@ "cDz" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/obj/structure/disposalpipe/segment,/obj/effect/turf_decal/delivery,/turf/open/floor/plasteel,/area/science/mixing) "cDA" = (/obj/structure/extinguisher_cabinet{pixel_x = 27},/obj/machinery/light_switch{pixel_y = 28},/turf/open/floor/plasteel/white,/area/science/mixing) "cDB" = (/turf/closed/wall/r_wall,/area/science/mixing) -"cDC" = (/obj/structure/chair/comfy,/turf/open/floor/plasteel,/area/science/misc_lab) -"cDD" = (/obj/structure/cable/yellow{icon_state = "1-2"},/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/open/floor/plasteel,/area/science/misc_lab) -"cDE" = (/obj/structure/reagent_dispensers/water_cooler,/turf/open/floor/plasteel,/area/science/misc_lab) +"cDC" = (/obj/structure/chair/comfy,/turf/open/floor/plasteel,/area/science/mixing) +"cDD" = (/obj/structure/cable/yellow{icon_state = "1-2"},/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/open/floor/plasteel,/area/science/mixing) +"cDE" = (/obj/structure/reagent_dispensers/water_cooler,/turf/open/floor/plasteel,/area/science/mixing) "cDF" = (/obj/effect/turf_decal/stripes/line{dir = 10},/turf/open/floor/plasteel,/area/science/circuit) "cDG" = (/obj/effect/turf_decal/stripes/line,/turf/open/floor/plasteel,/area/science/circuit) "cDH" = (/obj/effect/turf_decal/stripes/line{dir = 6},/turf/open/floor/plasteel,/area/science/circuit) @@ -6912,8 +6912,8 @@ "cEu" = (/obj/machinery/atmospherics/components/trinary/filter{dir = 8},/turf/open/floor/plasteel/white,/area/science/mixing) "cEv" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/obj/structure/disposalpipe/segment,/turf/open/floor/plasteel/white,/area/science/mixing) "cEw" = (/turf/open/floor/plasteel/white,/area/science/mixing) -"cEx" = (/obj/structure/table/glass,/obj/machinery/camera/autoname{dir = 4},/turf/open/floor/plasteel,/area/science/misc_lab) -"cEy" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 6},/turf/open/floor/plasteel,/area/science/misc_lab) +"cEx" = (/obj/structure/table/glass,/obj/machinery/camera/autoname{dir = 4},/turf/open/floor/plasteel,/area/science/mixing) +"cEy" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 6},/turf/open/floor/plasteel,/area/science/mixing) "cEz" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/obj/machinery/door/airlock/research/glass{dir = 8; name = "Circuitry Lab"; req_access_txt = "47"},/obj/machinery/door/firedoor,/turf/open/floor/plasteel,/area/science/circuit) "cEA" = (/obj/machinery/light_switch{pixel_y = -25},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/open/floor/plasteel/white,/area/science/circuit) "cEB" = (/obj/machinery/atmospherics/components/unary/vent_scrubber/on{dir = 8},/turf/open/floor/plasteel/white,/area/science/circuit) @@ -6972,8 +6972,8 @@ "cFC" = (/obj/machinery/holopad,/obj/effect/landmark/start/scientist,/obj/structure/disposalpipe/segment{dir = 4},/turf/open/floor/plasteel/white,/area/science/mixing) "cFD" = (/obj/structure/disposalpipe/segment{dir = 9},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/turf/open/floor/plasteel/white,/area/science/mixing) "cFE" = (/obj/structure/sign/warning/biohazard,/turf/closed/wall/r_wall,/area/science/mixing) -"cFF" = (/obj/effect/landmark/blobstart,/obj/effect/turf_decal/stripes/corner{dir = 1},/obj/structure/chair/comfy{dir = 1},/turf/open/floor/plasteel,/area/science/misc_lab) -"cFG" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/obj/machinery/light{dir = 4},/turf/open/floor/plasteel,/area/science/misc_lab) +"cFF" = (/obj/effect/landmark/blobstart,/obj/effect/turf_decal/stripes/corner{dir = 1},/obj/structure/chair/comfy{dir = 1},/turf/open/floor/plasteel,/area/science/mixing) +"cFG" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/obj/machinery/light{dir = 4},/turf/open/floor/plasteel,/area/science/mixing) "cFH" = (/obj/effect/turf_decal/stripes/line,/turf/closed/wall,/area/science/circuit) "cFJ" = (/obj/machinery/vending/cola/random,/turf/open/floor/carpet,/area/medical/medbay/aft) "cFK" = (/obj/machinery/holopad,/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 6},/turf/open/floor/carpet,/area/medical/medbay/aft) @@ -7011,9 +7011,9 @@ "cGq" = (/obj/machinery/atmospherics/pipe/manifold4w/scrubbers/hidden,/turf/open/floor/plasteel/white,/area/science/mixing) "cGr" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/obj/effect/turf_decal/delivery,/turf/open/floor/plasteel,/area/science/mixing) "cGs" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/obj/machinery/door/airlock/research{dir = 4; name = "Toxins Launch Room Access"; req_access_txt = "8"},/obj/machinery/door/poddoor/shutters/preopen{id = "toxins_blastdoor"; name = "biohazard containment shutters"},/obj/effect/turf_decal/delivery,/turf/open/floor/plasteel,/area/science/mixing) -"cGt" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/obj/effect/turf_decal/stripes/line{dir = 8},/turf/open/floor/plasteel,/area/science/misc_lab) -"cGu" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden,/obj/structure/cable/yellow{icon_state = "1-2"},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/open/floor/plasteel,/area/science/misc_lab) -"cGv" = (/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{dir = 4},/obj/structure/sign/poster/official/random{pixel_x = 32},/turf/open/floor/plasteel,/area/science/misc_lab) +"cGt" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/obj/effect/turf_decal/stripes/line{dir = 8},/turf/open/floor/plasteel,/area/science/mixing) +"cGu" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden,/obj/structure/cable/yellow{icon_state = "1-2"},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/open/floor/plasteel,/area/science/mixing) +"cGv" = (/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{dir = 4},/obj/structure/sign/poster/official/random{pixel_x = 32},/turf/open/floor/plasteel,/area/science/mixing) "cGw" = (/turf/closed/wall,/area/science/mixing) "cGx" = (/obj/machinery/camera{c_tag = "Toxins - Launch Area"; network = list("ss13","rd")},/obj/machinery/suit_storage_unit/rd,/obj/effect/turf_decal/bot{dir = 1},/turf/open/floor/plasteel{dir = 1},/area/science/mixing) "cGy" = (/obj/effect/turf_decal/bot{dir = 1},/turf/open/floor/plasteel{dir = 1},/area/science/mixing)