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:
deathride58
2018-03-02 21:30:58 -05:00
committed by GitHub
parent 616269a8f1
commit 272d0e1caf
1 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/client/preferences_savefile.dm
+2 -4
View File
@@ -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_med"] , job_engsec_med)
WRITE_FILE(S["job_engsec_low"] , job_engsec_low) WRITE_FILE(S["job_engsec_low"] , job_engsec_low)
<<<<<<< HEAD
cit_character_pref_save(S)
=======
//Traits //Traits
WRITE_FILE(S["all_traits"] , all_traits) WRITE_FILE(S["all_traits"] , all_traits)
WRITE_FILE(S["positive_traits"] , positive_traits) WRITE_FILE(S["positive_traits"] , positive_traits)
WRITE_FILE(S["negative_traits"] , negative_traits) WRITE_FILE(S["negative_traits"] , negative_traits)
WRITE_FILE(S["neutral_traits"] , neutral_traits) WRITE_FILE(S["neutral_traits"] , neutral_traits)
>>>>>>> ab9e2e8... Adds minor roundstart traits! (ala CDDA, etc.) (#35440)
cit_character_pref_save(S)
return 1 return 1