cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-01-04 14:33:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

Adds language preview to character setup

Browse Source
This commit is contained in:
Casey
2022-07-03 05:09:12 -04:00
committed by CHOMPStation2
parent acb9521a80
commit 0942038444
6 changed files with 46 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
code/modules/client/preference_setup/general/02_language.dm
View File

@@ -89,8 +89,17 @@
tgui_alert_async(user, "There are no additional languages available to select.")
else
var/new_lang = tgui_input_list(user, "Select an additional language", "Character Generation", available_languages)
<<<<<<< HEAD
if(new_lang && pref.alternate_languages.len < pref.numlanguage()) //CHOMPEdit
pref.alternate_languages |= new_lang
=======
if(new_lang && pref.alternate_languages.len < (S.num_alternate_languages + pref.extra_languages))
var/datum/language/chosen_lang = GLOB.all_languages[new_lang]
if(istype(chosen_lang))
var/choice = tgui_alert(usr, "[chosen_lang.desc]",chosen_lang.name, list("Take","Cancel"))
if(choice != "Cancel" && pref.alternate_languages.len < (S.num_alternate_languages + pref.extra_languages))
pref.alternate_languages |= new_lang
>>>>>>> 6ee75cc608... Merge pull request #13255 from Heroman3003/language-preview
return TOPIC_REFRESH
else if(href_list["change_prefix"])

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

@@ -18,7 +18,7 @@
// 'basic' language; spoken by default.
/datum/language/common
name = LANGUAGE_GALCOM
desc = "The common galactic tongue, engineered for cross-species communication."
desc = "The common galactic tongue, engineered for cross-species communication. Every spacer there is knows this!"
speech_verb = "says"
whisper_verb = "whispers"
key = "0"
@@ -127,7 +127,7 @@
/datum/language/sign
name = LANGUAGE_SIGN
desc = "A sign language commonly used for those who are deaf or mute."
desc = "A sign language commonly used for those who are deaf or mute. Especially popular with spacers, due to practicality in airless environments."
signlang_verb = list("gestures")
colour = "say_quote"
key = "s"
@@ -152,7 +152,7 @@
// Silly language for those times when you try to talk a languague you normally can't
/datum/language/gibberish
name = LANGUAGE_GIBBERISH
desc = "A completely incomprehensible language."
desc = "A completely incomprehensible gibberish that can barely be called a language."
signlang_verb = list("flails")
speech_verb = "spews"
whisper_verb = "mumbles"

32
code/modules/mob/language/monkey.dm
View File

@@ -1,6 +1,6 @@
/datum/language/human/monkey
name = "Chimpanzee"
desc = "Ook ook ook."
desc = "A collection of ooking noises made by monkeys"
speech_verb = "chimpers"
ask_verb = "chimpers"
exclaim_verb = "screeches"
@@ -10,28 +10,28 @@
/datum/language/skrell/monkey
name = "Neaera"
desc = "Squik squik squik."
desc = "A collection of squiking noises made by naera."
key = "8"
syllables = list("hiss","gronk")
syllables = list("squick","croak")
machine_understands = 0
/datum/language/unathi/monkey
name = "Stok"
desc = "Hiss hiss hiss."
desc = "A collection of hissing noises made by stok."
key = "7"
syllables = list("squick","croak")
syllables = list("hiss","gronk")
machine_understands = 0
/datum/language/tajaran/monkey
name = "Farwa"
desc = "Meow meow meow."
desc = "A collection of meowing noises made by farwa."
key = "9"
syllables = list("meow","mew")
machine_understands = 0
/datum/language/corgi
name = "Dog"
desc = "Woof woof woof."
desc = "A set of barks and woofs that only dogs can understand."
speech_verb = "barks"
ask_verb = "woofs"
exclaim_verb = "howls"
@@ -43,7 +43,7 @@
/datum/language/cat
name = "Cat"
desc = "Meow meow meow."
desc = "A set of meows and mrowls that only cats can understand."
speech_verb = "meows"
ask_verb = "mrowls"
exclaim_verb = "yowls"
@@ -55,7 +55,7 @@
/datum/language/mouse
name = "Mouse"
desc = "Squeak squeak. *Nibbles on cheese*"
desc = "A set of squeaks that only mice can understand."
speech_verb = "squeaks"
ask_verb = "squeaks"
exclaim_verb = "squeaks"
@@ -67,7 +67,7 @@
/datum/language/bird
name = "Bird"
desc = "Chirp chirp, give me food"
desc = "A set of chirps and squawks that only birds can understand."
speech_verb = "chirps"
ask_verb = "tweets"
exclaim_verb = "squawks"
@@ -76,3 +76,15 @@
machine_understands = 0
space_chance = 100
syllables = list("chirp", "squawk", "tweet")
/datum/language/teppi
name = "Teppi"
desc = "A set of gyohs that only teppi can understand."
speech_verb = "rumbles"
ask_verb = "tilts"
exclaim_verb = "roars"
key = "i"
flags = WHITELISTED
machine_understands = 0
space_chance = 100
syllables = list("gyoh", "snoof", "gyoooooOOOooh", "iuuuuh", "gyuuuuh")

12
code/modules/mob/language/station.dm
View File

@@ -114,7 +114,7 @@
/datum/language/skrell
name = LANGUAGE_SKRELLIAN
desc = "A set of warbles and hums, the language itself a complex mesh of both melodic and rhythmic components, exceptionally capable of conveying intent and emotion of the speaker."
desc = "A set of warbles and hums, the language itself a complex mesh of both melodic and rhythmic components, exceptionally capable of conveying intent and emotion of the speaker. Native to Skrell."
speech_verb = "warbles"
ask_verb = "warbles"
exclaim_verb = "sings"
@@ -127,7 +127,7 @@
/datum/language/skrellfar
name = LANGUAGE_SKRELLIANFAR
desc = "The most common language among the Skrellian Far Kingdoms. Has an even higher than usual concentration of inaudible phonemes."
desc = "The most common language among the Skrellian Far Kingdoms. Has an even higher than usual concentration of inaudible phonemes. Native to Skrell."
speech_verb = "warbles"
ask_verb = "warbles"
exclaim_verb = "sings"
@@ -145,7 +145,7 @@
/datum/language/human
name = LANGUAGE_SOL_COMMON
desc = "A bastardized hybrid of many languages, including Chinese, English, French, and more; it is the common language of the Sol system."
desc = "A bastardized hybrid of many human languages, including Chinese, English, French, and more; it is the common language of the Sol system."
speech_verb = "says"
whisper_verb = "whispers"
colour = "solcom"
@@ -172,7 +172,7 @@
/datum/language/machine
name = LANGUAGE_EAL
desc = "An efficient language of encoded tones developed by positronics."
desc = "An efficient language of encoded tones developed by positronics, although compatible with any synthetic lifeforms."
speech_verb = "whistles"
ask_verb = "chirps"
exclaim_verb = "whistles loudly"
@@ -190,7 +190,7 @@
/datum/language/teshari
name = LANGUAGE_SCHECHI
desc = "A trilling language spoken by the diminutive Teshari."
desc = "A trilling language spoken by the Teshari."
speech_verb = "chirps"
ask_verb = "chirrups"
exclaim_verb = "trills"
@@ -222,7 +222,7 @@
/datum/language/promethean
name = LANGUAGE_PROMETHEAN
desc = "A complex language composed of guttural noises and bioluminescent signals"
desc = "A complex language of prometheans, composed of guttural noises and bioluminescent signals."
signlang_verb = list("flickers","flashes","rapidly flashes a light","quickly flickers a light")
speech_verb = "gurgles"
ask_verb = "gurgles"

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

@@ -11,7 +11,7 @@
/datum/language/birdsong
name = LANGUAGE_BIRDSONG
desc = "A language primarily spoken by Narvians"
desc = "A tweety language primarily spoken by Nevreans."
speech_verb = "chirps"
colour = "birdsongc"
key = "G"
@@ -160,7 +160,7 @@
/datum/language/tavan
name = LANGUAGE_TAVAN
desc = "A language native to the Altevians, it has been adopted by other rodent faring species over time."
desc = "A language native to the rat-like Altevians, it has been adopted by other rodent faring species over time."
key = "E"
speech_verb = "squeaks"
whisper_verb = "squiks"
@@ -171,7 +171,7 @@
/datum/language/echosong
name = LANGUAGE_ECHOSONG
desc = "An ultrasound-based language, inaudible to those unable to understand it."
desc = "An ultrasound-based language, inaudible to those unable to understand it, spoken by few species capable of actually hearing it."
key = "U"
signlang_verb = list("opens their mouth soundlessly", "mouthes something silently")
signlang_verb_understood = list("squeaks")

3
code/modules/mob/living/simple_mob/subtypes/animal/alien animals/teppi.dm
View File

@@ -876,6 +876,7 @@ GLOBAL_VAR_INIT(teppi_count, 0) // How mant teppi DO we have?
speak_chance = 0.5
wander = TRUE
<<<<<<< HEAD
/datum/language/teppi
name = "Teppi"
desc = "The language of the meat things."
@@ -888,6 +889,8 @@ GLOBAL_VAR_INIT(teppi_count, 0) // How mant teppi DO we have?
space_chance = 100
syllables = list("gyoh", "snoof", "gyoooooOOOooh", "iuuuuh", "gyuuuuh")
=======
>>>>>>> 6ee75cc608... Merge pull request #13255 from Heroman3003/language-preview
////////////////// Da babby //////////////
/mob/living/simple_mob/vore/alienanimals/teppi/baby