Comment about where merging is handled, moved to_transfer variable to immediately above where it is used

This commit is contained in:
MINIMAN10000
2018-04-13 18:27:20 -07:00
parent e875af3d56
commit 5d52f60d9d
2 changed files with 2 additions and 1 deletions
+1 -1
View File
@@ -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
+1
View File
@@ -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