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

Merge pull request #6983 from Citadel-Station-13/upstream-merge-38238

Browse Source 
[MIRROR] Fixes pda style loading
This commit is contained in:
deathride58
2018-06-05 21:23:53 +00:00
committed by GitHub
parent 93d43c1d50 2b02092639
commit 963ad5dce9
3 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/client/preferences.dm
+1 -1
View File
@@ -1380,7 +1380,7 @@ GLOBAL_LIST_EMPTY(preferences_datums)
if(pickedui)
UI_style = pickedui
if("pda_style")
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
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))