From a999e8df87574c5fdc2b0850d9cd6dc1004f0934 Mon Sep 17 00:00:00 2001 From: SkyratBot <59378654+SkyratBot@users.noreply.github.com> Date: Sat, 25 May 2024 20:58:50 +0200 Subject: [PATCH] [MIRROR] Fix moon rocks, saturnx globs, and blastoff ampoules recipe reagents disappearing into the ether (#27842) * Fix moon rocks, saturnx globs, and blastoff ampoules recipe reagents disappearing into the ether (#83382) ## About The Pull Request When making moon rocks, saturnx, or blastoff I'd notice it'd sometimes use more reagents than expected. Testing around a bit, it'd sometimes just eat the reagents without making anything. Looking into it, this seemed to be due to it trying to react and eating the reagents to do so before actually reaching the minimum reagent count. Adding the `REACTION_INSTANT` flag to these reactions fixes this. ## Why It's Good For The Game Fixes reagents disappearing without doing anything. ## Changelog :cl: fix: Mixing the reagents for moon rocks, bLaSToFF ampoules, or SaturnX globs in amounts less than the minimum for the recipe no longer eats the reagents without doing anything. /:cl: * Fix moon rocks, saturnx globs, and blastoff ampoules recipe reagents disappearing into the ether --------- Co-authored-by: _0Steven <42909981+00-Steven@users.noreply.github.com> --- code/modules/reagents/chemistry/recipes/drugs.dm | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/code/modules/reagents/chemistry/recipes/drugs.dm b/code/modules/reagents/chemistry/recipes/drugs.dm index 3d25fa5e2b1..164e66bba90 100644 --- a/code/modules/reagents/chemistry/recipes/drugs.dm +++ b/code/modules/reagents/chemistry/recipes/drugs.dm @@ -122,9 +122,10 @@ reaction_tags = REACTION_TAG_EASY | REACTION_TAG_DRUG | REACTION_TAG_ORGAN | REACTION_TAG_DAMAGING //These drug item reactions should probably be converted to fermichem in the future. -/datum/chemical_reaction/moon_rock //botany is real easy so it requires a lot of kronkus_extract, make it cheaper if it doesnt get amde. +/datum/chemical_reaction/moon_rock //botany is real easy so it requires a lot of kronkus_extract, make it cheaper if it doesnt get made. required_reagents = list(/datum/reagent/kronkus_extract = 15, /datum/reagent/fuel = 10, /datum/reagent/ammonia = 5) mob_react = FALSE + reaction_flags = REACTION_INSTANT reaction_tags = REACTION_TAG_EASY | REACTION_TAG_DRUG | REACTION_TAG_ORGAN | REACTION_TAG_DAMAGING /datum/chemical_reaction/moon_rock/on_reaction(datum/reagents/holder, datum/equilibrium/reaction, created_volume) @@ -137,6 +138,7 @@ /datum/chemical_reaction/blastoff_ampoule required_reagents = list(/datum/reagent/silver = 10, /datum/reagent/toxin/cyanide = 10, /datum/reagent/lye = 5) mob_react = FALSE + reaction_flags = REACTION_INSTANT reaction_tags = REACTION_TAG_EASY | REACTION_TAG_DRUG | REACTION_TAG_ORGAN | REACTION_TAG_DAMAGING /datum/chemical_reaction/blastoff_ampoule/on_reaction(datum/reagents/holder, datum/equilibrium/reaction, created_volume) @@ -149,6 +151,7 @@ /datum/chemical_reaction/saturnx_glob required_reagents = list(/datum/reagent/lead = 5, /datum/reagent/consumable/nothing = 5, /datum/reagent/drug/maint/tar = 10) mob_react = FALSE + reaction_flags = REACTION_INSTANT reaction_tags = REACTION_TAG_EASY | REACTION_TAG_DRUG | REACTION_TAG_ORGAN | REACTION_TAG_DAMAGING /datum/chemical_reaction/saturnx_glob/on_reaction(datum/reagents/holder, datum/equilibrium/reaction, created_volume)