diff --git a/code/modules/reagents/chemistry/reagents/other_reagents.dm b/code/modules/reagents/chemistry/reagents/other_reagents.dm index 02b9e2982414..91cb7f52b3eb 100644 --- a/code/modules/reagents/chemistry/reagents/other_reagents.dm +++ b/code/modules/reagents/chemistry/reagents/other_reagents.dm @@ -143,8 +143,9 @@ 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.react(src) + qdel(hotspot) + if(isgroundlessturf(exposed_turf) || isnoslipturf(exposed_turf)) return 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)