From 58b8a028023df9ccca74ddf0c2d456474d7a22af Mon Sep 17 00:00:00 2001 From: LetterJay Date: Fri, 13 Oct 2017 02:59:04 -0500 Subject: [PATCH] Update gas_mixture.dm --- code/modules/atmospherics/gasmixtures/gas_mixture.dm | 3 --- 1 file changed, 3 deletions(-) diff --git a/code/modules/atmospherics/gasmixtures/gas_mixture.dm b/code/modules/atmospherics/gasmixtures/gas_mixture.dm index 24f1a8751d..8d8bb73a8f 100644 --- a/code/modules/atmospherics/gasmixtures/gas_mixture.dm +++ b/code/modules/atmospherics/gasmixtures/gas_mixture.dm @@ -71,12 +71,9 @@ GLOBAL_LIST_INIT(gaslist_cache, init_gaslist_cache()) for(var/id in cached_gases) var/gas_data = cached_gases[id] . += gas_data[MOLES] * gas_data[GAS_META][META_GAS_SPECIFIC_HEAT] -<<<<<<< HEAD -======= if(!. && temperature) //if temp isn't defined, this mixture isn't a vacuum like space is. it hasn't been filled with *anything* so we want it to take on the properties of whatever gas enters it . += HEAT_CAPACITY_VACUUM //however, if temp is defined but HC is still 0, then we want the mixture to behave like space does, as a heat sink ->>>>>>> 40ffeff... Merge pull request #31643 from duncathan/letsallsitdownbythefireplaceandwarmup /datum/gas_mixture/proc/heat_capacity_archived() //joules per kelvin var/list/cached_gases = gases