diff --git a/code/modules/client/preference_setup/general/02_language.dm b/code/modules/client/preference_setup/general/02_language.dm
index 7c16e4c306..1b065390a8 100644
--- a/code/modules/client/preference_setup/general/02_language.dm
+++ b/code/modules/client/preference_setup/general/02_language.dm
@@ -46,6 +46,14 @@
for(var/prefix in pref.language_prefixes)
if(prefix in forbidden_prefixes)
pref.language_prefixes -= prefix
+ if(isnull(pref.language_custom_keys))
+ pref.language_custom_keys = list()
+ var/datum/species/S = GLOB.all_species[pref.species]
+ for(var/key in pref.language_custom_keys)
+ if(!pref.language_custom_keys[key])
+ pref.language_custom_keys.Remove(key)
+ if(!((pref.language_custom_keys[key] == S.language) || (pref.language_custom_keys[key] == S.default_language && S.default_language != S.language) || (pref.language_custom_keys[key] in pref.alternate_languages)))
+ pref.language_custom_keys.Remove(key)
/datum/category_item/player_setup_item/general/language/content()
. += "Languages
"
@@ -54,14 +62,14 @@
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
if(S.language)
- . += "- [S.language]
"
+ . += "- [S.language] - Set Custom Key
"
if(S.default_language && S.default_language != S.language)
- . += "- [S.default_language]
"
+ . += "- [S.default_language] - Set Custom Key
"
if(S.num_alternate_languages + pref.extra_languages)
if(pref.alternate_languages.len)
for(var/i = 1 to pref.alternate_languages.len)
var/lang = pref.alternate_languages[i]
- . += "- [lang] - remove
"
+ . += "- [lang] - remove - Set Custom Key
"
if(pref.alternate_languages.len < (S.num_alternate_languages + pref.extra_languages))
. += "- add ([(S.num_alternate_languages + pref.extra_languages) - pref.alternate_languages.len] remaining)
"
@@ -129,4 +137,32 @@
pref.language_prefixes = config.language_prefixes.Copy()
return TOPIC_REFRESH
+ else if(href_list["set_custom_key"])
+ var/lang = href_list["set_custom_key"]
+ if(!lang in GLOB.all_languages)
+ return TOPIC_REFRESH
+
+ var/oldkey = ""
+ for(var/key in pref.language_custom_keys)
+ if(pref.language_custom_keys[key] == lang)
+ oldkey = key
+ break
+
+ var/char = tgui_input_text(user, "Input a language key for [lang]. Input a single space to reset.", "Language Custom Key", oldkey)
+ if(length(char) != 1)
+ return TOPIC_REFRESH
+ else if(char == " ")
+ for(var/key in pref.language_custom_keys)
+ if(pref.language_custom_keys[key] == lang)
+ pref.language_custom_keys -= key
+ break
+ else if(contains_az09(char))
+ if(!char in pref.language_custom_keys)
+ pref.language_custom_keys += char
+ pref.language_custom_keys[char] = lang
+ else
+ tgui_alert_async(user, "Improper language key. Rejected.", "Error")
+
+ return TOPIC_REFRESH
+
return ..()
diff --git a/code/modules/client/preferences.dm b/code/modules/client/preferences.dm
index 334d901e4b..8d23ca6e5f 100644
--- a/code/modules/client/preferences.dm
+++ b/code/modules/client/preferences.dm
@@ -63,7 +63,8 @@ var/list/preferences_datums = list()
var/species = SPECIES_HUMAN //Species datum to use.
var/species_preview //Used for the species selection window.
var/list/alternate_languages = list() //Secondary language(s)
- var/list/language_prefixes = list() //Kanguage prefix keys
+ var/list/language_prefixes = list() //Language prefix keys
+ var/list/language_custom_keys = list() //Language custom call keys
var/list/gear //Left in for Legacy reasons, will no longer save.
var/list/gear_list = list() //Custom/fluff item loadouts.
var/gear_slot = 1 //The current gear save slot
@@ -426,12 +427,12 @@ var/list/preferences_datums = list()
selecting_slots = FALSE
if(!choice)
return
-
+
var/slotnum = charlist[choice]
if(!slotnum)
error("Player picked [choice] slot to load, but that wasn't one we sent.")
return
-
+
load_character(slotnum)
attempt_vr(user.client?.prefs_vr,"load_vore","") //VOREStation Edit
sanitize_preferences()
@@ -466,12 +467,12 @@ var/list/preferences_datums = list()
selecting_slots = FALSE
if(!choice)
return
-
+
var/slotnum = charlist[choice]
if(!slotnum)
error("Player picked [choice] slot to copy to, but that wasn't one we sent.")
return
-
+
overwrite_character(slotnum)
sanitize_preferences()
ShowChoices(user)
diff --git a/code/modules/mob/language/language.dm b/code/modules/mob/language/language.dm
index f2ddceb84b..4fa749f41e 100644
--- a/code/modules/mob/language/language.dm
+++ b/code/modules/mob/language/language.dm
@@ -288,11 +288,17 @@
var/datum/language/L = locate(href_list["set_lang_key"])
if(L && (L in languages))
var/old_key = get_custom_prefix_by_lang(src, L)
- var/custom_key = tgui_input_text(src, "Input a new key for [L.name]", "Language Key", null)
+ var/custom_key = tgui_input_text(src, "Input a new key for [L.name]", "Language Key", old_key)
if(custom_key && length(custom_key) == 1)
- language_keys[custom_key] = L
- if(old_key && old_key != custom_key)
- language_keys.Remove(old_key)
+ if(contains_az09(custom_key))
+ language_keys[custom_key] = L
+ if(old_key && old_key != custom_key)
+ language_keys.Remove(old_key)
+ else if(custom_key == " ")
+ if(old_key && old_key != custom_key)
+ language_keys.Remove(old_key)
+ else
+ tgui_alert_async(src, "Improper language key. Rejected.", "Error")
check_languages()
else
return ..()
diff --git a/code/modules/mob/mob_defines.dm b/code/modules/mob/mob_defines.dm
index 86bc1989ce..19476f2460 100644
--- a/code/modules/mob/mob_defines.dm
+++ b/code/modules/mob/mob_defines.dm
@@ -94,7 +94,7 @@
var/list/pinned = list() // List of things pinning this creature to walls (see living_defense.dm)
var/list/embedded = list() // Embedded items, since simple mobs don't have organs.
var/list/languages = list() // For speaking/listening.
- var/list/language_keys = list() // List of language keys indexed by language
+ var/list/language_keys = list() // List of language keys indexing languages
var/species_language = null // For species who want reset to use a specified default.
var/only_species_language = 0 // For species who can only speak their default and no other languages. Does not affect understanding.
var/list/speak_emote = list("says") // Verbs used when speaking. Defaults to 'say' if speak_emote is null.
diff --git a/code/modules/mob/new_player/new_player.dm b/code/modules/mob/new_player/new_player.dm
index efe2531616..3d9cd13a51 100644
--- a/code/modules/mob/new_player/new_player.dm
+++ b/code/modules/mob/new_player/new_player.dm
@@ -604,6 +604,11 @@
if(chosen_language)
if(is_lang_whitelisted(src,chosen_language) || (new_character.species && (chosen_language.name in new_character.species.secondary_langs)))
new_character.add_language(lang)
+ for(var/key in client.prefs.language_custom_keys)
+ if(client.prefs.language_custom_keys[key])
+ var/datum/language/keylang = GLOB.all_languages[client.prefs.language_custom_keys[key]]
+ if(keylang)
+ new_character.language_keys[key] = keylang
// And uncomment this, too.
//new_character.dna.UpdateSE()
diff --git a/code/modules/mob/say.dm b/code/modules/mob/say.dm
index d3fcbe0a95..a603ee36f0 100644
--- a/code/modules/mob/say.dm
+++ b/code/modules/mob/say.dm
@@ -180,7 +180,7 @@
// Okay, we're definitely now trying to invoke a language (probably)
// This "[]" is probably unnecessary but BYOND will runtime if a number is used
var/datum/language/L = GLOB.language_keys["[language_key]"]
- if(language_key in language_keys && language_keys[language_key])
+ if((language_key in language_keys) && language_keys[language_key])
L = language_keys[language_key]
// MULTILINGUAL_SPACE enforces a space after the language key
diff --git a/code/modules/resleeving/autoresleever.dm b/code/modules/resleeving/autoresleever.dm
index 0b8433e90c..1e6753f4d7 100644
--- a/code/modules/resleeving/autoresleever.dm
+++ b/code/modules/resleeving/autoresleever.dm
@@ -74,21 +74,21 @@
return
var/client/ghost_client = ghost.client
-
+
if(!is_alien_whitelisted(ghost, GLOB.all_species[ghost_client?.prefs?.species]) && !check_rights(R_ADMIN, 0)) // Prevents a ghost ghosting in on a slot and spawning via a resleever with race they're not whitelisted for, getting around normal join restrictions.
to_chat(ghost, "You are not whitelisted to spawn as this species!")
return
-
+
/* // Comments out NO_SCAN restriction, as per headmin/maintainer request.
var/datum/species/chosen_species
if(ghost.client.prefs.species) // In case we somehow don't have a species set here.
chosen_species = GLOB.all_species[ghost_client.prefs.species]
-
+
if(chosen_species.flags && NO_SCAN) // Sanity. Prevents species like Xenochimera, Proteans, etc from rejoining the round via resleeve, as they should have their own methods of doing so already, as agreed to when you whitelist as them.
to_chat(ghost, "This species cannot be resleeved!")
return
*/
-
+
//Name matching is ugly but mind doesn't persist to look at.
var/charjob
var/datum/data/record/record_found
@@ -132,7 +132,7 @@
else
spawn_slots --
return
-
+
if(tgui_alert(ghost, "Would you like to be resleeved?", "Resleeve", list("No","Yes")) == "No")
return
var/mob/living/carbon/human/new_character
@@ -152,7 +152,7 @@
ghost.mind.transfer_to(new_character)
new_character.key = player_key
-
+
//Were they any particular special role? If so, copy.
if(new_character.mind)
new_character.mind.loaded_from_ckey = picked_ckey
@@ -167,6 +167,11 @@
if(chosen_language)
if(is_lang_whitelisted(src,chosen_language) || (new_character.species && (chosen_language.name in new_character.species.secondary_langs)))
new_character.add_language(lang)
+ for(var/key in ghost_client.prefs.language_custom_keys)
+ if(ghost_client.prefs.language_custom_keys[key])
+ var/datum/language/keylang = GLOB.all_languages[ghost_client.prefs.language_custom_keys[key]]
+ if(keylang)
+ new_character.language_keys[key] = keylang
//If desired, apply equipment.
if(equip_body)
diff --git a/code/modules/vore/eating/inbelly_spawn.dm b/code/modules/vore/eating/inbelly_spawn.dm
index 39c09554e0..207f3ca4e0 100644
--- a/code/modules/vore/eating/inbelly_spawn.dm
+++ b/code/modules/vore/eating/inbelly_spawn.dm
@@ -161,6 +161,11 @@ Please do not abuse this ability.
if(chosen_language)
if(is_lang_whitelisted(prey,chosen_language) || (new_character.species && (chosen_language.name in new_character.species.secondary_langs)))
new_character.add_language(lang)
+ for(var/key in prey.prefs.language_custom_keys)
+ if(prey.prefs.language_custom_keys[key])
+ var/datum/language/keylang = GLOB.all_languages[prey.prefs.language_custom_keys[key]]
+ if(keylang)
+ new_character.language_keys[key] = keylang
new_character.regenerate_icons()
diff --git a/vorestation.dme b/vorestation.dme
index f2a518448b..a0adcd3db9 100644
--- a/vorestation.dme
+++ b/vorestation.dme
@@ -4159,6 +4159,6 @@
#include "maps\submaps\space_submaps\debrisfield\debrisfield.dm"
#include "maps\submaps\surface_submaps\wilderness\wilderness.dm"
#include "maps\submaps\surface_submaps\wilderness\wilderness_areas.dm"
-#include "maps\virgo_minitest\virgo_minitest.dm"
+#include "maps\tether\tether.dm"
#include "maps\~map_system\maps.dm"
// END_INCLUDE