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
@@ -86,7 +86,6 @@
if (src.health <= 10)
var/atom/location = src.loc
AirflowRepel(location,air_contents.return_pressure())
location.assume_air(air_contents)
src.destroyed = 1
@@ -129,8 +128,6 @@
if(holding)
environment.merge(removed)
else
if(istype(removed))
AirflowRepel(loc,removed.return_pressure())
loc.assume_air(removed)
src.update_icon()
+1 -4
View File
@@ -43,8 +43,6 @@
if(holding)
environment.merge(removed)
else
if(istype(removed))
AirflowRepel(loc,removed.return_pressure())
loc.assume_air(removed)
else
var/pressure_delta = target_pressure - air_contents.return_pressure()
@@ -60,8 +58,7 @@
removed = environment.remove(transfer_moles)
else
removed = loc.remove_air(transfer_moles)
if(istype(removed))
AirflowAttract(loc,removed.return_pressure())
air_contents.merge(removed)
//src.update_icon()
@@ -37,8 +37,6 @@
removed = environment.remove(transfer_moles)
else
removed = loc.remove_air(transfer_moles)
if(istype(removed))
AirflowAttract(loc,removed.return_pressure())
//Filter it
if (removed)
+3 -3
View File
@@ -24,7 +24,7 @@
var/datum/gas_mixture/conn_air = zturf_conn.air //TODO: pop culture reference
var/datum/gas_mixture/my_air = myturf.air
if (istype(conn_air) && istype(my_air))
//if (!my_air.compare(conn_air))
// myturf.reset_delay()
// zturf_conn.reset_delay()
if (!my_air.compare(conn_air))
myturf.reset_delay()
zturf_conn.reset_delay()
my_air.share(conn_air)