Merge branch 'master' into master

This commit is contained in:
Thalpy
2019-07-14 15:10:32 +01:00
committed by GitHub
92 changed files with 834 additions and 565 deletions
@@ -1,7 +1,3 @@
/obj/machinery/vending/security
contraband = list(/obj/item/clothing/glasses/sunglasses = 2, /obj/item/storage/fancy/donut_box = 2, /obj/item/ssword_kit = 1)
premium = list(/obj/item/coin/antagtoken = 1, /obj/item/ssword_kit = 1)
/obj/machinery/vending/medical
products = list(/obj/item/reagent_containers/syringe = 12,
/obj/item/reagent_containers/dropper = 3,