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

various mergefixes

Browse Source 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
This commit is contained in:
Cael_Aislinn
2012-09-22 21:37:42 +10:00
parent e645d78f11
commit 283ae84dad
5 changed files with 7 additions and 816 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/machinery/atmoalter/zvent.dm
+3 -3
View File
@@ -23,7 +23,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)