cyberpresidentvanellope/Polaris
1
0
Fork 0
mirror of https://github.com/PolarisSS13/Polaris.git synced 2026-08-22 12:46:40 +01:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
Conflicts:
	code/game/antagonist/alien/borer.dm
	code/modules/mob/living/living_defense.dm
This commit is contained in:
PsiOmegaDelta
2015-10-07 08:07:23 +02:00
parent f4be4c0ad9 f47a58e23e
commit c5d8fbfd57
12 changed files with 68 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/language/language.dm
+1 -1
View File
@@ -134,7 +134,7 @@
var/datum/language/new_language = all_languages[language]
if(!istype(new_language) || new_language in languages)
if(!istype(new_language) || (new_language in languages))
return 0
languages.Add(new_language)