diff --git a/maps/sierra/z1-z5_sierra.dmm b/maps/sierra/z1-z5_sierra.dmm index cb57223bc6bea..5714921e7f81f 100644 --- a/maps/sierra/z1-z5_sierra.dmm +++ b/maps/sierra/z1-z5_sierra.dmm @@ -281,6 +281,11 @@ /obj/item/folder/nt, /turf/simulated/floor/carpet/blue, /area/crew_quarters/heads/office/iaa) +"abX" = ( +/obj/structure/catwalk, +/obj/random/trash, +/turf/simulated/floor/plating, +/area/maintenance/thirddeck/aftstarboard) "ace" = ( /obj/structure/cable/green{ d1 = 1; @@ -679,7 +684,10 @@ 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_interior_door = "engine_airlock_inner"; + tag_exterior_door = "engine_airlock_outer"; + tag_airpump = "engine_atmos_airlock_vent" }, /obj/structure/catwalk, /obj/structure/hygiene/drain, @@ -708,6 +716,21 @@ /obj/structure/bed/chair/office/dark, /turf/simulated/floor/plating, /area/maintenance/seconddeck/forestarboard) +"afj" = ( +/obj/floor_decal/borderfloorblack{ + dir = 8 + }, +/obj/floor_decal/borderfloorblack{ + dir = 4 + }, +/obj/floor_decal/industrial/warning/half{ + dir = 4 + }, +/obj/machinery/shield_diffuser, +/turf/simulated/floor/reinforced{ + map_airless = 1 + }, +/area/space) "afk" = ( /obj/structure/table/marble, /obj/item/reagent_containers/food/condiment/small/peppermill{ @@ -2603,7 +2626,8 @@ /obj/machinery/power/emitter{ desc = "A massive, heavy-duty industrial laser. This design is a fixed installation, capable of shooting in only one direction. It has a label on it reading 'SRV Petrov Analysis Lab.'"; name = "emitter (Petrov)"; - req_lock_access = list("ACCESS_TORCH_PETROV_ANALYSIS") + req_lock_access = list("ACCESS_TORCH_PETROV_ANALYSIS"); + anchored = 1 }, /obj/machinery/light{ dir = 8 @@ -3653,6 +3677,17 @@ /obj/structure/railing/mapped, /turf/space, /area/space) +"aBi" = ( +/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) "aBk" = ( /obj/machinery/atmospherics/pipe/simple/hidden, /obj/machinery/embedded_controller/radio/airlock/docking_port{ @@ -8774,11 +8809,22 @@ 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_exterior_door = "engine_airlock_outer"; + tag_chamber_sensor = "engine_airlock_sensor"; + tag_interior_door = "engine_airlock_inner"; + tag_interior_sensor = "engine_airlock_sensor_in"; + tag_exterior_sensor = "engine_airlock_sensor_out"; + tag_airpump = "engine_airlock_pump" }, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 1 }, +/obj/machinery/airlock_sensor/airlock_interior{ + id_tag = "engine_airlock_sensor_in"; + pixel_y = 26; + pixel_x = 11 + }, /turf/simulated/floor/tiled/techfloor, /area/engineering/engine_room) "bpU" = ( @@ -9416,6 +9462,7 @@ name = "Third Deck Port Airlock Access"; id_tag = "td_port_outer" }, +/obj/machinery/shield_diffuser, /turf/simulated/floor/plating, /area/maintenance/thirddeck/port) "buf" = ( @@ -9549,6 +9596,11 @@ dir = 8; pixel_x = 14 }, +/obj/machinery/airlock_sensor/airlock_exterior{ + id_tag = "engine_airlock_sensor_out"; + pixel_y = 8; + pixel_x = 25 + }, /turf/simulated/floor/plating, /area/maintenance/thirddeck/aftstarboard) "bva" = ( @@ -17021,6 +17073,11 @@ /obj/machinery/rotating_alarm/supermatter{ pixel_y = 14 }, +/obj/machinery/airlock_sensor/airlock_interior{ + id_tag = "engine_atmos_airlock_sensor_in"; + pixel_y = 32; + pixel_x = -9 + }, /turf/simulated/floor/plating, /area/engineering/engine_room) "cBq" = ( @@ -17216,7 +17273,10 @@ 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_interior_door = "engine_airlock_inner"; + tag_exterior_door = "engine_airlock_outer"; + tag_airpump = "engine_atmos_airlock_vent" }, /obj/floor_decal/techfloor{ dir = 1 @@ -18387,9 +18447,15 @@ /obj/machinery/embedded_controller/radio/airlock/advanced_airlock_controller{ id_tag = "engine_airlock"; name = "Engine Room Airlock Controlls"; - pixel_x = 7; pixel_y = 24; - req_access = list("ACCESS_ENGINE_EQUIP") + req_access = list("ACCESS_ENGINE_EQUIP"); + tag_exterior_door = "engine_airlock_outer"; + tag_chamber_sensor = "engine_airlock_sensor"; + tag_interior_door = "engine_airlock_inner"; + tag_interior_sensor = "engine_airlock_sensor_in"; + tag_exterior_sensor = "engine_airlock_sensor_out"; + tag_airpump = "engine_airlock_pump"; + pixel_x = 7 }, /obj/structure/extinguisher_cabinet{ pixel_x = -7; @@ -19015,7 +19081,8 @@ /area/medical/ward) "cOX" = ( /obj/machinery/atmospherics/unary/vent_pump/on{ - dir = 4 + dir = 4; + id_tag = "engine_atmos_airlock_vent" }, /obj/floor_decal/industrial/warning{ dir = 10 @@ -19707,6 +19774,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 9 }, +/obj/random/junk, /turf/simulated/floor/tiled/techfloor, /area/maintenance/thirddeck/aftstarboard) "cUd" = ( @@ -20946,6 +21014,7 @@ d2 = 8; icon_state = "4-8" }, +/obj/random/junk, /turf/simulated/floor/plating, /area/maintenance/thirddeck/starboard) "dch" = ( @@ -23561,6 +23630,16 @@ /obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled/steel_grid, /area/security/sierra/hallway/port) +"dwA" = ( +/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/aftstarboard) "dwC" = ( /obj/structure/cable/green{ d1 = 4; @@ -25217,7 +25296,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_exterior_door = "engine_airlock_outer"; + tag_chamber_sensor = "engine_airlock_sensor"; + tag_interior_door = "engine_airlock_inner"; + tag_interior_sensor = "engine_airlock_sensor_in"; + tag_exterior_sensor = "engine_airlock_sensor_out"; + tag_airpump = "engine_airlock_pump" }, /obj/machinery/airlock_sensor{ id_tag = "engine_airlock_sensor"; @@ -28279,13 +28364,20 @@ /obj/machinery/embedded_controller/radio/airlock/advanced_airlock_controller{ id_tag = "engine_atmos_airlock"; name = "Engine Room Airlock Controlls"; - pixel_y = -24; + pixel_y = -26; req_access = list("ACCESS_ENGINE_EQUIP"); + tag_interior_door = "engine_airlock_inner"; + tag_exterior_door = "engine_airlock_outer"; + tag_airpump = "engine_atmos_airlock_vent"; dir = 1 }, /obj/floor_decal/techfloor{ dir = 6 }, +/obj/machinery/airlock_sensor/airlock_exterior{ + id_tag = "engine_atmos_airlock_sensor_out"; + pixel_y = -32 + }, /turf/simulated/floor/tiled/techfloor/grid, /area/engineering/atmos) "eeE" = ( @@ -28492,6 +28584,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" = ( @@ -30315,10 +30411,10 @@ /obj/structure/disposalpipe/trunk{ dir = 2 }, -/obj/machinery/shield_diffuser, /obj/structure/disposaloutlet{ dir = 1 }, +/obj/machinery/shield_diffuser, /obj/floor_decal/borderfloorblack{ dir = 8 }, @@ -39151,6 +39247,7 @@ dir = 4 }, /obj/structure/table/rack, +/obj/random/junk, /turf/simulated/floor/plating, /area/maintenance/thirddeck/starboard) "fJD" = ( @@ -39580,6 +39677,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" = ( @@ -44485,7 +44586,7 @@ "gzO" = ( /obj/machinery/door/airlock/hatch{ frequency = 1379; - id_tag = "engine_airlock_inner"; + id_tag = "engine_atmos_airlock_inner"; name = "Engine Airlock Interior" }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -44675,6 +44776,12 @@ /obj/item/stack/material/rods, /turf/simulated/floor/plating, /area/maintenance/firstdeck/aftport) +"gBv" = ( +/obj/structure/catwalk, +/obj/decal/cleanable/dirt, +/obj/random/trash, +/turf/simulated/floor/plating, +/area/maintenance/thirddeck/aftport) "gBF" = ( /obj/structure/railing/mapped, /obj/structure/cart{ @@ -50186,6 +50293,19 @@ /obj/floor_decal/industrial/outline/yellow, /turf/simulated/floor/tiled/monotile, /area/exploration_shuttle/cargo_r) +"hsd" = ( +/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{ + dir = 1; + pixel_y = -32 + }, +/turf/simulated/floor/plating, +/area/crew_quarters/docking) "hse" = ( /obj/floor_decal/borderfloor{ dir = 8 @@ -51422,7 +51542,7 @@ "hBq" = ( /obj/machinery/door/airlock/hatch{ frequency = 1379; - id_tag = "engine_airlock_outer"; + id_tag = "engine_atmos_airlock_outer"; name = "Engine Airlock Exterior" }, /obj/machinery/door/firedoor, @@ -52197,6 +52317,7 @@ dir = 1 }, /obj/decal/cleanable/dirt, +/obj/random/trash, /turf/simulated/floor/plating, /area/maintenance/compactor) "hHm" = ( @@ -52714,6 +52835,7 @@ /obj/floor_decal/techfloor/orange{ dir = 9 }, +/obj/decal/cleanable/dirt, /turf/simulated/floor/tiled/techfloor, /area/maintenance/thirddeck/aftstarboard) "hLf" = ( @@ -55190,6 +55312,11 @@ }, /turf/simulated/floor/reinforced, /area/maintenance/fourthdeck/forestarboard) +"igD" = ( +/obj/structure/railing/mapped, +/obj/random/trash, +/turf/simulated/floor/plating, +/area/maintenance/thirddeck/starboard) "igE" = ( /obj/machinery/portable_atmospherics/powered/scrubber, /turf/simulated/floor/plating, @@ -55677,6 +55804,22 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/tiled/white, /area/rnd/office) +"ijU" = ( +/obj/structure/cable{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/structure/catwalk, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/random/obstruction, +/turf/simulated/floor/plating, +/area/maintenance/thirddeck/port) "ika" = ( /obj/machinery/portable_atmospherics/powered/pump/filled, /obj/machinery/atmospherics/portables_connector, @@ -57128,6 +57271,11 @@ /obj/floor_decal/corner/lime/border, /turf/simulated/floor/tiled, /area/hallway/primary/fourthdeck/center) +"iwb" = ( +/obj/structure/catwalk, +/obj/random/junk, +/turf/simulated/open, +/area/quartermaster/hangar/upper) "iwf" = ( /obj/floor_decal/borderfloor, /obj/floor_decal/corner/b_green/border, @@ -58515,6 +58663,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 5 }, +/obj/random/obstruction, /turf/simulated/floor/plating, /area/maintenance/thirddeck/port) "iGY" = ( @@ -59361,6 +59510,7 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/random/trash, /turf/simulated/floor/plating, /area/maintenance/thirddeck/starboard) "iMS" = ( @@ -74381,6 +74531,12 @@ }, /turf/simulated/floor/plating, /area/maintenance/firstdeck/forestarboard) +"kXm" = ( +/obj/structure/disposalpipe/segment, +/obj/structure/catwalk, +/obj/random/junk, +/turf/simulated/floor/plating, +/area/maintenance/thirddeck/starboard) "kXu" = ( /obj/structure/railing/mapped{ dir = 1 @@ -83373,6 +83529,11 @@ /obj/machinery/atmospherics/pipe/simple/visible/yellow, /turf/simulated/floor/reinforced, /area/thruster/d1port) +"moA" = ( +/obj/structure/railing/mapped, +/obj/decal/cleanable/dirt, +/turf/simulated/floor/plating, +/area/maintenance/thirddeck/starboard) "moM" = ( /obj/floor_decal/steeldecal/steel_decals4{ dir = 4 @@ -89851,6 +90012,18 @@ /obj/floor_decal/industrial/hatch/yellow, /turf/simulated/floor/tiled/techfloor, /area/security/sierra/armory) +"nma" = ( +/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/aftstarboard) "nmb" = ( /obj/floor_decal/borderfloor, /obj/floor_decal/corner/lime/border, @@ -91466,6 +91639,16 @@ }, /turf/simulated/floor/tiled/dark/monotile, /area/crew_quarters/galley) +"nxG" = ( +/obj/structure/cable{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/structure/catwalk, +/obj/random/obstruction, +/turf/simulated/floor/plating, +/area/maintenance/thirddeck/aftstarboard) "nxI" = ( /turf/simulated/floor/reinforced{ map_airless = 1 @@ -91635,6 +91818,16 @@ }, /turf/simulated/floor/bluegrid, /area/engineering/bluespace/chamber) +"nyU" = ( +/obj/structure/cable{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/structure/catwalk, +/obj/random/trash, +/turf/simulated/floor/plating, +/area/maintenance/thirddeck/starboard) "nyY" = ( /obj/structure/cable{ d1 = 4; @@ -94851,6 +95044,18 @@ }, /turf/simulated/floor/tiled/white, /area/hallway/infirmary) +"obl" = ( +/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/trash, +/turf/simulated/floor/plating, +/area/maintenance/thirddeck/aftstarboard) "obm" = ( /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 1 @@ -95571,6 +95776,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" = ( @@ -99831,6 +100039,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 5 }, +/obj/random/trash, /turf/simulated/floor/plating, /area/maintenance/thirddeck/aftport) "oMx" = ( @@ -111512,6 +111721,7 @@ /obj/floor_decal/industrial/warning{ dir = 1 }, +/obj/machinery/shield_diffuser, /turf/simulated/floor/plating, /area/space) "qwS" = ( @@ -128186,6 +128396,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" = ( @@ -130514,6 +130727,18 @@ "thW" = ( /turf/simulated/wall/r_wall/prepainted, /area/rnd/xenobiology/level1) +"thZ" = ( +/obj/structure/closet/radiation, +/obj/item/clothing/glasses/meson, +/obj/item/clothing/glasses/meson, +/obj/machinery/airlock_sensor{ + pixel_y = -16; + pixel_x = 24; + id_tag = "engine_atmos_airlock_chamber"; + master_tag = "engine_atmos_airlock" + }, +/turf/simulated/floor/tiled/techfloor, +/area/engineering/engine_room) "tih" = ( /obj/machinery/atmospherics/portables_connector{ dir = 1 @@ -132231,6 +132456,10 @@ dir = 1; id_tag = "nuke_shuttle_dock_airlock_pump" }, +/obj/machinery/oxygen_pump{ + dir = 1; + pixel_y = -32 + }, /turf/simulated/floor/plating, /area/crew_quarters/docking) "twH" = ( @@ -134769,6 +134998,7 @@ dir = 1 }, /obj/floor_decal/industrial/warning/full, +/obj/decal/cleanable/dirt, /turf/simulated/floor/tiled/techfloor/grid, /area/maintenance/thirddeck/aftstarboard) "tQf" = ( @@ -139245,6 +139475,7 @@ dir = 1 }, /obj/floor_decal/industrial/warning/full, +/obj/decal/cleanable/dirt, /turf/simulated/floor/tiled/techfloor/grid, /area/maintenance/thirddeck/aftstarboard) "uzY" = ( @@ -157793,7 +158024,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{ @@ -160360,6 +160591,10 @@ }, /turf/simulated/floor/wood/walnut, /area/vacant/bar) +"xIP" = ( +/obj/random/trash, +/turf/simulated/floor/plating, +/area/maintenance/compactor) "xIQ" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -160849,6 +161084,7 @@ /obj/floor_decal/techfloor/orange{ dir = 1 }, +/obj/decal/cleanable/dirt, /turf/simulated/floor/tiled/techfloor, /area/maintenance/thirddeck/aftstarboard) "xMc" = ( @@ -161236,6 +161472,7 @@ "xOH" = ( /obj/structure/railing/mapped, /obj/structure/table/rack, +/obj/random/junk, /turf/simulated/floor/plating, /area/maintenance/thirddeck/starboard) "xOK" = ( @@ -161676,6 +161913,13 @@ }, /turf/simulated/floor/tiled/steel_grid, /area/engineering/engineering_monitoring) +"xRW" = ( +/obj/structure/catwalk, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/random/trash, +/turf/simulated/floor/plating, +/area/maintenance/thirddeck/starboard) "xSc" = ( /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 1 @@ -173338,7 +173582,7 @@ qwe nLj fNt hHI -aDI +hsd niv haq haq @@ -220587,7 +220831,7 @@ bRV aAw upN oTo -qpN +aBi nFj jry eTK @@ -220787,7 +221031,7 @@ xMk lPg bRV ebh -fxm +moA oTo xsQ rPv @@ -221595,7 +221839,7 @@ yba lPg bRV mgK -fxm +igD oTo qpN rPv @@ -221797,7 +222041,7 @@ yba lPg bRV eff -fxm +moA oTo qpN rPv @@ -222406,7 +222650,7 @@ pTS swN icG nyZ -kqE +kXm kqE kqE kqE @@ -224426,7 +224670,7 @@ nMk okX unx unx -unx +xRW gyP unx okX @@ -224871,7 +225115,7 @@ nvT nvT nvT qNr -mOq +ijU weM suO lAU @@ -225070,7 +225314,7 @@ fHq fHq fHq fHq -fHq +iwb nvT qNr mOq @@ -225229,7 +225473,7 @@ cRn hHd hLq fJr -oTo +nyU ohN iIc fHq @@ -225827,7 +226071,7 @@ egk opM vUs myc -wke +xIP opM opM opM @@ -226643,7 +226887,7 @@ tOk dSX gjE gjE -ryk +nxG mGd nvT fHq @@ -227048,7 +227292,7 @@ jdg vdh vdh ryk -mGd +dwA nvT fHq whO @@ -227443,7 +227687,7 @@ sbr ttL xcq rfa -rfa +abX vdh oPi uli @@ -228504,7 +228748,7 @@ pKd pKd eIY fHq -fHq +iwb ppE ppE ppE @@ -229074,7 +229318,7 @@ vGI vGI vGI pIA -vGI +obl vGI vGI vGI @@ -229086,7 +229330,7 @@ vGI vGI vGI vGI -vGI +nma abM uOV uOV @@ -229308,7 +229552,7 @@ hGN uco egb khA -vTs +gBv aoH aoH aoH @@ -232310,7 +232554,7 @@ aIp jBX eep cfi -sBO +thZ sBO cfi cCx @@ -265618,7 +265862,7 @@ rtT rtT rtT rtT -pZz +afj esF rqg sBz @@ -299614,7 +299858,7 @@ gOA pZz pZz pZz -pZz +afj rtT rtT rtT