Skip to content
This repository was archived by the owner on May 22, 2025. It is now read-only.

fixes the broken things with atmos rework #2983

Merged
ThatLing merged 4 commits into from
Oct 12, 2018
Merged

fixes the broken things with atmos rework #2983

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
0806086
fixes the siphoning vents in viro, engi hallway and janitor room
Ktlwjec Oct 11, 2018
da44441
changes camera c_tags for atmos+viro
Ktlwjec Oct 11, 2018
e0e6673
makes the turbine work
Ktlwjec Oct 12, 2018
8248911
air mixer
Ktlwjec Oct 12, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
100 changes: 52 additions & 48 deletions _maps/map_files/YogStation/YogStation.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35259,14 +35259,7 @@
dir = 4
},
/obj/machinery/atmospherics/components/unary/vent_pump/on{
dir = 4;
external_pressure_bound = 0;
frequency = 1441;
id_tag = "n2_out";
internal_pressure_bound = 4000;
pressure_checks = 2;
pressure_resistance = 10;
pump_direction = 0
dir = 4
},
/turf/open/floor/plasteel,
/area/janitor)
Expand Down Expand Up @@ -38929,14 +38922,7 @@
dir = 10
},
/obj/machinery/atmospherics/components/unary/vent_pump/on{
dir = 4;
external_pressure_bound = 0;
frequency = 1441;
id_tag = "o2_out";
internal_pressure_bound = 4000;
pressure_checks = 2;
pressure_resistance = 10;
pump_direction = 0
dir = 4
},
/turf/open/floor/plasteel/white,
/area/medical/virology)
Expand Down Expand Up @@ -39825,7 +39811,7 @@
/area/medical/virology)
"bOn" = (
/obj/machinery/camera{
c_tag = "Chapel North";
c_tag = "Virology Module";
dir = 2
},
/obj/effect/turf_decal/tile/yellow{
Expand Down Expand Up @@ -42645,14 +42631,7 @@
},
/obj/item/twohanded/required/kirbyplants,
/obj/machinery/atmospherics/components/unary/vent_pump/on{
dir = 4;
external_pressure_bound = 0;
frequency = 1441;
id_tag = "n2_out";
internal_pressure_bound = 4000;
pressure_checks = 2;
pressure_resistance = 10;
pump_direction = 0
dir = 4
},
/turf/open/floor/plasteel,
/area/hallway/primary/aft)
Expand Down Expand Up @@ -48424,7 +48403,9 @@
/turf/open/floor/plating,
/area/tcommsat/entrance)
"cub" = (
/obj/machinery/atmospherics/components/unary/outlet_injector,
/obj/machinery/atmospherics/components/unary/outlet_injector{
on = 1
},
/turf/open/floor/plating,
/area/maintenance/disposal/incinerator)
"cuf" = (
Expand Down Expand Up @@ -49548,7 +49529,7 @@
dir = 4
},
/obj/machinery/camera{
c_tag = "Research Division South";
c_tag = "Atmospherics Tanks East";
dir = 8
},
/obj/item/radio/intercom{
Expand Down Expand Up @@ -51243,15 +51224,20 @@
/turf/open/floor/plating,
/area/maintenance/starboard/aft)
"cSf" = (
/obj/machinery/atmospherics/components/unary/vent_pump{
icon_state = "vent_map";
dir = 8
},
/obj/structure/sign/warning/vacuum{
name = "EXTERNAL AIRLOCK";
pixel_x = 32;
pixel_y = 0
},
/obj/machinery/atmospherics/components/unary/vent_pump/on{
dir = 8;
external_pressure_bound = 0;
initialize_directions = 1;
internal_pressure_bound = 4000;
on = 0;
pressure_checks = 2;
pump_direction = 0
},
/turf/open/floor/engine/vacuum,
/area/maintenance/disposal/incinerator)
"cSz" = (
Expand Down Expand Up @@ -52163,10 +52149,13 @@
/turf/open/floor/circuit/telecomms/mainframe,
/area/tcommsat/server)
"esg" = (
/obj/machinery/atmospherics/components/trinary/filter/atmos/flipped{
/obj/machinery/atmospherics/components/trinary/mixer/flipped{
dir = 4;
icon_state = "filter_on_f";
name = "Air Mixer"
icon_state = "mixer_off_f";
name = "Air Mixer";
node1_concentration = 0.8;
node2_concentration = 0.2;
on = 1
},
/turf/open/floor/plasteel,
/area/engine/atmos)
Expand Down Expand Up @@ -52240,8 +52229,9 @@
/area/space/nearstation)
"eGn" = (
/obj/machinery/power/turbine{
dir = 4;
icon_state = "turbine";
dir = 4
luminosity = 2
},
/obj/structure/cable/yellow{
icon_state = "0-8"
Expand Down Expand Up @@ -52496,7 +52486,7 @@
dir = 8
},
/obj/machinery/camera{
c_tag = "Circuitry Lab";
c_tag = "Atmospherics West";
dir = 4;
network = list("ss13","rd")
},
Expand Down Expand Up @@ -52768,7 +52758,7 @@
dir = 1
},
/obj/machinery/camera{
c_tag = "Medbay Treatment Center";
c_tag = "Atmospherics Storage";
dir = 8
},
/obj/machinery/airalarm{
Expand Down Expand Up @@ -53079,6 +53069,10 @@
/obj/item/paper_bin,
/obj/item/pen,
/obj/machinery/light,
/obj/machinery/camera{
c_tag = "Atmospherics Monitoring";
dir = 1
},
/turf/open/floor/plasteel,
/area/engine/atmos)
"gVe" = (
Expand Down Expand Up @@ -54118,8 +54112,11 @@
/area/medical/virology)
"kaF" = (
/obj/machinery/atmospherics/components/unary/outlet_injector{
dir = 8;
frequency = 1443;
icon_state = "inje_map";
dir = 8
id = "air_in";
on = 1
},
/turf/open/floor/engine/vacuum,
/area/maintenance/disposal/incinerator)
Expand Down Expand Up @@ -54882,7 +54879,7 @@
dir = 1
},
/obj/machinery/camera{
c_tag = "Atmospherics North West";
c_tag = "Atmospherics Corridor North";
dir = 4
},
/turf/open/floor/plasteel,
Expand Down Expand Up @@ -56678,7 +56675,7 @@
/area/engine/atmos)
"rqq" = (
/obj/machinery/camera{
c_tag = "Atmospherics Access";
c_tag = "Atmospherics Corridor West";
dir = 4
},
/obj/machinery/light{
Expand Down Expand Up @@ -56816,7 +56813,7 @@
/area/engine/atmos)
"rPO" = (
/obj/machinery/camera{
c_tag = "Circuitry Lab";
c_tag = "Atmospherics South West";
dir = 4;
network = list("ss13","rd")
},
Expand Down Expand Up @@ -56847,7 +56844,9 @@
/obj/structure/cable/yellow{
icon_state = "1-2"
},
/obj/machinery/computer/turbine_computer,
/obj/machinery/computer/turbine_computer{
id = "incineratorturbine"
},
/obj/machinery/atmospherics/pipe/simple/general/visible,
/turf/open/floor/plasteel,
/area/maintenance/disposal/incinerator)
Expand All @@ -56866,7 +56865,7 @@
dir = 4
},
/obj/machinery/camera{
c_tag = "Research Division South";
c_tag = "Atmospherics East";
dir = 8
},
/obj/machinery/firealarm{
Expand Down Expand Up @@ -57375,7 +57374,7 @@
/area/engine/atmos)
"tkb" = (
/obj/machinery/camera{
c_tag = "Gateway";
c_tag = "Atmospherics North West";
dir = 4
},
/obj/effect/turf_decal/tile/yellow{
Expand Down Expand Up @@ -57625,7 +57624,10 @@
/obj/structure/cable/yellow{
icon_state = "4-8"
},
/obj/machinery/igniter,
/obj/machinery/igniter{
id = "Incinerator";
luminosity = 2
},
/turf/open/floor/engine/vacuum,
/area/maintenance/disposal/incinerator)
"ulJ" = (
Expand Down Expand Up @@ -58469,7 +58471,7 @@
/obj/item/reagent_containers/blood/APlus,
/obj/item/reagent_containers/blood/random,
/obj/machinery/camera{
c_tag = "Auxillary Base Construction";
c_tag = "Virology Break Room";
dir = 8
},
/turf/open/floor/plasteel/white,
Expand Down Expand Up @@ -58736,8 +58738,10 @@
/area/engine/atmos)
"xoA" = (
/obj/machinery/power/compressor{
comp_id = "incineratorturbine";
dir = 8;
icon_state = "compressor";
dir = 8
luminosity = 1
},
/obj/structure/cable/yellow{
icon_state = "0-8"
Expand All @@ -58760,7 +58764,7 @@
/area/engine/atmos)
"xtz" = (
/obj/machinery/camera{
c_tag = "Dormitory South";
c_tag = "Atmospherics Mix Tank";
dir = 4
},
/turf/open/floor/engine/vacuum,
Expand Down