New mushrooms

mojave/code/modules/reagents/toxins.dm

@@ -54,3 +54,23 @@
 		M.Stun(40)
 		M.adjustToxLoss(rand(7,11))
 	return ..()
+
+/// From fly amanita fungus
+/datum/reagent/toxin/ms13/flyamanita
+	name = "fly amanita toxin"
+	description = "A potent poison extracted from the iconic fly amanita fungus."
+	reagent_state = LIQUID
+	color = "#fecfcf"
+	taste_description = "sharp bitterness"
+	metabolization_rate = 1.0 * REAGENTS_METABOLISM // 0.2 per second
+	toxpwr = 1.5
+
+/// Liquid gunpowder from Gremlin Stool shrooms, can be dried out into gunpowder for ammo
+/datum/reagent/toxin/ms13/gunpowder
+	name = "liquid gunpowder"
+	description = "Gunpowder diluted in a nondescript solvent."
+	reagent_state = LIQUID
+	color = "#a3aab0"
+	taste_description = "sharp chemical taste"
+	metabolization_rate = 3 * REAGENTS_METABOLISM // 0.6 per second
+	toxpwr = 0.5

mojave/effects/spawners/lootdrop/foodloot.dm

@@ -60,7 +60,12 @@
 		/obj/item/food/grown/ms13/firecap,
 		/obj/item/food/grown/ms13/gutshroom,
 		/obj/item/food/grown/ms13/lureweed,
-		/obj/item/food/grown/ms13/nara
+		/obj/item/food/grown/ms13/nara,
+		/obj/item/food/grown/ms13/flyamanita,
+		/obj/item/food/grown/ms13/pennybun,
+		/obj/item/food/grown/ms13/chanterelle,
+		/obj/item/food/grown/ms13/mindshroom,
+		/obj/item/food/grown/ms13/gremlinstool
 		)
 
 /obj/effect/spawner/random/ms13/food/produce_safe
@@ -110,7 +115,12 @@
 		/obj/item/food/grown/ms13/firecap,
 		/obj/item/food/grown/ms13/gutshroom,
 		/obj/item/food/grown/ms13/lureweed,
-		/obj/item/food/grown/ms13/nara
+		/obj/item/food/grown/ms13/nara,
+		/obj/item/food/grown/ms13/flyamanita,
+		/obj/item/food/grown/ms13/pennybun,
+		/obj/item/food/grown/ms13/chanterelle,
+		/obj/item/food/grown/ms13/mindshroom,
+		/obj/item/food/grown/ms13/gremlinstool
 		)
 
 // Pre-War Junkfoods //
@@ -192,7 +202,12 @@
 		/obj/item/seeds/ms13/firecap,
 		/obj/item/seeds/ms13/gutshroom,
 		/obj/item/seeds/ms13/lureweed,
-		/obj/item/seeds/ms13/nara
+		/obj/item/seeds/ms13/nara,
+		/obj/item/seeds/ms13/flyamanita,
+		/obj/item/seeds/ms13/pennybun,
+		/obj/item/seeds/ms13/chanterelle,
+		/obj/item/seeds/ms13/mindshroom,
+		/obj/item/seeds/ms13/gremlinstool
 		)
 
 // THE TIER FIVE PRODUCE. //

mojave/effects/spawners/lootdrop/guarenteed/foodloot.dm

@@ -58,7 +58,12 @@
 		/obj/item/food/grown/ms13/firecap,
 		/obj/item/food/grown/ms13/gutshroom,
 		/obj/item/food/grown/ms13/lureweed,
-		/obj/item/food/grown/ms13/nara
+		/obj/item/food/grown/ms13/nara,
+		/obj/item/food/grown/ms13/flyamanita,
+		/obj/item/food/grown/ms13/pennybun,
+		/obj/item/food/grown/ms13/chanterelle,
+		/obj/item/food/grown/ms13/mindshroom,
+		/obj/item/food/grown/ms13/gremlinstool
 		)
 
 /obj/effect/spawner/random/ms13/guaranteed/food/produce_safe
@@ -108,7 +113,12 @@
 		/obj/item/food/grown/ms13/firecap,
 		/obj/item/food/grown/ms13/gutshroom,
 		/obj/item/food/grown/ms13/lureweed,
-		/obj/item/food/grown/ms13/nara
+		/obj/item/food/grown/ms13/nara,
+		/obj/item/food/grown/ms13/flyamanita,
+		/obj/item/food/grown/ms13/pennybun,
+		/obj/item/food/grown/ms13/chanterelle,
+		/obj/item/food/grown/ms13/mindshroom,
+		/obj/item/food/grown/ms13/gremlinstool
 		)
 
 // Pre-War Junkfoods //
@@ -188,7 +198,12 @@
 		/obj/item/seeds/ms13/firecap,
 		/obj/item/seeds/ms13/gutshroom,
 		/obj/item/seeds/ms13/lureweed,
-		/obj/item/seeds/ms13/nara
+		/obj/item/seeds/ms13/nara,
+		/obj/item/seeds/ms13/flyamanita,
+		/obj/item/seeds/ms13/pennybun,
+		/obj/item/seeds/ms13/chanterelle,
+		/obj/item/seeds/ms13/mindshroom,
+		/obj/item/seeds/ms13/gremlinstool
 		)
 
 // THE TIER FIVE PRODUCE. //

mojave/flora/wasteplants.dm

@@ -309,6 +309,74 @@
 	harvest_message_high = "You collect a hearty harvest from the root patch."
 	harvest_amount_high = 4
 
+/obj/structure/flora/ms13/forage/flyamanita
+	icon_state = "flyamanita"
+	variants = 1
+	name = "fly amanita fungus"
+	desc = "A patch of fly amanita fungus"
+	harvested_name = "fly amanita fungus"
+	harvested_desc = "A fly amanita fungus"
+	harvest = /obj/item/food/grown/ms13/flyamanita
+	harvest_message_low = "You gather a small amount of mushrooms from the cluster."
+	harvest_message_med = "You collect a decent amount of mushrooms from the cluster."
+	harvest_message_high = "You collect a hearty harvest from the mushroom cluster."
+	harvest_amount_high = 3
+
+/obj/structure/flora/ms13/forage/pennybun
+	icon_state = "pennybun"
+	variants = 1
+	name = "penny bun fungus"
+	desc = "A patch of penny bun fungus"
+	harvested_name = "penny bun fungus"
+	harvested_desc = "A penny bun fungus"
+	harvest = /obj/item/food/grown/ms13/pennybun
+	harvest_message_low = "You gather a small amount of mushrooms from the cluster."
+	harvest_message_med = "You collect a decent amount of mushrooms from the cluster."
+	harvest_message_high = "You collect a hearty harvest from the mushroom cluster."
+	harvest_amount_high = 3
+
+/obj/structure/flora/ms13/forage/chanterelle
+	icon_state = "chanterelle"
+	variants = 1
+	name = "chanterelle fungus"
+	desc = "A patch of chanterelle fungus"
+	harvested_name = "chanterelle fungus"
+	harvested_desc = "A chanterelle fungus"
+	harvest = /obj/item/food/grown/ms13/chanterelle
+	harvest_message_low = "You gather a small amount of mushrooms from the cluster."
+	harvest_message_med = "You collect a decent amount of mushrooms from the cluster."
+	harvest_message_high = "You collect a hearty harvest from the mushroom cluster."
+	harvest_amount_high = 4
+
+/obj/structure/flora/ms13/forage/mindshroom
+	icon_state = "mindshroom"
+	variants = 1
+	name = "mindshroom fungus"
+	desc = "A patch of mindshroom fungus"
+	harvested_name = "mindshroom fungus"
+	harvested_desc = "A mindshroom fungus"
+	harvest = /obj/item/food/grown/ms13/mindshroom
+	harvest_message_low = "You gather a small amount of mushrooms from the cluster."
+	harvest_message_med = "You collect a decent amount of mushrooms from the cluster."
+	harvest_message_high = "You collect a hearty harvest from the mushroom cluster."
+	harvest_amount_high = 3
+	light_range = 2
+	light_power = 0.25
+	light_color = "#4468b2"
+
+/obj/structure/flora/ms13/forage/gremlinstool
+	icon_state = "gremlinstool"
+	variants = 1
+	name = "gremlin stool fungus"
+	desc = "A patch of gremlin stool fungus"
+	harvested_name = "gremlin stool fungus"
+	harvested_desc = "A gremlin stool fungus"
+	harvest = /obj/item/food/grown/ms13/gremlinstool
+	harvest_message_low = "You gather a small amount of mushrooms from the cluster."
+	harvest_message_med = "You collect a decent amount of mushrooms from the cluster."
+	harvest_message_high = "You collect a hearty harvest from the mushroom cluster."
+	harvest_amount_high = 3
+
 //Grasses
 
 /obj/structure/flora/grass/wasteland

mojave/flora/wasteproduce.dm

@@ -1621,3 +1621,165 @@
 	icon_state = "nara"
 	filling_color = "#770d0d"
 	tastes = list("blood"= 5)
+
+////////////////////// FLY AMANITA //////////////////////////
+
+/obj/item/seeds/ms13/flyamanita
+	name = "fly amanita spores"
+	desc = "These spores grow into the poisonous fly amanita."
+	species = "flyamanita"
+	icon_harvest = "flyamanita-grow1"
+	growing_color =  "#672d13"
+	wholeiconcolor = TRUE
+	plantname = "Fly Amanita"
+	genes = list(/datum/plant_gene/trait/plant_type/fungal_metabolism)
+	product = /obj/item/food/grown/ms13/flyamanita
+	lifespan = 48
+	endurance = 35
+	yield = 3
+	growthstages = 1
+	production = 12 //4m to produce
+	maturation = 30 //10m to mature
+	reagents_add = list(/datum/reagent/toxin/ms13/flyamanita = 0.04, /datum/reagent/consumable/nutriment = 0.1)
+	nutrient_type = "P"
+
+/obj/item/food/grown/ms13/flyamanita
+	seed = /obj/item/seeds/ms13/flyamanita
+	name = "fly amanita"
+	desc = "A dark red mushroom with white spots looking like nib sugar."
+	bite_consumption_mod = 1
+	foodtypes = TOXIC
+	icon_state = "flyamanita"
+	filling_color = "#c87070"
+	tastes = list("illness"= 5, "bitterness"= 5)
+
+/////////////////////// PENNY BUN ///////////////////////////
+
+/obj/item/seeds/ms13/pennybun
+	name = "penny bun spores"
+	desc = "These spores grow into the tasty penny bun."
+	species = "pennybun"
+	icon_harvest = "pennybun-grow1"
+	growing_color =  "#695433"
+	wholeiconcolor = TRUE
+	plantname = "Penny Bun"
+	genes = list(/datum/plant_gene/trait/plant_type/fungal_metabolism)
+	product = /obj/item/food/grown/ms13/pennybun
+	lifespan = 30
+	endurance = 25
+	yield = 3
+	growthstages = 1
+	production = 14 //4m 40s to produce
+	maturation = 38 //12m 40s to mature
+	reagents_add = list(/datum/reagent/consumable/nutriment/vitamin = 0.04, /datum/reagent/consumable/nutriment = 0.1)
+	nutrient_type = "K"
+
+/obj/item/food/grown/ms13/pennybun
+	seed = /obj/item/seeds/ms13/pennybun
+	name = "penny bun"
+	desc = "A fungus with a large brown cap and prized as an ingredient in various culinary dishes."
+	bite_consumption_mod = 1
+	foodtypes = VEGETABLES
+	icon_state = "pennybun"
+	filling_color = "#695433"
+	tastes = list("succulent"= 5, "mushroom"= 5)
+
+////////////////////// CHANTERELLE //////////////////////////
+
+/obj/item/seeds/ms13/chanterelle
+	name = "chanterelle spores"
+	desc = "These spores grow into the tasty penny bun."
+	species = "chanterelle"
+	icon_harvest = "chanterelle-grow1"
+	growing_color =  "#875a25"
+	wholeiconcolor = TRUE
+	plantname = "Chanterelle"
+	genes = list(/datum/plant_gene/trait/plant_type/fungal_metabolism)
+	product = /obj/item/food/grown/ms13/chanterelle
+	lifespan = 48
+	endurance = 35
+	yield = 4
+	growthstages = 1
+	production = 12 //4m to produce
+	maturation = 38 //12m 40s to mature
+	reagents_add = list(/datum/reagent/consumable/nutriment/vitamin = 0.04, /datum/reagent/consumable/nutriment = 0.1)
+	nutrient_type = "K"
+
+/obj/item/food/grown/ms13/chanterelle
+	seed = /obj/item/seeds/ms13/chanterelle
+	name = "chanterelle"
+	desc = "A funnel-shaped yellowish mushroom which emits a fruity aroma."
+	bite_consumption_mod = 1
+	foodtypes = VEGETABLES
+	icon_state = "chanterelle"
+	filling_color = "#875a25"
+	tastes = list("savory"= 5, "fruity"= 5)
+
+/////////////////////// MINDSHROOM //////////////////////////
+
+/obj/item/seeds/ms13/mindshroom
+	name = "mindshroom spores"
+	desc = "These spores grow into the glowing mindshroom."
+	species = "mindshroom"
+	icon_harvest = "mindshroom-grow1"
+	growing_color =  "#4468b2"
+	wholeiconcolor = TRUE
+	plantname = "Mindshroom"
+	genes = list(/datum/plant_gene/trait/plant_type/fungal_metabolism, /datum/plant_gene/trait/glow/ms13blue)
+	product = /obj/item/food/grown/ms13/mindshroom
+	lifespan = 40
+	endurance = 30
+	yield = 3
+	growthstages = 1
+	production = 18 //6m to produce
+	maturation = 45 //15m to mature
+	reagents_add = list(/datum/reagent/ms13/day_tripper = 0.03, /datum/reagent/ms13/mentats = 0.03, /datum/reagent/consumable/nutriment = 0.1)
+	nutrient_type = "N"
+
+/obj/item/food/grown/ms13/mindshroom
+	seed = /obj/item/seeds/ms13/mindshroom
+	name = "mindshroom"
+	desc = "A glowing mushroom. You feel something at the back of your mind just looking at it."
+	bite_consumption_mod = 1
+	foodtypes = TOXIC
+	icon_state = "mindshroom"
+	filling_color = "#4468b2"
+	tastes = list("spicy"= 5, "mint"= 5)
+	light_range = 2
+	light_power = 0.25
+
+/datum/plant_gene/trait/glow/ms13blue
+	name = "Psionic Bioluminescence"
+	rate = 0.01
+	glow_color = "#4468b2"
+
+///////////////////// GREMLIN STOOL /////////////////////////
+
+/obj/item/seeds/ms13/gremlinstool
+	name = "gremlinstool spores"
+	desc = "These spores grow into the invigorating gremling stool."
+	species = "gremlinstool"
+	icon_harvest = "gremlinstool-grow1"
+	growing_color =  "#7b704c"
+	wholeiconcolor = TRUE
+	plantname = "gremlinstool"
+	genes = list(/datum/plant_gene/trait/plant_type/fungal_metabolism)
+	product = /obj/item/food/grown/ms13/gremlinstool
+	lifespan = 48
+	endurance = 35
+	yield = 3
+	growthstages = 1
+	production = 15 //5m to produce
+	maturation = 30 //10m to mature
+	reagents_add = list(/datum/reagent/toxin/ms13/gunpowder = 0.05, /datum/reagent/consumable/nutriment = 0.1)
+	nutrient_type = "P"
+
+/obj/item/food/grown/ms13/gremlinstool
+	seed = /obj/item/seeds/ms13/gremlinstool
+	name = "gremlinstool"
+	desc = "A yellow-doted mushroom that oozes a grey liquid."
+	bite_consumption_mod = 1
+	foodtypes = TOXIC
+	icon_state = "gremlinstool"
+	filling_color = "#7b704c"
+	tastes = list("creamy"= 5, "fire"= 5)

mojave/modules/crafting/recipes/ammo_recipes.dm

@@ -442,3 +442,11 @@
 				/obj/item/stack/sheet/ms13/nugget/sulfur = 4)
 	category = CAT_JUNK_AMMO
 	crafting_interface = CRAFTING_BENCH_CAMPFIRE
+
+/datum/crafting_recipe/lq_gp_liquid
+	name = "dry out liquid gunpowder"
+	result = /obj/item/ms13/component/gunpowder
+	time = 20 SECONDS
+	reqs = list(/datum/reagent/toxin/ms13/gunpowder = 10)
+	category = CAT_JUNK_AMMO
+	crafting_interface = CRAFTING_BENCH_CHEM