From e2d7c9a6d26aedc828a25b8fc29c2a3ca92c1ac3 Mon Sep 17 00:00:00 2001 From: nevimer <77420409+nevimer@users.noreply.github.com> Date: Sat, 21 Jan 2023 16:37:32 -0500 Subject: [PATCH] Missed Mirror: Lambs can now be killed with swords (#71500) (#18851) Lambs can now be killed with swords (#71500) Previously hitting a sheep with any item which was not "a razor" or "some grass" would have no effect whatsoever. Now hitting a sheep with a sword, axe, toolbox, or implement of your choice will hurt it. If you do this a sufficient number of times (more than you might expect) the sheep will expire. (cherry picked from commit e285b75fc524cead3cb1d6359daa06b0559bf523) Co-authored-by: Jacquerel --- code/datums/components/mob_harvest.dm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/code/datums/components/mob_harvest.dm b/code/datums/components/mob_harvest.dm index 55098484503..0d001f85233 100644 --- a/code/datums/components/mob_harvest.dm +++ b/code/datums/components/mob_harvest.dm @@ -109,10 +109,12 @@ if(istype(used_item, harvest_tool)) INVOKE_ASYNC(src, PROC_REF(harvest_item), user) + return COMPONENT_NO_AFTERATTACK + if(istype(used_item, fed_item)) remove_wait_time(user) qdel(used_item) - return COMPONENT_NO_AFTERATTACK + return COMPONENT_NO_AFTERATTACK /// Signal proc for [COMSIG_ATOM_UPDATE_ICON_STATE] /datum/component/mob_harvest/proc/on_update_icon_state(datum/source)