Merge branch 'master' into upstream-merge-37598

This commit is contained in:
LetterJay
2018-05-23 07:44:52 -05:00
committed by GitHub
699 changed files with 12960 additions and 11469 deletions
+2
View File
@@ -15,6 +15,8 @@
/obj/item/reagent_containers/food/drinks/bottle/hcider = 5,
/obj/item/reagent_containers/food/drinks/bottle/absinthe = 5,
/obj/item/reagent_containers/food/drinks/bottle/grappa = 5,
/obj/item/reagent_containers/food/drinks/bottle/sake = 5,
/obj/item/reagent_containers/food/drinks/bottle/fernet = 5,
/obj/item/reagent_containers/food/drinks/ale = 6,
/obj/item/reagent_containers/food/drinks/bottle/orangejuice = 4,
/obj/item/reagent_containers/food/drinks/bottle/tomatojuice = 4,