From 91c146a00e31597c48ecc9c8e67a149b3915ea02 Mon Sep 17 00:00:00 2001 From: nemvar <47324920+nemvar@users.noreply.github.com> Date: Sat, 24 Aug 2019 10:08:58 +0200 Subject: [PATCH] Crafting can now pull stuff from your pockets and also put it into your hands. (#46045) That's pretty cool right? --- code/datums/components/crafting/crafting.dm | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/code/datums/components/crafting/crafting.dm b/code/datums/components/crafting/crafting.dm index 8f94da2f453..34ab803f526 100644 --- a/code/datums/components/crafting/crafting.dm +++ b/code/datums/components/crafting/crafting.dm @@ -102,6 +102,8 @@ if(AM.flags_1 & HOLOGRAM_1) continue . += AM + for(var/slot in list(SLOT_R_STORE, SLOT_L_STORE)) + . += user.get_item_by_slot(slot) /datum/component/personal_crafting/proc/get_surroundings(mob/user) . = list() @@ -169,6 +171,8 @@ var/list/parts = del_reqs(R, user) var/atom/movable/I = new R.result (get_turf(user.loc)) I.CheckParts(parts, R) + if(isitem(I)) + user.put_in_hands(I) if(send_feedback) SSblackbox.record_feedback("tally", "object_crafted", 1, I.type) return 0