Merge branch 'master' into plant-adding

code/modules/hydroponics/grown/chili.dm

@@ -93,7 +93,8 @@
 	yield = 3
 	rarity = 20
 	mutatelist = list()
-	reagents_add = list("aphro" = 0.2, "penis_enlarger" = 0.08, "vitamin" = 0.04, "nutriment" = 0.04)
+	genes = list(/datum/plant_gene/reagent/fragile/penischem, /datum/plant_gene/reagent/fragile/crocin)
+	reagents_add = list(/datum/reagent/consumable/nutriment/vitamin = 0.04, /datum/reagent/consumable/nutriment = 0.04)
 
 /obj/item/reagent_containers/food/snacks/grown/pink_chili
 	seed = /obj/item/seeds/chili/pink

code/modules/hydroponics/grown/flowers.dm

@@ -68,15 +68,10 @@
 	icon_grow = "spacemanstrumpet-grow"
 	icon_dead = "spacemanstrumpet-dead"
 	mutatelist = list()
-	genes = list(/datum/plant_gene/reagent/polypyr)
+	genes = list(/datum/plant_gene/reagent/fragile/polypyr)
 	reagents_add = list(/datum/reagent/consumable/nutriment = 0.05)
 	rarity = 30
 
-/obj/item/seeds/poppy/lily/trumpet/Initialize(mapload, nogenes = FALSE)
-	. = ..()
-	if(!nogenes)
-		unset_mutability(/datum/plant_gene/reagent/polypyr, PLANT_GENE_EXTRACTABLE)
-
 /obj/item/reagent_containers/food/snacks/grown/trumpet
 	seed = /obj/item/seeds/poppy/lily/trumpet
 	name = "spaceman's trumpet"
@@ -262,6 +257,69 @@
 		to_chat(user, "<span class='danger'>The [name] burns your bare hand!</span>")
 		user.adjustFireLoss(rand(1, 5))
 
+// Rose
+/obj/item/seeds/rose
+	name = "pack of rose seeds"
+	desc = "These seeds grow into roses."
+	icon_state = "seed-rose"
+	species = "rose"
+	plantname = "Rose Bush"
+	product = /obj/item/grown/rose
+	endurance = 12
+	yield = 6
+	potency = 15
+	growthstages = 3
+	genes = list(/datum/plant_gene/trait/repeated_harvest)
+	growing_icon = 'icons/obj/hydroponics/growing_flowers.dmi'
+	icon_grow = "rose-grow"
+	icon_dead = "rose-dead"
+	mutatelist = list(/obj/item/seeds/carbon_rose)
+	//Roses are commonly used as herbal medicines (diarrhodons) and for their 'rose oil'.
+	reagents_add = list(/datum/reagent/consumable/nutriment = 0.05, /datum/reagent/medicine/tricordrazine = 0.1, /datum/reagent/oil = 0.05)
+
+/obj/item/grown/rose
+	seed = /obj/item/seeds/rose
+	name = "rose"
+	desc = "The classic fleur d'amour - flower of love. Watch for its thorns!"
+	icon_state = "rose"
+	lefthand_file = 'icons/mob/inhands/weapons/plants_lefthand.dmi'
+	righthand_file = 'icons/mob/inhands/weapons/plants_righthand.dmi'
+	slot_flags = ITEM_SLOT_HEAD //|ITEM_SLOT_MASK // couldn't get this to work, revive another day
+
+// Carbon Rose
+/obj/item/seeds/carbon_rose
+	name = "pack of carbon rose seeds"
+	desc = "These seeds grow into carbon roses."
+	icon_state = "seed-carbonrose"
+	species = "carbonrose"
+	plantname = "Carbon Rose Flower"
+	product = /obj/item/grown/carbon_rose
+	endurance = 12
+	yield = 6
+	potency = 15
+	growthstages = 3
+	growing_icon = 'icons/obj/hydroponics/growing_flowers.dmi'
+	icon_grow = "carbonrose-grow"
+	icon_dead = "carbonrose-dead"
+	mutatelist = list(/obj/item/seeds/carbon_rose)
+	reagents_add = list(/datum/reagent/plastic_polymers = 0.05)
+	rarity = 10
+
+
+
+/obj/item/grown/carbon_rose
+	seed = /obj/item/seeds/carbon_rose
+	name = "carbon rose"
+	desc = "The all new fleur d'amour gris - the flower of love, modernized, with no harsh thorns."
+	icon_state = "carbonrose"
+	lefthand_file = 'icons/mob/inhands/weapons/plants_lefthand.dmi'
+	righthand_file = 'icons/mob/inhands/weapons/plants_righthand.dmi'
+	force = 0
+	throwforce = 0
+	slot_flags = ITEM_SLOT_HEAD
+	throw_speed = 1
+	throw_range = 3
+
 // Beebalm
 /obj/item/seeds/bee_balm
 	name = "pack of Bee Balm seeds"

code/modules/hydroponics/grown/melon.dm

@@ -84,13 +84,14 @@
 	plantname = "Milk Melon Vines"
 	product = /obj/item/reagent_containers/food/snacks/grown/milkmelon
 	mutatelist = list()
-	reagents_add = list("milk" = 0.2, "breast_enlarger" = 0.08, "vitamin" = 0.04, "nutriment" = 0.1)
+	genes = list(/datum/plant_gene/reagent/fragile/breastchem)
+	reagents_add = list(/datum/reagent/consumable/milk = 0.2, /datum/reagent/consumable/nutriment/vitamin = 0.04, /datum/reagent/consumable/nutriment = 0.1)
 	rarity = 20
 
 /obj/item/reagent_containers/food/snacks/grown/milkmelon
 	seed = /obj/item/seeds/watermelon/milk
 	name = "milkmelon"
-	desc = "A softer, rounder-looking watermelon that audibly sloshes with milk."
+	desc = "A softer watermelon that audibly sloshes with milk."
 	icon_state = "milkmelon"
 	filling_color = "#FFAABB"
 	dried_type = null

code/modules/hydroponics/grown/misc.dm

@@ -63,6 +63,42 @@
 	T.assume_air(stank)
 	T.air_update_turf()
 
+
+// Valentines flower
+/obj/item/seeds/starthistle/valentines
+	name = "pack of valentines flower seeds"
+	desc = "A species of plant that emits a arousing odor. The odor stops being produced in difficult atmospheric conditions."
+	icon_state = "valentines"
+	species = "valentines"
+	plantname = "Valentines Flower"
+	production = 2
+	growing_icon = 'icons/obj/hydroponics/growing_flowers.dmi'
+	genes = list()
+	mutatelist = list()
+
+/obj/item/seeds/starthistle/valentines/pre_attack(obj/machinery/hydroponics/I)
+	if(istype(I, /obj/machinery/hydroponics))
+		if(!I.myseed)
+			START_PROCESSING(SSobj, src)
+	return ..()
+
+/obj/item/seeds/starthistle/valentines/process()
+	var/obj/machinery/hydroponics/parent = loc
+	if(parent.age < maturation || parent.dead) // Start a little before it blooms
+		return
+
+	var/turf/open/T = get_turf(parent)
+	if(abs(ONE_ATMOSPHERE - T.return_air().return_pressure()) > (potency/10 + 10))
+		return
+
+	var/datum/gas_mixture/scent = new
+	var/list/cached_gases = scent.gases
+
+	cached_gases[/datum/gas/pheromone] += (yield + 5)*7*0.1
+	scent.temperature = T20C
+	T.assume_air(scent)
+	T.air_update_turf()
+
 //Galaxy Thistle
 /obj/item/seeds/galaxythistle
 	name = "pack of galaxythistle seeds"

code/modules/hydroponics/grown/mushrooms.dm

@@ -243,7 +243,7 @@
 	endurance = 8
 	yield = 4
 	growthstages = 2
-	genes = list(/datum/plant_gene/trait/plant_type/fungal_metabolism, /datum/plant_gene/reagent/teslium, /datum/plant_gene/trait/plant_type/carnivory)
+	genes = list(/datum/plant_gene/trait/plant_type/fungal_metabolism, /datum/plant_gene/reagent/fragile/teslium, /datum/plant_gene/trait/plant_type/carnivory)
 	growing_icon = 'icons/obj/hydroponics/growing_mushrooms.dmi'
 	reagents_add = list(/datum/reagent/consumable/nutriment = 0.1)
 	mutatelist = list()
@@ -251,7 +251,6 @@
 /obj/item/seeds/chanterelle/jupitercup/Initialize(mapload, nogenes = FALSE)
 	. = ..()
 	if(!nogenes)
-		unset_mutability(/datum/plant_gene/reagent/teslium, PLANT_GENE_EXTRACTABLE)
 		unset_mutability(/datum/plant_gene/trait/plant_type/carnivory, PLANT_GENE_REMOVABLE)
 
 /obj/item/seeds/chanterelle/jupitercup/hollow

code/modules/hydroponics/plant_genes.dm

@@ -109,7 +109,7 @@
 // Reagent genes store reagent ID and reagent ratio. Amount of reagent in the plant = 1 + (potency * rate)
 /datum/plant_gene/reagent
 	name = "Nutriment"
-	var/reagent_id = "nutriment"
+	var/reagent_id = /datum/reagent/consumable/nutriment
 	var/rate = 0.04
 
 /datum/plant_gene/reagent/get_name()
@@ -153,16 +153,35 @@
 			return FALSE
 	return TRUE
 
-/datum/plant_gene/reagent/polypyr
+/datum/plant_gene/reagent/fragile
+	name = "Fragile Gene"
+	mutability_flags = PLANT_GENE_REMOVABLE	//Cannot be extracted
+
+/datum/plant_gene/reagent/fragile/polypyr
 	name = "Polypyrylium Oligomers"
-	reagent_id = "polypyr"
+	reagent_id = /datum/reagent/medicine/polypyr
 	rate = 0.15
 
-/datum/plant_gene/reagent/teslium
+/datum/plant_gene/reagent/fragile/teslium
 	name = "Teslium"
-	reagent_id = "teslium"
+	reagent_id = /datum/reagent/teslium
 	rate = 0.1
 
+/datum/plant_gene/reagent/fragile/breastchem
+	name = "Succubus Milk"
+	reagent_id = /datum/reagent/fermi/breast_enlarger
+	rate = 0.04	//5 units at 100 potency
+
+/datum/plant_gene/reagent/fragile/penischem
+	name = "Incubus Draft"
+	reagent_id = /datum/reagent/fermi/penis_enlarger
+	rate = 0.04
+
+/datum/plant_gene/reagent/fragile/crocin
+	name = "Crocin"
+	reagent_id = /datum/reagent/drug/aphrodisiac
+	rate = 0.2
+
 // Various traits affecting the product.
 /datum/plant_gene/trait
 	var/rate = 0.05