Merge branch 'master' into upstream-merge-32093
This commit is contained in:
@@ -45,7 +45,7 @@ GLOBAL_LIST_EMPTY(preferences_datums)
|
||||
var/allow_midround_antag = 1
|
||||
var/preferred_map = null
|
||||
var/pda_style = MONO
|
||||
|
||||
|
||||
var/uses_glasses_colour = 0
|
||||
|
||||
var/screenshake = 100
|
||||
@@ -1185,7 +1185,7 @@ GLOBAL_LIST_EMPTY(preferences_datums)
|
||||
|
||||
if("species")
|
||||
|
||||
var/result = input(user, "Select a species", "Species Selection") as null|anything in CONFIG_GET(keyed_flag_list/roundstart_races)
|
||||
var/result = input(user, "Select a species", "Species Selection") as null|anything in GLOB.roundstart_races
|
||||
|
||||
if(result)
|
||||
var/newtype = GLOB.species_list[result]
|
||||
|
||||
Reference in New Issue
Block a user