diff --git a/code/game/objects/structures/janicart.dm b/code/game/objects/structures/janicart.dm index cd01da1686e..5b9a3a9346e 100644 --- a/code/game/objects/structures/janicart.dm +++ b/code/game/objects/structures/janicart.dm @@ -70,9 +70,6 @@ if(handle_janitorial_equipment(user, used)) return ITEM_INTERACT_COMPLETE - if(istype(used, /obj/item/reagent_containers)) - return ITEM_INTERACT_SKIP_TO_AFTER_ATTACK - if(my_bag) if(my_bag.can_be_inserted(used)) my_bag.handle_item_insertion(used, user) diff --git a/code/game/objects/structures/mop_bucket.dm b/code/game/objects/structures/mop_bucket.dm index b12e1d24c12..13faf7fd874 100644 --- a/code/game/objects/structures/mop_bucket.dm +++ b/code/game/objects/structures/mop_bucket.dm @@ -28,12 +28,12 @@ if(user.a_intent != INTENT_HELP) return ..() + if(istype(used, /obj/item/reagent_containers)) + return ..() + if(handle_mop_interaction(user, used)) return ITEM_INTERACT_COMPLETE - if(istype(used, /obj/item/reagent_containers)) - return ITEM_INTERACT_SKIP_TO_AFTER_ATTACK - return ..() /obj/structure/mopbucket/proc/handle_mop_interaction(mob/living/user, obj/item/used)