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

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

Browse Source 
Conflicts:
	code/modules/mob/living/carbon/human/species/station/station.dm
This commit is contained in:
PsiOmegaDelta
2015-11-06 17:43:05 +01:00
parent 7e9548d459 bef8d99703
commit e81f42840a
11 changed files with 45 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
code/modules/mob/language/language.dm
View File

@@ -199,4 +199,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