Merge branch 'master' into QM-as-Head

This commit is contained in:
Chayse Ramsay
2018-02-16 16:09:18 +00:00
committed by GitHub
131 changed files with 776 additions and 2731 deletions
@@ -0,0 +1,3 @@
/obj/machinery/vending/security
contraband = list(/obj/item/clothing/glasses/sunglasses = 2, /obj/item/storage/fancy/donut_box = 2, /obj/item/device/ssword_kit = 1)
premium = list(/obj/item/coin/antagtoken = 1, /obj/item/device/ssword_kit = 1)