Merge remote-tracking branch 'origin/master' into hardsync-1.5

2021-02-19 10:34:47 +08:00
parent 501d33cddd c45be49fd3
commit 037378eb7d
67 changed files with 3347 additions and 94 deletions
@@ -235,6 +235,8 @@ 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()
+
 /datum/preferences/New(client/C)
 	parent = C