Merge remote-tracking branch 'upstream/dev-freeze' into dev

Conflicts:
	code/game/antagonist/outsider/ert.dm
This commit is contained in:
PsiOmegaDelta
2015-11-06 17:50:34 +01:00
11 changed files with 45 additions and 42 deletions
+6
View File
@@ -212,4 +212,10 @@
else
return ..()
/proc/transfer_languages(var/mob/source, var/mob/target, var/except_flags)
for(var/datum/language/L in source.languages)
if(L.flags & except_flags)
continue
target.add_language(L.name)
#undef SCRAMBLE_CACHE_LEN