From 797a35e5ad79d23ec6f0cb16518d356962979d81 Mon Sep 17 00:00:00 2001 From: deathride58 Date: Fri, 2 Mar 2018 21:29:45 -0500 Subject: [PATCH] Update preferences_savefile.dm --- code/modules/client/preferences_savefile.dm | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/code/modules/client/preferences_savefile.dm b/code/modules/client/preferences_savefile.dm index f31fde3154..2ca1f3d094 100644 --- a/code/modules/client/preferences_savefile.dm +++ b/code/modules/client/preferences_savefile.dm @@ -369,7 +369,12 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car S["job_engsec_med"] >> job_engsec_med S["job_engsec_low"] >> job_engsec_low -<<<<<<< HEAD + //Traits + S["all_traits"] >> all_traits + S["positive_traits"] >> positive_traits + S["negative_traits"] >> negative_traits + S["neutral_traits"] >> neutral_traits + //Citadel code S["feature_genitals_use_skintone"] >> features["genitals_use_skintone"] S["feature_exhibitionist"] >> features["exhibitionist"] @@ -419,13 +424,6 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car else //We have no old flavortext, default to new S["feature_flavor_text"] >> features["flavor_text"] -======= - //Traits - S["all_traits"] >> all_traits - S["positive_traits"] >> positive_traits - S["negative_traits"] >> negative_traits - S["neutral_traits"] >> neutral_traits ->>>>>>> ab9e2e8... Adds minor roundstart traits! (ala CDDA, etc.) (#35440) //try to fix any outdated data if necessary if(needs_update >= 0)