From 6387c96bb514a12fdc44f3d4678f9c8961bcdf80 Mon Sep 17 00:00:00 2001 From: Menshin Date: Tue, 14 Oct 2014 22:31:19 +0200 Subject: [PATCH 1/2] Ambiguous expression readded. --- code/game/objects/items/stacks/stack.dm | 2 ++ 1 file changed, 2 insertions(+) diff --git a/code/game/objects/items/stacks/stack.dm b/code/game/objects/items/stacks/stack.dm index e008a8cf29..c7c74c392b 100644 --- a/code/game/objects/items/stacks/stack.dm +++ b/code/game/objects/items/stacks/stack.dm @@ -117,6 +117,8 @@ recipes_list = srl.recipes var/datum/stack_recipe/R = recipes_list[text2num(href_list["make"])] var/multiplier = text2num(href_list["multiplier"]) + if(!multiplier) //if multiplier is null + multiplier = 1 if (multiplier <= 0) //href exploit protection return if (src.amount < R.req_amount*multiplier) From 70b2c9a1faca694f943888cdaa32bce4e2d3305e Mon Sep 17 00:00:00 2001 From: Menshin Date: Tue, 14 Oct 2014 22:48:48 +0200 Subject: [PATCH 2/2] Who thought it was a good idea to omit multiplier for 1x ?!? --- code/game/objects/items/stacks/stack.dm | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/code/game/objects/items/stacks/stack.dm b/code/game/objects/items/stacks/stack.dm index c7c74c392b..cb66053692 100644 --- a/code/game/objects/items/stacks/stack.dm +++ b/code/game/objects/items/stacks/stack.dm @@ -81,7 +81,7 @@ title+= "[R.title]" title+= " ([R.req_amount] [src.singular_name]\s)" if (can_build) - t1 += text("[title] ") + t1 += text("[title] ") else t1 += text("[]", title) continue @@ -117,9 +117,7 @@ recipes_list = srl.recipes var/datum/stack_recipe/R = recipes_list[text2num(href_list["make"])] var/multiplier = text2num(href_list["multiplier"]) - if(!multiplier) //if multiplier is null - multiplier = 1 - if (multiplier <= 0) //href exploit protection + if (!multiplier || (multiplier <= 0)) //href exploit protection return if (src.amount < R.req_amount*multiplier) if (R.req_amount*multiplier>1)