From 2b020926399d80946b8f6b43897978a13c526611 Mon Sep 17 00:00:00 2001 From: deathride58 Date: Tue, 5 Jun 2018 17:03:55 -0400 Subject: [PATCH] Update preferences.dm --- code/modules/client/preferences.dm | 4 ---- 1 file changed, 4 deletions(-) diff --git a/code/modules/client/preferences.dm b/code/modules/client/preferences.dm index 044becba9c..5c6c0a8229 100644 --- a/code/modules/client/preferences.dm +++ b/code/modules/client/preferences.dm @@ -1380,11 +1380,7 @@ 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")