From 81d44ae02376db48435f24f13ab365b5a3e63274 Mon Sep 17 00:00:00 2001 From: Theos Date: Fri, 2 Sep 2022 20:05:14 -0400 Subject: [PATCH 1/3] should maybe make toolset implant tools count for crafting --- code/datums/components/crafting/crafting.dm | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/code/datums/components/crafting/crafting.dm b/code/datums/components/crafting/crafting.dm index be52116927ef..f259fab4a779 100644 --- a/code/datums/components/crafting/crafting.dm +++ b/code/datums/components/crafting/crafting.dm @@ -153,6 +153,13 @@ var/list/present_qualities = list() present_qualities |= contents["tool_behaviour"] for(var/obj/item/I in user.contents) + if(istype(I, /obj/item/organ/cyberimp/arm/toolset)) + var/obj/item/organ/cyberimp/arm/toolset/T = I + if(I.owner == user) + for(var/obj/item/implant_item in I.contents) + possible_tools += implant_item.type + if(implant_item.tool_behaviour) + present_qualities.Add(implant_item.tool_behaviour) if(istype(I, /obj/item/storage)) for(var/obj/item/SI in I.contents) possible_tools += SI.type From eb59fb686fcbb2a57c5cc1098addac414de7c8ca Mon Sep 17 00:00:00 2001 From: Theos Date: Fri, 2 Sep 2022 20:06:32 -0400 Subject: [PATCH 2/3] Update crafting.dm --- code/datums/components/crafting/crafting.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/datums/components/crafting/crafting.dm b/code/datums/components/crafting/crafting.dm index f259fab4a779..d1ac3c5739ae 100644 --- a/code/datums/components/crafting/crafting.dm +++ b/code/datums/components/crafting/crafting.dm @@ -155,7 +155,7 @@ for(var/obj/item/I in user.contents) if(istype(I, /obj/item/organ/cyberimp/arm/toolset)) var/obj/item/organ/cyberimp/arm/toolset/T = I - if(I.owner == user) + if(T.owner == user) for(var/obj/item/implant_item in I.contents) possible_tools += implant_item.type if(implant_item.tool_behaviour) From f8ec818286d7dd165f35a2ba26a571e442e2d679 Mon Sep 17 00:00:00 2001 From: Theos Date: Fri, 2 Sep 2022 20:09:19 -0400 Subject: [PATCH 3/3] Update crafting.dm --- code/datums/components/crafting/crafting.dm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/code/datums/components/crafting/crafting.dm b/code/datums/components/crafting/crafting.dm index d1ac3c5739ae..d3d329ec268d 100644 --- a/code/datums/components/crafting/crafting.dm +++ b/code/datums/components/crafting/crafting.dm @@ -157,9 +157,9 @@ var/obj/item/organ/cyberimp/arm/toolset/T = I if(T.owner == user) for(var/obj/item/implant_item in I.contents) - possible_tools += implant_item.type - if(implant_item.tool_behaviour) - present_qualities.Add(implant_item.tool_behaviour) + possible_tools += implant_item.type + if(implant_item.tool_behaviour) + present_qualities.Add(implant_item.tool_behaviour) if(istype(I, /obj/item/storage)) for(var/obj/item/SI in I.contents) possible_tools += SI.type