mirror of
https://github.com/PolarisSS13/Polaris.git
synced 2026-08-29 16:18:35 +01:00
Merge pull request #11376 from NullSnapshot/dev-freeze
Bunch of IPC fixes.
This commit is contained in:
@@ -1183,7 +1183,12 @@ datum/preferences
|
||||
if("name")
|
||||
var/raw_name = input(user, "Choose your character's name:", "Character Preference") as text|null
|
||||
if (!isnull(raw_name)) // Check to ensure that the user entered text (rather than cancel.)
|
||||
var/new_name = sanitizeName(raw_name)
|
||||
var/new_name
|
||||
var/datum/species/S = all_species[species]
|
||||
if(istype(S))
|
||||
new_name = S.sanitize_name(raw_name)
|
||||
else
|
||||
new_name = sanitizeName(raw_name)
|
||||
if(new_name)
|
||||
real_name = new_name
|
||||
else
|
||||
|
||||
@@ -188,11 +188,16 @@
|
||||
|
||||
//Sanitize
|
||||
metadata = sanitize_text(metadata, initial(metadata))
|
||||
real_name = sanitizeName(real_name)
|
||||
|
||||
if(isnull(species) || !(species in playable_species))
|
||||
species = "Human"
|
||||
|
||||
var/datum/species/cur_species = all_species[species]
|
||||
if(istype(cur_species))
|
||||
real_name = cur_species.sanitize_name(real_name)
|
||||
else
|
||||
real_name = sanitizeName(real_name)
|
||||
|
||||
if(isnum(underwear))
|
||||
var/list/undies = gender == MALE ? underwear_m : underwear_f
|
||||
underwear = undies[undies[underwear]]
|
||||
|
||||
Reference in New Issue
Block a user