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

2021-02-21 09:55:36 +08:00
parent 6abad913ff bcffa931b9
commit 0bb5ec3316
27 changed files with 277 additions and 104 deletions
@@ -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