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

Update generic.dm

Browse Source
This commit is contained in:
Novacat
2019-06-24 16:11:46 -04:00
committed by GitHub
parent 2064228917
commit 960df85343
1 changed files with 2 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -64,12 +64,8 @@
exclaim_verb = "insinuates"
colour = "terminus"
key = "4"
<<<<<<< HEAD
// flags = WHITELISTED (VOREstation edit)
=======
flags = WHITELISTED
partial_understanding = list(LANGUAGE_SOL_COMMON = 20)
>>>>>>> 1efb235... Merge pull request #5842 from Anewbe/language_buffs
// partial_understanding = list(LANGUAGE_SOL_COMMON = 20) (VOREStation Edit: It is a Zorren language now)
syllables = list (".a", "spa", "pan", "blaif", "stra", "!u", "!ei", "!am", "by", ".y", "gry", "zbly", "!y", "fl",
"sm", "rn", "cpi", "ku", "koi", "pr", "glau", "stu", "ved", "ki", "tsa", "xau", "jbu", "sny", "stro", "nu",
"uan", "ju", "!i", "ge", "luk", "an", "ar", "at", "es", "et", "bel", "ki", "jaa", "ch", "ki", "gh", "ll", "uu", "wat")