Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit490

2020-01-05 22:53:00 +01:00
parent f5b251db66 bd896b4629
commit 592422ee70
80 changed files with 8334 additions and 11698 deletions
@@ -439,7 +439,6 @@
 	desc = "Quinine tastes funny, but at least it'll keep that Space Malaria away."
 	icon_state = "tonic"
 	list_reagents = list(/datum/reagent/consumable/tonic = 50)
-	foodtype = ALCOHOL

 /obj/item/reagent_containers/food/drinks/soda_cans/sodawater
 	name = "soda water"