From c624c3ae1484b87c3351cf96216deb9f48afd777 Mon Sep 17 00:00:00 2001 From: Letter N <24603524+LetterN@users.noreply.github.com> Date: Fri, 5 Mar 2021 20:00:45 +0800 Subject: [PATCH] economical inflation --- code/game/objects/items/stacks/stack.dm | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/code/game/objects/items/stacks/stack.dm b/code/game/objects/items/stacks/stack.dm index 017c210070..7b251c075b 100644 --- a/code/game/objects/items/stacks/stack.dm +++ b/code/game/objects/items/stacks/stack.dm @@ -42,11 +42,6 @@ var/matter_amount = 0 /obj/item/stack/Initialize(mapload, new_amount, merge = TRUE) - //do this first, lazily inflate the value - if(LAZYLEN(custom_materials)) - for(var/i in custom_materials) - custom_materials[i] *= amount - if(new_amount != null) amount = new_amount while(amount > max_amount) @@ -58,6 +53,9 @@ if(LAZYLEN(mats_per_unit)) set_mats_per_unit(mats_per_unit, 1) else if(LAZYLEN(custom_materials)) + // DO NOT REMOVE! we have to inflate the values first + for(var/i in custom_materials) + custom_materials[i] *= amount set_mats_per_unit(custom_materials, amount ? 1/amount : 1) . = ..()