cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-10 10:12:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

More merge conflict resolution goodness.

Browse Source
This commit is contained in:
Neerti
2014-12-10 02:14:58 -05:00
parent a66dbd6fc6 1481c1e985
commit c90e9eb931
80 changed files with 715 additions and 686 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
code/game/objects/objs.dm
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)
/*