Merge remote-tracking branch 'origin/master' into rustsql

code/modules/client/preferences.dm

@@ -221,6 +221,7 @@ GLOBAL_LIST_EMPTY(preferences_datums)
 	var/hide_ckey = FALSE //pref for hiding if your ckey shows round-end or not
 
 	var/list/tcg_cards = list()
+	var/list/tcg_decks = list()
 
 /datum/preferences/New(client/C)
 	parent = C

code/modules/client/preferences_savefile.dm

@@ -666,6 +666,13 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car
 	else
 		tcg_cards = list()
 
+	var/tcgdeckstr
+	S["tcg_decks"] >> tcgdeckstr
+	if(length(tcgdeckstr))
+		tcg_decks = safe_json_decode(tcgdeckstr)
+	else
+		tcg_decks = list()
+
 	S["chosen_limb_id"]					>> chosen_limb_id
 	S["hide_ckey"]						>> hide_ckey //saved per-character
 
@@ -1108,6 +1115,11 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car
 	else
 		S["tcg_cards"] << safe_json_encode(list())
 
+	if(length(tcg_decks))
+		S["tcg_decks"] << safe_json_encode(tcg_decks)
+	else
+		S["tcg_decks"] << safe_json_encode(list())
+
 	cit_character_pref_save(S)
 
 	return 1