From 8ae4f385f9957ff287e48e7f3aceee00b83ec14b Mon Sep 17 00:00:00 2001 From: Seryn Date: Fri, 25 Aug 2023 13:00:48 -0700 Subject: [PATCH 01/11] Tweak --- _maps/map_files/Atlas/atlas.dmm | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/_maps/map_files/Atlas/atlas.dmm b/_maps/map_files/Atlas/atlas.dmm index 913204384ff..68077aebe71 100644 --- a/_maps/map_files/Atlas/atlas.dmm +++ b/_maps/map_files/Atlas/atlas.dmm @@ -1927,7 +1927,9 @@ /turf/open/floor/plating, /area/maintenance/department/engine/atmos) "gn" = ( -/obj/machinery/atmospherics/components/trinary/filter/atmos/co2, +/obj/machinery/atmospherics/components/trinary/filter/atmos/co2{ + dir = 8 + }, /turf/open/floor/plating, /area/engine/atmos) "go" = ( @@ -2392,6 +2394,7 @@ /obj/machinery/light{ dir = 8 }, +/obj/machinery/atmospherics/pipe/simple/green/visible, /turf/open/floor/plating, /area/engine/atmos) "hI" = ( @@ -8562,7 +8565,9 @@ }, /area/nsv/hanger/mining) "BG" = ( -/obj/machinery/atmospherics/components/trinary/filter/atmos/n2o, +/obj/machinery/atmospherics/components/trinary/filter/atmos/n2o{ + dir = 4 + }, /turf/open/floor/plating, /area/engine/atmos) "BH" = ( From 614ba979a52161714929682ca7c67ca7a7632202 Mon Sep 17 00:00:00 2001 From: Seryn Date: Sun, 3 Sep 2023 12:02:32 -0700 Subject: [PATCH 02/11] Added a plasma canister to Atmos --- _maps/map_files/Atlas/atlas.dmm | 1 + 1 file changed, 1 insertion(+) diff --git a/_maps/map_files/Atlas/atlas.dmm b/_maps/map_files/Atlas/atlas.dmm index 68077aebe71..89c0bcbc977 100644 --- a/_maps/map_files/Atlas/atlas.dmm +++ b/_maps/map_files/Atlas/atlas.dmm @@ -9542,6 +9542,7 @@ /obj/machinery/atmospherics/pipe/simple/green/visible{ dir = 6 }, +/obj/machinery/portable_atmospherics/canister/toxins, /turf/open/floor/plating, /area/engine/atmos) "FE" = ( From 2e1c4053809c3c83ce6e16258beff52359682d8f Mon Sep 17 00:00:00 2001 From: Seryn Date: Sun, 3 Sep 2023 14:40:45 -0700 Subject: [PATCH 03/11] Adds Core Lawset board to AI Upload --- _maps/map_files/Atlas/atlas2.dmm | 1 + 1 file changed, 1 insertion(+) diff --git a/_maps/map_files/Atlas/atlas2.dmm b/_maps/map_files/Atlas/atlas2.dmm index 32d7538cf04..300f355ad9b 100644 --- a/_maps/map_files/Atlas/atlas2.dmm +++ b/_maps/map_files/Atlas/atlas2.dmm @@ -2028,6 +2028,7 @@ c_tag = "AI Upload"; dir = 10 }, +/obj/item/aiModule/core/full/custom, /turf/open/floor/circuit, /area/ai_monitored/turret_protected/ai_upload) "jb" = ( From 3f9b7e4a728676053ba161ca609ae4dc19290c30 Mon Sep 17 00:00:00 2001 From: Seryn Date: Tue, 12 Sep 2023 20:20:15 -0700 Subject: [PATCH 04/11] Adds Atlas Mining Ready-Room --- _maps/map_files/Atlas/atlas.dmm | 545 +++++++++++++++++++++----------- 1 file changed, 362 insertions(+), 183 deletions(-) diff --git a/_maps/map_files/Atlas/atlas.dmm b/_maps/map_files/Atlas/atlas.dmm index 89c0bcbc977..cd4cf84a349 100644 --- a/_maps/map_files/Atlas/atlas.dmm +++ b/_maps/map_files/Atlas/atlas.dmm @@ -138,14 +138,19 @@ /turf/open/floor/plating, /area/maintenance/nsv/deck2/port) "ar" = ( -/obj/machinery/atmospherics/components/binary/dp_vent_pump/layer2{ +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 8 }, -/turf/open/floor/monotile/steel, -/area/quartermaster/storage) +/obj/structure/cable{ + icon_state = "4-8" + }, +/turf/open/floor/plasteel/techmaint{ + initial_gas_mix = "TEMP=2.7" + }, +/area/quartermaster/miningoffice) "au" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2, @@ -840,18 +845,12 @@ /turf/open/floor/monotile/steel, /area/quartermaster/storage) "cY" = ( -/obj/effect/landmark/start/shaft_miner, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 5 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 5 - }, /obj/machinery/light{ dir = 8 }, +/obj/machinery/suit_storage_unit/mining/eva, /turf/open/floor/monotile/steel, -/area/quartermaster/storage) +/area/quartermaster/miningoffice) "cZ" = ( /obj/structure/table/reinforced, /obj/item/clothing/gloves/color/yellow, @@ -1230,6 +1229,24 @@ }, /turf/open/floor/plasteel/grid/steel, /area/hallway/secondary/exit/departure_lounge) +"el" = ( +/obj/machinery/advanced_airlock_controller/directional/east{ + pixel_y = 24 + }, +/obj/item/radio/intercom/directional/north, +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 4 + }, +/turf/open/floor/plasteel/techmaint{ + initial_gas_mix = "TEMP=2.7" + }, +/area/quartermaster/miningoffice) "em" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -2103,6 +2120,20 @@ }, /turf/open/floor/monotile/dark, /area/ai_monitored/security/armory) +"gQ" = ( +/obj/machinery/atmospherics/components/binary/dp_vent_pump/layer2{ + dir = 4 + }, +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 8 + }, +/turf/open/floor/plasteel/techmaint{ + initial_gas_mix = "TEMP=2.7" + }, +/area/quartermaster/miningoffice) "gS" = ( /turf/open/floor/engine/airless, /area/space/nearstation) @@ -2999,16 +3030,11 @@ /turf/open/floor/durasteel/alt, /area/hallway/nsv/deck2/primary) "jG" = ( -/obj/machinery/requests_console{ - department = "Mining Hangar"; - departmentType = 2; - name = "Mining Hangar RC"; - pixel_y = 26 +/obj/machinery/camera/autoname{ + c_tag = "Atmos - Airlock #2"; + dir = 6 }, -/obj/structure/closet/secure_closet/miner, -/obj/item/encryptionkey/pilot, -/obj/item/encryptionkey/pilot, -/obj/item/stack/sheet/mineral/wood/five, +/obj/structure/reagent_dispensers/fueltank/cryogenic_fuel, /turf/open/floor/monotile/steel{ initial_gas_mix = "TEMP=2.7" }, @@ -3631,17 +3657,16 @@ /turf/open/floor/plating, /area/maintenance/nsv/deck2/port) "ls" = ( -/obj/machinery/light{ - dir = 1 +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 5 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 5 }, -/obj/structure/closet/secure_closet/miner, -/obj/item/encryptionkey/pilot, -/obj/item/encryptionkey/pilot, -/obj/item/stack/sheet/mineral/wood/five, /turf/open/floor/monotile/steel{ initial_gas_mix = "TEMP=2.7" }, -/area/nsv/hanger/mining) +/area/quartermaster/miningoffice) "lt" = ( /obj/machinery/computer/ams{ dir = 8 @@ -5422,6 +5447,11 @@ /obj/machinery/suit_storage_unit/standard_unit, /turf/open/floor/monotile/dark, /area/hallway/nsv/deck2/primary) +"qX" = ( +/turf/open/floor/plasteel/techmaint{ + initial_gas_mix = "TEMP=2.7" + }, +/area/quartermaster/miningoffice) "qY" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ dir = 1 @@ -5896,15 +5926,18 @@ /turf/open/floor/plating, /area/maintenance/nsv/deck2/port/fore) "sA" = ( -/obj/effect/turf_decal/stripes/corner{ - dir = 4 +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 5 + }, +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, +/obj/structure/cable{ + icon_state = "1-4" }, /obj/effect/landmark/start/shaft_miner, -/obj/machinery/atmospherics/pipe/layer_manifold{ - dir = 4 +/turf/open/floor/plasteel/techmaint{ + initial_gas_mix = "TEMP=2.7" }, -/turf/open/floor/monotile/steel, -/area/quartermaster/storage) +/area/quartermaster/miningoffice) "sC" = ( /obj/effect/turf_decal/stripes/line, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ @@ -7084,25 +7117,25 @@ /area/nsv/weapons/gauss/battery/deck2/port) "wk" = ( /obj/structure/cable{ - icon_state = "4-8" + icon_state = "1-2" }, -/obj/effect/turf_decal/stripes/line{ - dir = 4 +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 1 }, -/turf/open/floor/monotile/steel, -/area/quartermaster/storage) +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/turf/open/floor/plasteel/techmaint{ + initial_gas_mix = "TEMP=2.7" + }, +/area/quartermaster/miningoffice) "wl" = ( /turf/closed/wall/r_wall, /area/security/prison) "wn" = ( -/obj/structure/closet/secure_closet/miner, -/obj/item/encryptionkey/pilot, -/obj/item/encryptionkey/pilot, -/obj/item/stack/sheet/mineral/wood/five, +/obj/machinery/airalarm/directional/north, /turf/open/floor/monotile/steel{ initial_gas_mix = "TEMP=2.7" }, -/area/nsv/hanger/mining) +/area/quartermaster/miningoffice) "wq" = ( /obj/structure/cable{ icon_state = "4-8" @@ -7119,21 +7152,21 @@ /turf/open/floor/monotile/steel, /area/hallway/nsv/deck2/primary) "wr" = ( -/obj/machinery/door/airlock/ship/external{ - name = "Mining Shuttle Airlock"; - req_one_access_txt = "31;48" +/obj/item/radio/intercom/directional/east, +/obj/machinery/camera/autoname{ + c_tag = "Atmos - Airlock #2"; + dir = 8 }, -/obj/structure/cable{ - icon_state = "4-8" +/turf/open/floor/monotile/steel{ + initial_gas_mix = "TEMP=2.7" }, -/turf/open/floor/monotile/steel, -/area/quartermaster/storage) +/area/quartermaster/miningoffice) "wt" = ( -/obj/structure/cable{ - icon_state = "4-8" +/obj/effect/landmark/start/shaft_miner, +/turf/open/floor/plasteel/techmaint{ + initial_gas_mix = "TEMP=2.7" }, -/turf/open/floor/monotile/steel, -/area/quartermaster/storage) +/area/quartermaster/miningoffice) "wu" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 8 @@ -7434,11 +7467,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 9 }, -/obj/machinery/button/door{ - id = "atlas_mining_hangar"; - name = "Pod Bay Doors"; - pixel_y = 32; - req_one_access_txt = "48" +/obj/machinery/power/apc/auto_name/north, +/obj/structure/cable{ + icon_state = "0-2" }, /turf/open/floor/monotile/steel{ initial_gas_mix = "TEMP=2.7" @@ -7653,9 +7684,9 @@ /area/nsv/weapons) "ya" = ( /obj/machinery/light, -/obj/machinery/suit_storage_unit/mining/eva, +/obj/effect/landmark/start/shaft_miner, /turf/open/floor/monotile/steel, -/area/quartermaster/storage) +/area/quartermaster/miningoffice) "ye" = ( /obj/effect/turf_decal/stripes/line, /obj/item/kirbyplants{ @@ -7664,11 +7695,15 @@ /turf/open/floor/monotile/steel, /area/hallway/secondary/exit/departure_lounge) "yg" = ( -/obj/structure/reagent_dispensers/fueltank, +/obj/structure/closet/secure_closet/miner, +/obj/item/stack/sheet/mineral/wood/five, +/obj/item/stack/sheet/mineral/wood/five, +/obj/item/encryptionkey/pilot, +/obj/machinery/newscaster/directional/north, /turf/open/floor/monotile/steel{ initial_gas_mix = "TEMP=2.7" }, -/area/nsv/hanger/mining) +/area/quartermaster/miningoffice) "yk" = ( /obj/machinery/light_switch{ pixel_x = 6; @@ -7931,13 +7966,16 @@ /turf/open/floor/monotile/steel, /area/ai_monitored/security/armory) "zc" = ( -/obj/item/gps/mining, -/obj/structure/rack, -/obj/item/gps/mining, -/turf/open/floor/monotile/steel{ +/obj/machinery/atmospherics/components/binary/dp_vent_pump/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 8 + }, +/turf/open/floor/plasteel/techmaint{ initial_gas_mix = "TEMP=2.7" }, -/area/nsv/hanger/mining) +/area/quartermaster/miningoffice) "ze" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 8 @@ -8017,6 +8055,20 @@ /area/crew_quarters/abandoned_gambling_den{ name = "Abandoned Bar" }) +"zn" = ( +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ + dir = 1 + }, +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ + dir = 1 + }, +/turf/open/floor/monotile/steel{ + initial_gas_mix = "TEMP=2.7" + }, +/area/quartermaster/miningoffice) "zo" = ( /obj/machinery/door/airlock/ship/maintenance, /obj/machinery/door/firedoor/border_only{ @@ -8126,15 +8178,13 @@ /turf/closed/wall/r_wall, /area/maintenance/department/engine/atmos) "zJ" = ( -/obj/effect/landmark/start/shaft_miner, -/obj/machinery/atmospherics/components/binary/dp_vent_pump/layer2{ +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 +/turf/open/floor/plasteel/techmaint{ + initial_gas_mix = "TEMP=2.7" }, -/turf/open/floor/monotile/steel, -/area/quartermaster/storage) +/area/quartermaster/miningoffice) "zL" = ( /obj/effect/turf_decal/ship/outline, /obj/machinery/missile_builder/assembler{ @@ -8487,6 +8537,13 @@ "Bj" = ( /turf/open/floor/monotile/dark, /area/science) +"Bn" = ( +/obj/machinery/firealarm/directional/west, +/obj/structure/tank_dispenser/oxygen, +/turf/open/floor/monotile/steel{ + initial_gas_mix = "TEMP=2.7" + }, +/area/quartermaster/miningoffice) "Bp" = ( /obj/item/control_rod, /obj/machinery/light{ @@ -8655,6 +8712,9 @@ /obj/machinery/portable_atmospherics/canister/nitrous_oxide{ valve_open = 1 }, +/obj/structure/reagent_dispensers/fueltank/cryogenic_fuel, +/obj/structure/reagent_dispensers/fueltank/cryogenic_fuel, +/obj/structure/reagent_dispensers/fueltank/cryogenic_fuel, /turf/open/floor/engine/n2o, /area/engine/atmos) "BU" = ( @@ -8768,6 +8828,18 @@ /obj/machinery/vending/coffee, /turf/open/floor/carpet/red, /area/nsv/weapons) +"Co" = ( +/obj/machinery/camera/autoname{ + dir = 4 + }, +/obj/machinery/power/apc/auto_name/west, +/obj/structure/cable{ + icon_state = "0-2" + }, +/turf/open/floor/monotile/steel{ + initial_gas_mix = "TEMP=2.7" + }, +/area/quartermaster/miningoffice) "Cp" = ( /obj/machinery/power/apc/auto_name/north, /obj/structure/cable{ @@ -8954,16 +9026,12 @@ /turf/open/floor/carpet/ship, /area/nsv/hanger/notkmcstupidhanger) "De" = ( -/obj/structure/cable{ - icon_state = "1-4" - }, -/obj/machinery/camera/autoname{ - dir = 4 +/obj/structure/closet/secure_closet/engineering_welding{ + req_access = null; + req_one_access_txt = "48" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/turf/open/floor/monotile/steel, -/area/quartermaster/storage) +/turf/open/space/basic, +/area/space) "Dh" = ( /obj/item/radio/intercom/directional/west, /turf/open/floor/carpet/orange, @@ -9107,13 +9175,8 @@ /turf/open/floor/plating, /area/maintenance/nsv/deck2/starboard) "DH" = ( -/obj/structure/cable{ - icon_state = "2-8" - }, -/turf/open/floor/monotile/steel{ - initial_gas_mix = "TEMP=2.7" - }, -/area/nsv/hanger/mining) +/turf/closed/wall/r_wall, +/area/quartermaster/miningoffice) "DM" = ( /obj/structure/cable/yellow{ icon_state = "4-8" @@ -9183,12 +9246,21 @@ /turf/open/floor/carpet/red, /area/security/brig) "Eb" = ( -/obj/structure/cable, -/obj/machinery/power/apc/auto_name/west, -/turf/open/floor/monotile/steel{ - initial_gas_mix = "TEMP=2.7" +/obj/machinery/door/airlock/ship/external/glass{ + req_one_access_txt = "31; 48"; + name = "Mining Hangar Access" }, -/area/nsv/hanger/mining) +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 4 + }, +/turf/open/floor/plating, +/area/quartermaster/miningoffice) "Ec" = ( /obj/machinery/light{ dir = 8 @@ -9642,6 +9714,21 @@ /area/crew_quarters/abandoned_gambling_den{ name = "Abandoned Bar" }) +"FS" = ( +/obj/machinery/atmospherics/pipe/layer_manifold{ + dir = 4 + }, +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/door/airlock/ship/external/glass{ + req_one_access_txt = "31; 48"; + name = "Mining Hangar Access" + }, +/turf/open/floor/plasteel/techmaint{ + initial_gas_mix = "TEMP=2.7" + }, +/area/quartermaster/miningoffice) "FT" = ( /obj/effect/turf_decal/tile/ship/half/red{ dir = 1 @@ -10060,12 +10147,15 @@ /turf/open/floor/plating, /area/maintenance/nsv/deck2/port) "Ho" = ( -/obj/machinery/light_switch/west, -/obj/machinery/vendor/mining, -/turf/open/floor/monotile/steel{ - initial_gas_mix = "TEMP=2.7" +/obj/effect/spawner/structure/window/reinforced, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 8 }, -/area/nsv/hanger/mining) +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 4 + }, +/turf/open/floor/plating, +/area/quartermaster/miningoffice) "Hr" = ( /obj/machinery/modular_fabricator/autolathe, /obj/machinery/power/apc/auto_name/east, @@ -10271,6 +10361,20 @@ /obj/machinery/deck_turret/powder_gate, /turf/open/floor/plating, /area/nsv/weapons) +"HV" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/machinery/button/door{ + id = "atlas_mining_hangar"; + name = "Pod Bay Doors"; + pixel_y = 32; + req_one_access_txt = "48" + }, +/turf/open/floor/monotile/steel{ + initial_gas_mix = "TEMP=2.7" + }, +/area/nsv/hanger/mining) "HW" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 4 @@ -10467,7 +10571,7 @@ "Ja" = ( /obj/machinery/suit_storage_unit/mining/eva, /turf/open/floor/monotile/steel, -/area/quartermaster/storage) +/area/quartermaster/miningoffice) "Jb" = ( /obj/structure/sign/ship/securearea{ dir = 4 @@ -10583,9 +10687,18 @@ /turf/open/floor/plating, /area/maintenance/nsv/deck2/port/fore) "Jq" = ( -/obj/effect/spawner/structure/window/reinforced, -/turf/open/floor/plating, -/area/nsv/hanger/mining) +/obj/machinery/light, +/obj/machinery/atmospherics/pipe/layer_manifold{ + dir = 4 + }, +/obj/machinery/camera/autoname{ + c_tag = "Atmos - Airlock #2"; + dir = 8 + }, +/turf/open/floor/plasteel/techmaint{ + initial_gas_mix = "TEMP=2.7" + }, +/area/quartermaster/miningoffice) "Jr" = ( /obj/effect/turf_decal/stripes/line{ dir = 5 @@ -10639,6 +10752,17 @@ /obj/machinery/door/airlock/ship/maintenance/defaultaccess, /turf/open/floor/monotile/steel, /area/maintenance/nsv/deck2/port/fore) +"Jy" = ( +/obj/machinery/camera/autoname{ + dir = 1 + }, +/obj/structure/rack, +/obj/item/gps/mining, +/obj/item/gps/mining, +/turf/open/floor/monotile/steel{ + initial_gas_mix = "TEMP=2.7" + }, +/area/nsv/hanger/mining) "Jz" = ( /obj/effect/turf_decal/tile/ship/green{ dir = 4 @@ -11428,6 +11552,15 @@ }, /turf/open/floor/carpet/royalblack, /area/chapel/main) +"LI" = ( +/obj/structure/closet/secure_closet/miner, +/obj/item/stack/sheet/mineral/wood/five, +/obj/item/encryptionkey/pilot, +/obj/item/encryptionkey/pilot, +/turf/open/floor/monotile/steel{ + initial_gas_mix = "TEMP=2.7" + }, +/area/quartermaster/miningoffice) "LJ" = ( /obj/machinery/mineral/stacking_unit_console{ machinedir = 4; @@ -11995,14 +12128,22 @@ /turf/open/floor/monotile/dark, /area/engine/engine_room) "NN" = ( -/obj/effect/turf_decal/stripes/corner, -/obj/structure/tank_dispenser/oxygen, -/obj/machinery/newscaster/directional/north, -/obj/machinery/atmospherics/pipe/layer_manifold{ +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 9 + }, +/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ dir = 4 }, -/turf/open/floor/monotile/steel, -/area/quartermaster/storage) +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 10 + }, +/obj/structure/cable{ + icon_state = "2-8" + }, +/turf/open/floor/plasteel/techmaint{ + initial_gas_mix = "TEMP=2.7" + }, +/area/quartermaster/miningoffice) "NO" = ( /obj/effect/turf_decal/stripes/line{ dir = 9 @@ -12628,7 +12769,10 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, -/turf/open/floor/plasteel/techmaint{ +/obj/structure/cable{ + icon_state = "1-2" + }, +/turf/open/floor/monotile/steel{ initial_gas_mix = "TEMP=2.7" }, /area/nsv/hanger/mining) @@ -12832,21 +12976,22 @@ }, /area/nsv/hanger/notkmcstupidhanger) "Qs" = ( -/obj/machinery/advanced_airlock_controller/directional/east{ - pixel_y = 24 +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 8 }, /obj/structure/cable{ - icon_state = "2-8" + icon_state = "4-8" }, -/obj/item/radio/intercom/directional/north, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ - dir = 1 +/obj/structure/cable{ + icon_state = "1-8" }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ - dir = 1 +/turf/open/floor/monotile/steel{ + initial_gas_mix = "TEMP=2.7" }, -/turf/open/floor/monotile/steel, -/area/quartermaster/storage) +/area/quartermaster/miningoffice) "Qu" = ( /obj/effect/turf_decal/stripes/line, /turf/open/floor/engine, @@ -13222,10 +13367,6 @@ /turf/open/floor/monotile/steel, /area/quartermaster/storage) "Ry" = ( -/obj/machinery/door/airlock/ship/external{ - name = "Mining Shuttle Airlock"; - req_one_access_txt = "31;48" - }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 8 }, @@ -13235,8 +13376,19 @@ /obj/structure/cable{ icon_state = "4-8" }, +/obj/machinery/door/airlock/ship{ + name = "Mining Ready Room"; + req_one_access_txt = "31; 48" + }, +/obj/effect/landmark/zebra_interlock_point, +/obj/machinery/door/firedoor/border_only{ + dir = 4 + }, +/obj/machinery/door/firedoor/border_only{ + dir = 8 + }, /turf/open/floor/monotile/steel, -/area/quartermaster/storage) +/area/quartermaster/miningoffice) "Rz" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 4 @@ -14134,11 +14286,9 @@ /turf/open/floor/plating, /area/maintenance/nsv/deck2/port) "Uy" = ( -/obj/machinery/firealarm/directional/west, -/turf/open/floor/monotile/steel{ - initial_gas_mix = "TEMP=2.7" - }, -/area/nsv/hanger/mining) +/obj/effect/spawner/structure/window/reinforced, +/turf/open/floor/plating, +/area/quartermaster/miningoffice) "Uz" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -14812,6 +14962,17 @@ }, /turf/open/space/basic, /area/engine/engine_room) +"WK" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/structure/cable{ + icon_state = "1-8" + }, +/turf/open/floor/monotile/steel{ + initial_gas_mix = "TEMP=2.7" + }, +/area/nsv/hanger/mining) "WM" = ( /obj/machinery/aug_manipulator, /turf/open/floor/plasteel/techmaint, @@ -14840,6 +15001,12 @@ }, /turf/open/floor/monotile/dark, /area/nsv/weapons) +"WU" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2, +/turf/open/floor/plasteel/techmaint{ + initial_gas_mix = "TEMP=2.7" + }, +/area/quartermaster/miningoffice) "WW" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ dir = 4 @@ -14917,6 +15084,15 @@ }, /turf/closed/wall/r_wall, /area/security/brig) +"Xm" = ( +/obj/machinery/light{ + dir = 1 + }, +/obj/machinery/vendor/mining, +/turf/open/floor/monotile/steel{ + initial_gas_mix = "TEMP=2.7" + }, +/area/quartermaster/miningoffice) "Xn" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, @@ -14941,6 +15117,9 @@ /obj/effect/landmark/start/cargo_technician, /turf/open/floor/monotile/steel, /area/quartermaster/storage) +"Xr" = ( +/turf/open/floor/monotile/steel, +/area/quartermaster/miningoffice) "Xt" = ( /obj/docking_port/stationary{ dir = 2; @@ -52850,14 +53029,14 @@ fc oo tP tP -tP -tP -tP +DH +DH +DH Ry -tP -tP -tP -tP +Uy +DH +DH +DH Od Nh Nh @@ -53107,14 +53286,14 @@ kg Rh Tb QI -Pm -ot -tP +DH +Bn +Co Qs -De +Ja cY Ja -tR +Uy Od Nh Nh @@ -53364,14 +53543,14 @@ kg Gy td VM -Pm -wn -tP +DH +Xm +qX ar wt zJ ya -tR +Uy Od Nh Nh @@ -53621,14 +53800,14 @@ bo ti Ki xp -Pm +DH wn -tP +WU NN wk sA -Ja -tR +Xr +Uy Od Nh Nh @@ -53878,14 +54057,14 @@ Oq ti HA Yc -Pm +DH yg -tP -tP +LI +LI wr -tP -tP -tP +zn +ls +DH Od Nh Nh @@ -54135,14 +54314,14 @@ qf Be wU Wa -Pm -SP -LV +DH +DH +Uy Uy DH Eb Ho -Pm +DH Od Nh Nh @@ -54393,13 +54572,13 @@ nm Bj ez Pm -ls -sH -sH -sH -sH +ot +LV +kx +DH +el zc -Jq +Uy Od Nh Nh @@ -54652,11 +54831,11 @@ ZZ Pm jG sH -sH -sH -sH -kx +Jy +DH +gQ Jq +Uy Od Nh Nh @@ -54907,13 +55086,13 @@ yN sn Mi Pm -ot +SP LV -sH -sH -sH be -Pm +DH +FS +DH +DH kD Nh Nh @@ -55168,7 +55347,7 @@ Pm xs PJ PJ -PJ +WK fn Pm Nh @@ -55426,12 +55605,12 @@ qk sH sH Vg -hJ +BF Pm Nh Nh Nh -Nh +De Nh Nh Nh @@ -55679,7 +55858,7 @@ av lj WM Pm -Ju +HV sH sH sH @@ -55940,7 +56119,7 @@ HP sH sH sH -BF +hJ Pm Nh Nh @@ -56197,7 +56376,7 @@ Ju sH sH Vg -BF +no Pm Nh Nh @@ -56454,7 +56633,7 @@ Ju sH sH sH -no +BF Pm Nh Nh From 5b9852fe48e81d9e2b3fb8fb4a5e32958c8761c2 Mon Sep 17 00:00:00 2001 From: Seryn Date: Tue, 12 Sep 2023 20:31:43 -0700 Subject: [PATCH 05/11] Whoops, missed air tiles --- _maps/map_files/Atlas/atlas.dmm | 505 ++++++++++++++++---------------- 1 file changed, 247 insertions(+), 258 deletions(-) diff --git a/_maps/map_files/Atlas/atlas.dmm b/_maps/map_files/Atlas/atlas.dmm index cd4cf84a349..1c4be213356 100644 --- a/_maps/map_files/Atlas/atlas.dmm +++ b/_maps/map_files/Atlas/atlas.dmm @@ -351,11 +351,20 @@ /turf/open/floor/monotile/steel, /area/nsv/weapons) "be" = ( -/obj/machinery/light, +/obj/machinery/atmospherics/pipe/layer_manifold{ + dir = 4 + }, +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/door/airlock/ship/external/glass{ + req_one_access_txt = "31; 48"; + name = "Mining Hangar Access" + }, /turf/open/floor/monotile/steel{ initial_gas_mix = "TEMP=2.7" }, -/area/nsv/hanger/mining) +/area/quartermaster/miningoffice) "bf" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -849,7 +858,9 @@ dir = 8 }, /obj/machinery/suit_storage_unit/mining/eva, -/turf/open/floor/monotile/steel, +/turf/open/floor/monotile/steel{ + initial_gas_mix = "TEMP=2.7" + }, /area/quartermaster/miningoffice) "cZ" = ( /obj/structure/table/reinforced, @@ -1042,6 +1053,12 @@ }, /turf/closed/wall/r_wall, /area/engine/engine_room) +"dG" = ( +/obj/machinery/airalarm/directional/north, +/turf/open/floor/monotile/steel{ + initial_gas_mix = "TEMP=2.7" + }, +/area/quartermaster/miningoffice) "dH" = ( /obj/structure/lattice/catwalk/over/ship, /obj/structure/cable{ @@ -1229,24 +1246,6 @@ }, /turf/open/floor/plasteel/grid/steel, /area/hallway/secondary/exit/departure_lounge) -"el" = ( -/obj/machinery/advanced_airlock_controller/directional/east{ - pixel_y = 24 - }, -/obj/item/radio/intercom/directional/north, -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/turf/open/floor/plasteel/techmaint{ - initial_gas_mix = "TEMP=2.7" - }, -/area/quartermaster/miningoffice) "em" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -1459,6 +1458,17 @@ }, /turf/open/floor/durasteel/techfloor, /area/maintenance/nsv/deck2/port) +"eU" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/structure/cable{ + icon_state = "1-8" + }, +/turf/open/floor/monotile/steel{ + initial_gas_mix = "TEMP=2.7" + }, +/area/nsv/hanger/mining) "eV" = ( /obj/effect/turf_decal/tile/ship/half/red{ dir = 4 @@ -2120,20 +2130,6 @@ }, /turf/open/floor/monotile/dark, /area/ai_monitored/security/armory) -"gQ" = ( -/obj/machinery/atmospherics/components/binary/dp_vent_pump/layer2{ - dir = 4 - }, -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 - }, -/turf/open/floor/plasteel/techmaint{ - initial_gas_mix = "TEMP=2.7" - }, -/area/quartermaster/miningoffice) "gS" = ( /turf/open/floor/engine/airless, /area/space/nearstation) @@ -3035,9 +3031,7 @@ dir = 6 }, /obj/structure/reagent_dispensers/fueltank/cryogenic_fuel, -/turf/open/floor/monotile/steel{ - initial_gas_mix = "TEMP=2.7" - }, +/turf/open/floor/monotile/steel/airless, /area/nsv/hanger/mining) "jI" = ( /obj/machinery/atmospherics/components/unary/outlet_injector/atmos/nitrogen_input, @@ -3290,15 +3284,18 @@ /turf/open/floor/monotile/dark, /area/hallway/secondary/exit/departure_lounge) "kx" = ( -/obj/item/radio, -/obj/item/radio, -/obj/item/radio, -/obj/item/radio, -/obj/structure/rack, -/turf/open/floor/monotile/steel{ +/obj/machinery/light, +/obj/machinery/atmospherics/pipe/layer_manifold{ + dir = 4 + }, +/obj/machinery/camera/autoname{ + c_tag = "Atmos - Airlock #2"; + dir = 8 + }, +/turf/open/floor/plasteel/techmaint{ initial_gas_mix = "TEMP=2.7" }, -/area/nsv/hanger/mining) +/area/quartermaster/miningoffice) "ky" = ( /obj/structure/cable{ icon_state = "4-8" @@ -3657,16 +3654,9 @@ /turf/open/floor/plating, /area/maintenance/nsv/deck2/port) "ls" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 5 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 5 - }, -/turf/open/floor/monotile/steel{ - initial_gas_mix = "TEMP=2.7" - }, -/area/quartermaster/miningoffice) +/obj/structure/reagent_dispensers/fueltank/cryogenic_fuel, +/turf/open/floor/monotile/steel/airless, +/area/nsv/hanger/mining) "lt" = ( /obj/machinery/computer/ams{ dir = 8 @@ -4596,10 +4586,11 @@ /turf/open/floor/plasteel/techmaint, /area/security/brig) "ot" = ( -/obj/structure/reagent_dispensers/fueltank/cryogenic_fuel, -/turf/open/floor/monotile/steel{ - initial_gas_mix = "TEMP=2.7" +/obj/structure/closet/secure_closet/engineering_welding{ + req_access = null; + req_one_access_txt = "48" }, +/turf/open/floor/monotile/steel/airless, /area/nsv/hanger/mining) "ov" = ( /obj/structure/cable{ @@ -5328,6 +5319,24 @@ /obj/machinery/ship_weapon/vls, /turf/open/floor/monotile/dark, /area/nsv/weapons) +"qs" = ( +/obj/machinery/advanced_airlock_controller/directional/east{ + pixel_y = 24 + }, +/obj/item/radio/intercom/directional/north, +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 4 + }, +/turf/open/floor/plasteel/techmaint{ + initial_gas_mix = "TEMP=2.7" + }, +/area/quartermaster/miningoffice) "qt" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -5448,6 +5457,15 @@ /turf/open/floor/monotile/dark, /area/hallway/nsv/deck2/primary) "qX" = ( +/obj/machinery/atmospherics/components/binary/dp_vent_pump/layer2{ + dir = 4 + }, +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 8 + }, /turf/open/floor/plasteel/techmaint{ initial_gas_mix = "TEMP=2.7" }, @@ -6073,6 +6091,18 @@ }, /turf/open/space/basic, /area/space/nearstation) +"ta" = ( +/obj/machinery/camera/autoname{ + dir = 4 + }, +/obj/machinery/power/apc/auto_name/west, +/obj/structure/cable{ + icon_state = "0-2" + }, +/turf/open/floor/monotile/steel{ + initial_gas_mix = "TEMP=2.7" + }, +/area/quartermaster/miningoffice) "td" = ( /turf/open/floor/monotile/steel, /area/science) @@ -7131,7 +7161,10 @@ /turf/closed/wall/r_wall, /area/security/prison) "wn" = ( -/obj/machinery/airalarm/directional/north, +/obj/machinery/light{ + dir = 1 + }, +/obj/machinery/vendor/mining, /turf/open/floor/monotile/steel{ initial_gas_mix = "TEMP=2.7" }, @@ -7367,6 +7400,17 @@ icon_state = "platingdmg2" }, /area/maintenance/nsv/deck2/starboard) +"xb" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 5 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 5 + }, +/turf/open/floor/monotile/steel{ + initial_gas_mix = "TEMP=2.7" + }, +/area/quartermaster/miningoffice) "xc" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 10 @@ -7685,7 +7729,9 @@ "ya" = ( /obj/machinery/light, /obj/effect/landmark/start/shaft_miner, -/turf/open/floor/monotile/steel, +/turf/open/floor/monotile/steel{ + initial_gas_mix = "TEMP=2.7" + }, /area/quartermaster/miningoffice) "ye" = ( /obj/effect/turf_decal/stripes/line, @@ -8055,20 +8101,6 @@ /area/crew_quarters/abandoned_gambling_den{ name = "Abandoned Bar" }) -"zn" = ( -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ - dir = 1 - }, -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ - dir = 1 - }, -/turf/open/floor/monotile/steel{ - initial_gas_mix = "TEMP=2.7" - }, -/area/quartermaster/miningoffice) "zo" = ( /obj/machinery/door/airlock/ship/maintenance, /obj/machinery/door/firedoor/border_only{ @@ -8537,13 +8569,6 @@ "Bj" = ( /turf/open/floor/monotile/dark, /area/science) -"Bn" = ( -/obj/machinery/firealarm/directional/west, -/obj/structure/tank_dispenser/oxygen, -/turf/open/floor/monotile/steel{ - initial_gas_mix = "TEMP=2.7" - }, -/area/quartermaster/miningoffice) "Bp" = ( /obj/item/control_rod, /obj/machinery/light{ @@ -8828,18 +8853,6 @@ /obj/machinery/vending/coffee, /turf/open/floor/carpet/red, /area/nsv/weapons) -"Co" = ( -/obj/machinery/camera/autoname{ - dir = 4 - }, -/obj/machinery/power/apc/auto_name/west, -/obj/structure/cable{ - icon_state = "0-2" - }, -/turf/open/floor/monotile/steel{ - initial_gas_mix = "TEMP=2.7" - }, -/area/quartermaster/miningoffice) "Cp" = ( /obj/machinery/power/apc/auto_name/north, /obj/structure/cable{ @@ -9026,12 +9039,11 @@ /turf/open/floor/carpet/ship, /area/nsv/hanger/notkmcstupidhanger) "De" = ( -/obj/structure/closet/secure_closet/engineering_welding{ - req_access = null; - req_one_access_txt = "48" +/obj/machinery/suit_storage_unit/mining/eva, +/turf/open/floor/monotile/steel{ + initial_gas_mix = "TEMP=2.7" }, -/turf/open/space/basic, -/area/space) +/area/quartermaster/miningoffice) "Dh" = ( /obj/item/radio/intercom/directional/west, /turf/open/floor/carpet/orange, @@ -9175,7 +9187,9 @@ /turf/open/floor/plating, /area/maintenance/nsv/deck2/starboard) "DH" = ( -/turf/closed/wall/r_wall, +/turf/open/floor/plasteel/techmaint{ + initial_gas_mix = "TEMP=2.7" + }, /area/quartermaster/miningoffice) "DM" = ( /obj/structure/cable/yellow{ @@ -9259,7 +9273,9 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 4 }, -/turf/open/floor/plating, +/turf/open/floor/monotile/steel{ + initial_gas_mix = "TEMP=2.7" + }, /area/quartermaster/miningoffice) "Ec" = ( /obj/machinery/light{ @@ -9355,6 +9371,10 @@ /obj/item/clothing/ears/earmuffs, /turf/open/floor/monotile/dark, /area/nsv/weapons) +"Ev" = ( +/obj/machinery/light, +/turf/open/floor/monotile/steel/airless, +/area/nsv/hanger/mining) "Ex" = ( /obj/structure/chair, /turf/open/floor/wood, @@ -9714,21 +9734,6 @@ /area/crew_quarters/abandoned_gambling_den{ name = "Abandoned Bar" }) -"FS" = ( -/obj/machinery/atmospherics/pipe/layer_manifold{ - dir = 4 - }, -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/machinery/door/airlock/ship/external/glass{ - req_one_access_txt = "31; 48"; - name = "Mining Hangar Access" - }, -/turf/open/floor/plasteel/techmaint{ - initial_gas_mix = "TEMP=2.7" - }, -/area/quartermaster/miningoffice) "FT" = ( /obj/effect/turf_decal/tile/ship/half/red{ dir = 1 @@ -9769,6 +9774,12 @@ }, /turf/open/floor/monotile/dark, /area/nsv/weapons) +"Ga" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2, +/turf/open/floor/plasteel/techmaint{ + initial_gas_mix = "TEMP=2.7" + }, +/area/quartermaster/miningoffice) "Gd" = ( /obj/machinery/computer/camera_advanced/xenobio{ dir = 8 @@ -10361,20 +10372,6 @@ /obj/machinery/deck_turret/powder_gate, /turf/open/floor/plating, /area/nsv/weapons) -"HV" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/obj/machinery/button/door{ - id = "atlas_mining_hangar"; - name = "Pod Bay Doors"; - pixel_y = 32; - req_one_access_txt = "48" - }, -/turf/open/floor/monotile/steel{ - initial_gas_mix = "TEMP=2.7" - }, -/area/nsv/hanger/mining) "HW" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 4 @@ -10421,6 +10418,9 @@ }, /turf/open/floor/monotile/steel, /area/security/brig) +"Ij" = ( +/turf/open/floor/monotile/steel/airless, +/area/nsv/hanger/mining) "Il" = ( /obj/machinery/door/airlock/ship/external/glass{ req_one_access_txt = "24" @@ -10569,8 +10569,9 @@ /turf/open/floor/monotile/steel, /area/maintenance/department/science) "Ja" = ( -/obj/machinery/suit_storage_unit/mining/eva, -/turf/open/floor/monotile/steel, +/turf/open/floor/monotile/steel{ + initial_gas_mix = "TEMP=2.7" + }, /area/quartermaster/miningoffice) "Jb" = ( /obj/structure/sign/ship/securearea{ @@ -10687,18 +10688,13 @@ /turf/open/floor/plating, /area/maintenance/nsv/deck2/port/fore) "Jq" = ( -/obj/machinery/light, -/obj/machinery/atmospherics/pipe/layer_manifold{ - dir = 4 - }, -/obj/machinery/camera/autoname{ - c_tag = "Atmos - Airlock #2"; - dir = 8 - }, -/turf/open/floor/plasteel/techmaint{ - initial_gas_mix = "TEMP=2.7" - }, -/area/quartermaster/miningoffice) +/obj/item/radio, +/obj/item/radio, +/obj/item/radio, +/obj/item/radio, +/obj/structure/rack, +/turf/open/floor/monotile/steel/airless, +/area/nsv/hanger/mining) "Jr" = ( /obj/effect/turf_decal/stripes/line{ dir = 5 @@ -10752,17 +10748,6 @@ /obj/machinery/door/airlock/ship/maintenance/defaultaccess, /turf/open/floor/monotile/steel, /area/maintenance/nsv/deck2/port/fore) -"Jy" = ( -/obj/machinery/camera/autoname{ - dir = 1 - }, -/obj/structure/rack, -/obj/item/gps/mining, -/obj/item/gps/mining, -/turf/open/floor/monotile/steel{ - initial_gas_mix = "TEMP=2.7" - }, -/area/nsv/hanger/mining) "Jz" = ( /obj/effect/turf_decal/tile/ship/green{ dir = 4 @@ -11552,15 +11537,6 @@ }, /turf/open/floor/carpet/royalblack, /area/chapel/main) -"LI" = ( -/obj/structure/closet/secure_closet/miner, -/obj/item/stack/sheet/mineral/wood/five, -/obj/item/encryptionkey/pilot, -/obj/item/encryptionkey/pilot, -/turf/open/floor/monotile/steel{ - initial_gas_mix = "TEMP=2.7" - }, -/area/quartermaster/miningoffice) "LJ" = ( /obj/machinery/mineral/stacking_unit_console{ machinedir = 4; @@ -11614,10 +11590,9 @@ /turf/open/floor/durasteel/techfloor_grid, /area/maintenance/nsv/deck2/port) "LV" = ( -/turf/open/floor/monotile/steel{ - initial_gas_mix = "TEMP=2.7" - }, -/area/nsv/hanger/mining) +/obj/effect/spawner/structure/window/reinforced, +/turf/open/floor/plating, +/area/quartermaster/miningoffice) "LY" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 8 @@ -11906,6 +11881,20 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/carpet/red, /area/nsv/weapons) +"MM" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/machinery/button/door{ + id = "atlas_mining_hangar"; + name = "Pod Bay Doors"; + pixel_y = 32; + req_one_access_txt = "48" + }, +/turf/open/floor/monotile/steel{ + initial_gas_mix = "TEMP=2.7" + }, +/area/nsv/hanger/mining) "MO" = ( /turf/closed/wall/r_wall, /area/engine/engine_room) @@ -12717,6 +12706,13 @@ }, /turf/open/floor/monotile/dark, /area/science) +"Pu" = ( +/obj/machinery/firealarm/directional/west, +/obj/structure/tank_dispenser/oxygen, +/turf/open/floor/monotile/steel{ + initial_gas_mix = "TEMP=2.7" + }, +/area/quartermaster/miningoffice) "Px" = ( /obj/machinery/camera/autoname{ dir = 8 @@ -13741,14 +13737,8 @@ /turf/open/floor/monotile/steel, /area/science) "SP" = ( -/obj/structure/closet/secure_closet/engineering_welding{ - req_access = null; - req_one_access_txt = "48" - }, -/turf/open/floor/monotile/steel{ - initial_gas_mix = "TEMP=2.7" - }, -/area/nsv/hanger/mining) +/turf/closed/wall/r_wall, +/area/quartermaster/miningoffice) "SR" = ( /obj/machinery/recharge_station, /turf/open/floor/plating, @@ -14286,8 +14276,13 @@ /turf/open/floor/plating, /area/maintenance/nsv/deck2/port) "Uy" = ( -/obj/effect/spawner/structure/window/reinforced, -/turf/open/floor/plating, +/obj/structure/closet/secure_closet/miner, +/obj/item/stack/sheet/mineral/wood/five, +/obj/item/encryptionkey/pilot, +/obj/item/encryptionkey/pilot, +/turf/open/floor/monotile/steel{ + initial_gas_mix = "TEMP=2.7" + }, /area/quartermaster/miningoffice) "Uz" = ( /obj/structure/disposalpipe/segment{ @@ -14443,6 +14438,20 @@ }, /turf/open/floor/monotile/dark/airless, /area/nsv/hanger/notkmcstupidhanger) +"UU" = ( +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ + dir = 1 + }, +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ + dir = 1 + }, +/turf/open/floor/monotile/steel{ + initial_gas_mix = "TEMP=2.7" + }, +/area/quartermaster/miningoffice) "UY" = ( /obj/structure/reagent_dispensers/fueltank/cryogenic_fuel, /turf/open/floor/plating{ @@ -14926,6 +14935,15 @@ /obj/structure/sign/ship/deck/two, /turf/closed/wall/steel, /area/maintenance/nsv/deck2/port) +"WC" = ( +/obj/machinery/camera/autoname{ + dir = 1 + }, +/obj/structure/rack, +/obj/item/gps/mining, +/obj/item/gps/mining, +/turf/open/floor/monotile/steel/airless, +/area/nsv/hanger/mining) "WD" = ( /obj/structure/overmap/small_craft/transport/sabre, /obj/effect/turf_decal/loading_area{ @@ -14962,17 +14980,6 @@ }, /turf/open/space/basic, /area/engine/engine_room) -"WK" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/obj/structure/cable{ - icon_state = "1-8" - }, -/turf/open/floor/monotile/steel{ - initial_gas_mix = "TEMP=2.7" - }, -/area/nsv/hanger/mining) "WM" = ( /obj/machinery/aug_manipulator, /turf/open/floor/plasteel/techmaint, @@ -15001,12 +15008,6 @@ }, /turf/open/floor/monotile/dark, /area/nsv/weapons) -"WU" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2, -/turf/open/floor/plasteel/techmaint{ - initial_gas_mix = "TEMP=2.7" - }, -/area/quartermaster/miningoffice) "WW" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ dir = 4 @@ -15084,15 +15085,6 @@ }, /turf/closed/wall/r_wall, /area/security/brig) -"Xm" = ( -/obj/machinery/light{ - dir = 1 - }, -/obj/machinery/vendor/mining, -/turf/open/floor/monotile/steel{ - initial_gas_mix = "TEMP=2.7" - }, -/area/quartermaster/miningoffice) "Xn" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, @@ -15117,9 +15109,6 @@ /obj/effect/landmark/start/cargo_technician, /turf/open/floor/monotile/steel, /area/quartermaster/storage) -"Xr" = ( -/turf/open/floor/monotile/steel, -/area/quartermaster/miningoffice) "Xt" = ( /obj/docking_port/stationary{ dir = 2; @@ -53029,14 +53018,14 @@ fc oo tP tP -DH -DH -DH +SP +SP +SP Ry -Uy -DH -DH -DH +LV +SP +SP +SP Od Nh Nh @@ -53286,14 +53275,14 @@ kg Rh Tb QI -DH -Bn -Co +SP +Pu +ta Qs -Ja +De cY -Ja -Uy +De +LV Od Nh Nh @@ -53543,14 +53532,14 @@ kg Gy td VM +SP +wn DH -Xm -qX ar wt zJ ya -Uy +LV Od Nh Nh @@ -53800,14 +53789,14 @@ bo ti Ki xp -DH -wn -WU +SP +dG +Ga NN wk sA -Xr -Uy +Ja +LV Od Nh Nh @@ -54057,14 +54046,14 @@ Oq ti HA Yc -DH +SP yg -LI -LI +Uy +Uy wr -zn -ls -DH +UU +xb +SP Od Nh Nh @@ -54314,14 +54303,14 @@ qf Be wU Wa -DH -DH -Uy -Uy -DH +SP +SP +LV +LV +SP Eb Ho -DH +SP Od Nh Nh @@ -54572,13 +54561,13 @@ nm Bj ez Pm -ot -LV -kx -DH -el +ls +Ij +Jq +SP +qs zc -Uy +LV Od Nh Nh @@ -54831,11 +54820,11 @@ ZZ Pm jG sH -Jy -DH -gQ -Jq -Uy +WC +SP +qX +kx +LV Od Nh Nh @@ -55086,13 +55075,13 @@ yN sn Mi Pm +ot +Ij +Ev SP -LV be -DH -FS -DH -DH +SP +SP kD Nh Nh @@ -55347,7 +55336,7 @@ Pm xs PJ PJ -WK +eU fn Pm Nh @@ -55610,7 +55599,7 @@ Pm Nh Nh Nh -De +Nh Nh Nh Nh @@ -55858,7 +55847,7 @@ av lj WM Pm -HV +MM sH sH sH From 50d19c576b0e44caef56787a72225a3da8036ba9 Mon Sep 17 00:00:00 2001 From: Seryn Date: Tue, 12 Sep 2023 20:44:36 -0700 Subject: [PATCH 06/11] deleted one pipe that I think is causing a runtime? --- _maps/map_files/Atlas/atlas.dmm | 443 ++++++++++++++++---------------- 1 file changed, 220 insertions(+), 223 deletions(-) diff --git a/_maps/map_files/Atlas/atlas.dmm b/_maps/map_files/Atlas/atlas.dmm index 1c4be213356..a178a0cace8 100644 --- a/_maps/map_files/Atlas/atlas.dmm +++ b/_maps/map_files/Atlas/atlas.dmm @@ -351,20 +351,16 @@ /turf/open/floor/monotile/steel, /area/nsv/weapons) "be" = ( -/obj/machinery/atmospherics/pipe/layer_manifold{ - dir = 4 +/obj/effect/turf_decal/stripes/line{ + dir = 8 }, /obj/structure/cable{ - icon_state = "4-8" - }, -/obj/machinery/door/airlock/ship/external/glass{ - req_one_access_txt = "31; 48"; - name = "Mining Hangar Access" + icon_state = "1-2" }, /turf/open/floor/monotile/steel{ initial_gas_mix = "TEMP=2.7" }, -/area/quartermaster/miningoffice) +/area/nsv/hanger/mining) "bf" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -592,6 +588,12 @@ }, /turf/open/floor/monotile/steel, /area/hallway/nsv/deck2/primary) +"bX" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2, +/turf/open/floor/plasteel/techmaint{ + initial_gas_mix = "TEMP=2.7" + }, +/area/quartermaster/miningoffice) "bY" = ( /obj/machinery/atmospherics/miner/toxins, /obj/machinery/air_sensor/atmos/toxin_tank, @@ -1053,12 +1055,6 @@ }, /turf/closed/wall/r_wall, /area/engine/engine_room) -"dG" = ( -/obj/machinery/airalarm/directional/north, -/turf/open/floor/monotile/steel{ - initial_gas_mix = "TEMP=2.7" - }, -/area/quartermaster/miningoffice) "dH" = ( /obj/structure/lattice/catwalk/over/ship, /obj/structure/cable{ @@ -1458,17 +1454,6 @@ }, /turf/open/floor/durasteel/techfloor, /area/maintenance/nsv/deck2/port) -"eU" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/obj/structure/cable{ - icon_state = "1-8" - }, -/turf/open/floor/monotile/steel{ - initial_gas_mix = "TEMP=2.7" - }, -/area/nsv/hanger/mining) "eV" = ( /obj/effect/turf_decal/tile/ship/half/red{ dir = 4 @@ -2589,6 +2574,15 @@ /obj/item/extinguisher/advanced/hull_repair_juice, /turf/open/floor/plating, /area/maintenance/nsv/deck2/port) +"ip" = ( +/obj/machinery/light{ + dir = 1 + }, +/obj/machinery/vendor/mining, +/turf/open/floor/monotile/steel{ + initial_gas_mix = "TEMP=2.7" + }, +/area/quartermaster/miningoffice) "ir" = ( /turf/open/floor/durasteel/techfloor, /area/maintenance/nsv/deck2/port) @@ -3579,6 +3573,20 @@ }, /turf/open/floor/monotile/dark, /area/nsv/weapons) +"lg" = ( +/obj/machinery/atmospherics/components/binary/dp_vent_pump/layer2{ + dir = 4 + }, +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 8 + }, +/turf/open/floor/plasteel/techmaint{ + initial_gas_mix = "TEMP=2.7" + }, +/area/quartermaster/miningoffice) "lh" = ( /obj/machinery/portable_atmospherics/scrubber, /turf/open/floor/plating{ @@ -4586,12 +4594,12 @@ /turf/open/floor/plasteel/techmaint, /area/security/brig) "ot" = ( -/obj/structure/closet/secure_closet/engineering_welding{ - req_access = null; - req_one_access_txt = "48" +/obj/machinery/firealarm/directional/west, +/obj/structure/tank_dispenser/oxygen, +/turf/open/floor/monotile/steel{ + initial_gas_mix = "TEMP=2.7" }, -/turf/open/floor/monotile/steel/airless, -/area/nsv/hanger/mining) +/area/quartermaster/miningoffice) "ov" = ( /obj/structure/cable{ icon_state = "4-8" @@ -5012,6 +5020,15 @@ }, /turf/open/floor/durasteel/alt, /area/hallway/nsv/deck2/primary) +"pA" = ( +/obj/structure/closet/secure_closet/miner, +/obj/item/stack/sheet/mineral/wood/five, +/obj/item/encryptionkey/pilot, +/obj/item/encryptionkey/pilot, +/turf/open/floor/monotile/steel{ + initial_gas_mix = "TEMP=2.7" + }, +/area/quartermaster/miningoffice) "pC" = ( /obj/machinery/door/airlock/highsecurity/ship{ name = "Weapons Bay"; @@ -5319,24 +5336,6 @@ /obj/machinery/ship_weapon/vls, /turf/open/floor/monotile/dark, /area/nsv/weapons) -"qs" = ( -/obj/machinery/advanced_airlock_controller/directional/east{ - pixel_y = 24 - }, -/obj/item/radio/intercom/directional/north, -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/turf/open/floor/plasteel/techmaint{ - initial_gas_mix = "TEMP=2.7" - }, -/area/quartermaster/miningoffice) "qt" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -5456,20 +5455,6 @@ /obj/machinery/suit_storage_unit/standard_unit, /turf/open/floor/monotile/dark, /area/hallway/nsv/deck2/primary) -"qX" = ( -/obj/machinery/atmospherics/components/binary/dp_vent_pump/layer2{ - dir = 4 - }, -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 - }, -/turf/open/floor/plasteel/techmaint{ - initial_gas_mix = "TEMP=2.7" - }, -/area/quartermaster/miningoffice) "qY" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ dir = 1 @@ -5944,14 +5929,14 @@ /turf/open/floor/plating, /area/maintenance/nsv/deck2/port/fore) "sA" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 5 - }, /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, /obj/structure/cable{ icon_state = "1-4" }, /obj/effect/landmark/start/shaft_miner, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 5 + }, /turf/open/floor/plasteel/techmaint{ initial_gas_mix = "TEMP=2.7" }, @@ -6091,18 +6076,6 @@ }, /turf/open/space/basic, /area/space/nearstation) -"ta" = ( -/obj/machinery/camera/autoname{ - dir = 4 - }, -/obj/machinery/power/apc/auto_name/west, -/obj/structure/cable{ - icon_state = "0-2" - }, -/turf/open/floor/monotile/steel{ - initial_gas_mix = "TEMP=2.7" - }, -/area/quartermaster/miningoffice) "td" = ( /turf/open/floor/monotile/steel, /area/science) @@ -6432,6 +6405,13 @@ /obj/item/radio/intercom/directional/east, /turf/open/floor/monotile/steel, /area/hallway/nsv/deck2/primary) +"uc" = ( +/obj/structure/closet/secure_closet/engineering_welding{ + req_access = null; + req_one_access_txt = "48" + }, +/turf/open/floor/monotile/steel/airless, +/area/nsv/hanger/mining) "ud" = ( /obj/structure/cable{ icon_state = "4-8" @@ -7161,10 +7141,7 @@ /turf/closed/wall/r_wall, /area/security/prison) "wn" = ( -/obj/machinery/light{ - dir = 1 - }, -/obj/machinery/vendor/mining, +/obj/machinery/airalarm/directional/north, /turf/open/floor/monotile/steel{ initial_gas_mix = "TEMP=2.7" }, @@ -7400,17 +7377,6 @@ icon_state = "platingdmg2" }, /area/maintenance/nsv/deck2/starboard) -"xb" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 5 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 5 - }, -/turf/open/floor/monotile/steel{ - initial_gas_mix = "TEMP=2.7" - }, -/area/quartermaster/miningoffice) "xc" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 10 @@ -8576,6 +8542,10 @@ }, /turf/open/indestructible/sound/pool/spentfuel/wall, /area/engine/engine_room) +"Br" = ( +/obj/machinery/light, +/turf/open/floor/monotile/steel/airless, +/area/nsv/hanger/mining) "Bs" = ( /obj/effect/spawner/structure/window/reinforced, /obj/structure/cable{ @@ -9187,9 +9157,7 @@ /turf/open/floor/plating, /area/maintenance/nsv/deck2/starboard) "DH" = ( -/turf/open/floor/plasteel/techmaint{ - initial_gas_mix = "TEMP=2.7" - }, +/turf/closed/wall/r_wall, /area/quartermaster/miningoffice) "DM" = ( /obj/structure/cable/yellow{ @@ -9371,10 +9339,6 @@ /obj/item/clothing/ears/earmuffs, /turf/open/floor/monotile/dark, /area/nsv/weapons) -"Ev" = ( -/obj/machinery/light, -/turf/open/floor/monotile/steel/airless, -/area/nsv/hanger/mining) "Ex" = ( /obj/structure/chair, /turf/open/floor/wood, @@ -9774,12 +9738,6 @@ }, /turf/open/floor/monotile/dark, /area/nsv/weapons) -"Ga" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2, -/turf/open/floor/plasteel/techmaint{ - initial_gas_mix = "TEMP=2.7" - }, -/area/quartermaster/miningoffice) "Gd" = ( /obj/machinery/computer/camera_advanced/xenobio{ dir = 8 @@ -10092,6 +10050,18 @@ }, /turf/open/floor/durasteel/alt, /area/hallway/nsv/deck2/primary) +"Hb" = ( +/obj/machinery/camera/autoname{ + dir = 4 + }, +/obj/machinery/power/apc/auto_name/west, +/obj/structure/cable{ + icon_state = "0-2" + }, +/turf/open/floor/monotile/steel{ + initial_gas_mix = "TEMP=2.7" + }, +/area/quartermaster/miningoffice) "Hc" = ( /obj/structure/rack, /obj/effect/spawner/lootdrop/maintenance/three, @@ -10418,9 +10388,6 @@ }, /turf/open/floor/monotile/steel, /area/security/brig) -"Ij" = ( -/turf/open/floor/monotile/steel/airless, -/area/nsv/hanger/mining) "Il" = ( /obj/machinery/door/airlock/ship/external/glass{ req_one_access_txt = "24" @@ -10688,13 +10655,9 @@ /turf/open/floor/plating, /area/maintenance/nsv/deck2/port/fore) "Jq" = ( -/obj/item/radio, -/obj/item/radio, -/obj/item/radio, -/obj/item/radio, -/obj/structure/rack, -/turf/open/floor/monotile/steel/airless, -/area/nsv/hanger/mining) +/obj/effect/spawner/structure/window/reinforced, +/turf/open/floor/plating, +/area/quartermaster/miningoffice) "Jr" = ( /obj/effect/turf_decal/stripes/line{ dir = 5 @@ -11590,9 +11553,31 @@ /turf/open/floor/durasteel/techfloor_grid, /area/maintenance/nsv/deck2/port) "LV" = ( -/obj/effect/spawner/structure/window/reinforced, -/turf/open/floor/plating, -/area/quartermaster/miningoffice) +/turf/open/floor/monotile/steel/airless, +/area/nsv/hanger/mining) +"LW" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/machinery/button/door{ + id = "atlas_mining_hangar"; + name = "Pod Bay Doors"; + pixel_y = 32; + req_one_access_txt = "48" + }, +/turf/open/floor/monotile/steel{ + initial_gas_mix = "TEMP=2.7" + }, +/area/nsv/hanger/mining) +"LX" = ( +/obj/machinery/camera/autoname{ + dir = 1 + }, +/obj/structure/rack, +/obj/item/gps/mining, +/obj/item/gps/mining, +/turf/open/floor/monotile/steel/airless, +/area/nsv/hanger/mining) "LY" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 8 @@ -11739,6 +11724,20 @@ /obj/item/ship_weapon/parts/missile/iff_card, /turf/open/floor/engine, /area/nsv/weapons) +"Mq" = ( +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ + dir = 1 + }, +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ + dir = 1 + }, +/turf/open/floor/monotile/steel{ + initial_gas_mix = "TEMP=2.7" + }, +/area/quartermaster/miningoffice) "Ms" = ( /obj/structure/cable{ icon_state = "1-16" @@ -11881,20 +11880,6 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/carpet/red, /area/nsv/weapons) -"MM" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/obj/machinery/button/door{ - id = "atlas_mining_hangar"; - name = "Pod Bay Doors"; - pixel_y = 32; - req_one_access_txt = "48" - }, -/turf/open/floor/monotile/steel{ - initial_gas_mix = "TEMP=2.7" - }, -/area/nsv/hanger/mining) "MO" = ( /turf/closed/wall/r_wall, /area/engine/engine_room) @@ -12117,9 +12102,6 @@ /turf/open/floor/monotile/dark, /area/engine/engine_room) "NN" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 9 - }, /obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ dir = 4 }, @@ -12706,13 +12688,6 @@ }, /turf/open/floor/monotile/dark, /area/science) -"Pu" = ( -/obj/machinery/firealarm/directional/west, -/obj/structure/tank_dispenser/oxygen, -/turf/open/floor/monotile/steel{ - initial_gas_mix = "TEMP=2.7" - }, -/area/quartermaster/miningoffice) "Px" = ( /obj/machinery/camera/autoname{ dir = 8 @@ -12766,7 +12741,7 @@ dir = 8 }, /obj/structure/cable{ - icon_state = "1-2" + icon_state = "1-8" }, /turf/open/floor/monotile/steel{ initial_gas_mix = "TEMP=2.7" @@ -13425,6 +13400,11 @@ }, /turf/open/floor/monotile/steel, /area/nsv/weapons/gauss/battery/deck2/port) +"RG" = ( +/turf/open/floor/plasteel/techmaint{ + initial_gas_mix = "TEMP=2.7" + }, +/area/quartermaster/miningoffice) "RH" = ( /obj/structure/cable{ icon_state = "4-8" @@ -13737,7 +13717,19 @@ /turf/open/floor/monotile/steel, /area/science) "SP" = ( -/turf/closed/wall/r_wall, +/obj/machinery/atmospherics/pipe/layer_manifold{ + dir = 4 + }, +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/door/airlock/ship/external/glass{ + req_one_access_txt = "31; 48"; + name = "Mining Hangar Access" + }, +/turf/open/floor/monotile/steel{ + initial_gas_mix = "TEMP=2.7" + }, /area/quartermaster/miningoffice) "SR" = ( /obj/machinery/recharge_station, @@ -14133,6 +14125,17 @@ /obj/machinery/light, /turf/open/floor/durasteel/alt, /area/hallway/nsv/deck2/primary) +"TV" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 5 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 5 + }, +/turf/open/floor/monotile/steel{ + initial_gas_mix = "TEMP=2.7" + }, +/area/quartermaster/miningoffice) "TX" = ( /obj/effect/turf_decal/stripes/line{ dir = 6 @@ -14276,14 +14279,13 @@ /turf/open/floor/plating, /area/maintenance/nsv/deck2/port) "Uy" = ( -/obj/structure/closet/secure_closet/miner, -/obj/item/stack/sheet/mineral/wood/five, -/obj/item/encryptionkey/pilot, -/obj/item/encryptionkey/pilot, -/turf/open/floor/monotile/steel{ - initial_gas_mix = "TEMP=2.7" - }, -/area/quartermaster/miningoffice) +/obj/item/radio, +/obj/item/radio, +/obj/item/radio, +/obj/item/radio, +/obj/structure/rack, +/turf/open/floor/monotile/steel/airless, +/area/nsv/hanger/mining) "Uz" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -14438,20 +14440,6 @@ }, /turf/open/floor/monotile/dark/airless, /area/nsv/hanger/notkmcstupidhanger) -"UU" = ( -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ - dir = 1 - }, -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ - dir = 1 - }, -/turf/open/floor/monotile/steel{ - initial_gas_mix = "TEMP=2.7" - }, -/area/quartermaster/miningoffice) "UY" = ( /obj/structure/reagent_dispensers/fueltank/cryogenic_fuel, /turf/open/floor/plating{ @@ -14613,6 +14601,24 @@ /area/crew_quarters/abandoned_gambling_den{ name = "Abandoned Bar" }) +"Vy" = ( +/obj/machinery/advanced_airlock_controller/directional/east{ + pixel_y = 24 + }, +/obj/item/radio/intercom/directional/north, +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 4 + }, +/turf/open/floor/plasteel/techmaint{ + initial_gas_mix = "TEMP=2.7" + }, +/area/quartermaster/miningoffice) "Vz" = ( /obj/machinery/conveyor{ dir = 8; @@ -14935,15 +14941,6 @@ /obj/structure/sign/ship/deck/two, /turf/closed/wall/steel, /area/maintenance/nsv/deck2/port) -"WC" = ( -/obj/machinery/camera/autoname{ - dir = 1 - }, -/obj/structure/rack, -/obj/item/gps/mining, -/obj/item/gps/mining, -/turf/open/floor/monotile/steel/airless, -/area/nsv/hanger/mining) "WD" = ( /obj/structure/overmap/small_craft/transport/sabre, /obj/effect/turf_decal/loading_area{ @@ -53018,14 +53015,14 @@ fc oo tP tP -SP -SP -SP +DH +DH +DH Ry -LV -SP -SP -SP +Jq +DH +DH +DH Od Nh Nh @@ -53275,14 +53272,14 @@ kg Rh Tb QI -SP -Pu -ta +DH +ot +Hb Qs De cY De -LV +Jq Od Nh Nh @@ -53532,14 +53529,14 @@ kg Gy td VM -SP -wn DH +ip +RG ar wt zJ ya -LV +Jq Od Nh Nh @@ -53789,14 +53786,14 @@ bo ti Ki xp -SP -dG -Ga +DH +wn +bX NN wk sA Ja -LV +Jq Od Nh Nh @@ -54046,14 +54043,14 @@ Oq ti HA Yc -SP +DH yg -Uy -Uy +pA +pA wr -UU -xb -SP +Mq +TV +DH Od Nh Nh @@ -54303,14 +54300,14 @@ qf Be wU Wa -SP -SP -LV -LV -SP +DH +DH +Jq +Jq +DH Eb Ho -SP +DH Od Nh Nh @@ -54562,12 +54559,12 @@ Bj ez Pm ls -Ij -Jq -SP -qs -zc LV +Uy +DH +Vy +zc +Jq Od Nh Nh @@ -54820,11 +54817,11 @@ ZZ Pm jG sH -WC -SP -qX +LX +DH +lg kx -LV +Jq Od Nh Nh @@ -55075,13 +55072,13 @@ yN sn Mi Pm -ot -Ij -Ev -SP -be -SP +uc +LV +Br +DH SP +DH +DH kD Nh Nh @@ -55334,9 +55331,9 @@ fy Pm Pm xs +be +be PJ -PJ -eU fn Pm Nh @@ -55847,7 +55844,7 @@ av lj WM Pm -MM +LW sH sH sH From 37a47d85417ee02aabcbd94fc80efdcf4bae4159 Mon Sep 17 00:00:00 2001 From: Seryn Date: Tue, 12 Sep 2023 21:56:58 -0700 Subject: [PATCH 07/11] Last issue, I promise. Fixing atmos sins is a later project. --- _maps/map_files/Atlas/atlas2.dmm | 67 +++++++++++++++++++------------- 1 file changed, 40 insertions(+), 27 deletions(-) diff --git a/_maps/map_files/Atlas/atlas2.dmm b/_maps/map_files/Atlas/atlas2.dmm index 300f355ad9b..99ddd01f70e 100644 --- a/_maps/map_files/Atlas/atlas2.dmm +++ b/_maps/map_files/Atlas/atlas2.dmm @@ -1106,6 +1106,16 @@ }, /turf/open/floor/wood, /area/crew_quarters/bar/mess_hall) +"eZ" = ( +/obj/machinery/computer/robotics{ + dir = 1 + }, +/obj/machinery/camera/autoname{ + dir = 1 + }, +/obj/structure/extinguisher_cabinet/east, +/turf/open/floor/carpet/ship/beige_carpet, +/area/crew_quarters/heads/hor) "fa" = ( /turf/open/floor/plasteel/stairs{ dir = 8 @@ -1342,6 +1352,9 @@ /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ dir = 8 }, +/obj/structure/table/reinforced, +/obj/item/paper_bin, +/obj/item/stamp/research_director, /turf/open/floor/carpet/ship/beige_carpet, /area/crew_quarters/heads/hor) "fS" = ( @@ -1832,7 +1845,6 @@ /obj/structure/cable{ icon_state = "4-8" }, -/obj/structure/disposalpipe/segment, /obj/effect/turf_decal/tile/ship/blue{ dir = 8 }, @@ -1926,7 +1938,8 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/structure/disposalpipe/junction{ +/obj/structure/disposalpipe/sorting/mail{ + sortType = 10; dir = 8 }, /turf/open/floor/monotile/steel, @@ -2749,15 +2762,15 @@ /obj/effect/turf_decal/tile/ship/half/yellow{ dir = 8 }, -/obj/structure/disposalpipe/sorting/mail{ - sortType = 5 - }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 8 }, +/obj/structure/disposalpipe/segment{ + dir = 9 + }, /turf/open/floor/monotile/steel, /area/hallway/nsv/deck1/hallway) "ma" = ( @@ -3322,12 +3335,6 @@ /turf/closed/wall/r_wall, /area/crew_quarters/heads/chief) "oX" = ( -/obj/machinery/computer/robotics{ - dir = 8 - }, -/obj/machinery/camera/autoname{ - dir = 1 - }, /obj/machinery/light_switch/east, /turf/open/floor/carpet/ship/beige_carpet, /area/crew_quarters/heads/hor) @@ -3504,7 +3511,6 @@ dir = 1 }, /obj/machinery/firealarm/directional/west, -/obj/structure/disposalpipe/segment, /obj/effect/turf_decal/tile/ship/blue{ dir = 8 }, @@ -3607,13 +3613,13 @@ /obj/structure/railing/corner{ dir = 8 }, -/obj/structure/disposalpipe/sorting/mail{ - dir = 4; - sortType = "5;10" - }, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ dir = 4 }, +/obj/structure/disposalpipe/sorting/mail{ + sortType = 5; + dir = 4 + }, /turf/open/floor/monotile/steel, /area/hallway/nsv/deck1/hallway) "qo" = ( @@ -3813,8 +3819,6 @@ /turf/open/floor/monotile/dark, /area/bridge/cic) "rs" = ( -/obj/structure/table/reinforced, -/obj/item/paper_bin, /obj/machinery/requests_console{ announcementConsole = 1; department = "Research Director's Desk"; @@ -3826,7 +3830,7 @@ /obj/structure/disposalpipe/trunk{ dir = 8 }, -/obj/item/stamp/research_director, +/obj/machinery/disposal/bin, /turf/open/floor/carpet/ship/beige_carpet, /area/crew_quarters/heads/hor) "rt" = ( @@ -4664,7 +4668,6 @@ /obj/effect/turf_decal/tile/ship/green{ dir = 8 }, -/obj/structure/disposalpipe/segment, /obj/effect/turf_decal/tile/ship/yellow{ dir = 1 }, @@ -7669,15 +7672,15 @@ /obj/effect/turf_decal/tile/ship/half/blue{ dir = 8 }, -/obj/structure/disposalpipe/sorting/mail{ - sortType = 10 - }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 8 }, +/obj/structure/disposalpipe/segment{ + dir = 10 + }, /turf/open/floor/monotile/steel, /area/hallway/nsv/deck1/hallway) "IV" = ( @@ -8467,7 +8470,6 @@ /obj/machinery/computer/mecha{ dir = 1 }, -/obj/structure/extinguisher_cabinet/east, /obj/item/radio/intercom/directional/south, /turf/open/floor/carpet/ship/beige_carpet, /area/crew_quarters/heads/hor) @@ -8783,6 +8785,18 @@ /obj/machinery/vending/hydronutrients, /turf/open/floor/monotile/steel, /area/hydroponics) +"Nu" = ( +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/effect/turf_decal/tile/ship/yellow{ + dir = 1 + }, +/obj/effect/turf_decal/tile/ship/yellow{ + dir = 8 + }, +/turf/open/floor/durasteel/alt, +/area/hallway/nsv/deck1/hallway) "Nv" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 6 @@ -11151,7 +11165,6 @@ /obj/effect/turf_decal/tile/ship/half/green{ dir = 8 }, -/obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 4 }, @@ -40035,7 +40048,7 @@ ob Sx dE lZ -dE +Nu vl YL pK @@ -40820,7 +40833,7 @@ cD Am rs oX -Cx +eZ Cx MS LU From 19f417046d79e964485576c3f6641e04eae70bd2 Mon Sep 17 00:00:00 2001 From: Seryn Date: Sun, 17 Sep 2023 08:15:19 -0700 Subject: [PATCH 08/11] Who the fuck created an airless-by-variable variant of the steel tile?! There is already a damned subtype, you fucking dweeb. --- _maps/map_files/Atlas/atlas.dmm | 184 ++++++++------------------------ 1 file changed, 46 insertions(+), 138 deletions(-) diff --git a/_maps/map_files/Atlas/atlas.dmm b/_maps/map_files/Atlas/atlas.dmm index a178a0cace8..7cc331b7434 100644 --- a/_maps/map_files/Atlas/atlas.dmm +++ b/_maps/map_files/Atlas/atlas.dmm @@ -147,9 +147,7 @@ /obj/structure/cable{ icon_state = "4-8" }, -/turf/open/floor/plasteel/techmaint{ - initial_gas_mix = "TEMP=2.7" - }, +/turf/open/floor/plasteel/techmaint, /area/quartermaster/miningoffice) "au" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, @@ -357,9 +355,7 @@ /obj/structure/cable{ icon_state = "1-2" }, -/turf/open/floor/monotile/steel{ - initial_gas_mix = "TEMP=2.7" - }, +/turf/open/floor/monotile/steel/airless, /area/nsv/hanger/mining) "bf" = ( /obj/structure/disposalpipe/segment{ @@ -590,9 +586,7 @@ /area/hallway/nsv/deck2/primary) "bX" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2, -/turf/open/floor/plasteel/techmaint{ - initial_gas_mix = "TEMP=2.7" - }, +/turf/open/floor/plasteel/techmaint, /area/quartermaster/miningoffice) "bY" = ( /obj/machinery/atmospherics/miner/toxins, @@ -860,9 +854,7 @@ dir = 8 }, /obj/machinery/suit_storage_unit/mining/eva, -/turf/open/floor/monotile/steel{ - initial_gas_mix = "TEMP=2.7" - }, +/turf/open/floor/monotile/steel, /area/quartermaster/miningoffice) "cZ" = ( /obj/structure/table/reinforced, @@ -1553,9 +1545,7 @@ dir = 10 }, /obj/item/radio/intercom/directional/south, -/turf/open/floor/monotile/steel{ - initial_gas_mix = "TEMP=2.7" - }, +/turf/open/floor/monotile/steel/airless, /area/nsv/hanger/mining) "fo" = ( /obj/machinery/door/airlock/highsecurity/ship{ @@ -2425,9 +2415,7 @@ /obj/machinery/camera/autoname{ dir = 1 }, -/turf/open/floor/monotile/steel{ - initial_gas_mix = "TEMP=2.7" - }, +/turf/open/floor/monotile/steel/airless, /area/nsv/hanger/mining) "hK" = ( /obj/machinery/door/firedoor/border_only{ @@ -2579,9 +2567,7 @@ dir = 1 }, /obj/machinery/vendor/mining, -/turf/open/floor/monotile/steel{ - initial_gas_mix = "TEMP=2.7" - }, +/turf/open/floor/monotile/steel, /area/quartermaster/miningoffice) "ir" = ( /turf/open/floor/durasteel/techfloor, @@ -3286,9 +3272,7 @@ c_tag = "Atmos - Airlock #2"; dir = 8 }, -/turf/open/floor/plasteel/techmaint{ - initial_gas_mix = "TEMP=2.7" - }, +/turf/open/floor/plasteel/techmaint, /area/quartermaster/miningoffice) "ky" = ( /obj/structure/cable{ @@ -3583,9 +3567,7 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 8 }, -/turf/open/floor/plasteel/techmaint{ - initial_gas_mix = "TEMP=2.7" - }, +/turf/open/floor/plasteel/techmaint, /area/quartermaster/miningoffice) "lh" = ( /obj/machinery/portable_atmospherics/scrubber, @@ -4204,9 +4186,7 @@ "no" = ( /obj/effect/turf_decal/stripes/line, /obj/machinery/light, -/turf/open/floor/monotile/steel{ - initial_gas_mix = "TEMP=2.7" - }, +/turf/open/floor/monotile/steel/airless, /area/nsv/hanger/mining) "np" = ( /obj/machinery/computer/ship/viewscreen, @@ -4510,9 +4490,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 5 }, -/turf/open/floor/monotile/steel{ - initial_gas_mix = "TEMP=2.7" - }, +/turf/open/floor/monotile/steel/airless, /area/nsv/hanger/mining) "oj" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, @@ -4596,9 +4574,7 @@ "ot" = ( /obj/machinery/firealarm/directional/west, /obj/structure/tank_dispenser/oxygen, -/turf/open/floor/monotile/steel{ - initial_gas_mix = "TEMP=2.7" - }, +/turf/open/floor/monotile/steel, /area/quartermaster/miningoffice) "ov" = ( /obj/structure/cable{ @@ -5025,9 +5001,7 @@ /obj/item/stack/sheet/mineral/wood/five, /obj/item/encryptionkey/pilot, /obj/item/encryptionkey/pilot, -/turf/open/floor/monotile/steel{ - initial_gas_mix = "TEMP=2.7" - }, +/turf/open/floor/monotile/steel, /area/quartermaster/miningoffice) "pC" = ( /obj/machinery/door/airlock/highsecurity/ship{ @@ -5292,9 +5266,7 @@ /obj/machinery/airalarm/server{ pixel_y = 23 }, -/turf/open/floor/monotile/steel{ - initial_gas_mix = "TEMP=2.7" - }, +/turf/open/floor/monotile/steel/airless, /area/nsv/hanger/mining) "ql" = ( /obj/effect/turf_decal/tile/ship/green, @@ -5937,9 +5909,7 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 5 }, -/turf/open/floor/plasteel/techmaint{ - initial_gas_mix = "TEMP=2.7" - }, +/turf/open/floor/plasteel/techmaint, /area/quartermaster/miningoffice) "sC" = ( /obj/effect/turf_decal/stripes/line, @@ -5967,9 +5937,7 @@ /turf/open/floor/monotile/dark, /area/hallway/nsv/deck2/primary) "sH" = ( -/turf/open/floor/plasteel/techmaint{ - initial_gas_mix = "TEMP=2.7" - }, +/turf/open/floor/plasteel/techmaint, /area/nsv/hanger/mining) "sI" = ( /obj/effect/turf_decal/tile/ship/half/red{ @@ -6649,9 +6617,7 @@ dir = 4; id = "atlas_mining_hangar" }, -/turf/open/floor/plasteel/techmaint{ - initial_gas_mix = "TEMP=2.7" - }, +/turf/open/floor/monotile/steel/airless, /area/nsv/hanger/mining) "uC" = ( /obj/machinery/light/small{ @@ -7133,18 +7099,14 @@ dir = 1 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/turf/open/floor/plasteel/techmaint{ - initial_gas_mix = "TEMP=2.7" - }, +/turf/open/floor/plasteel/techmaint, /area/quartermaster/miningoffice) "wl" = ( /turf/closed/wall/r_wall, /area/security/prison) "wn" = ( /obj/machinery/airalarm/directional/north, -/turf/open/floor/monotile/steel{ - initial_gas_mix = "TEMP=2.7" - }, +/turf/open/floor/monotile/steel, /area/quartermaster/miningoffice) "wq" = ( /obj/structure/cable{ @@ -7167,15 +7129,11 @@ c_tag = "Atmos - Airlock #2"; dir = 8 }, -/turf/open/floor/monotile/steel{ - initial_gas_mix = "TEMP=2.7" - }, +/turf/open/floor/monotile/steel, /area/quartermaster/miningoffice) "wt" = ( /obj/effect/landmark/start/shaft_miner, -/turf/open/floor/plasteel/techmaint{ - initial_gas_mix = "TEMP=2.7" - }, +/turf/open/floor/plasteel/techmaint, /area/quartermaster/miningoffice) "wu" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ @@ -7481,9 +7439,7 @@ /obj/structure/cable{ icon_state = "0-2" }, -/turf/open/floor/monotile/steel{ - initial_gas_mix = "TEMP=2.7" - }, +/turf/open/floor/monotile/steel/airless, /area/nsv/hanger/mining) "xt" = ( /obj/structure/cable/yellow{ @@ -7695,9 +7651,7 @@ "ya" = ( /obj/machinery/light, /obj/effect/landmark/start/shaft_miner, -/turf/open/floor/monotile/steel{ - initial_gas_mix = "TEMP=2.7" - }, +/turf/open/floor/monotile/steel, /area/quartermaster/miningoffice) "ye" = ( /obj/effect/turf_decal/stripes/line, @@ -7712,9 +7666,7 @@ /obj/item/stack/sheet/mineral/wood/five, /obj/item/encryptionkey/pilot, /obj/machinery/newscaster/directional/north, -/turf/open/floor/monotile/steel{ - initial_gas_mix = "TEMP=2.7" - }, +/turf/open/floor/monotile/steel, /area/quartermaster/miningoffice) "yk" = ( /obj/machinery/light_switch{ @@ -7984,9 +7936,7 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 8 }, -/turf/open/floor/plasteel/techmaint{ - initial_gas_mix = "TEMP=2.7" - }, +/turf/open/floor/plasteel/techmaint, /area/quartermaster/miningoffice) "ze" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ @@ -8179,9 +8129,7 @@ /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ dir = 4 }, -/turf/open/floor/plasteel/techmaint{ - initial_gas_mix = "TEMP=2.7" - }, +/turf/open/floor/plasteel/techmaint, /area/quartermaster/miningoffice) "zL" = ( /obj/effect/turf_decal/ship/outline, @@ -8612,9 +8560,7 @@ /area/security/prison) "BF" = ( /obj/effect/turf_decal/stripes/line, -/turf/open/floor/monotile/steel{ - initial_gas_mix = "TEMP=2.7" - }, +/turf/open/floor/monotile/steel/airless, /area/nsv/hanger/mining) "BG" = ( /obj/machinery/atmospherics/components/trinary/filter/atmos/n2o{ @@ -9010,9 +8956,7 @@ /area/nsv/hanger/notkmcstupidhanger) "De" = ( /obj/machinery/suit_storage_unit/mining/eva, -/turf/open/floor/monotile/steel{ - initial_gas_mix = "TEMP=2.7" - }, +/turf/open/floor/monotile/steel, /area/quartermaster/miningoffice) "Dh" = ( /obj/item/radio/intercom/directional/west, @@ -9241,9 +9185,7 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 4 }, -/turf/open/floor/monotile/steel{ - initial_gas_mix = "TEMP=2.7" - }, +/turf/open/floor/plasteel/techmaint, /area/quartermaster/miningoffice) "Ec" = ( /obj/machinery/light{ @@ -10058,9 +10000,7 @@ /obj/structure/cable{ icon_state = "0-2" }, -/turf/open/floor/monotile/steel{ - initial_gas_mix = "TEMP=2.7" - }, +/turf/open/floor/monotile/steel, /area/quartermaster/miningoffice) "Hc" = ( /obj/structure/rack, @@ -10071,9 +10011,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 6 }, -/turf/open/floor/monotile/steel{ - initial_gas_mix = "TEMP=2.7" - }, +/turf/open/floor/monotile/steel/airless, /area/nsv/hanger/mining) "He" = ( /obj/machinery/light_switch/west, @@ -10324,9 +10262,7 @@ /obj/machinery/light{ dir = 1 }, -/turf/open/floor/monotile/steel{ - initial_gas_mix = "TEMP=2.7" - }, +/turf/open/floor/monotile/steel/airless, /area/nsv/hanger/mining) "HQ" = ( /obj/structure/grille, @@ -10536,9 +10472,7 @@ /turf/open/floor/monotile/steel, /area/maintenance/department/science) "Ja" = ( -/turf/open/floor/monotile/steel{ - initial_gas_mix = "TEMP=2.7" - }, +/turf/open/floor/monotile/steel, /area/quartermaster/miningoffice) "Jb" = ( /obj/structure/sign/ship/securearea{ @@ -10692,9 +10626,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 1 }, -/turf/open/floor/monotile/steel{ - initial_gas_mix = "TEMP=2.7" - }, +/turf/open/floor/monotile/steel/airless, /area/nsv/hanger/mining) "Jw" = ( /obj/machinery/gauss_dispenser, @@ -11565,9 +11497,7 @@ pixel_y = 32; req_one_access_txt = "48" }, -/turf/open/floor/monotile/steel{ - initial_gas_mix = "TEMP=2.7" - }, +/turf/open/floor/monotile/steel/airless, /area/nsv/hanger/mining) "LX" = ( /obj/machinery/camera/autoname{ @@ -11734,9 +11664,7 @@ /obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ dir = 1 }, -/turf/open/floor/monotile/steel{ - initial_gas_mix = "TEMP=2.7" - }, +/turf/open/floor/monotile/steel, /area/quartermaster/miningoffice) "Ms" = ( /obj/structure/cable{ @@ -12111,9 +12039,7 @@ /obj/structure/cable{ icon_state = "2-8" }, -/turf/open/floor/plasteel/techmaint{ - initial_gas_mix = "TEMP=2.7" - }, +/turf/open/floor/plasteel/techmaint, /area/quartermaster/miningoffice) "NO" = ( /obj/effect/turf_decal/stripes/line{ @@ -12743,9 +12669,7 @@ /obj/structure/cable{ icon_state = "1-8" }, -/turf/open/floor/monotile/steel{ - initial_gas_mix = "TEMP=2.7" - }, +/turf/open/floor/monotile/steel/airless, /area/nsv/hanger/mining) "PL" = ( /obj/machinery/airalarm/directional/north, @@ -12959,9 +12883,7 @@ /obj/structure/cable{ icon_state = "1-8" }, -/turf/open/floor/monotile/steel{ - initial_gas_mix = "TEMP=2.7" - }, +/turf/open/floor/monotile/steel, /area/quartermaster/miningoffice) "Qu" = ( /obj/effect/turf_decal/stripes/line, @@ -13401,9 +13323,7 @@ /turf/open/floor/monotile/steel, /area/nsv/weapons/gauss/battery/deck2/port) "RG" = ( -/turf/open/floor/plasteel/techmaint{ - initial_gas_mix = "TEMP=2.7" - }, +/turf/open/floor/plasteel/techmaint, /area/quartermaster/miningoffice) "RH" = ( /obj/structure/cable{ @@ -13727,9 +13647,7 @@ req_one_access_txt = "31; 48"; name = "Mining Hangar Access" }, -/turf/open/floor/monotile/steel{ - initial_gas_mix = "TEMP=2.7" - }, +/turf/open/floor/plasteel/techmaint, /area/quartermaster/miningoffice) "SR" = ( /obj/machinery/recharge_station, @@ -14132,9 +14050,7 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 5 }, -/turf/open/floor/monotile/steel{ - initial_gas_mix = "TEMP=2.7" - }, +/turf/open/floor/monotile/steel, /area/quartermaster/miningoffice) "TX" = ( /obj/effect/turf_decal/stripes/line{ @@ -14489,9 +14405,7 @@ /area/nsv/hanger/notkmcstupidhanger) "Vg" = ( /obj/structure/overmap/small_craft/transport/sabre/mining, -/turf/open/floor/plasteel/techmaint{ - initial_gas_mix = "TEMP=2.7" - }, +/turf/open/floor/plasteel/techmaint, /area/nsv/hanger/mining) "Vh" = ( /obj/structure/cable/yellow{ @@ -14615,9 +14529,7 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 4 }, -/turf/open/floor/plasteel/techmaint{ - initial_gas_mix = "TEMP=2.7" - }, +/turf/open/floor/plasteel/techmaint, /area/quartermaster/miningoffice) "Vz" = ( /obj/machinery/conveyor{ @@ -14725,9 +14637,7 @@ dir = 4; id = "atlas_mining_hangar" }, -/turf/open/floor/plasteel/techmaint{ - initial_gas_mix = "TEMP=2.7" - }, +/turf/open/floor/monotile/steel/airless, /area/nsv/hanger/mining) "VQ" = ( /obj/structure/particle_accelerator/end_cap{ @@ -15684,9 +15594,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 4 }, -/turf/open/floor/plasteel/techmaint{ - initial_gas_mix = "TEMP=2.7" - }, +/turf/open/floor/plasteel/techmaint, /area/nsv/hanger/mining) "Zu" = ( /obj/effect/turf_decal/tile/ship/half/green{ From e74d9ebc77b38ec05871b6107539cb5825b25a34 Mon Sep 17 00:00:00 2001 From: Seryn Date: Fri, 22 Sep 2023 16:05:17 -0700 Subject: [PATCH 09/11] Gas flow meter tweak --- _maps/map_files/Atlas/atlas.dmm | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/_maps/map_files/Atlas/atlas.dmm b/_maps/map_files/Atlas/atlas.dmm index 7cc331b7434..4ace60bf0fe 100644 --- a/_maps/map_files/Atlas/atlas.dmm +++ b/_maps/map_files/Atlas/atlas.dmm @@ -4427,9 +4427,6 @@ /turf/open/floor/durasteel/alt, /area/hallway/nsv/deck2/primary) "nT" = ( -/obj/machinery/meter/atmos{ - target_layer = 4 - }, /obj/machinery/atmospherics/components/binary/pump/on/layer2{ name = "Air to distro"; target_pressure = 2000 @@ -10343,6 +10340,10 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 9 }, +/obj/machinery/meter/atmos{ + target_layer = 4; + name = "Scrubber loop gas flow meter" + }, /turf/open/floor/plating, /area/engine/atmos) "In" = ( @@ -11843,7 +11844,8 @@ }, /obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, /obj/machinery/meter/atmos/distro_loop{ - target_layer = 2 + target_layer = 2; + name = "Distribution loop gas flow meter" }, /turf/open/floor/plating, /area/engine/atmos) @@ -12401,7 +12403,6 @@ /obj/machinery/atmospherics/pipe/simple/green/visible{ dir = 4 }, -/obj/machinery/meter/atmos/atmos_waste_loop, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 6 }, From 6b2b6f11965155085cbe08ac9a402098b08d1abb Mon Sep 17 00:00:00 2001 From: Seryn Date: Sat, 30 Sep 2023 12:40:06 -0700 Subject: [PATCH 10/11] fix for tyrozine in atmos --- _maps/map_files/Atlas/atlas.dmm | 3 --- 1 file changed, 3 deletions(-) diff --git a/_maps/map_files/Atlas/atlas.dmm b/_maps/map_files/Atlas/atlas.dmm index 4ace60bf0fe..4f600941ca4 100644 --- a/_maps/map_files/Atlas/atlas.dmm +++ b/_maps/map_files/Atlas/atlas.dmm @@ -8650,9 +8650,6 @@ /obj/machinery/portable_atmospherics/canister/nitrous_oxide{ valve_open = 1 }, -/obj/structure/reagent_dispensers/fueltank/cryogenic_fuel, -/obj/structure/reagent_dispensers/fueltank/cryogenic_fuel, -/obj/structure/reagent_dispensers/fueltank/cryogenic_fuel, /turf/open/floor/engine/n2o, /area/engine/atmos) "BU" = ( From 3ee2dbd93af075c34dec0728023db4ea1ce0b27f Mon Sep 17 00:00:00 2001 From: Seryn Date: Sat, 30 Sep 2023 13:22:45 -0700 Subject: [PATCH 11/11] Moved the mining sabre, slightly extended mining hangar --- _maps/map_files/Atlas/atlas.dmm | 46 ++++++++++++++++----------------- 1 file changed, 23 insertions(+), 23 deletions(-) diff --git a/_maps/map_files/Atlas/atlas.dmm b/_maps/map_files/Atlas/atlas.dmm index 4f600941ca4..efd857ea4cc 100644 --- a/_maps/map_files/Atlas/atlas.dmm +++ b/_maps/map_files/Atlas/atlas.dmm @@ -14010,7 +14010,7 @@ dir = 1 }, /turf/open/space/basic, -/area/nsv/hanger/mining) +/area/space/nearstation) "TT" = ( /obj/structure/cable/yellow{ icon_state = "1-2" @@ -55496,7 +55496,7 @@ Pm qk sH sH -Vg +sH BF Pm Nh @@ -55753,7 +55753,7 @@ Pm LW sH sH -sH +Vg BF Pm Nh @@ -56267,7 +56267,7 @@ Pm Ju sH sH -Vg +sH no Pm Nh @@ -56524,7 +56524,7 @@ Pm Ju sH sH -sH +Vg BF Pm Nh @@ -57035,11 +57035,11 @@ Ya Mi Mi Pm -oi -Zs -Zs -Zs -Hd +Ju +sH +sH +sH +BF Pm Nh Nh @@ -57292,11 +57292,11 @@ Vk HF fI Pm -Pm -VO -VO -VO -uA +oi +Zs +Zs +Zs +Hd Pm Nh Nh @@ -57549,12 +57549,12 @@ Lt UM fI Pm -TE -Nh -Nh -Nh -Nh -Nh +Pm +VO +VO +VO +uA +Pm Nh Nh Nh @@ -57806,7 +57806,7 @@ fI fI fI Pm -TS +TE Nh Nh Nh @@ -58063,7 +58063,7 @@ fI kD kD kD -pK +TS Nh Nh Nh