Skip to content

Commit

Permalink
Fix null character languages due to an oversight (#23590)
Browse files Browse the repository at this point in the history
* fix null character SQL

* species too
  • Loading branch information
S34NW authored Dec 17, 2023
1 parent 40e1a36 commit ab1c154
Showing 1 changed file with 6 additions and 4 deletions.
10 changes: 6 additions & 4 deletions code/modules/client/preference/link_processing.dm
Original file line number Diff line number Diff line change
Expand Up @@ -223,9 +223,10 @@
if(can_use_species(user, _species))
new_species += _species

active_character.species = tgui_input_list(user, "Please select a species", "Character Generation", sortList(new_species))
if(!active_character.species)
var/new_active_character_species = tgui_input_list(user, "Please select a species", "Character Generation", sortList(new_species))
if(!new_active_character_species)
return
active_character.species = new_active_character_species
var/datum/species/NS = GLOB.all_species[active_character.species]
if(!istype(NS)) //The species was invalid. Notify the user and fail out.
active_character.species = prev_species
Expand Down Expand Up @@ -311,9 +312,10 @@
if(!(lang.flags & RESTRICTED))
new_languages += lang.name

active_character.language = tgui_input_list(user, "Please select a secondary language", "Character Generation", sortList(new_languages))
if(!active_character.language)
var/new_active_character_language = tgui_input_list(user, "Please select a secondary language", "Character Generation", sortList(new_languages))
if(!new_active_character_language)
return
active_character.language = new_active_character_language

if("autohiss_mode")
if(S.autohiss_basic_map)
Expand Down

0 comments on commit ab1c154

Please sign in to comment.