diff --git a/code/_global_vars/misc.dm b/code/_global_vars/misc.dm index 6720589533..b45a4fbcfb 100644 --- a/code/_global_vars/misc.dm +++ b/code/_global_vars/misc.dm @@ -1,3 +1 @@ GLOBAL_LIST_EMPTY(all_observable_events) - -GLOBAL_LIST_INIT(font_resources, list('fonts/Shage/Shage.ttf')) \ No newline at end of file diff --git a/code/modules/mob/language/factional.dm b/code/modules/mob/language/factional.dm index d2bda0dd35..75a4641d36 100644 --- a/code/modules/mob/language/factional.dm +++ b/code/modules/mob/language/factional.dm @@ -58,6 +58,6 @@ . = ..() var/input_size = length(.) if(copytext(., input_size) in list("!","?",".")) - . = "[copytext(.,1,input_size)], mayet[copytext(.,input_size)]" + . = "[copytext(., 1, input_size)], mayet[copytext(., input_size)]" else . += ", mayet" \ No newline at end of file diff --git a/code/modules/mob/language/generic.dm b/code/modules/mob/language/generic.dm index 35e3026fd6..6e5129f1e8 100644 --- a/code/modules/mob/language/generic.dm +++ b/code/modules/mob/language/generic.dm @@ -22,7 +22,6 @@ /datum/language/common name = LANGUAGE_RUNGLISH desc = "The official language of space, first pioneered on the International Space Station in days of yore. A combination of English and Russian." - colour = "runglish" speech_verb = "says" whisper_verb = "whispers" key = "0" @@ -38,7 +37,7 @@ /datum/language/common/get_random_name(var/gender, name_count=2, syllable_count=4, syllable_divisor=2) if (prob(80)) - if(gender==FEMALE) + if(gender == FEMALE) return capitalize(pick(GLOB.first_names_female)) + " " + capitalize(pick(GLOB.last_names)) else return capitalize(pick(GLOB.first_names_male)) + " " + capitalize(pick(GLOB.last_names)) diff --git a/code/stylesheet.dm b/code/stylesheet.dm index 4275925360..8ed525b42f 100644 --- a/code/stylesheet.dm +++ b/code/stylesheet.dm @@ -89,7 +89,6 @@ h1.alert, h2.alert {color: #000000;} /* Languages */ .alien {color: #543354;} -.runglish {color: #9C250B;} .lunar {color: #6E0B9C;} .exterior {color: #0B819C;} .belter {color: #9C6E0B;} diff --git a/fonts/Shage/README.txt b/fonts/Shage/README.txt deleted file mode 100644 index fad1495ab8..0000000000 --- a/fonts/Shage/README.txt +++ /dev/null @@ -1,22 +0,0 @@ ----LEGAL SHIT--- -The font file in this archive was created using Fontstruct the free, online -font-building tool. -This font was created by “BlueNexus”. -This font has a homepage where this archive and other versions may be found: -https://fontstruct.com/fontstructions/show/1476786 - -Try Fontstruct at http://fontstruct.com -It's easy and it's fun. - -NOTE FOR FLASH USERS: Fontstruct fonts (fontstructions) are optimized for Flash. -If the font in this archive is a pixel font, it is best displayed at a font-size -of 7. - -Fontstruct is copyright ©2018 Rob Meek - -LEGAL NOTICE: -In using this font you must comply with the licensing terms described in the -file “license.txt” included with this archive. -If you redistribute the font file in this archive, it must be accompanied by all -the other files from this archive, including this one. ----END LEGAL SHIT-- \ No newline at end of file diff --git a/fonts/Shage/Shage.ttf b/fonts/Shage/Shage.ttf deleted file mode 100644 index 9c76ad47e7..0000000000 Binary files a/fonts/Shage/Shage.ttf and /dev/null differ diff --git a/fonts/Shage/license.txt b/fonts/Shage/license.txt deleted file mode 100644 index fc4bf3708e..0000000000 --- a/fonts/Shage/license.txt +++ /dev/null @@ -1,4 +0,0 @@ -The FontStruction “Shage” -(https://fontstruct.com/fontstructions/show/1476786) by “BlueNexus” is -licensed under a Creative Commons Attribution license -(http://creativecommons.org/licenses/by/3.0/). diff --git a/tools/languageconverter/README.txt b/tools/languageconverter/README.txt deleted file mode 100644 index eba320dc61..0000000000 --- a/tools/languageconverter/README.txt +++ /dev/null @@ -1,61 +0,0 @@ -Contents: -1. Legal shit -2. Usage - - ----LEGAL SHIT--- -The font file in this archive was created using Fontstruct the free, online -font-building tool. -This font was created by “BlueNexus”. -This font has a homepage where this archive and other versions may be found: -https://fontstruct.com/fontstructions/show/1476786 - -Try Fontstruct at http://fontstruct.com -It's easy and it's fun. - -NOTE FOR FLASH USERS: Fontstruct fonts (fontstructions) are optimized for Flash. -If the font in this archive is a pixel font, it is best displayed at a font-size -of 7. - -Fontstruct is copyright ©2018 Rob Meek - -LEGAL NOTICE: -In using this font you must comply with the licensing terms described in the -file “license.txt” included with this archive. -If you redistribute the font file in this archive, it must be accompanied by all -the other files from this archive, including this one. ----END LEGAL SHIT--- - ----USAGE--- -[ENGLISH TO SHAGE] -First, find the word you want to translate in shage_3.html, via ctrl-F. -Apply the grammar rules on the doc to get the correct IPA. - EXAMPLE - For example, if you wanted the word "shooter", well, that exact word doesn't - exist. But we can make that word via grammar rules. - you would get the word for - "shoot" (ħuˈʔos), and look at the derivational morphology section. - Applying those rules, we would add ɛʔ to get ħuˈʔosɛʔ. Brackets mean - that that character is only included if a vowel is required. - Contact BlueNexus on discord if you need help in this regard. - -Once you have your input text: -1. copy the IPA (the weird characters after the word) -2. Start up transliterator.py (You'll need python 3.x for that) -3. Paste in your IPA - -If this is for SS13: -4. Copy the second line of output into your code editor -5. Done - -If this is for anything else: -4. Install the included font -5. Open up a word editor and select the "Shage" font -6. Paste in the first line of transliterator output -7. Done - -[SHAGE TO ENGLISH] -1. Start up detransliterator.py -2. Copy the shage letters -3. Paste them into the program, and press enter -4. Done \ No newline at end of file diff --git a/tools/languageconverter/Shage.ttf b/tools/languageconverter/Shage.ttf deleted file mode 100644 index 3d67510413..0000000000 Binary files a/tools/languageconverter/Shage.ttf and /dev/null differ diff --git a/tools/languageconverter/Shage_3.html b/tools/languageconverter/Shage_3.html deleted file mode 100644 index 6296d13fc7..0000000000 --- a/tools/languageconverter/Shage_3.html +++ /dev/null @@ -1 +0,0 @@ -

The Language of Shage /ʃəˈgɛ/

...and he stood holding his hat and turned his wet face to the wind....
hu se rai bo la se shero' hu xeshoi la se ihe fo u axo
Pronunciation: /ħu sɛ ɾəˈi bɔ lə sɛ ˈʃɛɾɔʔ ħu ɣɛˈʃoi lə sɛ iˈhɛ fɔ u aˈɣo/
Narrow pronunciation: [ħu sɛ ɾəˈi bɔ ʎə sɛ ˈʃɛɾɔʔ ħu ɣɛˈʃoi ʎə sɛ iˈhɛ fɔ u aˈɣo]
Shage structure: and he stood holding his hat and turned his wet face to the wind
Seed for this language: 0.517338243451477

Phonology

Vowel inventory: /a i o u ɔ ə ɛ/

Dipthongs: None
Syllable structure: (C)V(C)
Stress pattern: No fixed stress
Word initial consonants: b, d, dʒ, f, g, h, j, l, m, r, s, t, w, x, z, ð, ħ, ɣ, ɾ, ʃ, ʕ, θ
Mid-word consonants: b, d, dʒ, f, g, h, j, l, m, r, s, t, w, x, z, ð, ħ, ɣ, ɾ, ʃ, ʔ, θ
Word final consonants: b, d, g, l, m, r, s, t, w, x, z, ð, ɣ, ʃ, ʔ, ʕ, θ
Phonological rules (in order of application):

Guide to phonological rules: "e → i / _g" means 'e' turns into 'i' before a 'g'.
C = consonant, V = vowel, S = stop, N = nasal consonant, F = fricative, K = velar, L = lateral, R = resonant/sonorant, P = labial/bilabial E = front vowel, B = back vowel, # = word boundary, Ø = null/nothing

  • b → w / V_V
  • N → h / _S
  • j → w / _o
  • s → z / _{N,l,r}
  • s → ʃ / i_#
  • ɛ → ɛa / _l{C,#}
  • h → Ø / _#
  • j → i / C(V)_
  • w → Ø / V_V
  • ɣ → g / C_V
  • h → Ø / _#
  • ja → iː / C_C
  • V → Ø / di_
  • l → ʎ / #_

    • Grammar

    Main word order: Subject-Verb-Object-Oblique. "Mary opened the door with a key" turns into Mary opened the door with a key.
    Adjective order: Adjectives are positioned before the noun.
    Adposition: prepositions

    Noun morphology

    SingularPlural
    Nominativemanoxo /ˈoxo/ menSuffix: -(o)ʃ
    oxosh /ˈoxoʃ/
    AccusativemanSuffix: -(ɛ)ɣu
    oxoxu /oˈxoɣu/     		menSuffix: -u
    oxou /oˈxou/
    Genitiveman'sSuffix: -(ɛ)b
    oxob /ˈoxob/     		men'sSuffix: -(ɛ)ʕ
    oxor /ˈoxoʕ/
    Dativeto [the/a] manSuffix: -(ɔ)b
    oxob /oˈxob/     		to menSuffix: -i
    oxoi /oˈxoi/
    Locativein/at/by [the/a] manSuffix: -(ɛ)l
    oxol /ˈoxol/     		in/at/by [the/some] menSuffix: -(ɛ)r
    oxor /ˈoxor/

    Definite article

    SingularPlural
    Nominativethe [man]xab /xəb/ the [men]xub /xub/
    Accusativethe [man]xuy /xuj/ [xuˈi]the [men]xah /xəh/ [xə]
    Genitivethe [man's]xey /xɛj/ [xɛˈi]the [men's]fuh /fuh/ [fu]
    Dativeto the [man]xuh /xuħ/ to the [men]fug /fug/
    Locativein/at/by the [man]xaj /xədʒ/ in/at/by the [men]jeg /dʒɛg/

    Indefinite article

    Numeral for 'one' is used as indefinite article.

    Personal pronouns

    NominativeAccusativeGenitiveDative
    1st.sgIdha' /ðəʔ/ medhit /ðit/ minela dha' /lə ðəʔ/ [ʎə ðəʔ]to meo dha' /ɔ ðəʔ/
    2nd.sgyouse /sɛ/ youser /sɛɾ/ yoursla se /lə sɛ/ [ʎə sɛ]to youo se /ɔ sɛ/
    3rd.sg.mhea /ə/ hima /ə/ hisla a /lə ə/ [ʎə ə]to himo a /ɔ ə/
    3rd.sg.fsheu /u/ herur /uɾ/ hersla u /lə u/ [ʎə u]to hero u /ɔ u/
    1st.plwei /i/ usiz /iz/ oursla i /lə i/ [ʎə i]to uso i /ɔ i/
    2nd.plyoume /mɛ/ youme' /mɛʔ/ yoursla me /lə mɛ/ [ʎə mɛ]to youo me /ɔ mɛ/
    3rd.pl.mthey (masc.)fi /fi/ them (masc.)fid /fid/ their (masc.)la fi /lə fi/ [ʎə fi]to them (masc.)o fi /ɔ fi/
    3rd.pl.fthey (fem.)xe /ɣɛ/ them (fem.)xedh /ɣɛð/ their (fem.)la xe /lə ɣɛ/ [ʎə ɣɛ]to them (fem.)o xe /ɔ ɣɛ/

    Verbs

    Indicative mood
    PastPresentFuture
    Perfectivestudiedstudywill study
    1st.sgSuffix: -o
    dazuo /ˈdazuo/     		Prefix: s(i)-
    sidazu /siˈdazu/     		Suffix: -(ɛ)z
    dazuz /ˈdazuz/
    2nd.sgSuffix: -(ɔ)ʃi
    dazushi /daˈzuʃi/     		Prefix: d(ɔ)-
    dodazu /dɔˈdazu/     		Suffix: -(i)s
    dazus /ˈdazus/
    3rd.sgSuffix: -i
    dazui /daˈzui/     		Prefix: g(ɛ)-
    gedazu /gɛˈdazu/     		Suffix: -(ɔ)m
    dazum /daˈzum/
    1st.plSuffix: -(o)ji
    dazuyi /daˈzuji/ [daˈzuii]    		Prefix: ɛ-
    edazu /ɛˈdazu/     		Suffix: -(o)l
    dazul /ˈdazul/
    2nd.plSuffix: -(a)w
    dazuw /ˈdazuw/     		Prefix: sɛ-
    sedazu /sɛˈdazu/     		Suffix: -(u)ʔɛ
    dazu'e /daˈzuʔɛ/
    3rd.plSuffix: -(o)ʕ
    dazur /ˈdazuʕ/     		Prefix: ɛ-
    edazu /ɛˈdazu/     		Suffix: -(i)ðu
    dazudhu /daˈzuðu/

    Derivational morphology

    Noun → adjective: Suffix: -(ɛ)b
    Adjective → noun: Suffix: -u
    Noun → verb: Suffix: -(o)ʃa
    Verb → noun: Suffix: -ɛ
    Verb → adjective: Suffix: -(ɛ)ħɛ
    Adjective → adverb: Suffix: -(a)z
    One who X's (e.g. paint → painter): Suffix: -(ɛ)ʔ
    Place where (e.g. wine → winery): Suffix: -(u)tu
    Diminutive: Suffix: -i
    Augmentative: Suffix: -(i)x

    Lexicon

    \ No newline at end of file diff --git a/tools/languageconverter/detransliterator.py b/tools/languageconverter/detransliterator.py deleted file mode 100644 index 769ae7ff04..0000000000 --- a/tools/languageconverter/detransliterator.py +++ /dev/null @@ -1,23 +0,0 @@ -letters = ['A','B','C','D','E','F','G','H','I',\ - 'J','K','L','M','N','O','P','Q','R',\ - 'S','T','U','V','W','X','Y','Z','a','b','c','.',' '] -phonetics = ['m','b','f','θ','ð','t','d','s','z',\ - 'ɾ','r','l','ʃ','dʒ','j','g','x','ɣ',\ - 'ħ','ʕ','h','ʔ','i','ɛ','a','u','o','ɔ','ə','.',' '] - -pholet = {} -for i in range(len(letters)): - pholet[letters[i]] = phonetics[i] - -def convert(mes): - result = "" - for char in mes: - result += pholet[char] if char in pholet else '' - print(result) - - -def main(): - while(True): - convert(input("Enter Shage to convert")) - -main() diff --git a/tools/languageconverter/license.txt b/tools/languageconverter/license.txt deleted file mode 100644 index fc4bf3708e..0000000000 --- a/tools/languageconverter/license.txt +++ /dev/null @@ -1,4 +0,0 @@ -The FontStruction “Shage” -(https://fontstruct.com/fontstructions/show/1476786) by “BlueNexus” is -licensed under a Creative Commons Attribution license -(http://creativecommons.org/licenses/by/3.0/). diff --git a/tools/languageconverter/shageletters.docx b/tools/languageconverter/shageletters.docx deleted file mode 100644 index 4e02f0fd9a..0000000000 Binary files a/tools/languageconverter/shageletters.docx and /dev/null differ diff --git a/tools/languageconverter/transliterator.py b/tools/languageconverter/transliterator.py deleted file mode 100644 index 86a8fd6594..0000000000 --- a/tools/languageconverter/transliterator.py +++ /dev/null @@ -1,29 +0,0 @@ -letters = ['A','B','C','D','E','F','G','H','I',\ - 'J','K','L','M','N','O','P','Q','R',\ - 'S','T','U','V','W','X','Y','Z','a','b','c','.',' '] -phonetics = ['m','b','f','θ','ð','t','d','s','z',\ - 'ɾ','r','l','ʃ','dʒ','j','g','x','ɣ',\ - 'ħ','ʕ','h','ʔ','i','ɛ','a','u','o','ɔ','ə','.',' '] - -pholet = {} -for i in range(len(letters)): - pholet[phonetics[i]] = letters[i] - -def convert(mes): - result = "" - counter = 0 - for char in mes: - if(len(mes) > counter + 1 and char == 'd' and mes[counter + 1] == 'ʒ'): - result += 'N' - else: - result += pholet[char] if char in pholet else '' - counter += 1 - print(result) - print("" + result + "") - - -def main(): - while(True): - convert(input("Enter IPA to convert")) - -main()