Noise emotes

Conflicts:
	code/modules/mob/living/carbon/brain/say.dm
This commit is contained in:
GinjaNinja32
2014-12-07 12:09:02 +00:00
parent 93805d5742
commit 6a975a1e6a
20 changed files with 131 additions and 92 deletions
@@ -293,11 +293,11 @@
else
icon_state = icon_opened
/obj/structure/closet/hear_talk(mob/M as mob, text)
/obj/structure/closet/hear_talk(mob/M as mob, text, verb, datum/language/speaking)
for (var/atom/A in src)
if(istype(A,/obj/))
var/obj/O = A
O.hear_talk(M, text)
O.hear_talk(M, text, verb, speaking)
/obj/structure/closet/attack_generic(var/mob/user, var/damage, var/attack_message = "destroys", var/wallbreaker)
if(!damage || !wallbreaker)