Merge pull request #2896 from Cameron653/master

Removes an unused gas from the code
This commit is contained in:
Anewbe
2017-01-03 15:29:39 -05:00
committed by GitHub
3 changed files with 6 additions and 12 deletions
@@ -40,7 +40,7 @@
..()
switch(filter_type)
if(0) //removing hydrocarbons
filtered_out = list("phoron", "oxygen_agent_b")
filtered_out = list("phoron")
if(1) //removing O2
filtered_out = list("oxygen")
if(2) //removing N2
@@ -95,10 +95,10 @@
/obj/machinery/atmospherics/trinary/filter/process()
..()
last_power_draw = 0
last_flow_rate = 0
if((stat & (NOPOWER|BROKEN)) || !use_power)
return
+2 -8
View File
@@ -21,11 +21,11 @@
/decl/xgm_gas/phoron
id = "phoron"
name = "Phoron"
//Note that this has a significant impact on TTV yield.
//Because it is so high, any leftover phoron soaks up a lot of heat and drops the yield pressure.
specific_heat = 200 // J/(mol*K)
//Hypothetical group 14 (same as carbon), period 8 element.
//Using multiplicity rule, it's atomic number is 162
//and following a N/Z ratio of 1.5, the molar mass of a monatomic gas is:
@@ -51,9 +51,3 @@
tile_overlay = "sleeping_agent"
overlay_limit = 1
/decl/xgm_gas/oxygen_agent_b
id = "oxygen_agent_b"
name = "Oxygen Agent-B" //what is this?
specific_heat = 300 // J/(mol*K)
molar_mass = 0.032 // kg/mol
+1 -1
View File
@@ -17,7 +17,7 @@
var/minrate = 0
var/maxrate = 10 * ONE_ATMOSPHERE
var/list/scrubbing_gas = list("phoron", "carbon_dioxide", "sleeping_agent", "oxygen_agent_b")
var/list/scrubbing_gas = list("phoron", "carbon_dioxide", "sleeping_agent")
/obj/machinery/portable_atmospherics/powered/scrubber/New()
..()