mirror of
https://github.com/VOREStation/VOREStation.git
synced 2026-07-20 19:44:46 +01:00
Conversion of realname and nickname from bay (#19120)
* Automatic changelog compile [ci skip] * replace all bay instances for realname and nickname with tg * add comments where uncertain of sanitisation needed * Fix issue from git conflict.. * Fix issue causing setup menu not opening * Attempt to clean up how name datums are handled * Remove redundant check * Fix number issues with character names --------- Co-authored-by: vorestation-ci[bot] <199609141+vorestation-ci[bot]@users.noreply.github.com>
This commit is contained in:
@@ -19,8 +19,6 @@ GLOBAL_LIST_EMPTY(preferences_datums)
|
||||
var/be_special = 0 //Special role selection
|
||||
|
||||
//character preferences
|
||||
var/real_name //our character's name
|
||||
var/nickname //our character's nickname
|
||||
var/b_type = DEFAULT_BLOOD_TYPE //blood type (not-chooseable)
|
||||
var/blood_reagents = "default" //blood restoration reagents
|
||||
var/headset = 1 //headset type
|
||||
@@ -160,7 +158,7 @@ GLOBAL_LIST_EMPTY(preferences_datums)
|
||||
|
||||
// Didn't load a character, so let's randomize
|
||||
set_biological_gender(pick(MALE, FEMALE))
|
||||
real_name = random_name(identifying_gender,species)
|
||||
update_preference_by_type(/datum/preference/name/real_name, random_name(identifying_gender, species))
|
||||
b_type = RANDOM_BLOOD_TYPE
|
||||
|
||||
if(client)
|
||||
@@ -177,7 +175,8 @@ GLOBAL_LIST_EMPTY(preferences_datums)
|
||||
return ..()
|
||||
|
||||
/datum/preferences/proc/ShowChoices(mob/user)
|
||||
if(!user || !user.client) return
|
||||
if(!user || !user.client)
|
||||
return
|
||||
|
||||
if(!get_mob_by_key(client_ckey))
|
||||
to_chat(user, span_danger("No mob exists for the given client!"))
|
||||
@@ -260,7 +259,7 @@ GLOBAL_LIST_EMPTY(preferences_datums)
|
||||
|
||||
if(href_list["save"])
|
||||
if(save_character())
|
||||
to_chat(usr,span_notice("Character [player_setup?.preferences?.real_name] saved!"))
|
||||
to_chat(usr,span_notice("Character [player_setup?.preferences?.read_preference(/datum/preference/name/real_name)] saved!"))
|
||||
save_preferences()
|
||||
else if(href_list["reload"])
|
||||
load_preferences(TRUE)
|
||||
@@ -301,7 +300,7 @@ GLOBAL_LIST_EMPTY(preferences_datums)
|
||||
character.set_species(species)
|
||||
// Special Case: This references variables owned by two different datums, so do it here.
|
||||
if(read_preference(/datum/preference/toggle/human/name_is_always_random))
|
||||
real_name = random_name(identifying_gender,species)
|
||||
update_preference_by_type(/datum/preference/name/real_name, random_name(identifying_gender, species))
|
||||
|
||||
// Ask the preferences datums to apply their own settings to the new mob
|
||||
player_setup.copy_to_mob(character)
|
||||
@@ -424,18 +423,19 @@ GLOBAL_LIST_EMPTY(preferences_datums)
|
||||
blood color
|
||||
*/
|
||||
if (copy_name)
|
||||
var/char_real_name = read_preference(/datum/preference/name/real_name)
|
||||
if(CONFIG_GET(flag/humans_need_surnames))
|
||||
var/firstspace = findtext(real_name, " ")
|
||||
var/name_length = length(real_name)
|
||||
var/firstspace = findtext(char_real_name, " ")
|
||||
var/name_length = length(char_real_name)
|
||||
if(!firstspace) //we need a surname
|
||||
real_name += " [pick(GLOB.last_names)]"
|
||||
char_real_name += " [pick(GLOB.last_names)]"
|
||||
else if(firstspace == name_length)
|
||||
real_name += "[pick(GLOB.last_names)]"
|
||||
character.real_name = real_name
|
||||
char_real_name += "[pick(GLOB.last_names)]"
|
||||
character.real_name = char_real_name
|
||||
character.name = character.real_name
|
||||
if(character.dna)
|
||||
character.dna.real_name = character.real_name
|
||||
character.nickname = nickname
|
||||
character.nickname = read_preference(/datum/preference/name/nickname)
|
||||
character.gender = biological_gender
|
||||
character.identifying_gender = identifying_gender
|
||||
|
||||
|
||||
Reference in New Issue
Block a user