cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-22 11:37:40 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2825 from Tastyfish/coughsplosion

Browse Source 
Added voice analyzer & Entertainment monitor supporting audible emotes
This commit is contained in:
Fox McCloud
2015-12-14 20:47:33 -05:00
parent 8323fa4d93 37ec30d75f
commit 3d04e396ed
15 changed files with 92 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/reagents/reagent_containers/glass_containers.dm
+4
View File
@@ -266,6 +266,10 @@
if(assembly)
assembly.hear_talk(M, msg)
/obj/item/weapon/reagent_containers/glass/beaker/hear_message(mob/living/M, msg)
if(assembly)
assembly.hear_message(M, msg)
/obj/item/weapon/reagent_containers/glass/beaker/large
name = "large beaker"
desc = "A large beaker. Can hold up to 100 units."
code/modules/reagents/reagent_dispenser.dm
+4
View File
@@ -176,6 +176,10 @@
if(rig)
rig.hear_talk(M, msg)
/obj/structure/reagent_dispensers/fueltank/hear_message(mob/living/M, msg)
if(rig)
rig.hear_message(M, msg)
/obj/structure/reagent_dispensers/fueltank/Bump()
..()
if(rig)