From 272d0e1caf1db07f07e5e2012b623bc77e55aae3 Mon Sep 17 00:00:00 2001 From: deathride58 Date: Fri, 2 Mar 2018 21:30:58 -0500 Subject: [PATCH] Update preferences_savefile.dm --- code/modules/client/preferences_savefile.dm | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/code/modules/client/preferences_savefile.dm b/code/modules/client/preferences_savefile.dm index 95bbf635d5..12f2b8d4ee 100644 --- a/code/modules/client/preferences_savefile.dm +++ b/code/modules/client/preferences_savefile.dm @@ -553,15 +553,13 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car WRITE_FILE(S["job_engsec_med"] , job_engsec_med) WRITE_FILE(S["job_engsec_low"] , job_engsec_low) -<<<<<<< HEAD - cit_character_pref_save(S) -======= //Traits WRITE_FILE(S["all_traits"] , all_traits) WRITE_FILE(S["positive_traits"] , positive_traits) WRITE_FILE(S["negative_traits"] , negative_traits) WRITE_FILE(S["neutral_traits"] , neutral_traits) ->>>>>>> ab9e2e8... Adds minor roundstart traits! (ala CDDA, etc.) (#35440) + + cit_character_pref_save(S) return 1