Lower Mining Access fix and airlock fix (#4452)

* Minor Changes to the main mining base airlock * Finaglling * Wire is fixed now
2025-12-09 20:43:35 +00:00 · 2022-09-29 23:22:55 -04:00
parent 346068a53e
commit ca0e93e69b
5 changed files with 389 additions and 137 deletions
--- a/_maps/map_files/rift/rift-01-underground3.dmm
+++ b/_maps/map_files/rift/rift-01-underground3.dmm
@@ -10,7 +10,7 @@
 	dir = 4
 	},
 /turf/simulated/floor/tiled/steel_grid,
-/area/quartermaster/miningdock)
+/area/quartermaster/mining_airlock)
 "bk" = (
 /obj/effect/floor_decal/steeldecal/steel_decals10{
 	dir = 5
@@ -19,7 +19,7 @@
 	dir = 6
 	},
 /turf/simulated/floor/tiled/steel_grid,
-/area/quartermaster/miningdock)
+/area/quartermaster/mining_airlock)
 "bC" = (
 /obj/effect/overlay/snow/floor/grav_edges{
 	dir = 9
@@ -36,12 +36,29 @@
 /obj/effect/floor_decal/industrial/warning{
 	dir = 4
 	},
+/obj/machinery/atmospherics/pipe/manifold/hidden,
+/atom/movable/map_helper/airlock/sensor/chamber_sensor,
+/obj/machinery/airlock_sensor/phoron{
+	pixel_y = 28;
+	pixel_x = 30
+	},
 /turf/simulated/floor/tiled/steel_grid,
-/area/quartermaster/miningdock)
+/area/quartermaster/mining_airlock)
 "cf" = (
 /obj/effect/overlay/snow/floor/grav_edges,
 /turf/simulated/floor/outdoors/snow/lythios43c/indoors,
 /area/rift/surfacebase/underground/under2)
+"cn" = (
+/obj/structure/railing{
+	dir = 1
+	},
+/obj/machinery/portable_atmospherics/powered/scrubber/huge/stationary/phoronlock{
+	frequency = 1379;
+	on = 1;
+	scrub_id = "mining_underground_airlock_scrubber"
+	},
+/turf/simulated/floor/plating,
+/area/quartermaster/mining_airlock)
 "cu" = (
 /obj/effect/zone_divider,
 /obj/effect/zone_divider,
@@ -60,6 +77,12 @@
 	},
 /turf/simulated/floor/outdoors/safeice/lythios43c/indoors,
 /area/rift/surfacebase/underground/under2)
+"et" = (
+/obj/machinery/atmospherics/pipe/simple/hidden{
+	dir = 6
+	},
+/turf/simulated/floor/tiled/steel,
+/area/quartermaster/mining_airlock)
 "eW" = (
 /obj/effect/zone_divider,
 /obj/effect/map_effect/portal/line/side_a{
@@ -76,18 +99,25 @@
 	name = "Mining Outpost Airlock"
 	},
 /obj/structure/catwalk,
+/atom/movable/map_helper/airlock/door/int_door,
+/obj/machinery/atmospherics/pipe/simple/hidden{
+	dir = 4
+	},
 /turf/simulated/floor,
-/area/quartermaster/miningdock)
-"gc" = (
-/turf/simulated/wall/r_wall,
-/area/quartermaster/miningdock)
+/area/quartermaster/mining_airlock)
+"ge" = (
+/obj/structure/cable/green{
+	icon_state = "2-8"
+	},
+/turf/simulated/floor/plating,
+/area/quartermaster/mining_airlock)
 "gG" = (
 /obj/machinery/conveyor{
 	dir = 4;
 	id = "miningboxtransfer1"
 	},
 /turf/simulated/floor/tiled/steel_dirty/lythios43c/indoors,
-/area/quartermaster/miningdock)
+/area/quartermaster/mining_airlock)
 "gO" = (
 /obj/effect/blocker,
 /turf/simulated/floor/outdoors/snow/lythios43c,
@@ -99,40 +129,49 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 10
 	},
+/obj/structure/cable/green{
+	icon_state = "1-2"
+	},
 /turf/simulated/floor/plating,
-/area/maintenance/lower/mining)
+/area/quartermaster/mining_airlock)
 "hN" = (
 /obj/machinery/conveyor{
 	dir = 4;
 	id = "miningboxtransfer1"
 	},
 /turf/simulated/floor/tiled/steel,
-/area/quartermaster/miningdock)
+/area/quartermaster/mining_airlock)
+"ig" = (
+/obj/structure/cable/green{
+	icon_state = "4-6"
+	},
+/turf/simulated/floor/plating,
+/area/quartermaster/mining_airlock)
 "iy" = (
 /obj/machinery/conveyor_switch{
 	id = "miningboxtransfer1"
 	},
 /turf/simulated/floor/tiled/steel,
-/area/quartermaster/miningdock)
+/area/quartermaster/mining_airlock)
 "jo" = (
-/obj/effect/floor_decal/steeldecal/steel_decals10{
-	dir = 9
+/obj/structure/railing,
+/obj/machinery/light/small{
+	dir = 1;
+	pixel_x = -2
 	},
-/obj/effect/floor_decal/steeldecal/steel_decals10{
-	dir = 10
+/atom/movable/map_helper/airlock/atmos/chamber_pump,
+/obj/machinery/atmospherics/component/unary/vent_pump/high_volume{
+	frequency = 1379
 	},
-/obj/machinery/alarm{
-	pixel_y = 20
-	},
-/turf/simulated/floor/tiled/steel_grid,
-/area/quartermaster/miningdock)
+/turf/simulated/floor/plating,
+/area/quartermaster/mining_airlock)
 "jq" = (
 /obj/structure/ladder/snake_eater/up,
 /turf/simulated/floor/plating,
-/area/maintenance/lower/mining)
+/area/quartermaster/mining_airlock)
 "jJ" = (
 /turf/simulated/wall,
-/area/quartermaster/miningdock)
+/area/quartermaster/mining_airlock)
 "jV" = (
 /turf/simulated/floor/holofloor/tiled/dark,
 /area/turbolift/rmine/under3)
@@ -144,7 +183,7 @@
 	dir = 8
 	},
 /turf/simulated/floor/tiled/steel,
-/area/quartermaster/miningdock)
+/area/quartermaster/mining_airlock)
 "ky" = (
 /obj/effect/zone_divider,
 /obj/effect/zone_divider,
@@ -160,7 +199,7 @@
 	},
 /obj/effect/floor_decal/industrial/hatch/yellow,
 /turf/simulated/floor/tiled/steel,
-/area/quartermaster/miningdock)
+/area/quartermaster/mining_airlock)
 "ln" = (
 /obj/effect/zone_divider,
 /obj/effect/zone_divider,
@@ -174,7 +213,7 @@
 /area/rift/surfacebase/underground/under2)
 "lz" = (
 /turf/simulated/wall/r_wall,
-/area/maintenance/lower/mining)
+/area/quartermaster/mining_airlock)
 "lH" = (
 /obj/effect/zone_divider,
 /obj/effect/zone_divider,
@@ -185,6 +224,12 @@
 	name = "glacier wall"
 	},
 /area/rift/surfacebase/underground/under2)
+"lP" = (
+/obj/structure/cable/green{
+	icon_state = "4-10"
+	},
+/turf/simulated/floor/plating,
+/area/quartermaster/mining_airlock)
 "mv" = (
 /obj/effect/floor_decal/steeldecal/steel_decals10{
 	dir = 9
@@ -194,8 +239,11 @@
 	},
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/machinery/atmospherics/pipe/simple/hidden{
+	dir = 4
+	},
 /turf/simulated/floor/tiled/steel_grid,
-/area/quartermaster/miningdock)
+/area/quartermaster/mining_airlock)
 "mG" = (
 /obj/effect/overlay/snow/floor/grav_edges{
 	dir = 1
@@ -205,20 +253,31 @@
 "ne" = (
 /turf/simulated/floor/outdoors/gravsnow/lythios43c/indoors,
 /area/rift/surfacebase/underground/under2)
+"nu" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	dir = 8
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 4
+	},
+/turf/simulated/floor/tiled/steel,
+/area/quartermaster/mining_airlock)
 "ou" = (
 /obj/machinery/atmospherics/component/unary/vent_scrubber/on{
 	dir = 4
 	},
 /turf/simulated/floor/tiled/steel,
-/area/quartermaster/miningdock)
+/area/quartermaster/mining_airlock)
 "oE" = (
 /obj/structure/catwalk,
-/obj/machinery/door/airlock/multi_tile/glass,
+/obj/machinery/door/airlock/multi_tile/glass{
+	req_access = list(31)
+	},
 /obj/machinery/door/firedoor/multi_tile,
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /turf/simulated/floor,
-/area/quartermaster/miningdock)
+/area/quartermaster/mining_airlock)
 "oQ" = (
 /obj/effect/zone_divider,
 /obj/effect/zone_divider,
@@ -241,12 +300,15 @@
 	dir = 4
 	},
 /turf/simulated/floor/tiled/steel_grid,
-/area/quartermaster/miningdock)
+/area/quartermaster/mining_airlock)
 "pk" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/structure/cable/green{
+	icon_state = "1-2"
+	},
 /turf/simulated/floor/plating,
-/area/maintenance/lower/mining)
+/area/quartermaster/mining_airlock)
 "pw" = (
 /obj/machinery/door/airlock/lift,
 /turf/simulated/floor/holofloor/tiled/dark,
@@ -261,7 +323,7 @@
 	id = "miningboxtransfer1"
 	},
 /turf/simulated/floor/tiled/steel,
-/area/quartermaster/miningdock)
+/area/quartermaster/mining_airlock)
 "rl" = (
 /obj/effect/zone_divider,
 /obj/effect/zone_divider,
@@ -274,7 +336,7 @@
 	dir = 4
 	},
 /turf/simulated/floor/tiled/steel_dirty/lythios43c/indoors,
-/area/quartermaster/miningdock)
+/area/quartermaster/mining_airlock)
 "rS" = (
 /obj/effect/floor_decal/steeldecal/steel_decals10{
 	dir = 9
@@ -285,8 +347,11 @@
 /obj/effect/floor_decal/industrial/warning{
 	dir = 8
 	},
+/obj/machinery/atmospherics/pipe/simple/hidden{
+	dir = 5
+	},
 /turf/simulated/floor/tiled/steel_grid,
-/area/quartermaster/miningdock)
+/area/quartermaster/mining_airlock)
 "rZ" = (
 /obj/effect/map_effect/portal/master/side_a{
 	dir = 4;
@@ -295,6 +360,18 @@
 	},
 /turf/simulated/floor/outdoors/snow/lythios43c,
 /area/rift/surfacebase/underground/under2)
+"sc" = (
+/obj/machinery/door/airlock/glass_external/public{
+	name = "Mining Outpost Airlock"
+	},
+/obj/structure/catwalk,
+/atom/movable/map_helper/airlock/door/int_door,
+/obj/machinery/access_button/airlock_interior{
+	pixel_y = -28;
+	master_tag = "mining_underground_airlock"
+	},
+/turf/simulated/floor,
+/area/quartermaster/mining_airlock)
 "so" = (
 /obj/effect/zone_divider,
 /obj/effect/overlay/snow/floor/grav_edges{
@@ -302,11 +379,19 @@
 	},
 /turf/simulated/floor/outdoors/snow/lythios43c,
 /area/rift/surfacebase/underground/under2)
+"tB" = (
+/obj/machinery/atmospherics/component/binary/passive_gate/on{
+	dir = 8;
+	pressure_resistance = 750;
+	target_pressure = 750
+	},
+/turf/simulated/floor/tiled/steel,
+/area/quartermaster/mining_airlock)
 "ux" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /turf/simulated/floor/tiled/steel,
-/area/quartermaster/miningdock)
+/area/quartermaster/mining_airlock)
 "uC" = (
 /turf/simulated/floor/outdoors/snow/lythios43c,
 /area/rift/surfacebase/underground/under2)
@@ -315,8 +400,11 @@
 	dir = 1;
 	pixel_y = -24
 	},
+/obj/machinery/atmospherics/pipe/simple/hidden{
+	dir = 4
+	},
 /turf/simulated/floor/tiled/steel,
-/area/quartermaster/miningdock)
+/area/quartermaster/mining_airlock)
 "uY" = (
 /obj/effect/map_effect/portal/line/side_a{
 	dir = 4
@@ -328,7 +416,7 @@
 /area/rift/surfacebase/underground/under2)
 "vr" = (
 /turf/simulated/floor/plating,
-/area/maintenance/lower/mining)
+/area/quartermaster/mining_airlock)
 "wH" = (
 /obj/effect/zone_divider,
 /turf/simulated/floor/outdoors/snow/lythios43c,
@@ -352,26 +440,32 @@
 	dir = 8
 	},
 /turf/simulated/floor/tiled/steel,
-/area/quartermaster/miningdock)
+/area/quartermaster/mining_airlock)
 "xb" = (
 /obj/effect/floor_decal/industrial/warning/dust{
 	dir = 10
 	},
 /turf/simulated/floor/tiled/steel_dirty/lythios43c/indoors,
-/area/quartermaster/miningdock)
+/area/quartermaster/mining_airlock)
 "xj" = (
 /obj/effect/zone_divider,
 /turf/simulated/floor/outdoors/gravsnow/lythios43c,
 /area/rift/surfacebase/underground/under2)
 "xs" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
-	dir = 9
-	},
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
 	dir = 9
 	},
+/obj/machinery/power/apc{
+	dir = 4;
+	name = "east bump";
+	pixel_x = 24
+	},
+/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
+	dir = 4
+	},
+/obj/structure/cable/green,
 /turf/simulated/floor/tiled/steel,
-/area/quartermaster/miningdock)
+/area/quartermaster/mining_airlock)
 "xK" = (
 /turf/simulated/wall/r_wall,
 /area/rift/surfacebase/underground/under2)
@@ -382,8 +476,11 @@
 /obj/effect/floor_decal/steeldecal/steel_decals10{
 	dir = 10
 	},
+/obj/machinery/atmospherics/pipe/simple/hidden{
+	dir = 4
+	},
 /turf/simulated/floor/tiled/steel_grid,
-/area/quartermaster/miningdock)
+/area/quartermaster/mining_airlock)
 "yo" = (
 /obj/effect/zone_divider,
 /obj/effect/overlay/snow/floor/grav_edges,
@@ -397,8 +494,9 @@
 /area/rift/surfacebase/underground/under2)
 "yS" = (
 /obj/structure/catwalk,
+/obj/machinery/atmospherics/pipe/simple/hidden,
 /turf/simulated/floor,
-/area/quartermaster/miningdock)
+/area/quartermaster/mining_airlock)
 "yV" = (
 /obj/effect/zone_divider,
 /turf/simulated/mineral/icerock/lythios43c,
@@ -410,27 +508,44 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
 	dir = 6
 	},
+/obj/structure/cable/green{
+	icon_state = "2-5"
+	},
 /turf/simulated/floor/plating,
-/area/maintenance/lower/mining)
+/area/quartermaster/mining_airlock)
+"AB" = (
+/obj/structure/railing{
+	dir = 1
+	},
+/obj/machinery/portable_atmospherics/powered/scrubber/huge/stationary/phoronlock/heater{
+	on = 1
+	},
+/turf/simulated/floor/plating,
+/area/quartermaster/mining_airlock)
 "AN" = (
 /obj/effect/floor_decal/industrial/hatch/yellow,
 /obj/effect/floor_decal/industrial/warning/dust{
 	dir = 8
 	},
 /turf/simulated/floor/tiled/steel_dirty/lythios43c/indoors,
-/area/quartermaster/miningdock)
+/area/quartermaster/mining_airlock)
 "Cq" = (
 /obj/structure/closet/crate,
+/obj/machinery/atmospherics/pipe/simple/hidden/universal,
 /turf/simulated/floor/tiled/steel,
-/area/quartermaster/miningdock)
+/area/quartermaster/mining_airlock)
 "Cz" = (
 /obj/structure/catwalk,
 /obj/machinery/door/airlock/glass_external/public{
 	name = "Mining Outpost Airlock"
 	},
-/obj/structure/fans/tiny,
+/atom/movable/map_helper/airlock/door/ext_door,
+/obj/machinery/embedded_controller/radio/airlock/phoron{
+	pixel_y = 26;
+	id_tag = "mining_underground_airlock"
+	},
 /turf/simulated/floor,
-/area/quartermaster/miningdock)
+/area/quartermaster/mining_airlock)
 "CE" = (
 /turf/simulated/floor/outdoors/gravsnow/lythios43c,
 /area/rift/surfacebase/underground/under2)
@@ -451,16 +566,25 @@
 	dir = 8
 	},
 /turf/simulated/floor/tiled/steel_grid,
-/area/quartermaster/miningdock)
+/area/quartermaster/mining_airlock)
 "EA" = (
 /obj/effect/overlay/snow/floor/grav_edges{
 	dir = 8
 	},
 /turf/simulated/floor/outdoors/snow/lythios43c/indoors,
 /area/rift/surfacebase/underground/under2)
-"EE" = (
-/turf/simulated/wall,
-/area/maintenance/lower/mining)
+"FV" = (
+/obj/structure/catwalk,
+/obj/machinery/door/airlock/glass_external/public{
+	name = "Mining Outpost Airlock"
+	},
+/atom/movable/map_helper/airlock/door/ext_door,
+/obj/machinery/access_button/airlock_exterior{
+	pixel_y = -28;
+	master_tag = "mining_underground_airlock"
+	},
+/turf/simulated/floor,
+/area/quartermaster/mining_airlock)
 "Ho" = (
 /obj/effect/overlay/snow/floor/grav_surround{
 	dir = 1
@@ -476,13 +600,29 @@
 "Ji" = (
 /obj/structure/closet/crate/miningcar,
 /obj/machinery/light,
+/obj/machinery/atmospherics/pipe/simple/hidden{
+	dir = 4
+	},
 /turf/simulated/floor/tiled/steel,
-/area/quartermaster/miningdock)
+/area/quartermaster/mining_airlock)
+"JC" = (
+/obj/machinery/atmospherics/portables_connector{
+	dir = 8
+	},
+/obj/machinery/portable_atmospherics/canister/air/airlock,
+/obj/effect/floor_decal/steeldecal/steel_decals10{
+	dir = 10
+	},
+/obj/effect/floor_decal/steeldecal/steel_decals10{
+	dir = 9
+	},
+/turf/simulated/floor/tiled/steel_grid,
+/area/quartermaster/mining_airlock)
 "JZ" = (
 /obj/structure/ore_box,
 /obj/effect/floor_decal/industrial/hatch/yellow,
 /turf/simulated/floor/tiled/steel,
-/area/quartermaster/miningdock)
+/area/quartermaster/mining_airlock)
 "Ki" = (
 /obj/effect/floor_decal/steeldecal/steel_decals10{
 	dir = 5
@@ -497,22 +637,19 @@
 	dir = 9
 	},
 /turf/simulated/floor/tiled/steel_grid,
-/area/quartermaster/miningdock)
+/area/quartermaster/mining_airlock)
 "KS" = (
 /obj/structure/sign/mining,
 /turf/simulated/wall,
-/area/maintenance/lower/mining)
+/area/quartermaster/mining_airlock)
 "LO" = (
 /turf/simulated/floor/tiled/steel,
-/area/quartermaster/miningdock)
+/area/quartermaster/mining_airlock)
 "LY" = (
 /obj/machinery/space_heater,
 /obj/structure/railing,
-/obj/machinery/alarm{
-	pixel_y = 20
-	},
 /turf/simulated/floor/plating,
-/area/quartermaster/miningdock)
+/area/quartermaster/mining_airlock)
 "Mb" = (
 /obj/machinery/door/airlock/maintenance/cargo{
 	req_access = list(50);
@@ -520,14 +657,26 @@
 	},
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/structure/cable/green{
+	icon_state = "1-2"
+	},
 /turf/simulated/floor/plating,
-/area/maintenance/lower/mining)
+/area/quartermaster/mining_airlock)
 "Nd" = (
 /turf/unsimulated/wall/planetary/lythios43c{
 	desc = "Glacial permafrost, compacted harder than stone.";
 	icon_state = "icerock-dark"
 	},
 /area/rift/surfacebase/underground/under2)
+"Nq" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	dir = 8
+	},
+/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
+	dir = 1
+	},
+/turf/simulated/floor/tiled/steel,
+/area/quartermaster/mining_airlock)
 "Ok" = (
 /obj/effect/overlay/snow/floor/grav_edges,
 /obj/machinery/light/flamp/noshade,
@@ -541,30 +690,36 @@
 	dir = 8
 	},
 /turf/simulated/floor/tiled/steel,
-/area/quartermaster/miningdock)
+/area/quartermaster/mining_airlock)
 "PG" = (
 /obj/effect/floor_decal/industrial/warning/dust{
 	dir = 1
 	},
 /obj/structure/ore_box,
 /turf/simulated/floor/tiled/steel_dirty/lythios43c/indoors,
-/area/quartermaster/miningdock)
-"Qr" = (
-/obj/structure/sign/mining,
-/turf/simulated/wall,
-/area/quartermaster/miningdock)
+/area/quartermaster/mining_airlock)
+"Qn" = (
+/obj/effect/floor_decal/steeldecal/steel_decals10{
+	dir = 9
+	},
+/obj/effect/floor_decal/steeldecal/steel_decals10{
+	dir = 10
+	},
+/obj/machinery/atmospherics/pipe/manifold/hidden,
+/turf/simulated/floor/tiled/steel_grid,
+/area/quartermaster/mining_airlock)
 "Qt" = (
 /obj/structure/grille,
 /obj/structure/window/reinforced/full,
 /obj/machinery/door/firedoor/glass,
 /turf/simulated/floor/plating,
-/area/maintenance/lower/mining)
+/area/quartermaster/mining_airlock)
 "QE" = (
 /obj/machinery/light/small{
 	dir = 4
 	},
 /turf/simulated/floor/tiled/steel_dirty/lythios43c/indoors,
-/area/quartermaster/miningdock)
+/area/quartermaster/mining_airlock)
 "Ro" = (
 /turf/unsimulated/wall/planetary/lythios43c{
 	desc = "Glacial permafrost, compacted harder than stone.";
@@ -575,7 +730,7 @@
 "RA" = (
 /obj/machinery/light,
 /turf/simulated/floor/tiled/steel,
-/area/quartermaster/miningdock)
+/area/quartermaster/mining_airlock)
 "RU" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
 	dir = 6
@@ -584,7 +739,7 @@
 	dir = 6
 	},
 /turf/simulated/floor/tiled/steel,
-/area/quartermaster/miningdock)
+/area/quartermaster/mining_airlock)
 "Sy" = (
 /obj/effect/overlay/snow/floor/grav_edges,
 /turf/simulated/floor/outdoors/snow/lythios43c,
@@ -597,7 +752,7 @@
 	dir = 5
 	},
 /turf/simulated/floor/tiled/steel_grid,
-/area/quartermaster/miningdock)
+/area/quartermaster/mining_airlock)
 "SW" = (
 /obj/effect/map_effect/portal/line/side_a{
 	dir = 4
@@ -612,10 +767,17 @@
 	dir = 4
 	},
 /turf/simulated/floor/plating,
-/area/maintenance/lower/mining)
+/area/quartermaster/mining_airlock)
 "TC" = (
 /turf/simulated/floor/tiled/steel_dirty/lythios43c/indoors,
-/area/quartermaster/miningdock)
+/area/quartermaster/mining_airlock)
+"Uw" = (
+/obj/structure/closet/crate,
+/obj/machinery/atmospherics/pipe/simple/hidden{
+	dir = 9
+	},
+/turf/simulated/floor/tiled/steel,
+/area/quartermaster/mining_airlock)
 "Vf" = (
 /obj/effect/floor_decal/steeldecal/steel_decals10{
 	dir = 6
@@ -627,7 +789,7 @@
 	dir = 4
 	},
 /turf/simulated/floor/tiled/steel_grid,
-/area/quartermaster/miningdock)
+/area/quartermaster/mining_airlock)
 "Vu" = (
 /obj/effect/floor_decal/industrial/outline/yellow,
 /obj/machinery/atmospherics/pipe/zpipe/up/scrubbers{
@@ -636,8 +798,12 @@
 /obj/machinery/atmospherics/pipe/zpipe/up/supply{
 	dir = 1
 	},
+/obj/structure/cable/green{
+	icon_state = "16-0"
+	},
+/obj/structure/cable/green,
 /turf/simulated/floor/plating,
-/area/maintenance/lower/mining)
+/area/quartermaster/mining_airlock)
 "VU" = (
 /turf/simulated/shuttle/wall/voidcraft/hard_corner,
 /area/turbolift/rmine/under3)
@@ -647,14 +813,12 @@
 	dir = 1;
 	pixel_x = -2
 	},
+/obj/machinery/atmospherics/component/unary/vent_pump/high_volume{
+	frequency = 1379
+	},
+/atom/movable/map_helper/airlock/atmos/chamber_pump,
 /turf/simulated/floor/plating,
-/area/quartermaster/miningdock)
-"XF" = (
-/obj/structure/grille,
-/obj/structure/window/reinforced/full,
-/obj/machinery/door/firedoor/glass,
-/turf/simulated/floor/plating,
-/area/quartermaster/miningdock)
+/area/quartermaster/mining_airlock)
 "XL" = (
 /turf/simulated/floor/outdoors/snow/lythios43c/indoors,
 /area/rift/surfacebase/underground/under2)
@@ -674,14 +838,20 @@
 /obj/machinery/light/small{
 	dir = 4
 	},
+/obj/structure/cable/green{
+	icon_state = "8-9"
+	},
+/obj/structure/cable/green{
+	icon_state = "1-2"
+	},
 /turf/simulated/floor/plating,
-/area/maintenance/lower/mining)
+/area/quartermaster/mining_airlock)
 "ZA" = (
 /obj/effect/floor_decal/industrial/warning/dust{
 	dir = 9
 	},
 /turf/simulated/floor/tiled/steel_dirty/lythios43c/indoors,
-/area/quartermaster/miningdock)
+/area/quartermaster/mining_airlock)
 "ZX" = (
 /obj/effect/floor_decal/steeldecal/steel_decals10{
 	dir = 6
@@ -693,7 +863,7 @@
 	dir = 8
 	},
 /turf/simulated/floor/tiled/steel_grid,
-/area/quartermaster/miningdock)
+/area/quartermaster/mining_airlock)

 (1,1,1) = {"
 gO
@@ -18050,13 +18220,13 @@ lp
 lp
 lp
 lp
-gc
+lz
 TC
 TC
 TC
 TC
 TC
-gc
+lz
 TC
 TC
 TC
@@ -18443,12 +18613,12 @@ TC
 TC
 TC
 TC
-Qr
+KS
 jJ
 Cz
-Cz
-Qr
-lp
+FV
+jJ
+KS
 lp
 lp
 lp
@@ -18641,11 +18811,11 @@ jJ
 Ws
 rS
 ZX
+AB
 jJ
 lp
 lp
 lp
-lp
 dq
 dq
 dq
@@ -18835,8 +19005,8 @@ jJ
 LY
 yh
 SJ
-XF
-lp
+cn
+Qt
 lp
 lp
 lp
@@ -19026,14 +19196,14 @@ PG
 gG
 rA
 jJ
-Ws
+jo
 bX
 Vf
+AB
 jJ
 lp
 lp
 lp
-lp
 dq
 dq
 dq
@@ -19212,19 +19382,19 @@ lp
 lp
 lp
 fs
-Qr
+KS
 jJ
 jJ
 jJ
 jJ
 qF
-XF
+Qt
 jJ
 jJ
 fH
-fH
+sc
+jJ
 jJ
-lp
 lp
 lp
 lp
@@ -19609,9 +19779,9 @@ kE
 ou
 RA
 jJ
-jo
+yh
 pj
-XF
+Qt
 lp
 lp
 lp
@@ -19805,7 +19975,7 @@ ux
 oE
 mv
 Ki
-XF
+Qt
 lp
 lp
 lp
@@ -19995,11 +20165,11 @@ jV
 pz
 jW
 wY
-LO
+et
 yS
-yh
+Qn
 Es
-XF
+Qt
 lp
 lp
 lp
@@ -20181,17 +20351,17 @@ lp
 lp
 lp
 fs
-EE
+jJ
 jJ
 VU
 pz
 pz
 VU
-jW
+nu
 LO
 uH
 jJ
-yh
+JC
 aW
 jJ
 Dr
@@ -20380,14 +20550,14 @@ jq
 vr
 zF
 Vu
-EE
+jJ
 jW
 LO
 Ji
 jJ
 jJ
 jJ
-Qr
+KS
 lp
 lp
 lp
@@ -20570,15 +20740,15 @@ lp
 lp
 lp
 Qt
-vr
-vr
+ig
+lP
 Tr
-EE
-EE
-jW
+jJ
+jJ
+Nq
 LO
-LO
-XF
+tB
+Qt
 lp
 lp
 lp
@@ -20763,16 +20933,16 @@ lp
 lp
 lp
 lp
-EE
-vr
+jJ
+ge
 Zn
 hH
 pk
 Mb
 xs
 Cq
-Cq
-XF
+Uw
+Qt
 lp
 lp
 lp
@@ -20957,16 +21127,16 @@ lp
 xK
 lp
 lp
-EE
-EE
-EE
-lz
-EE
-EE
 jJ
-XF
-XF
-gc
+jJ
+jJ
+lz
+jJ
+jJ
+jJ
+Qt
+Qt
+lz
 Dr
 lp
 lp
--- a/_maps/map_files/rift/rift-02-underground2.dmm
+++ b/_maps/map_files/rift/rift-02-underground2.dmm
@@ -9144,6 +9144,11 @@
 	dir = 6
 	},
 /obj/structure/catwalk,
+/obj/structure/cable/green{
+	d1 = 2;
+	d2 = 4;
+	icon_state = "2-4"
+	},
 /turf/simulated/floor/plating,
 /area/maintenance/lower/mining)
 "tT" = (
@@ -9545,7 +9550,13 @@
 "wL" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/turf/simulated/wall/r_wall,
+/obj/structure/cable/green{
+	d1 = 1;
+	d2 = 2;
+	icon_state = "1-2"
+	},
+/obj/machinery/door/airlock/maintenance/engi,
+/turf/simulated/floor/plating,
 /area/maintenance/lower/mining)
 "wV" = (
 /obj/machinery/atmospherics/pipe/simple/visible/red{
@@ -9725,6 +9736,10 @@
 /obj/structure/railing{
 	dir = 4
 	},
+/obj/structure/cable/green{
+	d1 = 32;
+	icon_state = "32-1"
+	},
 /turf/simulated/open,
 /area/maintenance/lower/mining)
 "xK" = (
@@ -9847,6 +9862,11 @@
 /obj/effect/floor_decal/industrial/warning{
 	dir = 4
 	},
+/obj/structure/cable/green{
+	d1 = 1;
+	d2 = 2;
+	icon_state = "1-2"
+	},
 /turf/simulated/floor/tiled,
 /area/quartermaster/belterdock/refinery)
 "yE" = (
@@ -9894,6 +9914,11 @@
 	d2 = 8;
 	icon_state = "4-8"
 	},
+/obj/structure/cable/green{
+	d1 = 1;
+	d2 = 8;
+	icon_state = "1-8"
+	},
 /turf/simulated/floor/tiled,
 /area/quartermaster/belterdock/refinery)
 "zb" = (
@@ -10958,6 +10983,11 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
 	dir = 9
 	},
+/obj/structure/cable/green{
+	d1 = 1;
+	d2 = 2;
+	icon_state = "1-2"
+	},
 /turf/simulated/floor/tiled,
 /area/quartermaster/miningdock)
 "Hg" = (
@@ -11041,6 +11071,11 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /obj/structure/catwalk,
+/obj/structure/cable/green{
+	d1 = 1;
+	d2 = 2;
+	icon_state = "1-2"
+	},
 /turf/simulated/floor/plating,
 /area/maintenance/lower/mining)
 "HV" = (
@@ -11212,6 +11247,11 @@
 /obj/structure/window/reinforced{
 	dir = 4
 	},
+/obj/structure/cable/green{
+	d1 = 1;
+	d2 = 2;
+	icon_state = "1-2"
+	},
 /turf/simulated/floor/tiled,
 /area/quartermaster/belterdock/refinery)
 "Jo" = (
@@ -11258,6 +11298,11 @@
 	dir = 4
 	},
 /obj/structure/catwalk,
+/obj/structure/cable/green{
+	d1 = 2;
+	d2 = 8;
+	icon_state = "2-8"
+	},
 /turf/simulated/floor/plating,
 /area/maintenance/lower/mining)
 "Jx" = (
@@ -11271,6 +11316,11 @@
 /obj/effect/floor_decal/industrial/warning/corner{
 	dir = 4
 	},
+/obj/structure/cable/green{
+	d1 = 1;
+	d2 = 2;
+	icon_state = "1-2"
+	},
 /turf/simulated/floor/tiled,
 /area/quartermaster/belterdock/refinery)
 "JH" = (
@@ -11585,6 +11635,11 @@
 	dir = 8
 	},
 /obj/structure/catwalk,
+/obj/structure/cable/green{
+	d1 = 4;
+	d2 = 8;
+	icon_state = "4-8"
+	},
 /turf/simulated/floor/plating,
 /area/maintenance/lower/mining)
 "Md" = (
@@ -11780,6 +11835,11 @@
 	req_access = list(31);
 	req_one_access = list()
 	},
+/obj/structure/cable/green{
+	d1 = 1;
+	d2 = 2;
+	icon_state = "1-2"
+	},
 /turf/simulated/floor/tiled,
 /area/quartermaster/belterdock/refinery)
 "Nq" = (
@@ -12037,6 +12097,11 @@
 /obj/effect/floor_decal/industrial/warning{
 	dir = 4
 	},
+/obj/structure/cable/green{
+	d1 = 1;
+	d2 = 2;
+	icon_state = "1-2"
+	},
 /turf/simulated/floor/tiled,
 /area/quartermaster/miningdock)
 "Pm" = (
@@ -12920,6 +12985,11 @@
 	},
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/structure/cable/green{
+	d1 = 1;
+	d2 = 2;
+	icon_state = "1-2"
+	},
 /turf/simulated/floor/plating,
 /area/quartermaster/miningdock)
 "Wy" = (
@@ -13073,6 +13143,11 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /obj/structure/catwalk,
+/obj/structure/cable/green{
+	d1 = 1;
+	d2 = 2;
+	icon_state = "1-2"
+	},
 /turf/simulated/floor/plating,
 /area/maintenance/lower/mining)
 "XR" = (
--- a/code/game/area/Space
+++ b/code/game/area/Space
@@ -2604,6 +2604,9 @@ NOTE: there are two lists of areas in the end of this file: centcom and station
 	name = "\improper Cargo Mining Dock"
 	icon_state = "mining"

+/area/quartermaster/mining_airlock
+	name = "\improper Mining Airlock"
+	icon_state = "mining"
 /area/quartermaster/belterdock
 	name = "\improper Cargo Belter Access"
 	icon_state = "mining"
--- a/code/game/machinery/doors/phoronlocks.dm
+++ b/code/game/machinery/doors/phoronlocks.dm
@@ -97,6 +97,10 @@ obj/machinery/airlock_sensor/phoron/airlock_exterior
 	var/target_temp = T20C
 	var/heating_power = 150000

+/obj/machinery/portable_atmospherics/powered/scrubber/huge/stationary/phoronlock/heater //Variant for use on rift
+	name = "Stationary Air Heater"
+	active_power_usage = 1000
+
 /obj/machinery/portable_atmospherics/powered/scrubber/huge/stationary/phoronlock/process()
 	..()

@@ -113,6 +117,7 @@ obj/machinery/airlock_sensor/phoron/airlock_exterior
 		for(var/i=1 to 3)	//Scrubs 4 times as fast
 			scrub_gas(src, scrubbing_gas, env, air_contents, transfer_moles, active_power_usage)

+
 //
 // PHORON LOCK CONTROLLER
 //
--- a/maps/rift/rift_areas.dm
+++ b/maps/rift/rift_areas.dm
@@ -69,7 +69,6 @@
 	lift_floor_label = "Undergound Level 3"
 	lift_floor_name = "Mining Bottom"
 	lift_announce_str = "Arriving at Lower Level."
-	delay_time = 15 SECONDS

 /area/turbolift/rwest_mining/surface
 	name = "mining shaft (surface)"