Merge remote-tracking branch 'Citadel-Station-13/master' into kills_the_shitty_fix

This commit is contained in:
Artur
2020-04-05 18:21:50 +03:00
194 changed files with 141945 additions and 4075 deletions
+2
View File
@@ -8,6 +8,8 @@
/obj/item/toy/cards/deck/cas = 3,
/obj/item/toy/cards/deck/cas/black = 3)
contraband = list(/obj/item/dice/fudge = 9)
premium = list(/obj/item/melee/skateboard/pro = 3,
/obj/item/melee/skateboard/hoverboard = 1)
refill_canister = /obj/item/vending_refill/games
/obj/item/vending_refill/games