From 32d9ea87f6c3c0e6e249f1bb843995fdb2a77b31 Mon Sep 17 00:00:00 2001 From: ShizCalev Date: Mon, 20 Nov 2017 03:42:49 -0500 Subject: [PATCH] Various Meta area fixes --- _maps/map_files/MetaStation/MetaStation.dmm | 82 ++++++++++++++------- 1 file changed, 55 insertions(+), 27 deletions(-) diff --git a/_maps/map_files/MetaStation/MetaStation.dmm b/_maps/map_files/MetaStation/MetaStation.dmm index ad97c70e39..614bedb415 100644 --- a/_maps/map_files/MetaStation/MetaStation.dmm +++ b/_maps/map_files/MetaStation/MetaStation.dmm @@ -317,7 +317,7 @@ dir = 8; icon_state = "diagonalWall3" }, -/area/space) +/area/security/prison) "aaV" = ( /turf/closed/wall/mineral/titanium, /area/shuttle/pod_2) @@ -327,7 +327,7 @@ dir = 1; icon_state = "diagonalWall3" }, -/area/space) +/area/security/prison) "aaY" = ( /obj/structure/cable{ icon_state = "1-2" @@ -22485,7 +22485,7 @@ req_access_txt = "10" }, /turf/open/floor/plating, -/area/engine/engineering) +/area/maintenance/starboard) "aVh" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 @@ -27447,7 +27447,7 @@ dir = 4 }, /turf/open/floor/plating, -/area/janitor) +/area/maintenance/central) "bfo" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -34687,7 +34687,7 @@ }, /obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/plating, -/area/engine/break_room) +/area/maintenance/starboard) "btA" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 5 @@ -36175,7 +36175,7 @@ dir = 8 }, /turf/open/floor/plating, -/area/crew_quarters/heads/captain/private) +/area/maintenance/central) "bwH" = ( /obj/machinery/atmospherics/pipe/manifold/supply/hidden{ dir = 4 @@ -45420,7 +45420,7 @@ dir = 4 }, /turf/open/floor/plating, -/area/gateway) +/area/maintenance/central) "bQy" = ( /obj/structure/cable/yellow{ icon_state = "1-2" @@ -46652,7 +46652,7 @@ icon_state = "4-8" }, /turf/open/floor/plating, -/area/crew_quarters/kitchen) +/area/maintenance/starboard) "bTa" = ( /obj/structure/disposalpipe/segment{ dir = 6 @@ -51984,7 +51984,7 @@ req_one_access_txt = "0" }, /turf/open/floor/plating, -/area/hydroponics) +/area/maintenance/starboard/aft) "cdV" = ( /obj/structure/cable/yellow{ icon_state = "1-2" @@ -55180,7 +55180,7 @@ }, /obj/structure/disposalpipe/segment, /turf/open/space, -/area/space) +/area/maintenance/disposal/incinerator) "ckD" = ( /obj/machinery/doorButtons/access_button{ idDoor = "incinerator_airlock_exterior"; @@ -56163,7 +56163,7 @@ /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/plating, -/area/science/research) +/area/maintenance/starboard/aft) "cmN" = ( /obj/machinery/door/firedoor, /obj/structure/disposalpipe/segment, @@ -58016,7 +58016,7 @@ req_access_txt = "40" }, /turf/open/floor/plating, -/area/crew_quarters/heads/cmo) +/area/maintenance/aft) "cqq" = ( /obj/structure/disposalpipe/segment{ dir = 10 @@ -58690,7 +58690,7 @@ /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/plating, -/area/medical/chemistry) +/area/maintenance/aft) "crF" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/item/device/radio/intercom{ @@ -59411,7 +59411,7 @@ dir = 4 }, /turf/open/floor/plating, -/area/science/research) +/area/maintenance/aft) "csV" = ( /obj/structure/disposalpipe/junction{ dir = 8 @@ -59727,7 +59727,7 @@ }, /obj/structure/disposalpipe/segment, /turf/open/floor/plating, -/area/medical/genetics) +/area/maintenance/aft) "ctD" = ( /obj/structure/sign/directions/evac, /turf/closed/wall, @@ -59786,7 +59786,7 @@ req_one_access_txt = "7;47;29" }, /turf/open/floor/plating, -/area/science/misc_lab/range) +/area/maintenance/aft) "ctN" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/machinery/light{ @@ -60779,7 +60779,7 @@ }, /obj/structure/disposalpipe/segment, /turf/open/floor/plating, -/area/science/robotics/mechbay) +/area/maintenance/aft) "cvJ" = ( /obj/structure/sign/nosmoking_2{ pixel_x = -29 @@ -67658,7 +67658,7 @@ dir = 1 }, /turf/open/floor/plating, -/area/science/lab) +/area/maintenance/aft) "cJn" = ( /obj/structure/cable/yellow{ icon_state = "2-4" @@ -78692,7 +78692,7 @@ pixel_x = 32 }, /turf/open/floor/plating, -/area/science/research) +/area/maintenance/starboard/aft) "diI" = ( /obj/item/poster/random_contraband, /obj/item/poster/random_contraband, @@ -79452,7 +79452,7 @@ req_access_txt = "12" }, /turf/open/floor/plating, -/area/crew_quarters/locker) +/area/maintenance/starboard/fore) "dtP" = ( /obj/structure/cable/yellow{ icon_state = "4-8" @@ -80679,6 +80679,34 @@ /obj/effect/spawner/structure/window/plasma/reinforced, /turf/open/floor/plating, /area/engine/atmos) +<<<<<<< HEAD +======= +"EDv" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/machinery/rnd/protolathe/department/engineering, +/turf/open/floor/plasteel, +/area/engine/engineering) +"EDw" = ( +/obj/machinery/rnd/protolathe/department/service, +/turf/closed/wall, +/area/hydroponics) +"EDx" = ( +/turf/open/space, +/turf/closed/wall/mineral/plastitanium{ + dir = 8; + icon_state = "diagonalWall3" + }, +/area/hallway/secondary/entry) +"EDy" = ( +/turf/open/space, +/turf/closed/wall/mineral/plastitanium{ + dir = 1; + icon_state = "diagonalWall3" + }, +/area/hallway/secondary/entry) +>>>>>>> a394a18... Various Meta area fixes (#32856) (1,1,1) = {" aaa @@ -89780,8 +89808,8 @@ aaa aaa aaa aaa -aaU -blx +EDx +aRA aRA aRA aRA @@ -90808,8 +90836,8 @@ aaa aaa aaf aaa -aaX -blx +EDy +aRA aRA aRA aRA @@ -100886,7 +100914,7 @@ coE cpZ coB csp -ctp +csr duH dyg ceu @@ -118529,7 +118557,7 @@ aaa aaa aaf aaa -blx +acP adl bih adl @@ -118786,7 +118814,7 @@ aaa aaa aaf aaa -blx +acP adl aQf adl