shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update preferences_savefile.dm

Browse Source
This commit is contained in:
LetterJay
2017-10-27 23:54:51 -05:00
committed by GitHub
parent 9daacd69c5
commit 12fa1e3ece
1 changed files with 0 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/client/preferences_savefile.dm
-11
View File
@@ -294,20 +294,9 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car
//Species
var/species_id
S["species"] >> species_id
<<<<<<< HEAD
var/list/roundstart_races = CONFIG_GET(keyed_flag_list/roundstart_races)
if(species_id && (species_id in roundstart_races) && CONFIG_GET(flag/join_with_mutant_race))
var/newtype = GLOB.species_list[species_id]
pref_species = new newtype()
else if (roundstart_races.len)
var/rando_race = pick(roundstart_races)
if (rando_race)
pref_species = new rando_race()
=======
if(species_id)
var/newtype = GLOB.species_list[species_id]
pref_species = new newtype()
>>>>>>> 360fbff... Fixes losing species preferences (#32093)
if(!S["features["mcolor"]"] || S["features["mcolor"]"] == "#000")
WRITE_FILE(S["features["mcolor"]"] , "#FFF")