diff --git a/maps/sierra/z1-z5_sierra.dmm b/maps/sierra/z1-z5_sierra.dmm index 2783f7e240ef6..74a7d38e01561 100644 --- a/maps/sierra/z1-z5_sierra.dmm +++ b/maps/sierra/z1-z5_sierra.dmm @@ -685,7 +685,11 @@ id_tag = "engine_atmos_airlock"; name = "Engine Room Airlock Controlls"; pixel_y = 24; - req_access = list("ACCESS_ENGINE_EQUIP") + req_access = list("ACCESS_ENGINE_EQUIP"); + tag_exterior_door = "engine_airlock_outer"; + tag_interior_door = "engine_airlock_inner"; + tag_exterior_sensor = "engine_atmos_exterior_sensor"; + tag_interior_sensor = "engine_atmos_interior_sensor" }, /obj/structure/catwalk, /obj/structure/hygiene/drain, @@ -2595,12 +2599,6 @@ /turf/simulated/floor/tiled/dark/monotile, /area/medical/staging) "atw" = ( -/obj/machinery/airlock_sensor/airlock_interior{ - id_tag = "engine_airlock"; - master_tag = "engine_airlock_interior_sensor"; - pixel_x = -24; - pixel_y = -24 - }, /obj/machinery/light/spot{ dir = 8 }, @@ -2874,6 +2872,12 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/floor_decal/techfloor, +/obj/machinery/airlock_sensor/airlock_exterior{ + id_tag = "engine_atmos_exterior_sensor"; + master_tag = "engine_atmos"; + pixel_x = -25; + pixel_y = -24 + }, /turf/simulated/floor/tiled/techfloor/grid, /area/engineering/atmos) "avg" = ( @@ -6727,6 +6731,15 @@ }, /turf/simulated/floor/tiled/white, /area/medical/wardhallway) +"aXJ" = ( +/obj/structure/railing/mapped{ + dir = 1 + }, +/obj/structure/table/rack, +/obj/random/maintenance, +/obj/random/junk, +/turf/simulated/floor/plating, +/area/maintenance/thirddeck/aftport) "aXK" = ( /obj/floor_decal/borderfloorblack, /obj/floor_decal/corner/darkblue/border, @@ -7414,6 +7427,10 @@ }, /turf/simulated/floor/carpet/blue, /area/crew_quarters/heads/captain) +"bds" = ( +/obj/random/trash, +/turf/simulated/floor/tiled/techfloor, +/area/maintenance/thirddeck/aftstarboard) "bdv" = ( /obj/floor_decal/corner_techfloor_grid{ dir = 6 @@ -7959,6 +7976,13 @@ }, /turf/simulated/floor/tiled/white, /area/shuttle/petrov/equipment) +"bik" = ( +/obj/structure/catwalk, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/random/junk, +/turf/simulated/floor/plating, +/area/maintenance/thirddeck/starboard) "bin" = ( /obj/structure/cable/green{ d1 = 1; @@ -8059,6 +8083,7 @@ }, /obj/structure/table/rack, /obj/random/junkfood, +/obj/random/junk, /turf/simulated/floor/plating, /area/maintenance/thirddeck/starboard) "bje" = ( @@ -8780,11 +8805,21 @@ id_tag = "engine_airlock"; name = "Engine Room Airlock Controlls"; pixel_y = 24; - req_access = list("ACCESS_ENGINE_EQUIP") + req_access = list("ACCESS_ENGINE_EQUIP"); + tag_interior_door = "engine_airlock_inner"; + tag_exterior_door = "engine_airlock_outer"; + tag_chamber_sensor = "engine_airlock_sensor"; + tag_airpump = "engine_airlock_pump" }, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 1 }, +/obj/machinery/airlock_sensor/airlock_exterior{ + id_tag = "engine_airlock_interior_sensor"; + master_tag = "engine_airlock"; + pixel_x = -25; + pixel_y = 24 + }, /turf/simulated/floor/tiled/techfloor, /area/engineering/engine_room) "bpU" = ( @@ -10994,6 +11029,22 @@ /obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled/dark/monotile, /area/chapel/main) +"bFw" = ( +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/structure/catwalk, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/random/trash, +/turf/simulated/floor/plating, +/area/maintenance/thirddeck/starboard) "bFA" = ( /obj/machinery/status_display, /turf/simulated/wall/prepainted, @@ -12146,6 +12197,16 @@ }, /turf/simulated/wall/r_wall/hull, /area/engineering/atmos/bridge) +"bOB" = ( +/obj/structure/railing/mapped, +/obj/structure/railing/mapped{ + dir = 4 + }, +/obj/structure/table/rack, +/obj/random/toolbox, +/obj/random/junk, +/turf/simulated/floor/plating, +/area/maintenance/thirddeck/starboard) "bOD" = ( /obj/floor_decal/industrial/hatch/yellow, /obj/structure/cable/green{ @@ -14589,6 +14650,10 @@ }, /turf/simulated/floor/tiled, /area/hallway/primary/bridgedeck/central_stairwell) +"chG" = ( +/obj/random/trash, +/turf/simulated/floor/tiled/techmaint, +/area/maintenance/compactor) "chU" = ( /obj/floor_decal/industrial/outline/yellow, /obj/machinery/atmospherics/unary/tank/air{ @@ -17191,7 +17256,11 @@ id_tag = "engine_atmos_airlock"; name = "Engine Room Airlock Controlls"; pixel_y = 24; - req_access = list("ACCESS_ENGINE_EQUIP") + req_access = list("ACCESS_ENGINE_EQUIP"); + tag_exterior_door = "engine_airlock_outer"; + tag_interior_door = "engine_airlock_inner"; + tag_exterior_sensor = "engine_atmos_exterior_sensor"; + tag_interior_sensor = "engine_atmos_interior_sensor" }, /obj/floor_decal/techfloor{ dir = 1 @@ -20002,6 +20071,13 @@ }, /turf/simulated/floor/carpet/green, /area/medical/mentalhealth/therapyroom) +"cWC" = ( +/obj/structure/catwalk, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/random/trash, +/turf/simulated/floor/plating, +/area/maintenance/thirddeck/starboard) "cWK" = ( /obj/structure/bed/chair/office/green{ dir = 1 @@ -21387,6 +21463,16 @@ /obj/structure/catwalk, /turf/simulated/floor/plating, /area/maintenance/substation/fourthdeck) +"dfR" = ( +/obj/structure/cable{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/structure/catwalk, +/obj/random/junk, +/turf/simulated/floor/plating, +/area/maintenance/thirddeck/aftstarboard) "dfT" = ( /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 1 @@ -25211,7 +25297,13 @@ id_tag = "engine_airlock"; name = "Engine Room Airlock Controlls"; pixel_y = 24; - req_access = list("ACCESS_ENGINE_EQUIP") + req_access = list("ACCESS_ENGINE_EQUIP"); + tag_interior_door = "engine_airlock_inner"; + tag_exterior_door = "engine_airlock_outer"; + tag_chamber_sensor = "engine_airlock_sensor"; + tag_airpump = "engine_airlock_pump"; + tag_interior_sensor = "engine_airlock_interior_sensor"; + tag_exterior_sensor = "engine_airlock_exterior_sensor" }, /obj/machinery/airlock_sensor{ id_tag = "engine_airlock_sensor"; @@ -28290,7 +28382,11 @@ name = "Engine Room Airlock Controlls"; pixel_y = -24; req_access = list("ACCESS_ENGINE_EQUIP"); - dir = 1 + dir = 1; + tag_exterior_door = "engine_airlock_outer"; + tag_interior_door = "engine_airlock_inner"; + tag_exterior_sensor = "engine_atmos_exterior_sensor"; + tag_interior_sensor = "engine_atmos_interior_sensor" }, /obj/floor_decal/techfloor{ dir = 6 @@ -28501,6 +28597,10 @@ id_tag = "rescue_shuttle_dock_airlock_pump"; power_rating = 25000 }, +/obj/machinery/oxygen_pump{ + dir = 8; + pixel_x = -27 + }, /turf/simulated/floor/plating, /area/hallway/primary/fourthdeck/center) "egb" = ( @@ -29661,6 +29761,9 @@ /obj/machinery/light/small{ dir = 4 }, +/obj/machinery/oxygen_pump{ + pixel_y = 32 + }, /turf/simulated/floor/tiled/techfloor/grid, /area/maintenance/firstdeck/forestarboard) "eoX" = ( @@ -32680,6 +32783,13 @@ }, /turf/simulated/floor/tiled/techfloor/grid, /area/storage/auxillary/port) +"eKU" = ( +/obj/structure/railing/mapped, +/obj/structure/table/rack, +/obj/random/maintenance, +/obj/random/junk, +/turf/simulated/floor/plating, +/area/maintenance/thirddeck/aftstarboard) "eKY" = ( /obj/structure/closet, /obj/random/maintenance, @@ -33776,6 +33886,11 @@ /obj/floor_decal/techfloor, /turf/simulated/floor/tiled/techfloor/grid, /area/maintenance/firstdeck/forestarboard) +"eTZ" = ( +/obj/structure/catwalk, +/obj/random/junk, +/turf/simulated/open, +/area/quartermaster/hangar/upper) "eUc" = ( /obj/machinery/suit_storage_unit/atmos/alt, /obj/floor_decal/borderfloor{ @@ -37145,6 +37260,9 @@ icon_state = "4-8" }, /obj/floor_decal/industrial/warning/half, +/obj/machinery/oxygen_pump{ + pixel_y = -32 + }, /turf/simulated/floor/plating, /area/maintenance/solar) "ftU" = ( @@ -39592,6 +39710,10 @@ dir = 4; id_tag = "admin_shuttle_dock_pump" }, +/obj/machinery/oxygen_pump{ + dir = 8; + pixel_x = -27 + }, /turf/simulated/floor/plating, /area/hallway/primary/fourthdeck/center) "fMy" = ( @@ -48505,6 +48627,16 @@ }, /turf/simulated/floor/tiled, /area/crew_quarters/gym) +"hdx" = ( +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/structure/catwalk, +/obj/random/junk, +/turf/simulated/floor/plating, +/area/maintenance/thirddeck/aftstarboard) "hdI" = ( /obj/structure/cable/green{ d1 = 4; @@ -50153,6 +50285,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, +/obj/machinery/oxygen_pump{ + pixel_y = -32 + }, /turf/simulated/floor/tiled/techfloor, /area/vacant/prototype/engine) "hrY" = ( @@ -56674,6 +56809,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 5 }, +/obj/random/trash, /turf/simulated/floor/plating, /area/maintenance/thirddeck/aftport) "isA" = ( @@ -59895,6 +60031,10 @@ dir = 4; id_tag = "sd_port_pump" }, +/obj/machinery/oxygen_pump{ + dir = 8; + pixel_x = -27 + }, /turf/simulated/floor/plating, /area/maintenance/seconddeck/foreport) "iQd" = ( @@ -60163,6 +60303,7 @@ dir = 1 }, /obj/structure/table/rack, +/obj/random/junk, /turf/simulated/floor/plating, /area/maintenance/thirddeck/starboard) "iRB" = ( @@ -64399,6 +64540,7 @@ /obj/floor_decal/techfloor/orange{ dir = 5 }, +/obj/random/trash, /turf/simulated/floor/tiled/techfloor, /area/maintenance/thirddeck/aftstarboard) "jAU" = ( @@ -69718,6 +69860,18 @@ }, /turf/simulated/floor/tiled/white, /area/rnd/xenobiology/level1) +"koi" = ( +/obj/structure/catwalk, +/obj/machinery/atmospherics/unary/vent_pump/high_volume/external_air{ + dir = 1; + id_tag = "nuke_shuttle_dock_airlock_pump" + }, +/obj/floor_decal/industrial/warning/half, +/obj/machinery/oxygen_pump{ + pixel_y = -32 + }, +/turf/simulated/floor/plating, +/area/crew_quarters/docking) "kok" = ( /obj/structure/railing/mapped, /obj/random/maintenance, @@ -71612,6 +71766,9 @@ /obj/floor_decal/techfloor{ dir = 4 }, +/obj/machinery/oxygen_pump{ + pixel_y = -32 + }, /turf/simulated/floor/tiled/techfloor/grid, /area/maintenance/thirddeck/forestarboard) "kBw" = ( @@ -74832,6 +74989,16 @@ }, /turf/simulated/floor/tiled/dark, /area/hallway/primary/bridgedeck/center) +"lax" = ( +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/structure/catwalk, +/obj/random/trash, +/turf/simulated/floor/plating, +/area/maintenance/thirddeck/port) "laz" = ( /obj/item/stool/padded, /obj/floor_decal/corner/yellow/half{ @@ -78343,6 +78510,7 @@ }, /obj/structure/table/rack, /obj/random/tech_supply, +/obj/random/junk, /turf/simulated/floor/tiled/techfloor, /area/maintenance/thirddeck/aftstarboard) "lAy" = ( @@ -79945,6 +80113,7 @@ /obj/machinery/alarm{ pixel_y = 24 }, +/obj/random/junk, /turf/simulated/floor/tiled/techfloor, /area/maintenance/thirddeck/aftstarboard) "lLL" = ( @@ -82554,6 +82723,9 @@ "mgL" = ( /obj/machinery/atmospherics/pipe/manifold/hidden, /obj/structure/catwalk, +/obj/machinery/oxygen_pump{ + pixel_y = -32 + }, /turf/simulated/floor/plating, /area/maintenance/firstdeck/aftport) "mgN" = ( @@ -90763,6 +90935,10 @@ /obj/floor_decal/industrial/warning/half{ dir = 4 }, +/obj/machinery/oxygen_pump{ + dir = 8; + pixel_x = -27 + }, /turf/simulated/floor/plating, /area/maintenance/firstdeck/centralstarboard) "nsb" = ( @@ -95616,6 +95792,12 @@ /obj/floor_decal/techfloor{ dir = 1 }, +/obj/machinery/airlock_sensor/airlock_exterior{ + id_tag = "engine_atmos_interior_sensor"; + master_tag = "engine_atmos"; + pixel_x = -25; + pixel_y = 24 + }, /turf/simulated/floor/tiled/techfloor, /area/engineering/engine_room) "ofR" = ( @@ -95638,6 +95820,9 @@ /obj/floor_decal/industrial/warning/cee{ dir = 8 }, +/obj/machinery/oxygen_pump{ + pixel_y = 32 + }, /turf/simulated/floor/plating, /area/maintenance/fourthdeck/aft) "ogA" = ( @@ -103014,6 +103199,18 @@ }, /turf/simulated/floor/tiled, /area/exploration_shuttle/seats_place) +"piu" = ( +/obj/structure/cable/green{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/structure/catwalk, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/random/junk, +/turf/simulated/floor/plating, +/area/maintenance/thirddeck/aftport) "piy" = ( /obj/machinery/mineral/unloading_machine, /obj/machinery/door/firedoor, @@ -105170,6 +105367,9 @@ /obj/floor_decal/industrial/warning/cee{ dir = 4 }, +/obj/machinery/oxygen_pump{ + pixel_y = -32 + }, /turf/simulated/floor/plating, /area/maintenance/bridgedeck/aft) "pxP" = ( @@ -105819,6 +106019,7 @@ icon_state = "4-8" }, /obj/floor_decal/techfloor/orange, +/obj/random/trash, /turf/simulated/floor/tiled/techfloor, /area/maintenance/thirddeck/aftstarboard) "pDv" = ( @@ -113848,6 +114049,7 @@ "qOy" = ( /obj/structure/table/rack, /obj/random/maintenance, +/obj/random/junk, /turf/simulated/floor/plating, /area/maintenance/thirddeck/aftport) "qOz" = ( @@ -118376,6 +118578,21 @@ /obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled, /area/hallway/primary/thirddeck/aft_stairwell) +"rwt" = ( +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/structure/catwalk, +/obj/machinery/airlock_sensor/airlock_exterior{ + id_tag = "engine_airlock_exterior_sensor"; + master_tag = "engine_airlock"; + pixel_x = 25; + pixel_y = 24 + }, +/turf/simulated/floor/plating, +/area/maintenance/thirddeck/aftstarboard) "rwx" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -128041,6 +128258,11 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/tiled/white, /area/crew_quarters/sleep/cryo/south) +"sOn" = ( +/obj/structure/catwalk, +/obj/random/trash, +/turf/simulated/floor/plating, +/area/maintenance/thirddeck/aftstarboard) "sOJ" = ( /obj/structure/table/glass, /obj/machinery/dnaforensics, @@ -128243,6 +128465,9 @@ /obj/floor_decal/industrial/warning/cee{ dir = 4 }, +/obj/machinery/oxygen_pump{ + pixel_y = 32 + }, /turf/simulated/floor/plating, /area/maintenance/fourthdeck/aft) "sPL" = ( @@ -129944,6 +130169,9 @@ req_access = list("ACCESS_EXTERNAL") }, /obj/floor_decal/industrial/warning/half, +/obj/machinery/oxygen_pump{ + pixel_y = -32 + }, /turf/simulated/floor/plating, /area/maintenance/solar/starboard) "tcn" = ( @@ -132022,6 +132250,7 @@ icon_state = "2-4" }, /obj/structure/catwalk, +/obj/random/trash, /turf/simulated/floor/plating, /area/maintenance/thirddeck/starboard) "tuF" = ( @@ -132274,6 +132503,9 @@ dir = 1; id_tag = "nuke_shuttle_dock_airlock_pump" }, +/obj/machinery/oxygen_pump{ + pixel_y = -32 + }, /turf/simulated/floor/plating, /area/crew_quarters/docking) "twH" = ( @@ -134922,6 +135154,10 @@ id_tag = "sd_starboard_pump" }, /obj/structure/catwalk, +/obj/machinery/oxygen_pump{ + dir = 8; + pixel_x = -27 + }, /turf/simulated/floor/plating, /area/maintenance/seconddeck/forestarboard) "tQH" = ( @@ -136478,6 +136714,11 @@ /obj/machinery/reagent_temperature, /turf/simulated/floor/tiled/white, /area/crew_quarters/galley) +"uck" = ( +/obj/structure/catwalk, +/obj/random/junk, +/turf/simulated/floor/plating, +/area/maintenance/thirddeck/starboard) "uco" = ( /obj/machinery/atmospherics/pipe/simple/hidden/fuel, /obj/floor_decal/industrial/hatch/yellow, @@ -138659,6 +138900,7 @@ /obj/structure/railing/mapped, /obj/structure/table/rack, /obj/random/accessory, +/obj/random/junk, /turf/simulated/floor/plating, /area/maintenance/thirddeck/starboard) "uuV" = ( @@ -156265,6 +156507,9 @@ /obj/floor_decal/industrial/warning/cee{ dir = 4 }, +/obj/machinery/oxygen_pump{ + pixel_y = 32 + }, /turf/simulated/floor/plating, /area/maintenance/bridgedeck/aft) "xcx" = ( @@ -157845,7 +158090,7 @@ }, /obj/machinery/atmospherics/unary/vent_pump/high_volume/airlock{ dir = 8; - id_tag = "sd_port_pump" + id_tag = "engine_airlock_pump" }, /obj/structure/catwalk, /obj/machinery/camera/network/engine{ @@ -161392,6 +161637,10 @@ dir = 4 }, /obj/structure/catwalk, +/obj/machinery/oxygen_pump{ + dir = 4; + pixel_x = 27 + }, /turf/simulated/floor/plating, /area/maintenance/thirddeck/port) "xPo" = ( @@ -173393,7 +173642,7 @@ qwe nLj fNt hHI -aDI +koi niv haq haq @@ -218622,7 +218871,7 @@ kZw sKa rJX mmo -pfo +bOB pvb oTo pAW @@ -222667,7 +222916,7 @@ jEc jEc jEc jEc -jEc +cWC jEc jEc iMO @@ -224285,7 +224534,7 @@ lRq lRq pvb pvb -pvb +uck vGl ogC fyg @@ -224480,7 +224729,7 @@ oTo nMk okX unx -unx +bik unx gyP unx @@ -225127,7 +225376,7 @@ fHq fHq fHq nvT -qNr +lax mOq weM weM @@ -225282,10 +225531,10 @@ hLq qwu cRn hHd -hLq +chG fJr oTo -ohN +bFw iIc fHq vif @@ -226698,7 +226947,7 @@ tOk dSX gjE gjE -ryk +dfR mGd nvT fHq @@ -226892,7 +227141,7 @@ sbr ttL mfZ yeX -rfa +sOn vdh vdh vdh @@ -227346,7 +227595,7 @@ daw daw daw lFN -fHq +eTZ fHq ppE taq @@ -227900,7 +228149,7 @@ idA tXe sbr ttL -mfZ +eKU rfa rfa vdh @@ -228511,7 +228760,7 @@ rfa rfa kEC xLV -wjg +bds vYV qME qME @@ -229146,7 +229395,7 @@ abM uOV uOV oCW -uOV +piu uOV cge uOV @@ -229333,7 +229582,7 @@ jYu mfP aTn aTn -aTn +hdx aTn aTn aTn @@ -229342,7 +229591,7 @@ aTn sNN aTn buZ -aTn +rwt aTn noY mHe @@ -229569,7 +229818,7 @@ vTs aoH aoH aoH -vem +aXJ ppE uZh doj