From d829ebab49468ef4d1f3c2e2e4bb49c61c27b8e4 Mon Sep 17 00:00:00 2001 From: SkyratBot <59378654+SkyratBot@users.noreply.github.com> Date: Tue, 9 Mar 2021 18:31:07 +0100 Subject: [PATCH] [MIRROR] Fix issues with custom reagent holder (#4014) * Fix issues with custom reagent holder (#57132) Co-authored-by: Jordan Brown * Fix issues with custom reagent holder Co-authored-by: Jack LeCroy <3073035+jacklecroy@users.noreply.github.com> Co-authored-by: Jordan Brown --- code/datums/components/customizable_reagent_holder.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/datums/components/customizable_reagent_holder.dm b/code/datums/components/customizable_reagent_holder.dm index 003c91b6a88..6c0abc1a053 100644 --- a/code/datums/components/customizable_reagent_holder.dm +++ b/code/datums/components/customizable_reagent_holder.dm @@ -28,7 +28,7 @@ atom/replacement, fill_type, ingredient_type = CUSTOM_INGREDIENT_TYPE_EDIBLE, - max_ingredients = INFINITY, + max_ingredients = MAX_ATOM_OVERLAYS - 2, list/obj/item/initial_ingredients = null) if(!isatom(parent)) return COMPONENT_INCOMPATIBLE @@ -122,7 +122,7 @@ if(!attacker.transferItemToLoc(ingredient, atom_parent)) return if (replacement) - var/atom/replacement_parent = new replacement(atom_parent.loc) + var/atom/replacement_parent = new replacement(atom_parent.drop_location()) ingredient.forceMove(replacement_parent) replacement = null RemoveComponent()