From 90aa9a9ff5c3cc655a632cf9d600911af4c94f58 Mon Sep 17 00:00:00 2001
From: Shadowfire117 <Jonasbangmoller@gmail.com>
Date: Sun, 17 Mar 2019 20:34:34 +0100
Subject: [PATCH] This time we got 4 new plants and 2 new chemicals! We got
 voltato which is a potato mutant that produces 200 V for all, then we have
 the solarflower which is a sunflower mutant that glows and can be planted
 anywhere, perfect for mood lights and blackout! Then we have two lavender
 mutants, milk dew that produces milk and sweet breeze that produces Serazine!
 The two new chems are Serazine that is a mild anti toxin that can be used to
 enhance drugs, which at the current time is bicaridine with some tungsten
 added in to produce the other new chem called Alizine that is double as
 effective as bicaridine, though it sadly cant cure internal bleeding when
 overdosing patients :c

---
 code/modules/hydroponics/seed_datums.dm       | 62 +++++++++++++++++++
 code/modules/hydroponics/seed_packets.dm      | 12 ++++
 .../Chemistry-Reagents-Medicine.dm            | 34 ++++++++++
 code/modules/reagents/Chemistry-Recipes.dm    |  7 +++
 4 files changed, 115 insertions(+)

diff --git a/code/modules/hydroponics/seed_datums.dm b/code/modules/hydroponics/seed_datums.dm
index 7c6b2b507e..3b3767077a 100644
--- a/code/modules/hydroponics/seed_datums.dm
+++ b/code/modules/hydroponics/seed_datums.dm
@@ -547,6 +547,7 @@
 	name = "sunflowers"
 	seed_name = "sunflower"
 	display_name = "sunflowers"
+	mutants = list("solarflower")
 
 /datum/seed/flower/sunflower/New()
 	..()
@@ -558,10 +559,27 @@
 	set_trait(TRAIT_WATER_CONSUMPTION, 6)
 	set_trait(TRAIT_NUTRIENT_CONSUMPTION, 0.15)
 
+/datum/seed/flower/sunflower/solarflower
+	name = "solarflower"
+	seed_name = "solarflower"
+	display_name = "solarflowers"
+	mutants = null
+
+/datum/seed/flower/sunflower/solarflower/New()
+	..()
+	set_trait(TRAIT_PRODUCT_COLOUR,"#4466b3")
+	set_trait(TRAIT_BIOLUM,1)
+	set_trait(TRAIT_BIOLUM_COLOUR,"#4e74cc")
+	set_trait(TRAIT_POTENCY,25)
+	set_trait(TRAIT_MATURATION,10)
+	set_trait(TRAIT_YIELD,1)
+	set_trait(TRAIT_SPREAD,1)
+
 /datum/seed/flower/lavender
 	name = "lavender"
 	seed_name = "lavender"
 	display_name = "lavender"
+	mutants = list("milkdew")
 	chems = list("nutriment" = list(1,20), "bicaridine" = list(1,10))
 
 /datum/seed/flower/lavender/New()
@@ -576,6 +594,34 @@
 	set_trait(TRAIT_IDEAL_LIGHT, 7)
 	set_trait(TRAIT_NUTRIENT_CONSUMPTION, 0.05)
 	set_trait(TRAIT_WATER_CONSUMPTION, 0.5)
+	
+/datum/seed/flower/lavender/milkdew
+	name = "milkdew"
+	seed_name = "milk dew"
+	display_name = "milk dew"
+	chems = list("nutriment" = list(1,10), "milk" = list(4,5))
+	mutants = list("sweetbreeze")
+
+/datum/seed/flower/lavender/milkdew/New()
+	..()
+	set_trait(TRAIT_PRODUCT_COLOUR,"#DFDFDF")
+	set_trait(TRAIT_POTENCY,5)
+	set_trait(TRAIT_YIELD,3)
+
+/datum/seed/flower/lavender/sweetbreeze
+	name = "sweetbreeze"
+	seed_name = "sweet breeze"
+	display_name = "sweet breeze"
+	chems = list("nutriment" = list(1,10), "serazine" = list(1,10))
+	mutants = null
+
+/datum/seed/flower/lavender/sweetbreeze/New()
+	..()
+	set_trait(TRAIT_PRODUCT_COLOUR,"#df9898")
+	set_trait(TRAIT_POTENCY,10)
+	set_trait(TRAIT_MATURATION,20)
+	set_trait(TRAIT_PRODUCTION,7)
+	set_trait(TRAIT_YIELD,3)
 
 //Grapes/varieties
 /datum/seed/grapes
@@ -699,6 +745,7 @@
 	name = "potato"
 	seed_name = "potato"
 	display_name = "potatoes"
+	mutants = list("voltato")
 	chems = list("nutriment" = list(1,10), "potatojuice" = list(10,10))
 	kitchen_tag = "potato"
 
@@ -713,6 +760,21 @@
 	set_trait(TRAIT_PRODUCT_COLOUR,"#D4CAB4")
 	set_trait(TRAIT_PLANT_ICON,"bush2")
 	set_trait(TRAIT_WATER_CONSUMPTION, 6)
+	
+/datum/seed/potato/voltato
+	name = "voltato"
+	seed_name = "voltato"
+	display_name = "voltatos"
+	chems = list("nutriment" = list(1,10), "shockchem" = list(0,10))
+	mutants = null
+
+/datum/seed/potato/voltato/New()
+	..()
+	set_trait(TRAIT_PRODUCT_COLOUR,"#E4EC2F")
+	set_trait(TRAIT_POTENCY,30)
+	set_trait(TRAIT_MATURATION,12)
+	set_trait(TRAIT_PRODUCTION,3)
+	set_trait(TRAIT_YIELD,3)
 
 /datum/seed/onion
     name = "onion"
diff --git a/code/modules/hydroponics/seed_packets.dm b/code/modules/hydroponics/seed_packets.dm
index 80654d408b..92242bc3e6 100644
--- a/code/modules/hydroponics/seed_packets.dm
+++ b/code/modules/hydroponics/seed_packets.dm
@@ -142,6 +142,9 @@ GLOBAL_LIST_BOILERPLATE(all_seed_packs, /obj/item/seeds)
 
 /obj/item/seeds/potatoseed
 	seed_type = "potato"
+	
+/obj/item/seeds/voltatoseed
+	seed_type = "voltato"
 
 /obj/item/seeds/icepepperseed
 	seed_type = "icechili"
@@ -196,9 +199,18 @@ GLOBAL_LIST_BOILERPLATE(all_seed_packs, /obj/item/seeds)
 
 /obj/item/seeds/sunflowerseed
 	seed_type = "sunflowers"
+	
+/obj/item/seeds/solarflowerseed
+	seed_type = "solarflower"
 
 /obj/item/seeds/lavenderseed
 	seed_type = "lavender"
+	
+/obj/item/seeds/milkdewseed
+	seed_type = "milkdew"
+	
+/obj/item/seeds/sweetbreezeseed
+	seed_type = "sweetbreeze"
 
 /obj/item/seeds/brownmold
 	seed_type = "mold"
diff --git a/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Medicine.dm b/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Medicine.dm
index 7c7529122e..4452cc840c 100644
--- a/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Medicine.dm
+++ b/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Medicine.dm
@@ -51,6 +51,24 @@
 					if(W.damage <= 0)
 						O.wounds -= W
 
+/datum/reagent/alizene
+	name = "Alizene"
+	id = "alizene"
+	description = "A derivative from bicaridine enhanced by serazine to more effectively mend flesh, but is ineffective against internal hemorrhage."
+	taste_description = "bittersweet"
+	taste_mult = 3
+	reagent_state = LIQUID
+	color = "#b37979"
+	overdose = REAGENTS_OVERDOSE
+	scannable = 1
+
+/datum/reagent/alizene/affect_blood(var/mob/living/carbon/M, var/alien, var/removed)
+	var/chem_effective = 1
+	if(alien == IS_SLIME)
+		chem_effective = 0.75
+	if(alien != IS_DIONA)
+		M.heal_organ_damage(12 * removed * chem_effective, 0)
+
 /datum/reagent/kelotane
 	name = "Kelotane"
 	id = "kelotane"
@@ -107,6 +125,22 @@
 		M.hallucination = max(0, M.hallucination - 9 * removed * chem_effective)
 		M.adjustToxLoss(-4 * removed * chem_effective)
 
+/datum/reagent/serazine
+	name = "Serazine"
+	id = "serazine"
+	description = "A sweet tasting flower extract, it has very mild anti toxic properties and can be used to make potent drugs."
+	taste_description = "sweet nectar"
+	reagent_state = LIQUID
+	color = "#df9898"
+	scannable = 1
+
+/datum/reagent/serazine/affect_blood(var/mob/living/carbon/M, var/alien, var/removed)
+	var/chem_effective = 1
+	if(alien != IS_DIONA)
+		M.drowsyness = max(0, M.drowsyness - 3 * removed * chem_effective)
+		M.hallucination = max(0, M.hallucination - 6 * removed * chem_effective)
+		M.adjustToxLoss(-2 * removed * chem_effective)
+		
 /datum/reagent/carthatoline
 	name = "Carthatoline"
 	id = "carthatoline"
diff --git a/code/modules/reagents/Chemistry-Recipes.dm b/code/modules/reagents/Chemistry-Recipes.dm
index 431916dedf..70c6bf3553 100644
--- a/code/modules/reagents/Chemistry-Recipes.dm
+++ b/code/modules/reagents/Chemistry-Recipes.dm
@@ -365,6 +365,13 @@
 	required_reagents = list("inaprovaline" = 1, "carbon" = 1)
 	inhibitors = list("sugar" = 1) // Messes up with inaprovaline
 	result_amount = 2
+	
+/datum/chemical_reaction/alizine
+	name = "Alizine"
+	id = "alizine"
+	result = "alizine"
+	required_reagents = list("bicaridine" = 1, "serazine" = 1, "tungsten" = 1)
+	result_amount = 3
 
 /datum/chemical_reaction/myelamine
 	name = "Myelamine"