diff --git a/monkestation/code/modules/botany/tools.dm b/monkestation/code/modules/botany/tools.dm index 47d392e4549e..e10db76511da 100644 --- a/monkestation/code/modules/botany/tools.dm +++ b/monkestation/code/modules/botany/tools.dm @@ -1,23 +1,28 @@ /obj/item/shovel/spade/pre_attack(atom/A, mob/living/user, params) + if(user.istate & ISTATE_HARM) + return ..() if(A.GetComponent(/datum/component/plant_growing)) - if(!do_after(user, 3 SECONDS, A)) - return ..() - SEND_SIGNAL(A, COMSIG_PLANTER_REMOVE_PLANTS) + if(do_after(user, 3 SECONDS, A)) + SEND_SIGNAL(A, COMSIG_PLANTER_REMOVE_PLANTS) return TRUE - . = ..() + return ..() /obj/item/cultivator/pre_attack(atom/A, mob/living/user, params) + if(user.istate & ISTATE_HARM) + return ..() if(SEND_SIGNAL(A, COMSIG_GROWING_ADJUST_WEED, -10)) user.visible_message(span_notice("[user] uproots the weeds."), span_notice("You remove the weeds from [src].")) return TRUE - . = ..() + return ..() /obj/item/secateurs/pre_attack(atom/A, mob/living/user, params) + if(user.istate & ISTATE_HARM) + return ..() if(SEND_SIGNAL(A, COMSIG_GROWING_TRY_SECATEUR, user)) return TRUE - . = ..() + return ..() /obj/item/graft/pre_attack(atom/A, mob/living/user, params) if(SEND_SIGNAL(A, COMSIG_GROWER_TRY_GRAFT, user, src)) return TRUE - . = ..() + return ..()