Merge pull request #4672 from Citadel-Station-13/upstream-merge-34083

[MIRROR] Removed some superfluous stack code
This commit is contained in:
deathride58
2018-01-05 22:16:16 +00:00
committed by GitHub
2 changed files with 0 additions and 5 deletions

View File

@@ -201,9 +201,6 @@
var/obj/item/stack/N = new being_built.build_path(A, multiplier)
N.update_icon()
N.autolathe_crafted(src)
for(var/obj/item/stack/S in (A.contents - N))
if(istype(S, N.merge_type))
N.merge(S)
else
for(var/i=1, i<=multiplier, i++)
var/obj/item/new_item = new being_built.build_path(A)

View File

@@ -494,8 +494,6 @@ GLOBAL_LIST_INIT(cable_coil_recipes, list (new/datum/stack_recipe("cable restrai
/obj/item/stack/cable_coil/Initialize(mapload, new_amount = null, param_color = null)
. = ..()
if(new_amount) // MAXCOIL by default
amount = new_amount
var/list/cable_colors = GLOB.cable_colors
item_color = param_color || item_color || pick(cable_colors)