From a72921c95207fb40ce5da0acb7fa265da05df98f Mon Sep 17 00:00:00 2001 From: BiG-b0SS-Le-Cigar Date: Sun, 7 Sep 2025 23:21:24 +0300 Subject: [PATCH 1/4] =?UTF-8?q?=D0=90=D1=82=D0=BC=D0=BE=D1=81=20=D1=8D?= =?UTF-8?q?=D1=82=D0=BE=20=D1=80=D0=B0=D0=BA...?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/reagents/chemistry/reagents/other_reagents.dm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/code/modules/reagents/chemistry/reagents/other_reagents.dm b/code/modules/reagents/chemistry/reagents/other_reagents.dm index 02b9e2982414..1d306dcfe0da 100644 --- a/code/modules/reagents/chemistry/reagents/other_reagents.dm +++ b/code/modules/reagents/chemistry/reagents/other_reagents.dm @@ -141,10 +141,10 @@ if(hotspot && !isspaceturf(exposed_turf)) // the water evaporates in an endothermic reaction if(exposed_turf.air) var/datum/gas_mixture/air = exposed_turf.air - air.temperature = min(max(min(air.temperature-(cool_temp*1000), air.temperature/cool_temp), T0C), air.temperature) // the outer min temperature check is for weird phenomena like freon combustion - exposed_turf.temperature = clamp(min(exposed_turf.temperature-(cool_temp*1000), exposed_turf.temperature/cool_temp), T20C, exposed_turf.temperature) // turfs normally don't go below T20C so I'll just clamp it to that in case of weird phenomena. - air.react(src) - qdel(hotspot) + air.temperature = max(min(air.temperature-(cool_temp*1000), air.temperature/cool_temp),TCMB) + air.react(src) + qdel(hotspot) + if(isgroundlessturf(exposed_turf) || isnoslipturf(exposed_turf)) return From 2aa4687ac63f3f02ca548ccbe9cb360216ab73b7 Mon Sep 17 00:00:00 2001 From: BiG-b0SS-Le-Cigar Date: Sun, 7 Sep 2025 23:23:52 +0300 Subject: [PATCH 2/4] Update other_reagents.dm --- code/modules/reagents/chemistry/reagents/other_reagents.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/modules/reagents/chemistry/reagents/other_reagents.dm b/code/modules/reagents/chemistry/reagents/other_reagents.dm index 1d306dcfe0da..b1a08c28cf22 100644 --- a/code/modules/reagents/chemistry/reagents/other_reagents.dm +++ b/code/modules/reagents/chemistry/reagents/other_reagents.dm @@ -142,8 +142,8 @@ if(exposed_turf.air) var/datum/gas_mixture/air = exposed_turf.air air.temperature = max(min(air.temperature-(cool_temp*1000), air.temperature/cool_temp),TCMB) - air.react(src) - qdel(hotspot) + air.react(src) + qdel(hotspot) if(isgroundlessturf(exposed_turf) || isnoslipturf(exposed_turf)) From 17f87eecb9e3f882c8cd9d63cf20aca68d3c1403 Mon Sep 17 00:00:00 2001 From: BiG-b0SS-Le-Cigar Date: Tue, 23 Sep 2025 19:36:32 +0300 Subject: [PATCH 3/4] Update pyrotechnic_reagents.dm --- .../modules/reagents/chemistry/reagents/pyrotechnic_reagents.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/reagents/chemistry/reagents/pyrotechnic_reagents.dm b/code/modules/reagents/chemistry/reagents/pyrotechnic_reagents.dm index 0d6417175f60..1ee08b800e86 100644 --- a/code/modules/reagents/chemistry/reagents/pyrotechnic_reagents.dm +++ b/code/modules/reagents/chemistry/reagents/pyrotechnic_reagents.dm @@ -366,7 +366,7 @@ if(hotspot && !isspaceturf(exposed_turf) && exposed_turf.air) var/datum/gas_mixture/air = exposed_turf.air if(air.temperature > T20C) - air.temperature = max(air.temperature/2,T20C) + air.temperature = max(min(air.temperature-(cool_temp*1000), air.temperature/cool_temp),TCMB) air.react(src) qdel(hotspot) From da83a04d6085935be68625c05bc9ce3b7e408b89 Mon Sep 17 00:00:00 2001 From: BiG-b0SS-Le-Cigar Date: Tue, 23 Sep 2025 19:40:10 +0300 Subject: [PATCH 4/4] Update other_reagents.dm --- code/modules/reagents/chemistry/reagents/other_reagents.dm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/code/modules/reagents/chemistry/reagents/other_reagents.dm b/code/modules/reagents/chemistry/reagents/other_reagents.dm index b1a08c28cf22..91cb7f52b3eb 100644 --- a/code/modules/reagents/chemistry/reagents/other_reagents.dm +++ b/code/modules/reagents/chemistry/reagents/other_reagents.dm @@ -141,7 +141,8 @@ if(hotspot && !isspaceturf(exposed_turf)) // the water evaporates in an endothermic reaction if(exposed_turf.air) var/datum/gas_mixture/air = exposed_turf.air - air.temperature = max(min(air.temperature-(cool_temp*1000), air.temperature/cool_temp),TCMB) + air.temperature = min(max(min(air.temperature-(cool_temp*1000), air.temperature/cool_temp), T0C), air.temperature) // the outer min temperature check is for weird phenomena like freon combustion + exposed_turf.temperature = clamp(min(exposed_turf.temperature-(cool_temp*1000), exposed_turf.temperature/cool_temp), T20C, exposed_turf.temperature) // turfs normally don't go below T20C so I'll just clamp it to that in case of weird phenomena. air.react(src) qdel(hotspot)