Merge branch 'master' of github.com:Baystation12/Baystation12

This commit is contained in:
Miniature
2012-05-15 00:52:14 +09:30
44 changed files with 348 additions and 252 deletions

View File

@@ -42,6 +42,7 @@ obj/machinery/atmospherics/unary/oxygen_generator
air_contents.temperature = (current_heat_capacity*air_contents.temperature + 20*added_oxygen*T0C)/(current_heat_capacity+20*added_oxygen)
air_contents.oxygen += added_oxygen
air_contents.update_values()
if(network)
network.update = 1

View File

@@ -124,6 +124,7 @@
//Remix the resulting gases
filtered_out.update_values()
removed.update_values()
air_contents.merge(filtered_out)
loc.assume_air(removed)