From 14a213dd8638cacc89df23b9447f929064670fbc Mon Sep 17 00:00:00 2001 From: mwerezak Date: Sat, 20 Sep 2014 01:45:06 -0400 Subject: [PATCH] Fixes #6470 --- code/ATMOSPHERICS/_atmospherics_helpers.dm | 2 +- .../components/trinary_devices/filter.dm | 14 +++++++++++++- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/code/ATMOSPHERICS/_atmospherics_helpers.dm b/code/ATMOSPHERICS/_atmospherics_helpers.dm index 599a8ecd04d..8e3a2b0dd76 100644 --- a/code/ATMOSPHERICS/_atmospherics_helpers.dm +++ b/code/ATMOSPHERICS/_atmospherics_helpers.dm @@ -200,8 +200,8 @@ if (g in filtering) //use update=0. All the filtered gasses are supposed to be added simultaneously, so we update after the for loop. - removed.adjust_gas(g, -removed.gas[g], update=0) sink_filtered.adjust_gas_temp(g, removed.gas[g], removed.temperature, update=0) + removed.adjust_gas(g, -removed.gas[g], update=0) filtered_power_used += power_used else unfiltered_power_used += power_used diff --git a/code/ATMOSPHERICS/components/trinary_devices/filter.dm b/code/ATMOSPHERICS/components/trinary_devices/filter.dm index 7590c453e44..5649b25e012 100755 --- a/code/ATMOSPHERICS/components/trinary_devices/filter.dm +++ b/code/ATMOSPHERICS/components/trinary_devices/filter.dm @@ -23,7 +23,7 @@ 3: Carbon Dioxide: Carbon Dioxide ONLY 4: Sleeping Agent (N2O) */ - var/filter_type = 0 + var/filter_type = -1 var/list/filtered_out = list() @@ -38,6 +38,18 @@ /obj/machinery/atmospherics/trinary/filter/New() ..() + switch(filter_type) + if(0) //removing hydrocarbons + filtered_out = list("phoron", "oxygen_agent_b") + if(1) //removing O2 + filtered_out = list("oxygen") + if(2) //removing N2 + filtered_out = list("nitrogen") + if(3) //removing CO2 + filtered_out = list("carbon_dioxide") + if(4)//removing N2O + filtered_out = list("sleeping_agent") + air1.volume = ATMOS_DEFAULT_VOLUME_FILTER air2.volume = ATMOS_DEFAULT_VOLUME_FILTER air3.volume = ATMOS_DEFAULT_VOLUME_FILTER