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