shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[MIRROR] You can no longer bypass language restrictions with default language (#859)

Browse Source 
* You can no longer bypass language restrictions with default language

* resolve rej files

* Update language_menu.dm
This commit is contained in:
CitadelStationBot
2017-05-18 05:05:19 -05:00
committed by Poojawa
parent d40c2224c3
commit f345d6a3ca
3 changed files with 2 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/language/language.dm.rej
-15
View File
@@ -1,15 +0,0 @@
diff a/code/modules/language/language.dm b/code/modules/language/language.dm (rejected hunks)
@@ -16,10 +16,10 @@
// If key is null, then the language isn't real or learnable.
var/flags // Various language flags.
var/list/syllables // Used when scrambling text for a non-speaker.
- var/list/sentence_chance = 5 // Likelihood of making a new sentence after each syllable.
- var/list/space_chance = 55 // Likelihood of getting a space in the random scramble string
+ var/sentence_chance = 5 // Likelihood of making a new sentence after each syllable.
+ var/space_chance = 55 // Likelihood of getting a space in the random scramble string
var/list/spans = list()
- var/static/list/scramble_cache = list()
+ var/list/scramble_cache = list()
var/default_priority = 0 // the language that an atom knows with the highest "default_priority" is selected by default.
// if you are seeing someone speak popcorn language, then something is wrong.
code/modules/language/language_menu.dm
+1 -1
View File
@@ -76,7 +76,7 @@
switch(action)
if("select_default")
if(language_datum)
if(language_datum && AM.can_speak_in_language(language_datum))
language_holder.selected_default_language = language_datum
. = TRUE
if("grant_language")