Reverts ZAS

This reverts commit fd09ea6ce8. and https://github.com/Baystation12/Baystation12/pull/681
This commit is contained in:
Ren Erthilo
2012-04-10 17:38:44 +01:00
parent 076b899718
commit ae5ea54af1
22 changed files with 248 additions and 347 deletions

View File

@@ -77,8 +77,6 @@
var/datum/gas_mixture/removed = air1.remove(transfer_moles)
if(istype(removed))
AirflowRepel(loc,removed.return_pressure())
loc.assume_air(removed)
if(network1)
@@ -97,8 +95,6 @@
var/transfer_moles = pressure_delta*air2.volume/(environment.temperature * R_IDEAL_GAS_EQUATION)
var/datum/gas_mixture/removed = loc.remove_air(transfer_moles)
if(istype(removed))
AirflowAttract(loc,removed.return_pressure())
air2.merge(removed)

View File

@@ -40,9 +40,6 @@
var/datum/gas_mixture/removed = air_contents.remove(transfer_moles)
if(istype(removed))
AirflowRepel(loc,removed.return_pressure())
loc.assume_air(removed)
if(network)
@@ -61,9 +58,6 @@
var/datum/gas_mixture/removed = air_contents.remove(transfer_moles)
if(istype(removed))
AirflowRepel(loc,removed.return_pressure())
loc.assume_air(removed)
if(network)

View File

@@ -94,9 +94,6 @@
var/datum/gas_mixture/removed = air_contents.remove(transfer_moles)
if(istype(removed))
AirflowRepel(loc,removed.return_pressure())
loc.assume_air(removed)
if(network)
@@ -112,10 +109,8 @@
if(pressure_delta > 0)
if(environment.temperature > 0)
var/transfer_moles = pressure_delta*air_contents.volume/(environment.temperature * R_IDEAL_GAS_EQUATION)
var/datum/gas_mixture/removed = loc.remove_air(transfer_moles)
if(istype(removed))
AirflowAttract(loc,removed.return_pressure())
var/datum/gas_mixture/removed = loc.remove_air(transfer_moles)
if (isnull(removed)) //in space
return

View File

@@ -127,8 +127,6 @@
//Remix the resulting gases
if(istype(removed))
AirflowAttract(loc,filtered_out.return_pressure())
air_contents.merge(filtered_out)
loc.assume_air(removed)
@@ -144,9 +142,6 @@
var/datum/gas_mixture/removed = loc.remove_air(transfer_moles)
if(istype(removed))
AirflowAttract(loc,removed.return_pressure())
air_contents.merge(removed)
if(network)