mirror of
https://github.com/VOREStation/VOREStation.git
synced 2026-07-15 09:03:53 +01:00
Atmos Intake Refactor
- Minor refactor so mice don't... Spawn outside because of the filepath being a child of atmos for the vermin event spawning. - More adjustments to Atmos. Missing Air Alarm added. Windows with blast doors for Intake area.
This commit is contained in:
TheFurryFeline
@@ -33,7 +33,8 @@
|
||||
|
||||
/area/engineering
|
||||
holomap_color = HOLOMAP_AREACOLOR_ENGINEERING
|
||||
/area/engineering/atmos/intake
|
||||
//TFF 11/12/19 - Minor refactor, makes mice spawn only in Atmos.
|
||||
/area/engineering/atmos_intake
|
||||
holomap_color = null
|
||||
/area/maintenance/substation/engineering
|
||||
holomap_color = HOLOMAP_AREACOLOR_ENGINEERING
|
||||
|
||||
@@ -5347,7 +5347,7 @@
|
||||
report_danger_level = 0
|
||||
},
|
||||
/turf/simulated/floor/tiled/steel_dirty/virgo3b,
|
||||
/area/engineering/atmos/intake)
|
||||
/area/engineering/atmos_intake)
|
||||
"ajg" = (
|
||||
/obj/structure/cable/cyan{
|
||||
d1 = 1;
|
||||
@@ -5358,13 +5358,13 @@
|
||||
dir = 4
|
||||
},
|
||||
/turf/simulated/floor/tiled/steel_dirty/virgo3b,
|
||||
/area/engineering/atmos/intake)
|
||||
/area/engineering/atmos_intake)
|
||||
"ajh" = (
|
||||
/obj/machinery/atmospherics/unary/vent_scrubber{
|
||||
dir = 4
|
||||
},
|
||||
/turf/simulated/floor/tiled/steel_dirty/virgo3b,
|
||||
/area/engineering/atmos/intake)
|
||||
/area/engineering/atmos_intake)
|
||||
"aji" = (
|
||||
/obj/effect/floor_decal/borderfloor{
|
||||
dir = 6
|
||||
@@ -27273,6 +27273,14 @@
|
||||
/obj/structure/grille,
|
||||
/obj/structure/window/reinforced/full,
|
||||
/obj/structure/window/reinforced,
|
||||
/obj/machinery/door/blast/regular{
|
||||
density = 0;
|
||||
dir = 4;
|
||||
icon_state = "pdoor0";
|
||||
id = "atmoslockdown";
|
||||
name = "Atmospherics Lockdown";
|
||||
opacity = 0
|
||||
},
|
||||
/turf/simulated/floor/plating,
|
||||
/area/engineering/atmos/processing)
|
||||
"aTK" = (
|
||||
@@ -27283,6 +27291,14 @@
|
||||
/obj/structure/grille,
|
||||
/obj/structure/window/reinforced/full,
|
||||
/obj/structure/window/reinforced,
|
||||
/obj/machinery/door/blast/regular{
|
||||
density = 0;
|
||||
dir = 4;
|
||||
icon_state = "pdoor0";
|
||||
id = "atmoslockdown";
|
||||
name = "Atmospherics Lockdown";
|
||||
opacity = 0
|
||||
},
|
||||
/turf/simulated/floor/plating,
|
||||
/area/engineering/atmos/processing)
|
||||
"aTL" = (
|
||||
@@ -27294,6 +27310,14 @@
|
||||
/obj/structure/grille,
|
||||
/obj/structure/window/reinforced/full,
|
||||
/obj/structure/window/reinforced,
|
||||
/obj/machinery/door/blast/regular{
|
||||
density = 0;
|
||||
dir = 4;
|
||||
icon_state = "pdoor0";
|
||||
id = "atmoslockdown";
|
||||
name = "Atmospherics Lockdown";
|
||||
opacity = 0
|
||||
},
|
||||
/turf/simulated/floor/plating,
|
||||
/area/engineering/atmos/processing)
|
||||
"aTM" = (
|
||||
@@ -27415,11 +27439,11 @@
|
||||
/area/crew_quarters/visitor_lodging)
|
||||
"aTW" = (
|
||||
/turf/simulated/floor/tiled/steel_dirty/virgo3b,
|
||||
/area/engineering/atmos/intake)
|
||||
/area/engineering/atmos_intake)
|
||||
"aTX" = (
|
||||
/obj/machinery/atmospherics/pipe/simple/heat_exchanging/junction,
|
||||
/turf/simulated/floor/tiled/steel_dirty/virgo3b,
|
||||
/area/engineering/atmos/intake)
|
||||
/area/engineering/atmos_intake)
|
||||
"aTY" = (
|
||||
/obj/machinery/atmospherics/pipe/manifold/visible/black,
|
||||
/turf/simulated/floor/tiled/techmaint,
|
||||
@@ -27683,7 +27707,7 @@
|
||||
dir = 6
|
||||
},
|
||||
/turf/simulated/floor/tiled/steel_dirty/virgo3b,
|
||||
/area/engineering/atmos/intake)
|
||||
/area/engineering/atmos_intake)
|
||||
"aUw" = (
|
||||
/obj/machinery/atmospherics/pipe/simple/heat_exchanging{
|
||||
dir = 9
|
||||
@@ -27692,19 +27716,19 @@
|
||||
dir = 6
|
||||
},
|
||||
/turf/simulated/floor/tiled/steel_dirty/virgo3b,
|
||||
/area/engineering/atmos/intake)
|
||||
/area/engineering/atmos_intake)
|
||||
"aUx" = (
|
||||
/obj/machinery/atmospherics/pipe/simple/heat_exchanging{
|
||||
dir = 9
|
||||
},
|
||||
/turf/simulated/floor/tiled/steel_dirty/virgo3b,
|
||||
/area/engineering/atmos/intake)
|
||||
/area/engineering/atmos_intake)
|
||||
"aUy" = (
|
||||
/obj/machinery/atmospherics/pipe/simple/heat_exchanging{
|
||||
dir = 5
|
||||
},
|
||||
/turf/simulated/floor/tiled/steel_dirty/virgo3b,
|
||||
/area/engineering/atmos/intake)
|
||||
/area/engineering/atmos_intake)
|
||||
"aUz" = (
|
||||
/obj/machinery/atmospherics/pipe/simple/heat_exchanging{
|
||||
dir = 5
|
||||
@@ -27713,13 +27737,13 @@
|
||||
dir = 10
|
||||
},
|
||||
/turf/simulated/floor/tiled/steel_dirty/virgo3b,
|
||||
/area/engineering/atmos/intake)
|
||||
/area/engineering/atmos_intake)
|
||||
"aUA" = (
|
||||
/obj/machinery/atmospherics/pipe/simple/heat_exchanging{
|
||||
dir = 10
|
||||
},
|
||||
/turf/simulated/floor/tiled/steel_dirty/virgo3b,
|
||||
/area/engineering/atmos/intake)
|
||||
/area/engineering/atmos_intake)
|
||||
"aUB" = (
|
||||
/obj/machinery/power/apc/super{
|
||||
dir = 4;
|
||||
@@ -27731,10 +27755,10 @@
|
||||
icon_state = "0-2"
|
||||
},
|
||||
/turf/simulated/floor/tiled/steel_dirty/virgo3b,
|
||||
/area/engineering/atmos/intake)
|
||||
/area/engineering/atmos_intake)
|
||||
"aUC" = (
|
||||
/turf/simulated/wall/r_wall,
|
||||
/area/engineering/atmos/intake)
|
||||
/area/engineering/atmos_intake)
|
||||
"aUD" = (
|
||||
/obj/machinery/atmospherics/pipe/simple/visible/purple,
|
||||
/obj/structure/cable/cyan{
|
||||
@@ -27743,7 +27767,7 @@
|
||||
icon_state = "1-2"
|
||||
},
|
||||
/turf/simulated/floor/plating,
|
||||
/area/engineering/atmos/intake)
|
||||
/area/engineering/atmos_intake)
|
||||
"aUE" = (
|
||||
/obj/effect/decal/cleanable/dirt,
|
||||
/turf/simulated/floor/plating,
|
||||
@@ -27867,7 +27891,7 @@
|
||||
},
|
||||
/obj/machinery/atmospherics/pipe/simple/heat_exchanging,
|
||||
/turf/simulated/floor/tiled/steel_dirty/virgo3b,
|
||||
/area/engineering/atmos/intake)
|
||||
/area/engineering/atmos_intake)
|
||||
"aUS" = (
|
||||
/obj/machinery/atmospherics/pipe/simple/visible/yellow,
|
||||
/obj/machinery/light/small{
|
||||
@@ -28052,6 +28076,14 @@
|
||||
d2 = 8;
|
||||
icon_state = "4-8"
|
||||
},
|
||||
/obj/machinery/door/blast/regular{
|
||||
density = 0;
|
||||
dir = 1;
|
||||
icon_state = "pdoor0";
|
||||
id = "atmoslockdown";
|
||||
name = "Atmospherics Lockdown";
|
||||
opacity = 0
|
||||
},
|
||||
/turf/simulated/floor/plating,
|
||||
/area/engineering/atmos/processing)
|
||||
"aVl" = (
|
||||
@@ -28305,7 +28337,7 @@
|
||||
id_tag = "atmos_intake"
|
||||
},
|
||||
/turf/simulated/floor/tiled/steel_dirty/virgo3b,
|
||||
/area/engineering/atmos/intake)
|
||||
/area/engineering/atmos_intake)
|
||||
"aVF" = (
|
||||
/obj/machinery/door/firedoor,
|
||||
/obj/machinery/atmospherics/pipe/simple/visible/purple{
|
||||
@@ -28316,6 +28348,14 @@
|
||||
/obj/structure/window/reinforced{
|
||||
dir = 8
|
||||
},
|
||||
/obj/machinery/door/blast/regular{
|
||||
density = 0;
|
||||
dir = 1;
|
||||
icon_state = "pdoor0";
|
||||
id = "atmoslockdown";
|
||||
name = "Atmospherics Lockdown";
|
||||
opacity = 0
|
||||
},
|
||||
/turf/simulated/floor/plating,
|
||||
/area/engineering/atmos/processing)
|
||||
"aVG" = (
|
||||
@@ -28490,7 +28530,7 @@
|
||||
use_power = 1
|
||||
},
|
||||
/turf/simulated/floor/tiled/steel_dirty/virgo3b,
|
||||
/area/engineering/atmos/intake)
|
||||
/area/engineering/atmos_intake)
|
||||
"aVV" = (
|
||||
/obj/machinery/door/firedoor,
|
||||
/obj/machinery/atmospherics/pipe/simple/visible/yellow{
|
||||
@@ -28501,6 +28541,14 @@
|
||||
/obj/structure/window/reinforced{
|
||||
dir = 8
|
||||
},
|
||||
/obj/machinery/door/blast/regular{
|
||||
density = 0;
|
||||
dir = 1;
|
||||
icon_state = "pdoor0";
|
||||
id = "atmoslockdown";
|
||||
name = "Atmospherics Lockdown";
|
||||
opacity = 0
|
||||
},
|
||||
/turf/simulated/floor/plating,
|
||||
/area/engineering/atmos/processing)
|
||||
"aVW" = (
|
||||
@@ -28859,7 +28907,7 @@
|
||||
dir = 8
|
||||
},
|
||||
/turf/simulated/floor/tiled/steel_dirty/virgo3b,
|
||||
/area/engineering/atmos/intake)
|
||||
/area/engineering/atmos_intake)
|
||||
"aWP" = (
|
||||
/obj/effect/decal/cleanable/dirt,
|
||||
/turf/simulated/floor/plating,
|
||||
@@ -29002,7 +29050,7 @@
|
||||
dir = 4
|
||||
},
|
||||
/turf/simulated/floor/tiled/steel_dirty/virgo3b,
|
||||
/area/engineering/atmos/intake)
|
||||
/area/engineering/atmos_intake)
|
||||
"aXe" = (
|
||||
/obj/structure/table/bench/steel,
|
||||
/turf/simulated/floor/plating,
|
||||
@@ -31928,6 +31976,15 @@
|
||||
},
|
||||
/turf/simulated/floor/tiled,
|
||||
/area/tether/surfacebase/mining_main/surfacecargo)
|
||||
"bcP" = (
|
||||
/obj/machinery/atmospherics/pipe/simple/visible/yellow,
|
||||
/obj/machinery/alarm{
|
||||
dir = 8;
|
||||
icon_state = "alarm0";
|
||||
pixel_x = 24
|
||||
},
|
||||
/turf/simulated/floor/plating,
|
||||
/area/engineering/atmos/processing)
|
||||
"cGJ" = (
|
||||
/turf/simulated/floor/plating,
|
||||
/area/maintenance/lower/mining_eva)
|
||||
@@ -41159,7 +41216,7 @@ aRU
|
||||
aSC
|
||||
aTj
|
||||
aSC
|
||||
aSC
|
||||
bcP
|
||||
aSC
|
||||
aUS
|
||||
aVm
|
||||
|
||||
@@ -8548,16 +8548,8 @@
|
||||
/obj/machinery/door/firedoor/glass,
|
||||
/obj/structure/grille,
|
||||
/obj/structure/window/reinforced/full,
|
||||
/obj/machinery/door/blast/regular{
|
||||
density = 0;
|
||||
dir = 1;
|
||||
icon_state = "pdoor0";
|
||||
id = "atmoslockdown";
|
||||
name = "Atmospherics Lockdown";
|
||||
opacity = 0
|
||||
},
|
||||
/turf/simulated/floor/plating,
|
||||
/area/engineering/lower/breakroom)
|
||||
/area/engineering/lower/lobby)
|
||||
"are" = (
|
||||
/obj/machinery/door/firedoor/glass,
|
||||
/obj/structure/grille,
|
||||
@@ -8577,49 +8569,21 @@
|
||||
name = "Atmospherics"
|
||||
},
|
||||
/obj/machinery/door/firedoor/glass,
|
||||
/obj/machinery/door/blast/regular{
|
||||
density = 0;
|
||||
dir = 4;
|
||||
icon_state = "pdoor0";
|
||||
id = "atmoslockdown";
|
||||
name = "Atmospherics Lockdown";
|
||||
opacity = 0
|
||||
},
|
||||
/turf/simulated/floor/tiled/steel_grid,
|
||||
/area/engineering/lower/lobby)
|
||||
"arg" = (
|
||||
/turf/simulated/wall,
|
||||
/area/engineering/lower/breakroom)
|
||||
"arh" = (
|
||||
/obj/structure/cable/cyan{
|
||||
d1 = 4;
|
||||
d2 = 8;
|
||||
icon_state = "4-8"
|
||||
},
|
||||
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
|
||||
dir = 4
|
||||
},
|
||||
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
|
||||
dir = 4
|
||||
},
|
||||
/obj/machinery/door/airlock/glass_atmos{
|
||||
name = "Atmospherics";
|
||||
req_access = list(24)
|
||||
},
|
||||
/obj/structure/disposalpipe/segment{
|
||||
dir = 4
|
||||
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
|
||||
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
|
||||
/obj/machinery/door/airlock/glass{
|
||||
name = "Atmospherics"
|
||||
},
|
||||
/obj/structure/disposalpipe/segment,
|
||||
/obj/machinery/door/firedoor/glass,
|
||||
/obj/machinery/door/blast/regular{
|
||||
density = 0;
|
||||
dir = 1;
|
||||
icon_state = "pdoor0";
|
||||
id = "atmoslockdown";
|
||||
name = "Atmospherics Lockdown";
|
||||
opacity = 0
|
||||
},
|
||||
/turf/simulated/floor/wood,
|
||||
/area/engineering/lower/breakroom)
|
||||
/turf/simulated/floor/tiled/steel_grid,
|
||||
/area/engineering/lower/lobby)
|
||||
"ari" = (
|
||||
/obj/structure/grille,
|
||||
/obj/structure/railing{
|
||||
@@ -14139,23 +14103,11 @@
|
||||
/turf/simulated/floor/plating,
|
||||
/area/maintenance/asmaint2)
|
||||
"aAe" = (
|
||||
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
|
||||
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
|
||||
/obj/machinery/door/airlock/glass{
|
||||
name = "Atmospherics"
|
||||
},
|
||||
/obj/structure/disposalpipe/segment,
|
||||
/obj/machinery/door/firedoor/glass,
|
||||
/obj/machinery/door/blast/regular{
|
||||
density = 0;
|
||||
dir = 4;
|
||||
icon_state = "pdoor0";
|
||||
id = "atmoslockdown";
|
||||
name = "Atmospherics Lockdown";
|
||||
opacity = 0
|
||||
},
|
||||
/turf/simulated/floor/tiled/steel_grid,
|
||||
/area/engineering/lower/lobby)
|
||||
/obj/structure/grille,
|
||||
/obj/structure/window/reinforced/full,
|
||||
/turf/simulated/floor/plating,
|
||||
/area/engineering/lower/breakroom)
|
||||
"aAf" = (
|
||||
/obj/effect/floor_decal/borderfloor{
|
||||
dir = 10
|
||||
@@ -14751,18 +14703,26 @@
|
||||
/turf/simulated/open,
|
||||
/area/engineering/atmos)
|
||||
"aBg" = (
|
||||
/obj/machinery/door/firedoor/glass,
|
||||
/obj/structure/grille,
|
||||
/obj/structure/window/reinforced/full,
|
||||
/obj/machinery/door/blast/regular{
|
||||
density = 0;
|
||||
dir = 4;
|
||||
icon_state = "pdoor0";
|
||||
id = "atmoslockdown";
|
||||
name = "Atmospherics Lockdown";
|
||||
opacity = 0
|
||||
/obj/structure/cable/cyan{
|
||||
d1 = 4;
|
||||
d2 = 8;
|
||||
icon_state = "4-8"
|
||||
},
|
||||
/turf/simulated/floor/plating,
|
||||
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
|
||||
dir = 4
|
||||
},
|
||||
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
|
||||
dir = 4
|
||||
},
|
||||
/obj/machinery/door/airlock/glass_atmos{
|
||||
name = "Atmospherics";
|
||||
req_access = list(24)
|
||||
},
|
||||
/obj/structure/disposalpipe/segment{
|
||||
dir = 4
|
||||
},
|
||||
/obj/machinery/door/firedoor/glass,
|
||||
/turf/simulated/floor/wood,
|
||||
/area/engineering/lower/breakroom)
|
||||
"aBh" = (
|
||||
/obj/structure/railing{
|
||||
@@ -40097,7 +40057,7 @@ adY
|
||||
aoZ
|
||||
afG
|
||||
aqs
|
||||
are
|
||||
ard
|
||||
arH
|
||||
asD
|
||||
ath
|
||||
@@ -40239,7 +40199,7 @@ adY
|
||||
apa
|
||||
apI
|
||||
aqt
|
||||
are
|
||||
ard
|
||||
arH
|
||||
asE
|
||||
ath
|
||||
@@ -40381,7 +40341,7 @@ aeK
|
||||
apb
|
||||
apJ
|
||||
aqs
|
||||
are
|
||||
ard
|
||||
arI
|
||||
asF
|
||||
ath
|
||||
@@ -40807,7 +40767,7 @@ ajB
|
||||
ajB
|
||||
apL
|
||||
aqv
|
||||
are
|
||||
ard
|
||||
arL
|
||||
asF
|
||||
atj
|
||||
@@ -40949,7 +40909,7 @@ aia
|
||||
ape
|
||||
apM
|
||||
aqw
|
||||
aAe
|
||||
arh
|
||||
arM
|
||||
asG
|
||||
atk
|
||||
@@ -41234,11 +41194,11 @@ apf
|
||||
apN
|
||||
aqs
|
||||
arg
|
||||
ard
|
||||
ard
|
||||
arh
|
||||
ard
|
||||
ard
|
||||
aAe
|
||||
aAe
|
||||
aBg
|
||||
aAe
|
||||
aAe
|
||||
avf
|
||||
avN
|
||||
awB
|
||||
@@ -41659,7 +41619,7 @@ aoC
|
||||
apf
|
||||
apN
|
||||
aqs
|
||||
aBg
|
||||
aAe
|
||||
arQ
|
||||
asK
|
||||
atp
|
||||
@@ -41801,7 +41761,7 @@ aoC
|
||||
apf
|
||||
apN
|
||||
aqs
|
||||
aBg
|
||||
aAe
|
||||
arR
|
||||
asL
|
||||
atq
|
||||
@@ -41943,7 +41903,7 @@ aoC
|
||||
apf
|
||||
apN
|
||||
aqs
|
||||
aBg
|
||||
aAe
|
||||
arS
|
||||
asK
|
||||
atp
|
||||
|
||||
@@ -284,7 +284,8 @@
|
||||
name = "Atmospherics Gas Storage"
|
||||
icon_state = "atmos"
|
||||
|
||||
/area/engineering/atmos/intake
|
||||
//TFF 11/12/19 - Minor refactor, makes mice spawn only in Atmos.
|
||||
/area/engineering/atmos_intake
|
||||
name = "\improper Atmospherics Intake"
|
||||
icon_state = "atmos"
|
||||
sound_env = MOUNTAINS
|
||||
|
||||
@@ -114,7 +114,8 @@
|
||||
/area/crew_quarters/sleep/Dorm_7/holo,
|
||||
/area/rnd/miscellaneous_lab) //TFF 31/8/19 - exempt new construction site from unit tests
|
||||
unit_test_exempt_from_atmos = list(
|
||||
/area/engineering/atmos/intake, // Outside,
|
||||
//TFF 11/12/19 - Minor refactor, makes mice spawn only in Atmos.
|
||||
/area/engineering/atmos_intake, // Outside,
|
||||
/area/rnd/external, // Outside,
|
||||
/area/tether/surfacebase/mining_main/external, // Outside,
|
||||
/area/tether/surfacebase/mining_main/airlock, // Its an airlock,
|
||||
|
||||
Reference in New Issue
Block a user