Merge pull request #6587 from phil235/MonkeyBiteMaskFix

Fixes being able to bite as a monkey with your mouth covered by a mask.
This commit is contained in:
tkdrg
2014-12-28 01:01:14 -03:00
+4 -1
View File
@@ -215,7 +215,10 @@ proc/vol_by_throwforce_and_or_w_class(var/obj/item/I)
M << "No attacking people at spawn, you jackass."
return 0
if (M.a_intent == "harm" && !M.is_muzzled())
if (M.a_intent == "harm")
if(M.is_muzzled() || (M.wear_mask && M.wear_mask.flags & MASKCOVERSMOUTH))
M << "<span class='warning'>You can't bite with your mouth covered!</span>"
return 0
M.do_attack_animation(src)
if (prob(75))
add_logs(M, src, "attacked", admin=0)