From f21b87d4a2014acc4d67c3b926026e9ea6eae077 Mon Sep 17 00:00:00 2001 From: itseasytosee <55666666+itseasytosee@users.noreply.github.com> Date: Sun, 28 Aug 2022 20:28:48 -0500 Subject: [PATCH] Butchering requires you to be in combat mode. (#69510) This was an oversight that occurred when intents were replaced with combat mode if(user.a_intent != INTENT_HARM) return was never replaced by its combat mode equivalent. This is relevant today because it makes it impossible to preform surgeries on dead monkeys (you will just butcher them) --- code/datums/components/butchering.dm | 2 ++ 1 file changed, 2 insertions(+) diff --git a/code/datums/components/butchering.dm b/code/datums/components/butchering.dm index eee8ca18c59..9e118edea42 100644 --- a/code/datums/components/butchering.dm +++ b/code/datums/components/butchering.dm @@ -37,6 +37,8 @@ /datum/component/butchering/proc/onItemAttack(obj/item/source, mob/living/M, mob/living/user) SIGNAL_HANDLER + if(!user.combat_mode) + return if(M.stat == DEAD && (M.butcher_results || M.guaranteed_butcher_results)) //can we butcher it? if(butchering_enabled && (can_be_blunt || source.get_sharpness())) INVOKE_ASYNC(src, .proc/startButcher, source, M, user)