From 46389605f2b37656e544a3932805a38423f906ce Mon Sep 17 00:00:00 2001 From: SmArtKar <44720187+SmArtKar@users.noreply.github.com> Date: Sat, 23 May 2026 17:02:00 +0200 Subject: [PATCH] Fixes certain reaction overheats being always treated as impure (#96108) ## About The Pull Request Closes #96063 ## Changelog :cl: fix: Fixed certain reaction overheats being always treated as impure /:cl: --- code/modules/reagents/chemistry/recipes/cat2_medicines.dm | 8 ++++---- code/modules/reagents/chemistry/recipes/medicine.dm | 2 +- code/modules/reagents/chemistry/recipes/pyrotechnics.dm | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/code/modules/reagents/chemistry/recipes/cat2_medicines.dm b/code/modules/reagents/chemistry/recipes/cat2_medicines.dm index 8600f1ecdb7..64b88bfc29a 100644 --- a/code/modules/reagents/chemistry/recipes/cat2_medicines.dm +++ b/code/modules/reagents/chemistry/recipes/cat2_medicines.dm @@ -190,7 +190,7 @@ else reaction.delta_t = delta_t/10 //slow without oxygen -/datum/chemical_reaction/medicine/convermol/overheated(datum/reagents/holder, datum/equilibrium/equilibrium, impure = FALSE) +/datum/chemical_reaction/medicine/convermol/overheated(datum/reagents/holder, datum/equilibrium/equilibrium, step_volume_added, impure = FALSE) var/range = impure ? 4 : 3 if(holder.has_reagent(/datum/reagent/oxygen)) explode_shockwave(holder, equilibrium, range) //damage 5 @@ -199,7 +199,7 @@ /datum/chemical_reaction/medicine/convermol/overly_impure(datum/reagents/holder, datum/equilibrium/equilibrium, step_volume_added) . = ..() - overheated(holder, equilibrium, impure = TRUE) + overheated(holder, equilibrium, step_volume_added, impure = TRUE) if(holder.has_reagent(/datum/reagent/oxygen)) clear_reactants(holder, step_volume_added*2) else @@ -226,7 +226,7 @@ reaction_tags = REACTION_TAG_EASY | REACTION_TAG_HEALING | REACTION_TAG_OXY //Sleepytime for chem -/datum/chemical_reaction/medicine/tirimol/overheated(datum/reagents/holder, datum/equilibrium/equilibrium, impure = FALSE) +/datum/chemical_reaction/medicine/tirimol/overheated(datum/reagents/holder, datum/equilibrium/equilibrium, step_volume_added, impure = FALSE) var/bonus = impure ? 2 : 1 if(holder.has_reagent(/datum/reagent/oxygen)) explode_attack_chem(holder, equilibrium, /datum/reagent/inverse/healing/tirimol, 7.5*bonus, 2, ignore_eyes = TRUE) //since we're smoke/air based @@ -237,7 +237,7 @@ /datum/chemical_reaction/medicine/tirimol/overly_impure(datum/reagents/holder, datum/equilibrium/equilibrium, step_volume_added) . = ..() - overheated(holder, equilibrium, TRUE) + overheated(holder, equilibrium, step_volume_added, impure = TRUE) clear_reactants(holder, 2) /*****TOX*****/ diff --git a/code/modules/reagents/chemistry/recipes/medicine.dm b/code/modules/reagents/chemistry/recipes/medicine.dm index 9ebad8f2900..6ec8cf3a1f0 100644 --- a/code/modules/reagents/chemistry/recipes/medicine.dm +++ b/code/modules/reagents/chemistry/recipes/medicine.dm @@ -198,7 +198,7 @@ thermic_constant = 25 mix_message = "The solution rapidly breaks apart, turning a mix of colors." -/datum/chemical_reaction/medicine/albuterol_to_convermol/overheated(datum/reagents/holder, datum/equilibrium/equilibrium, impure = FALSE) +/datum/chemical_reaction/medicine/albuterol_to_convermol/overheated(datum/reagents/holder, datum/equilibrium/equilibrium, step_volume_added, impure = FALSE) var/bonus = impure ? 2 : 1 explode_smoke(holder, equilibrium, 7.5 * bonus, TRUE, TRUE) diff --git a/code/modules/reagents/chemistry/recipes/pyrotechnics.dm b/code/modules/reagents/chemistry/recipes/pyrotechnics.dm index 18f31136961..5e74d91f230 100644 --- a/code/modules/reagents/chemistry/recipes/pyrotechnics.dm +++ b/code/modules/reagents/chemistry/recipes/pyrotechnics.dm @@ -513,7 +513,7 @@ /datum/chemical_reaction/cryostylane/reaction_finish(datum/reagents/holder, datum/equilibrium/reaction, react_vol) . = ..() if(holder.chem_temp < CRYOSTYLANE_UNDERHEAT_TEMP) - overheated(holder, null, react_vol) //replace null with fix win 2.3 is merged + overheated(holder, reaction, react_vol) //Freezes the area around you! /datum/chemical_reaction/cryostylane/overheated(datum/reagents/holder, datum/equilibrium/equilibrium, vol_added)