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

2020-04-18 18:44:46 +02:00
parent 0663a3f01c bd03d2a362
commit 59f2b66fd9
131 changed files with 5138 additions and 6411 deletions
@@ -318,3 +318,4 @@
 	bitesize_mod = 8
 	tastes = list("wax" = 1)
 	foodtype = SUGAR
+	distill_reagent = /datum/reagent/consumable/ethanol/mead
@@ -51,6 +51,7 @@
 	desc = "Long stocks with flowering tips that has a chemical to make feline attracted to it."
 	species = "catnip"
 	plantname = "Catnip Plant"
+	growthstages = 3
 	product = /obj/item/reagent_containers/food/snacks/grown/tea/catnip
 	reagents_add = list(/datum/reagent/pax/catnip = 0.1, /datum/reagent/consumable/nutriment/vitamin = 0.06, /datum/reagent/toxin/teapowder = 0.3)
 	rarity = 50