From 9510c120655605fb8658fa2614d91c4dba1ab832 Mon Sep 17 00:00:00 2001 From: kevinz000 <2003111+kevinz000@users.noreply.github.com> Date: Thu, 10 May 2018 22:37:59 -0700 Subject: [PATCH 1/2] Fixes morphs (#37772) --- code/modules/antagonists/morph/morph.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/antagonists/morph/morph.dm b/code/modules/antagonists/morph/morph.dm index 3ddbd0117c..6572584eab 100644 --- a/code/modules/antagonists/morph/morph.dm +++ b/code/modules/antagonists/morph/morph.dm @@ -190,7 +190,7 @@ return ..() /mob/living/simple_animal/hostile/morph/AttackingTarget() - if(!melee_damage_disguised) + if(morphed && !melee_damage_disguised) to_chat(src, "You can not attack while disguised!") return if(isliving(target)) //Eat Corpses to regen health