Merge pull request #4760 from VOREStation/upstream-merge-5946

[MIRROR] i don't know how vending machines work
This commit is contained in:
Novacat
2019-03-28 20:22:37 -04:00
committed by GitHub
+2 -1
View File
@@ -794,6 +794,7 @@
/obj/item/weapon/reagent_containers/food/snacks/candy/proteinbar = 8,
/obj/item/weapon/reagent_containers/food/snacks/liquidfood = 8,
/obj/item/weapon/reagent_containers/pill/diet = 8,
/obj/item/weapon/reagent_containers/hypospray/autoinjector/biginjector/glucose = 5,
/obj/item/weapon/towel/random = 8)
prices = list(/obj/item/weapon/reagent_containers/food/drinks/smallmilk = 3,
@@ -1145,4 +1146,4 @@
/obj/item/toy/plushie/face_hugger = 50,
/obj/item/toy/plushie/carp = 50,
/obj/item/toy/plushie/deer = 50,
/obj/item/toy/plushie/tabby_cat = 50)
/obj/item/toy/plushie/tabby_cat = 50)