mirror of
https://github.com/CHOMPStation2/CHOMPStation2.git
synced 2025-12-11 10:43:20 +00:00
Preferred Language + Autohiss Default Options
This commit is contained in:
committed by
CHOMPStation2
parent
b8a9f86017
commit
0d5f21d733
@@ -1,6 +1,10 @@
|
||||
/datum/preferences
|
||||
var/extra_languages = 0
|
||||
<<<<<<< HEAD
|
||||
var/preferred_language = "common" // CHOMPStation Edit: Allow selecting a preferred language
|
||||
=======
|
||||
var/preferred_language = "common" // VOREStation Edit: Allow selecting a preferred language
|
||||
>>>>>>> 657ee05f13... Merge pull request #14756 from Rykka-Stormheart/shep-dev-auto-lang-prefs
|
||||
|
||||
/datum/category_item/player_setup_item/general/language
|
||||
name = "Language"
|
||||
@@ -13,10 +17,16 @@
|
||||
if(islist(pref.alternate_languages)) // Because aparently it may not be?
|
||||
testing("LANGSANI: Loaded from [pref.client]'s character [pref.real_name || "-name not yet loaded-"] savefile: [english_list(pref.alternate_languages || list())]")
|
||||
S["language_prefixes"] >> pref.language_prefixes
|
||||
<<<<<<< HEAD
|
||||
//CHOMPEdit Begin
|
||||
S["species"] >> pref.species
|
||||
S["preflang"] >> pref.preferred_language
|
||||
//CHOMPEdit End
|
||||
=======
|
||||
//VORE Edit Begin
|
||||
S["preflang"] >> pref.preferred_language
|
||||
//VORE Edit End
|
||||
>>>>>>> 657ee05f13... Merge pull request #14756 from Rykka-Stormheart/shep-dev-auto-lang-prefs
|
||||
S["language_custom_keys"] >> pref.language_custom_keys
|
||||
|
||||
/datum/category_item/player_setup_item/general/language/save_character(var/savefile/S)
|
||||
@@ -26,7 +36,11 @@
|
||||
testing("LANGSANI: Loaded from [pref.client]'s character [pref.real_name || "-name not yet loaded-"] savefile: [english_list(pref.alternate_languages || list())]")
|
||||
S["language_prefixes"] << pref.language_prefixes
|
||||
S["language_custom_keys"] << pref.language_custom_keys
|
||||
<<<<<<< HEAD
|
||||
S["preflang"] << pref.preferred_language // CHOMPStation Edit
|
||||
=======
|
||||
S["preflang"] << pref.preferred_language // VOREStation Edit
|
||||
>>>>>>> 657ee05f13... Merge pull request #14756 from Rykka-Stormheart/shep-dev-auto-lang-prefs
|
||||
|
||||
/datum/category_item/player_setup_item/general/language/sanitize_character()
|
||||
if(!islist(pref.alternate_languages)) pref.alternate_languages = list()
|
||||
@@ -38,10 +52,17 @@
|
||||
testing("LANGSANI: Truncated [pref.client]'s character [pref.real_name || "-name not yet loaded-"] language list because it was too long (len: [pref.alternate_languages.len], allowed: [S.num_alternate_languages])")
|
||||
pref.alternate_languages.len = (S.num_alternate_languages + pref.extra_languages) // Truncate to allowed length
|
||||
|
||||
<<<<<<< HEAD
|
||||
// CHOMPStation Edit Start
|
||||
if(!(pref.preferred_language in pref.alternate_languages) || !pref.preferred_language) // Safety handling for if our preferred language is ever somehow removed from the character's list of langauges, or they don't have one set
|
||||
pref.preferred_language = S.language // Reset to default, for safety
|
||||
// CHOMPStation Edit end
|
||||
=======
|
||||
// VOREStation Edit Start
|
||||
if(!(pref.preferred_language in pref.alternate_languages) || !pref.preferred_language) // Safety handling for if our preferred language is ever somehow removed from the character's list of langauges, or they don't have one set
|
||||
pref.preferred_language = S.language // Reset to default, for safety
|
||||
// VOREStation Edit end
|
||||
>>>>>>> 657ee05f13... Merge pull request #14756 from Rykka-Stormheart/shep-dev-auto-lang-prefs
|
||||
|
||||
// Sanitize illegal languages
|
||||
for(var/language in pref.alternate_languages)
|
||||
@@ -87,7 +108,11 @@
|
||||
|
||||
. += "<b>Language Keys</b><br>"
|
||||
. += " [jointext(pref.language_prefixes, " ")] <a href='?src=\ref[src];change_prefix=1'>Change</a> <a href='?src=\ref[src];reset_prefix=1'>Reset</a><br>"
|
||||
<<<<<<< HEAD
|
||||
. += "<b>Preferred Language</b> <a href='?src=\ref[src];pref_lang=1'>[pref.preferred_language]</a><br>" // CHOMPStation Add
|
||||
=======
|
||||
. += "<b>Preferred Language</b> <a href='?src=\ref[src];pref_lang=1'>[pref.preferred_language]</a><br>" // VOREStation Add
|
||||
>>>>>>> 657ee05f13... Merge pull request #14756 from Rykka-Stormheart/shep-dev-auto-lang-prefs
|
||||
|
||||
/datum/category_item/player_setup_item/general/language/OnTopic(var/href,var/list/href_list, var/mob/user)
|
||||
if(href_list["remove_language"])
|
||||
@@ -175,11 +200,19 @@
|
||||
|
||||
return TOPIC_REFRESH
|
||||
|
||||
<<<<<<< HEAD
|
||||
// CHOMPStation Add: Preferred Language
|
||||
else if(href_list["pref_lang"])
|
||||
if(pref.species) // Safety to prevent a null runtime here
|
||||
var/datum/species/S = GLOB.all_species[pref.species]
|
||||
var/list/lang_opts = list(S.language) + pref.alternate_languages
|
||||
=======
|
||||
// VOREStation Add: Preferred Language
|
||||
else if(href_list["pref_lang"])
|
||||
if(pref.species) // Safety to prevent a null runtime here
|
||||
var/datum/species/S = GLOB.all_species[pref.species]
|
||||
var/list/lang_opts = list(S.language) + pref.alternate_languages + LANGUAGE_GALCOM
|
||||
>>>>>>> 657ee05f13... Merge pull request #14756 from Rykka-Stormheart/shep-dev-auto-lang-prefs
|
||||
var/selection = tgui_input_list(user, "Choose your preferred spoken language:", "Preferred Spoken Language", lang_opts, pref.preferred_language)
|
||||
if(!selection) // Set our preferred to default, just in case.
|
||||
tgui_alert_async(user, "Preferred Language not modified.", "Selection Canceled")
|
||||
@@ -190,7 +223,11 @@
|
||||
else // Did they set anything else?
|
||||
tgui_alert_async(user, "You will now speak [pref.preferred_language] if you do not specify a language when speaking.", "Preferred Language Set")
|
||||
return TOPIC_REFRESH
|
||||
<<<<<<< HEAD
|
||||
// CHOMPStation Add End
|
||||
=======
|
||||
// VOREStation Add End
|
||||
>>>>>>> 657ee05f13... Merge pull request #14756 from Rykka-Stormheart/shep-dev-auto-lang-prefs
|
||||
|
||||
|
||||
return ..()
|
||||
|
||||
Reference in New Issue
Block a user