diff --git a/code/game/objects/items/stacks/stack.dm b/code/game/objects/items/stacks/stack.dm index 6a631f53e38..2d22191f6fc 100644 --- a/code/game/objects/items/stacks/stack.dm +++ b/code/game/objects/items/stacks/stack.dm @@ -13,7 +13,6 @@ var/list/recipes = list() // /datum/stack_recipe var/singular_name var/amount = 1 - var/to_transfer = 0 var/max_amount //also see stack recipes initialisation, param "max_res_amount" must be equal to this max_amount var/merge_type = null // This path and its children should merge with this stack, defaults to src.type @@ -232,6 +231,7 @@ /obj/item/stack/proc/get_max_amount() return max_amount +var/to_transfer = 0 /obj/item/stack/proc/get_amount_transferred() return to_transfer diff --git a/code/modules/power/cable.dm b/code/modules/power/cable.dm index 9e377d0ca71..356d293ddf8 100644 --- a/code/modules/power/cable.dm +++ b/code/modules/power/cable.dm @@ -588,6 +588,7 @@ var/global/list/datum/stack_recipe/cable_coil_recipes = list( ..() if(istype(W, /obj/item/stack/cable_coil)) var/obj/item/stack/cable_coil/C = W + // Cable merging is handled by parent proc if(C.amount >= MAXCOIL) to_chat(user, "The coil is as long as it will get.") return