From bd7c475fccb014e5747507a81b7b3c1c31e71425 Mon Sep 17 00:00:00 2001 From: PsiOmegaDelta Date: Thu, 8 Oct 2015 20:29:39 +0200 Subject: [PATCH] Stack material use now depends on charge costs. This ensures one does not have to remember to set uses_charge equal to the length of the charge_cost list. Fixes #10943. --- code/game/objects/items/stacks/stack.dm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/code/game/objects/items/stacks/stack.dm b/code/game/objects/items/stacks/stack.dm index 94b6db4f958..8c5ac01c7a5 100644 --- a/code/game/objects/items/stacks/stack.dm +++ b/code/game/objects/items/stacks/stack.dm @@ -191,7 +191,7 @@ else if(get_amount() < used) return 0 - for(var/i = 1 to uses_charge) + for(var/i = 1 to charge_costs.len) var/datum/matter_synth/S = synths[i] S.use_charge(charge_costs[i] * used) // Doesn't need to be deleted return 1 @@ -264,8 +264,8 @@ return 0 var/datum/matter_synth/S = synths[1] . = round(S.get_charge() / charge_costs[1]) - if(uses_charge > 1) - for(var/i = 2 to uses_charge) + if(charge_costs.len > 1) + for(var/i = 2 to charge_costs.len) S = synths[i] . = min(., round(S.get_charge() / charge_costs[i])) return