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/dev-freeze' into dev

Browse Source 
Conflicts:
	code/modules/mob/living/silicon/robot/robot_modules.dm
This commit is contained in:
PsiOmegaDelta
2015-10-07 08:14:30 +02:00
parent 5a83cdaa75 712c97f114
commit aaba2c5c8c
12 changed files with 63 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -136,7 +136,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)