cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-22 11:37:40 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #681 from Mloc/zas

Browse Source 
Zoned Atmos System, merged properly from aryn's repo.
This commit is contained in:
Hawk-v3
2012-03-15 15:48:28 -07:00
parent f1f60ee20f 4861e100be
commit 86cc95cf33
20 changed files with 339 additions and 244 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/machinery/atmoalter/canister.dm
+3
View File
@@ -86,6 +86,7 @@
if (src.health <= 10)
var/atom/location = src.loc
AirflowRepel(location,air_contents.return_pressure())
location.assume_air(air_contents)
src.destroyed = 1
@@ -128,6 +129,8 @@
if(holding)
environment.merge(removed)
else
if(istype(removed))
AirflowRepel(loc,removed.return_pressure())
loc.assume_air(removed)
src.update_icon()
code/game/machinery/atmoalter/pump.dm
+4 -1
View File
@@ -43,6 +43,8 @@
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()
@@ -58,7 +60,8 @@
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()
code/game/machinery/atmoalter/scrubber.dm
+2
View File
@@ -37,6 +37,8 @@
removed = environment.remove(transfer_moles)
else
removed = loc.remove_air(transfer_moles)
if(istype(removed))
AirflowAttract(loc,removed.return_pressure())
//Filter it
if (removed)
code/game/machinery/atmoalter/zvent.dm
+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)