diff --git a/maps/tether/tether-01-surface1.dmm b/maps/tether/tether-01-surface1.dmm index 7b949157a4..210c4e5b23 100644 --- a/maps/tether/tether-01-surface1.dmm +++ b/maps/tether/tether-01-surface1.dmm @@ -73,37 +73,32 @@ }, /turf/simulated/floor/tiled/steel_dirty/virgo3b, /area/tether/surfacebase/mining_main/external) -"aao" = ( -/turf/simulated/wall, -/area/tether/surfacebase/mining_main/airlock) "aap" = ( /obj/structure/cable/green{ d1 = 1; d2 = 2; icon_state = "1-2" }, -/obj/machinery/door/airlock/glass_external{ - frequency = 1379; - icon_state = "door_locked"; - id_tag = "mining_airlock_outer"; - locked = 1 +/obj/structure/fans/tiny, +/obj/machinery/door/firedoor/glass, +/obj/machinery/door/airlock/glass_mining{ + name = "Mining Operations" }, /turf/simulated/floor/tiled/steel_grid, -/area/tether/surfacebase/mining_main/airlock) +/area/tether/surfacebase/mining_main/storage) "aaq" = ( -/obj/machinery/door/airlock/glass_external{ - frequency = 1379; - icon_state = "door_locked"; - id_tag = "mining_airlock_outer"; - locked = 1 - }, /obj/machinery/access_button/airlock_exterior{ master_tag = "mining_airlock"; pixel_x = 25; pixel_y = 8 }, +/obj/structure/fans/tiny, +/obj/machinery/door/firedoor/glass, +/obj/machinery/door/airlock/glass_mining{ + name = "Mining Operations" + }, /turf/simulated/floor/tiled/steel_grid, -/area/tether/surfacebase/mining_main/airlock) +/area/tether/surfacebase/mining_main/storage) "aar" = ( /turf/simulated/wall, /area/tether/surfacebase/mining_main/refinery) @@ -121,13 +116,6 @@ }, /turf/simulated/floor/tiled/steel_dirty/virgo3b, /area/tether/surfacebase/mining_main/refinery) -"aau" = ( -/obj/machinery/portable_atmospherics/powered/scrubber/huge/stationary{ - frequency = 1379; - scrub_id = "mining_airlock_scrubber" - }, -/turf/simulated/floor/tiled/techmaint, -/area/tether/surfacebase/mining_main/airlock) "aav" = ( /obj/effect/floor_decal/industrial/warning{ dir = 8 @@ -146,33 +134,15 @@ /obj/effect/floor_decal/steeldecal/steel_decals7{ dir = 5 }, -/obj/machinery/atmospherics/pipe/simple/hidden/cyan{ - dir = 10; - icon_state = "intact" - }, /obj/machinery/light_switch{ pixel_x = -25; pixel_y = 25 }, -/obj/structure/cable/green{ - d1 = 2; - d2 = 4; - icon_state = "2-4" +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 6 }, /turf/simulated/floor/tiled, -/area/tether/surfacebase/mining_main/airlock) -"aaw" = ( -/obj/structure/grille, -/obj/structure/railing{ - dir = 4 - }, -/obj/machinery/atmospherics/unary/vent_pump/high_volume{ - dir = 4; - frequency = 1379; - id_tag = "mining_airlock_pump" - }, -/turf/simulated/floor/tiled/techmaint, -/area/tether/surfacebase/mining_main/airlock) +/area/tether/surfacebase/mining_main/storage) "aax" = ( /obj/effect/floor_decal/steeldecal/steel_decals4{ dir = 9 @@ -189,16 +159,14 @@ /obj/effect/floor_decal/steeldecal/steel_decals7{ dir = 9 }, -/obj/machinery/power/apc{ - dir = 4; - name = "east bump"; - pixel_x = 28 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 8 }, -/obj/structure/cable/green{ - icon_state = "0-8" +/obj/machinery/light{ + dir = 4 }, /turf/simulated/floor/tiled, -/area/tether/surfacebase/mining_main/airlock) +/area/tether/surfacebase/mining_main/storage) "aay" = ( /obj/structure/plasticflaps/mining, /obj/machinery/conveyor{ @@ -230,11 +198,9 @@ /obj/effect/floor_decal/steeldecal/steel_decals7{ dir = 5 }, -/obj/machinery/atmospherics/pipe/manifold/hidden/cyan{ - dir = 4 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled, -/area/tether/surfacebase/mining_main/airlock) +/area/tether/surfacebase/mining_main/storage) "aaB" = ( /obj/effect/floor_decal/steeldecal/steel_decals7{ dir = 6 @@ -249,7 +215,7 @@ dir = 9 }, /turf/simulated/floor/tiled, -/area/tether/surfacebase/mining_main/airlock) +/area/tether/surfacebase/mining_main/storage) "aaC" = ( /obj/structure/grille, /obj/structure/window/reinforced/full, @@ -348,37 +314,13 @@ /obj/effect/floor_decal/steeldecal/steel_decals7{ dir = 5 }, -/obj/machinery/atmospherics/pipe/manifold/hidden/cyan{ - dir = 4 +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 6 }, /turf/simulated/floor/tiled, -/area/tether/surfacebase/mining_main/airlock) -"aaP" = ( -/obj/structure/grille, -/obj/structure/railing{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/cyan{ - dir = 5; - icon_state = "intact" - }, -/obj/machinery/atmospherics/unary/vent_pump/high_volume{ - dir = 4; - frequency = 1379; - id_tag = "mining_airlock_pump" - }, -/turf/simulated/floor/tiled/techmaint, -/area/tether/surfacebase/mining_main/airlock) +/area/tether/surfacebase/mining_main/storage) "aaQ" = ( -/obj/machinery/embedded_controller/radio/airlock/phoron{ - id_tag = "mining_airlock"; - pixel_x = 25 - }, -/obj/machinery/airlock_sensor/phoron{ - id_tag = "mining_airlock_sensor"; - pixel_x = 25; - pixel_y = 11 - }, /obj/effect/floor_decal/steeldecal/steel_decals4{ dir = 8 }, @@ -394,23 +336,18 @@ /obj/effect/floor_decal/steeldecal/steel_decals7{ dir = 9 }, +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 8 + }, +/obj/machinery/light{ + dir = 4 + }, /turf/simulated/floor/tiled, -/area/tether/surfacebase/mining_main/airlock) +/area/tether/surfacebase/mining_main/storage) "aaR" = ( /obj/machinery/mineral/unloading_machine, /turf/simulated/floor/tiled/techfloor, /area/tether/surfacebase/mining_main/refinery) -"aaS" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/cyan{ - dir = 4 - }, -/obj/machinery/door/airlock/maintenance/common, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/door/firedoor/glass, -/turf/simulated/floor/plating, -/area/maintenance/lower/mining_eva) "aaT" = ( /obj/structure/cable{ d1 = 4; @@ -462,25 +399,23 @@ icon_state = "1-2" }, /obj/machinery/door/firedoor/glass, -/obj/machinery/door/airlock/glass_external{ - frequency = 1379; - icon_state = "door_locked"; - id_tag = "mining_airlock_inner"; - locked = 1 - }, /obj/machinery/atmospherics/pipe/simple/hidden/cyan, +/obj/structure/fans/tiny, +/obj/machinery/door/airlock/glass_mining{ + name = "Mining Operations" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/tiled/steel_grid, -/area/tether/surfacebase/mining_main/airlock) +/area/tether/surfacebase/mining_main/storage) "aaZ" = ( /obj/machinery/door/firedoor/glass, -/obj/machinery/door/airlock/glass_external{ - frequency = 1379; - icon_state = "door_locked"; - id_tag = "mining_airlock_inner"; - locked = 1 +/obj/structure/fans/tiny, +/obj/machinery/door/airlock/glass_mining{ + name = "Mining Operations" }, /turf/simulated/floor/tiled/steel_grid, -/area/tether/surfacebase/mining_main/airlock) +/area/tether/surfacebase/mining_main/storage) "aba" = ( /obj/machinery/conveyor{ dir = 6; @@ -488,13 +423,6 @@ }, /turf/simulated/floor/plating, /area/tether/surfacebase/mining_main/refinery) -"abb" = ( -/obj/machinery/disposal, -/obj/structure/disposalpipe/trunk{ - dir = 4 - }, -/turf/simulated/floor/tiled, -/area/tether/surfacebase/mining_main/refinery) "abc" = ( /obj/machinery/camera/network/cargo, /obj/structure/disposalpipe/segment{ @@ -578,25 +506,6 @@ /obj/structure/closet/crate, /turf/simulated/floor/plating, /area/maintenance/lower/trash_pit) -"abm" = ( -/obj/effect/floor_decal/techfloor{ - dir = 1 - }, -/obj/effect/floor_decal/techfloor{ - dir = 5 - }, -/obj/structure/railing{ - dir = 8 - }, -/obj/effect/decal/cleanable/dirt, -/obj/effect/floor_decal/rust, -/obj/structure/closet, -/obj/random/maintenance/cargo, -/obj/random/maintenance/cargo, -/obj/random/maintenance/clean, -/obj/random/tool, -/turf/simulated/floor/plating, -/area/maintenance/lower/trash_pit) "abn" = ( /turf/simulated/wall, /area/tether/surfacebase/mining_main/storage) @@ -687,10 +596,10 @@ /obj/effect/floor_decal/steeldecal/steel_decals7{ dir = 6 }, -/obj/machinery/atmospherics/pipe/simple/hidden/cyan, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 10 +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/tiled, /area/tether/surfacebase/mining_main/storage) "abw" = ( @@ -999,17 +908,6 @@ }, /turf/simulated/floor/tiled, /area/tether/surfacebase/mining_main/storage) -"abW" = ( -/obj/effect/floor_decal/techfloor{ - dir = 4 - }, -/obj/structure/railing{ - dir = 8 - }, -/obj/effect/decal/cleanable/dirt, -/obj/random/junk, -/turf/simulated/floor/plating, -/area/maintenance/lower/trash_pit) "abX" = ( /obj/structure/catwalk, /obj/effect/decal/cleanable/dirt, @@ -1164,11 +1062,11 @@ /obj/effect/floor_decal/steeldecal/steel_decals7{ dir = 6 }, -/obj/machinery/atmospherics/pipe/simple/hidden/cyan, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/sign/nosmoking_2{ pixel_x = -32 }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/tiled, /area/tether/surfacebase/mining_main/storage) "ack" = ( @@ -1530,29 +1428,6 @@ }, /turf/simulated/floor/tiled/steel_grid, /area/tether/surfacebase/mining_main/eva) -"acQ" = ( -/obj/machinery/atmospherics/pipe/tank/air{ - dir = 4 - }, -/turf/simulated/floor/plating, -/area/maintenance/lower/mining_eva) -"acR" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/cyan{ - dir = 4 - }, -/obj/effect/floor_decal/industrial/warning{ - dir = 8 - }, -/turf/simulated/floor/plating, -/area/maintenance/lower/mining_eva) -"acS" = ( -/obj/effect/floor_decal/rust, -/obj/effect/floor_decal/industrial/outline/blue, -/obj/machinery/atmospherics/binary/passive_gate/on{ - dir = 1 - }, -/turf/simulated/floor/plating, -/area/maintenance/lower/mining_eva) "acT" = ( /obj/structure/cable/green{ d1 = 4; @@ -1621,11 +1496,11 @@ /obj/effect/floor_decal/steeldecal/steel_decals7{ dir = 5 }, -/obj/machinery/atmospherics/pipe/simple/hidden/cyan, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/vending/wallmed_airlock{ pixel_x = -32 }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/tiled, /area/tether/surfacebase/mining_main/storage) "acY" = ( @@ -1835,30 +1710,6 @@ }, /turf/simulated/floor/tiled, /area/hallway/lower/first_west) -"adl" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/cyan{ - dir = 10; - icon_state = "intact" - }, -/obj/machinery/floodlight, -/turf/simulated/floor/plating, -/area/maintenance/lower/mining_eva) -"adm" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/cyan{ - dir = 6; - icon_state = "intact" - }, -/obj/effect/decal/cleanable/dirt, -/obj/machinery/alarm{ - pixel_y = 22; - target_temperature = 293.15 - }, -/obj/machinery/meter, -/obj/effect/floor_decal/industrial/warning/corner{ - dir = 8 - }, -/turf/simulated/floor/plating, -/area/maintenance/lower/mining_eva) "adn" = ( /obj/effect/floor_decal/industrial/warning{ icon_state = "warning"; @@ -1870,10 +1721,6 @@ }, /turf/simulated/floor/tiled, /area/rnd/xenobiology/xenoflora_storage) -"ado" = ( -/obj/machinery/atmospherics/pipe/simple/visible/universal, -/turf/simulated/floor/plating, -/area/maintenance/lower/mining_eva) "adp" = ( /obj/effect/floor_decal/borderfloor{ dir = 10 @@ -1891,13 +1738,12 @@ d2 = 4; icon_state = "2-4" }, -/obj/machinery/atmospherics/pipe/simple/hidden/cyan, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6 - }, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 8 }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/tether/surfacebase/mining_main/storage) "adq" = ( @@ -2158,32 +2004,6 @@ "adK" = ( /turf/simulated/wall, /area/tether/surfacebase/outside/outside1) -"adL" = ( -/obj/machinery/atmospherics/pipe/tank/air{ - dir = 4 - }, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/plating, -/area/maintenance/lower/mining_eva) -"adM" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/cyan, -/obj/effect/floor_decal/rust, -/obj/effect/floor_decal/industrial/warning{ - dir = 8 - }, -/obj/machinery/light/small, -/turf/simulated/floor/plating, -/area/maintenance/lower/mining_eva) -"adN" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/cyan{ - dir = 4 - }, -/obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 5 - }, -/turf/simulated/floor/plating, -/area/maintenance/lower/mining_eva) "adO" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -2801,7 +2621,6 @@ name = "Mining Maintenance Access"; req_one_access = list(48) }, -/obj/machinery/atmospherics/pipe/simple/hidden/cyan, /obj/structure/catwalk, /turf/simulated/floor/tiled/techfloor, /area/tether/surfacebase/mining_main/storage) @@ -5220,13 +5039,7 @@ d2 = 2; icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/hidden/cyan{ - dir = 9; - icon_state = "intact" - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 4 - }, +/obj/machinery/atmospherics/pipe/simple/visible/supply, /turf/simulated/floor/tiled/techfloor, /area/maintenance/lower/mining_eva) "aiU" = ( @@ -27149,16 +26962,6 @@ "gPz" = ( /turf/simulated/floor/tiled, /area/tether/surfacebase/public_garden_one) -"gRx" = ( -/obj/machinery/portable_atmospherics/powered/scrubber/huge/stationary{ - frequency = 1379; - scrub_id = "mining_airlock_scrubber" - }, -/obj/structure/sign/nosmoking_2{ - pixel_x = -32 - }, -/turf/simulated/floor/tiled/techmaint, -/area/tether/surfacebase/mining_main/airlock) "gSq" = ( /obj/machinery/door/firedoor/glass, /obj/machinery/door/airlock{ @@ -27550,16 +27353,6 @@ /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plating, /area/maintenance/lower/atmos) -"iAg" = ( -/obj/machinery/portable_atmospherics/powered/scrubber/huge/stationary{ - frequency = 1379; - scrub_id = "mining_airlock_scrubber" - }, -/obj/structure/sign/fire{ - pixel_x = -32 - }, -/turf/simulated/floor/tiled/techmaint, -/area/tether/surfacebase/mining_main/airlock) "iDf" = ( /obj/machinery/atmospherics/pipe/simple/visible/purple{ icon_state = "intact"; @@ -29347,6 +29140,17 @@ }, /turf/simulated/floor/plating, /area/vacant/vacant_bar) +"nVZ" = ( +/obj/effect/floor_decal/techfloor{ + dir = 4 + }, +/obj/structure/railing{ + dir = 8 + }, +/obj/effect/decal/cleanable/dirt, +/obj/random/junk, +/turf/simulated/floor/plating, +/area/maintenance/lower/trash_pit) "nZd" = ( /obj/machinery/atmospherics/pipe/simple/visible/yellow{ dir = 9 @@ -31293,6 +31097,25 @@ }, /turf/simulated/floor/tiled, /area/engineering/atmos) +"uPt" = ( +/obj/effect/floor_decal/techfloor{ + dir = 1 + }, +/obj/effect/floor_decal/techfloor{ + dir = 5 + }, +/obj/structure/railing{ + dir = 8 + }, +/obj/effect/decal/cleanable/dirt, +/obj/effect/floor_decal/rust, +/obj/structure/closet, +/obj/random/maintenance/cargo, +/obj/random/maintenance/cargo, +/obj/random/maintenance/clean, +/obj/random/tool, +/turf/simulated/floor/plating, +/area/maintenance/lower/trash_pit) "uSZ" = ( /obj/machinery/atmospherics/pipe/simple/visible/purple, /obj/structure/cable/cyan{ @@ -31666,6 +31489,13 @@ /obj/effect/floor_decal/corner/yellow/bordercorner, /turf/simulated/floor/tiled, /area/engineering/atmos) +"waB" = ( +/obj/machinery/disposal, +/obj/structure/disposalpipe/trunk{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/mining_main/refinery) "weg" = ( /obj/structure/railing{ dir = 8 @@ -42311,11 +42141,11 @@ aah aah aah aah -abT -abT -abT -abT -abT +aah +aah +aah +aah +aah aex aex aex @@ -42452,12 +42282,12 @@ aah aah aah aah -abT -abT -acQ -acQ -adL -abT +aah +aah +aah +aah +aah +aah aex alw amI @@ -42586,20 +42416,20 @@ aad aad ajI aah -aao -aao -aao -aao -aao -aao aah aah -abT -adm -acR -acR -adM -abT +aah +aah +aah +aah +aah +aah +aah +aah +aah +aah +aah +aah aex alA anb @@ -42728,20 +42558,20 @@ aae aae oPX aaf -aao -aau -gRx -iAg -aau -aao +aah +aah +aah +aah +aah abn abn -abT -adl -acS -ado -adN -abT +abn +aah +aah +aah +aah +aah +aah aex alx amQ @@ -42870,19 +42700,19 @@ aae aae kfl aaj -aao -aaw -aaw -aaw -aaP -aao +abn +abn +abn +abn +abn +abn abo abn abn abn abn abT -aaS +abT abT akz alH @@ -45005,7 +44835,7 @@ aah aar aaI aaC -abb +waB abh abM acg @@ -46851,9 +46681,9 @@ aah aah aah aaU -abm +uPt ace -abW +nVZ acq aen abH