Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit765

2020-05-30 03:29:02 +02:00
parent a84e7bcecc 668205c149
commit 1bca74465f
322 changed files with 9457 additions and 2425 deletions
@@ -6,7 +6,8 @@
 	products = list(/obj/item/toy/cards/deck = 5,
 					/obj/item/storage/pill_bottle/dice = 10,
 					/obj/item/toy/cards/deck/cas = 3,
-					/obj/item/toy/cards/deck/cas/black = 3)
+					/obj/item/toy/cards/deck/cas/black = 3,
+					/obj/item/toy/cards/deck/unum = 3)
 	contraband = list(/obj/item/dice/fudge = 9)
 	premium = list(/obj/item/melee/skateboard/pro = 3,
 					/obj/item/melee/skateboard/hoverboard = 1)