From b840605cb603bf1e2172f8ef70220904849d5da5 Mon Sep 17 00:00:00 2001 From: duncathan salt Date: Sat, 14 Oct 2017 14:52:38 -0600 Subject: [PATCH 1/3] restores safety check in gas mixture temperature_share() (#31726) --- code/modules/atmospherics/gasmixtures/gas_mixture.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/modules/atmospherics/gasmixtures/gas_mixture.dm b/code/modules/atmospherics/gasmixtures/gas_mixture.dm index 8d8bb73a8f..72c4f1cbae 100644 --- a/code/modules/atmospherics/gasmixtures/gas_mixture.dm +++ b/code/modules/atmospherics/gasmixtures/gas_mixture.dm @@ -371,8 +371,8 @@ GLOBAL_LIST_INIT(gaslist_cache, init_gaslist_cache()) var/heat = conduction_coefficient*temperature_delta* \ (self_heat_capacity*sharer_heat_capacity/(self_heat_capacity+sharer_heat_capacity)) - temperature -= heat/self_heat_capacity - sharer_temperature += heat/sharer_heat_capacity + temperature = max(temperature + heat/self_heat_capacity, TCMB) + sharer_temperature = max(sharer_temperature - heat/sharer_heat_capacity, TCMB) if(sharer) sharer.temperature = sharer_temperature return sharer_temperature From 243d8759c7dff35b329a796ebf553bb871a42da8 Mon Sep 17 00:00:00 2001 From: LetterJay Date: Sun, 15 Oct 2017 07:51:48 -0500 Subject: [PATCH 3/3] Update gas_mixture.dm --- code/modules/atmospherics/gasmixtures/gas_mixture.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/modules/atmospherics/gasmixtures/gas_mixture.dm b/code/modules/atmospherics/gasmixtures/gas_mixture.dm index 72c4f1cbae..74264b4eae 100644 --- a/code/modules/atmospherics/gasmixtures/gas_mixture.dm +++ b/code/modules/atmospherics/gasmixtures/gas_mixture.dm @@ -371,8 +371,8 @@ GLOBAL_LIST_INIT(gaslist_cache, init_gaslist_cache()) var/heat = conduction_coefficient*temperature_delta* \ (self_heat_capacity*sharer_heat_capacity/(self_heat_capacity+sharer_heat_capacity)) - temperature = max(temperature + heat/self_heat_capacity, TCMB) - sharer_temperature = max(sharer_temperature - heat/sharer_heat_capacity, TCMB) + temperature = max(temperature - heat/self_heat_capacity, TCMB) + sharer_temperature = max(sharer_temperature + heat/sharer_heat_capacity, TCMB) if(sharer) sharer.temperature = sharer_temperature return sharer_temperature