From d519501425747121a135c99ec356c726f80768bc Mon Sep 17 00:00:00 2001 From: Menshin Date: Mon, 15 Sep 2014 19:20:47 +0200 Subject: [PATCH] * prevent the same item from being selected multiple times when looking for parts while table crafting (fixes #4820) * small typo in construction fixed --- code/game/objects/structures/tables_racks.dm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/code/game/objects/structures/tables_racks.dm b/code/game/objects/structures/tables_racks.dm index 778c0ff308d..ef6edb8cf9e 100644 --- a/code/game/objects/structures/tables_racks.dm +++ b/code/game/objects/structures/tables_racks.dm @@ -262,6 +262,7 @@ while(amt > 0) I = locate(B) in loc Deletion.Add(I) + I.loc = null //remove it from the table loc so that we don't locate the same item every time (will be relocated inside the crafted item in construct_item()) amt-- break item_loop else @@ -286,6 +287,7 @@ if(!istype(B, A)) Deletion.Remove(B) qdel(B) + return Deletion /obj/structure/table/interact(mob/user) @@ -295,7 +297,7 @@ var/dat = "

Construction menu

" dat += "
" if(busy) - dat += "Construction inprogress...
" + dat += "Construction in progress..." else for(var/datum/table_recipe/R in table_recipes) if(check_contents(R))