cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-08-30 07:28:53 +01:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Bay update."

Browse Source
This commit is contained in:
Zuhayr
2016-02-07 16:07:05 +10:30
parent 2d2e60f6c6
commit 98d983577c
136 changed files with 1512 additions and 1162 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/xgm/xgm_gas_mixture.dm
+9 -14
View File
@@ -306,7 +306,7 @@
return 1
/datum/gas_mixture/proc/react()
/datum/gas_mixture/proc/react(atom/dump_location)
zburn(null, force_burn=0, no_check=0) //could probably just call zburn() here with no args but I like being explicit.
@@ -442,25 +442,20 @@
total_gas[g] += gasmix.gas[g]
if(total_volume > 0)
var/datum/gas_mixture/combined = new(total_volume)
combined.gas = total_gas
//Average out the gases
for(var/g in total_gas)
total_gas[g] /= total_volume
//Calculate temperature
var/temperature = 0
if(total_heat_capacity > 0)
combined.temperature = total_thermal_energy / total_heat_capacity
combined.update_values()
//Allow for reactions
combined.react()
//Average out the gases
for(var/g in combined.gas)
combined.gas[g] /= total_volume
temperature = total_thermal_energy / total_heat_capacity
//Update individual gas_mixtures
for(var/datum/gas_mixture/gasmix in gases)
gasmix.gas = combined.gas.Copy()
gasmix.temperature = combined.temperature
gasmix.gas = total_gas.Copy()
gasmix.temperature = temperature
gasmix.multiply(gasmix.volume)
return 1