From ef557d77430ac7b8a51cfc07f64d77150355f689 Mon Sep 17 00:00:00 2001 From: Spaghetti-bit <60483458+Spaghetti-bit@users.noreply.github.com> Date: Thu, 6 Jun 2024 13:26:42 -0600 Subject: [PATCH] [TWEAK/FIX] Fixes hurting people you intend to help while performing surgery or repairing IPCs (#25704) * Addresses (https://github.com/ParadiseSS13/Paradise/issues/25655) * Update code/_onclick/item_attack.dm Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com> Signed-off-by: Spaghetti-bit <60483458+Spaghetti-bit@users.noreply.github.com> --------- Signed-off-by: Spaghetti-bit <60483458+Spaghetti-bit@users.noreply.github.com> Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com> --- code/_onclick/item_attack.dm | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/code/_onclick/item_attack.dm b/code/_onclick/item_attack.dm index 17d9c8c54e4..d06b59689ab 100644 --- a/code/_onclick/item_attack.dm +++ b/code/_onclick/item_attack.dm @@ -61,6 +61,10 @@ if(flags & (NOBLUDGEON)) return FALSE + if((is_surgery_tool_by_behavior(src) || is_organ(src) || tool_behaviour) && user.a_intent == INTENT_HELP && on_operable_surface(M) && M != user) + to_chat(user, "You don't want to harm the person you're trying to help!") + return + if(force && HAS_TRAIT(user, TRAIT_PACIFISM)) to_chat(user, "You don't want to harm other living beings!") return