From a71ecee6f96e08d1b83119af3e5e7a8073637fbf Mon Sep 17 00:00:00 2001 From: SyncIt21 <110812394+SyncIt21@users.noreply.github.com> Date: Fri, 5 Jul 2024 23:30:25 +0530 Subject: [PATCH] Makes the omnitool lathe proof (#84643) ## About The Pull Request - Fixes #84600 As mentioned in https://github.com/tgstation/tgstation/issues/84600#issuecomment-2204975628 there is no problem with omnitool & airlock interactions, but just with the lathe consuming the omnitool. ## Changelog :cl: fix: Autolathe won't eat the borg omni tool /:cl: --- code/datums/components/material/material_container.dm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/code/datums/components/material/material_container.dm b/code/datums/components/material/material_container.dm index 207e1d080f7..6ee50f5d78c 100644 --- a/code/datums/components/material/material_container.dm +++ b/code/datums/components/material/material_container.dm @@ -274,7 +274,9 @@ //All messages to be displayed to chat var/list/chat_msgs = list() //differs from held_item when using TK - var/active_held = user.get_active_held_item() + var/obj/item/active_held = user.get_active_held_item() + //omni tools can act as any tool so get its real behaviour + active_held = active_held.get_proxy_attacker_for(held_item) while(items.len) //no point inserting more items