Merge pull request #6715 from Citadel-Station-13/upstream-merge-37772

[MIRROR] Fixes morphs
2018-05-12 21:37:34 -05:00
parent cbfa3053ee 5ac4463754
commit 646403e6e1
1 changed files with 1 additions and 1 deletions
@@ -190,7 +190,7 @@
 	return ..()

 /mob/living/simple_animal/hostile/morph/AttackingTarget()
-	if(!melee_damage_disguised)
+	if(morphed && !melee_damage_disguised)
 		to_chat(src, "<span class='warning'>You can not attack while disguised!</span>")
 		return
 	if(isliving(target)) //Eat Corpses to regen health