cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 18:53:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #10858 from GinjaNinja32/more-equal

Browse Source 
fix equalize() not equalizing gases
This commit is contained in:
mwerezak
2015-08-24 15:54:44 -04:00
parent d7650f55ea 9a5da57d60
commit 9e65e63b97
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
code/ZAS/_gas_mixture_xgm.dm
View File

@@ -99,15 +99,15 @@
/datum/gas_mixture/proc/equalize(datum/gas_mixture/sharer) /datum/gas_mixture/proc/equalize(datum/gas_mixture/sharer)
for(var/g in sharer.gas) var/our_heatcap = heat_capacity()
var/share_heatcap = sharer.heat_capacity()
for(var/g in gas|sharer.gas)
var/comb = gas[g] + sharer.gas[g] var/comb = gas[g] + sharer.gas[g]
comb /= volume + sharer.volume comb /= volume + sharer.volume
gas[g] = comb * volume gas[g] = comb * volume
sharer.gas[g] = comb * sharer.volume sharer.gas[g] = comb * sharer.volume
var/our_heatcap = heat_capacity()
var/share_heatcap = sharer.heat_capacity()
if(our_heatcap + share_heatcap) if(our_heatcap + share_heatcap)
temperature = ((temperature * our_heatcap) + (sharer.temperature * share_heatcap)) / (our_heatcap + share_heatcap) temperature = ((temperature * our_heatcap) + (sharer.temperature * share_heatcap)) / (our_heatcap + share_heatcap)
sharer.temperature = temperature sharer.temperature = temperature