Merge pull request #7267 from GinjaNinja32/noise

Audible emote improvement, adds ability to emote over radio.
This commit is contained in:
PsiOmegaDelta
2014-12-09 11:54:57 +01:00
18 changed files with 152 additions and 103 deletions

View File

@@ -452,11 +452,11 @@
del(src)
//BubbleWrap END
/obj/item/weapon/storage/hear_talk(mob/M as mob, text)
/obj/item/weapon/storage/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)
//Returns the storage depth of an atom. This is the number of storage items the atom is contained in before reaching toplevel (the area).
//Returns -1 if the atom was not found on container.

View File

@@ -126,7 +126,7 @@
return
/obj/proc/hear_talk(mob/M as mob, text)
/obj/proc/hear_talk(mob/M as mob, text, verb, datum/language/speaking)
if(talking_atom)
talking_atom.catchMessage(text, M)
/*

View File

@@ -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)