From 0d7929f34f1c1604c35b31400109a2a443209496 Mon Sep 17 00:00:00 2001 From: DGamerL <108773801+DGamerL@users.noreply.github.com> Date: Fri, 14 Nov 2025 00:23:57 +0100 Subject: [PATCH] Mops can now clean on disarm and grab intent (#30828) * Mops can now clean more easily * Also changes the janicart * Update code/game/objects/items/weapons/mop.dm Co-authored-by: CRUNCH <143041327+CRUNCH-Borg@users.noreply.github.com> Signed-off-by: DGamerL <108773801+DGamerL@users.noreply.github.com> --------- Signed-off-by: DGamerL <108773801+DGamerL@users.noreply.github.com> Co-authored-by: CRUNCH <143041327+CRUNCH-Borg@users.noreply.github.com> --- code/game/objects/items/weapons/mop.dm | 2 +- code/game/objects/structures/janicart.dm | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/code/game/objects/items/weapons/mop.dm b/code/game/objects/items/weapons/mop.dm index f906e669ece..bb42718266b 100644 --- a/code/game/objects/items/weapons/mop.dm +++ b/code/game/objects/items/weapons/mop.dm @@ -53,7 +53,7 @@ /obj/item/mop/interact_with_atom(atom/target, mob/living/user, list/modifiers) // Use the mop as a weapon. - if(user.a_intent != INTENT_HELP) + if(!isturf(target) && !isitem(target) && user.a_intent == INTENT_HARM) return ..() if(istype(target, /obj/item/reagent_containers/glass/bucket/)) diff --git a/code/game/objects/structures/janicart.dm b/code/game/objects/structures/janicart.dm index 47312248b06..cb30fbc53a0 100644 --- a/code/game/objects/structures/janicart.dm +++ b/code/game/objects/structures/janicart.dm @@ -63,7 +63,7 @@ update_icon(UPDATE_OVERLAYS) /obj/structure/janitorialcart/item_interaction(mob/living/user, obj/item/used, list/modifiers) - if(user.a_intent != INTENT_HELP) + if(user.a_intent == INTENT_HARM) return ..() if(handle_janitorial_equipment(user, used))