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

Fixes pda style loading

Browse Source
This commit is contained in:
Ling
2018-06-03 09:33:10 +02:00
committed by letterjay
parent 5bf3bd761d
commit 49bd6e24fb
3 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/client/preferences.dm
+4
View File
@@ -1380,7 +1380,11 @@ GLOBAL_LIST_EMPTY(preferences_datums)
if(pickedui)
UI_style = pickedui
if("pda_style")
<<<<<<< HEAD
var/pickedPDAStyle = input(user, "Choose your PDA style.", "Character Preference") as null|anything in list(MONO, SHARE, ORBITRON, VT)
=======
var/pickedPDAStyle = input(user, "Choose your PDA style.", "Character Preference", pda_style) as null|anything in GLOB.pda_styles
>>>>>>> 513a5f1... Fixes pda style loading (#38238)
if(pickedPDAStyle)
pda_style = pickedPDAStyle
if("pda_color")
code/modules/client/preferences_savefile.dm
+1 -1
View File
@@ -168,7 +168,7 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car
ghost_others = sanitize_inlist(ghost_others, GLOB.ghost_others_options, GHOST_OTHERS_DEFAULT_OPTION)
menuoptions = SANITIZE_LIST(menuoptions)
be_special = SANITIZE_LIST(be_special)
pda_style = sanitize_inlist(MONO, VT, SHARE, ORBITRON)
pda_style = sanitize_inlist(pda_style, GLOB.pda_styles, initial(pda_style))
pda_color = sanitize_hexcolor(pda_color, 6, 1, initial(pda_color))
screenshake = sanitize_integer(screenshake, 0, 800, initial(screenshake))