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

Merge remote-tracking branch 'upstream/dev' into 150817-SynthAccess

Browse Source
This commit is contained in:
PsiOmegaDelta
2015-08-20 10:01:19 +02:00
parent 15f54c595b 11eefbc4c9
commit 1c92c62399
269 changed files with 11310 additions and 10989 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
code/game/objects/objs.dm
View File

@@ -136,6 +136,8 @@
/obj/proc/hide(h)
return
/obj/proc/hides_under_flooring()
return 0
/obj/proc/hear_talk(mob/M as mob, text, verb, datum/language/speaking)
if(talking_atom)