Adds new plants and genes

code/datums/supplypacks.dm

@@ -968,10 +968,27 @@ var/list/all_supply_groups = list(supply_emergency,supply_security,supply_engine
 					/obj/item/seeds/amanita,
 					/obj/item/seeds/reishi,
 					/obj/item/seeds/banana,
-					/obj/item/seeds/eggplant/eggy)
+					/obj/item/seeds/eggplant/eggy,
+					/obj/item/seeds/random,
+					/obj/item/seeds/random)
 	cost = 15
 	containername = "exotic seeds crate"
 
+/datum/supply_packs/organic/hydroponics/xenohydrophonics
+	name = "Xenohydrophonics Supply Crate"
+	contains = list(/obj/item/seeds/random,
+					/obj/item/seeds/random,
+					/obj/item/seeds/random,
+					/obj/item/seeds/random,
+					/obj/item/seeds/random,
+					/obj/item/seeds/random,
+					/obj/item/seeds/random,
+					/obj/item/seeds/random,
+					/obj/item/seeds/random,
+					/obj/item/seeds/random)
+	cost = 20
+	containername = "xenohydrophonics supply crate"
+
 /datum/supply_packs/organic/vending
 	name = "Bartending Supply Crate"
 	contains = list(/obj/item/weapon/vending_refill/boozeomat,

code/game/machinery/vending.dm

@@ -850,7 +850,7 @@
 						/obj/item/seeds/tea = 3,/obj/item/seeds/tobacco = 3,/obj/item/seeds/tomato = 3,
 						/obj/item/seeds/tower = 3,/obj/item/seeds/watermelon = 3,/obj/item/seeds/wheat = 3,/obj/item/seeds/whitebeet = 3)
 	contraband = list(/obj/item/seeds/amanita = 2,/obj/item/seeds/glowshroom = 2,/obj/item/seeds/liberty = 2,/obj/item/seeds/nettle = 2,
-						/obj/item/seeds/plump = 2,/obj/item/seeds/reishi = 2)
+						/obj/item/seeds/plump = 2,/obj/item/seeds/reishi = 2,/obj/item/seeds/cannabis = 3, /obj/item/seeds/random = 2)
 	premium = list(/obj/item/weapon/reagent_containers/spray/waterflower = 1)
 
 

code/modules/food&drinks/food/snacks/meat.dm

@@ -161,7 +161,13 @@
 	slice_path = /obj/item/weapon/reagent_containers/food/snacks/meat/rawcutlet/spider
 
 
-
+/obj/item/weapon/reagent_containers/food/snacks/meat/slab/meatwheat
+	name = "meatwheat clump"
+	desc = "This doesn't look like meat, but your standards aren't <i>that</i> high to begin with."
+	list_reagents = list("nutriment" = 3, "vitamin" = 2, "blood" = 5)
+	filling_color = rgb(150, 0, 0)
+	icon_state = "meatwheat_clump"
+	bitesize = 4
 
 ////////////////////////////////////// MEAT STEAKS ///////////////////////////////////////////////////////////
 

code/modules/hydroponics/gene_modder.dm

@@ -320,7 +320,9 @@
 			/datum/plant_gene/core/yield,
 			/datum/plant_gene/core/production,
 			/datum/plant_gene/core/endurance,
-			/datum/plant_gene/core/lifespan
+			/datum/plant_gene/core/lifespan,
+			/datum/plant_gene/core/weed_rate,
+			/datum/plant_gene/core/weed_chance
 			)
 		for(var/a in gene_paths)
 			core_genes += seed.get_gene(a)

code/modules/hydroponics/grown.dm

@@ -80,8 +80,10 @@
 			msg += reag_txt
 			msg += "<br><span class='info'>*---------*</span>"
 		user << msg
-		return
-	return
+	else
+		if(seed)
+			for(var/datum/plant_gene/trait/T in seed.genes)
+				T.on_attackby(src, O, user)
 
 
 // Various gene procs
@@ -111,8 +113,9 @@
 			new trash(T)
 
 	visible_message("<span class='warning'>[src] has been squashed.</span>","<span class='italics'>You hear a smack.</span>")
-	for(var/datum/plant_gene/trait/trait in seed.genes)
-		trait.on_squash(src, target)
+	if(seed)
+		for(var/datum/plant_gene/trait/trait in seed.genes)
+			trait.on_squash(src, target)
 
 	for(var/A in T)
 		reagents.reaction(A)

code/modules/hydroponics/grown/ambrosia.dm

@@ -21,13 +21,15 @@
 	yield = 6
 	potency = 5
 	icon_dead = "ambrosia-dead"
+	genes = list(/datum/plant_gene/trait/repeated_harvest)
 	mutatelist = list(/obj/item/seeds/ambrosia/deus)
 	reagents_add = list("space_drugs" = 0.15, "bicaridine" = 0.1, "kelotane" = 0.1, "vitamin" = 0.04, "nutriment" = 0.05, "toxin" = 0.1)
 
 /obj/item/weapon/reagent_containers/food/snacks/grown/ambrosia/vulgaris
 	seed = /obj/item/seeds/ambrosia
 	name = "ambrosia vulgaris branch"
 	desc = "This is a plant containing various healing chemicals."
+	origin_tech = "biotech=2"
 
 // Ambrosia Deus
 /obj/item/seeds/ambrosia/deus
@@ -37,7 +39,7 @@
 	species = "ambrosiadeus"
 	plantname = "Ambrosia Deus"
 	product = /obj/item/weapon/reagent_containers/food/snacks/grown/ambrosia/deus
-	mutatelist = list()
+	mutatelist = list(/obj/item/seeds/ambrosia/gaia)
 	reagents_add = list("omnizine" = 0.15, "synaptizine" = 0.15, "space_drugs" = 0.1, "vitamin" = 0.04, "nutriment" = 0.05)
 	rarity = 40
 
@@ -46,4 +48,27 @@
 	name = "ambrosia deus branch"
 	desc = "Eating this makes you feel immortal!"
 	icon_state = "ambrosiadeus"
-	filling_color = "#008B8B"
+	filling_color = "#008B8B"
+	origin_tech = "biotech=4;materials=3"
+
+//Ambrosia Gaia
+/obj/item/seeds/ambrosia/gaia
+	name = "pack of ambrosia gaia seeds"
+	desc = "These seeds grow into ambrosia gaia, incredibly rare but imbued with breathtaking potential."
+	icon_state = "seed-ambrosia_gaia"
+	species = "ambrosia_gaia"
+	plantname = "Ambrosia Gaia"
+	product = /obj/item/weapon/reagent_containers/food/snacks/grown/ambrosia/gaia
+	mutatelist = list()
+	reagents_add = list("earthsblood" = 0.4, "nutriment" = 0.2, "vitamin" = 0.1)
+	rarity = 100 //These are some pretty good plants right here
+	genes = list()
+
+/obj/item/weapon/reagent_containers/food/snacks/grown/ambrosia/gaia
+	name = "ambrosia gaia branch"
+	desc = "Eating this <i>makes</i> you immortal."
+	icon_state = "ambrosia_gaia"
+	filling_color = rgb(255, 175, 0)
+	origin_tech = "biotech=7"
+	luminosity = 3
+	seed = /obj/item/seeds/ambrosia/gaia

code/modules/hydroponics/grown/apple.dm

@@ -11,6 +11,7 @@
 	yield = 5
 	icon_grow = "apple-grow"
 	icon_dead = "apple-dead"
+	genes = list(/datum/plant_gene/trait/repeated_harvest)
 	mutatelist = list(/obj/item/seeds/apple/gold)
 	reagents_add = list("vitamin" = 0.04, "nutriment" = 0.1)
 
@@ -51,4 +52,5 @@
 	name = "golden apple"
 	desc = "Emblazoned upon the apple is the word 'Kallisti'."
 	icon_state = "goldapple"
-	filling_color = "#FFD700"
+	filling_color = "#FFD700"
+	origin_tech = "biotech=4;materials=5"

code/modules/hydroponics/grown/banana.dm

@@ -9,7 +9,7 @@
 	lifespan = 50
 	endurance = 30
 	icon_dead = "banana-dead"
-	genes = list(/datum/plant_gene/trait/slip)
+	genes = list(/datum/plant_gene/trait/slip, /datum/plant_gene/trait/repeated_harvest)
 	mutatelist = list(/obj/item/seeds/banana/mime, /obj/item/seeds/banana/bluespace)
 	reagents_add = list("banana" = 0.1, "vitamin" = 0.04, "nutriment" = 0.02)
 
@@ -65,6 +65,7 @@
 	mutatelist = list()
 	reagents_add = list("nothing" = 0.1, "mutetoxin" = 0.1, "nutriment" = 0.02)
 	rarity = 15
+	genes = list(/datum/plant_gene/trait/slip, /datum/plant_gene/trait/repeated_harvest)
 
 /obj/item/weapon/reagent_containers/food/snacks/grown/banana/mime
 	seed = /obj/item/seeds/banana/mime
@@ -90,7 +91,7 @@
 	plantname = "Bluespace Banana Tree"
 	product = /obj/item/weapon/reagent_containers/food/snacks/grown/banana/bluespace
 	mutatelist = list()
-	genes = list(/datum/plant_gene/trait/slip, /datum/plant_gene/trait/teleport)
+	genes = list(/datum/plant_gene/trait/slip, /datum/plant_gene/trait/teleport, /datum/plant_gene/trait/repeated_harvest)
 	reagents_add = list("singulo" = 0.2, "banana" = 0.1, "vitamin" = 0.04, "nutriment" = 0.02)
 	rarity = 30
 

code/modules/hydroponics/grown/beans.dm

@@ -12,6 +12,7 @@
 	growthstages = 4
 	icon_grow = "soybean-grow"
 	icon_dead = "soybean-dead"
+	genes = list(/datum/plant_gene/trait/repeated_harvest)
 	mutatelist = list(/obj/item/seeds/soya/koi)
 	reagents_add = list("vitamin" = 0.04, "nutriment" = 0.05)
 

code/modules/hydroponics/grown/berries.dm

@@ -12,6 +12,7 @@
 	yield = 2
 	icon_grow = "berry-grow" // Uses one growth icons set for all the subtypes
 	icon_dead = "berry-dead" // Same for the dead icon
+	genes = list(/datum/plant_gene/trait/repeated_harvest)
 	mutatelist = list(/obj/item/seeds/berry/glow, /obj/item/seeds/berry/poison)
 	reagents_add = list("vitamin" = 0.04, "nutriment" = 0.1)
 
@@ -75,7 +76,7 @@
 	lifespan = 30
 	endurance = 25
 	mutatelist = list()
-	genes = list(/datum/plant_gene/trait/glow/berry)
+	genes = list(/datum/plant_gene/trait/glow/berry , /datum/plant_gene/trait/noreact)
 	reagents_add = list("uranium" = 0.25, "iodine" = 0.2, "vitamin" = 0.04, "nutriment" = 0.1)
 	rarity = 20
 
@@ -101,6 +102,7 @@
 	growthstages = 5
 	icon_grow = "cherry-grow"
 	icon_dead = "cherry-dead"
+	genes = list(/datum/plant_gene/trait/repeated_harvest)
 	mutatelist = list(/obj/item/seeds/cherry/blue)
 	reagents_add = list("nutriment" = 0.07, "sugar" = 0.07)
 
@@ -121,7 +123,7 @@
 	species = "bluecherry"
 	plantname = "Blue Cherry Tree"
 	product = /obj/item/weapon/reagent_containers/food/snacks/grown/bluecherries
-	mutatelist = list()
+	mutatelist = list(/obj/item/seeds/cherry/bomb)
 	reagents_add = list("nutriment" = 0.07, "sugar" = 0.07)
 	rarity = 10
 
@@ -133,6 +135,32 @@
 	filling_color = "#6495ED"
 	bitesize_mod = 2
 
+//Cherry Bombs
+/obj/item/seeds/cherry/bomb
+	name = "pack of cherry bomb pits"
+	desc = "They give you vibes of dread and frustration."
+	icon_state = "seed-cherry_bomb"
+	species = "cherry_bomb"
+	plantname = "Cherry Bomb Tree"
+	product = /obj/item/weapon/reagent_containers/food/snacks/grown/cherry_bomb
+	mutatelist = list()
+	reagents_add = list("nutriment" = 0.1, "sugar" = 0.1, "blackpowder" = 0.1)
+	rarity = 25
+
+/obj/item/weapon/reagent_containers/food/snacks/grown/cherry_bomb
+	name = "cherry bombs"
+	desc = "You think you can hear the hissing of a tiny fuse."
+	icon_state = "cherry_bomb"
+	filling_color = rgb(20, 20, 20)
+	seed = /obj/item/seeds/cherry/bomb
+	bitesize_mod = 2
+
+/obj/item/weapon/reagent_containers/food/snacks/grown/cherry_bomb/attack_self(mob/living/user)
+	var/area/A = get_area(user)
+	user.visible_message("<span class='warning'>[user] plucks the stem from [src]!</span>", "<span class='userdanger'>You pluck the stem from [src], which begins to hiss loudly!</span>")
+	message_admins("[user] ([user.key ? user.key : "no key"]) primed a cherry bomb for detonation at [A] ([user.x], [user.y], [user.z]) <A HREF='?_src_=holder;adminplayerobservecoodjump=1;X=[user.x];Y=[user.y];Z=[user.z]'>(JMP)</a>")
+	log_game("[user] ([user.key ? user.key : "no key"]) primed a cherry bomb for detonation at [A] ([user.x],[user.y],[user.z]).")
+	prime()
 
 // Grapes
 /obj/item/seeds/grape
@@ -150,6 +178,7 @@
 	growthstages = 2
 	icon_grow = "grape-grow"
 	icon_dead = "grape-dead"
+	genes = list(/datum/plant_gene/trait/repeated_harvest)
 	mutatelist = list(/obj/item/seeds/grape/green)
 	reagents_add = list("vitamin" = 0.04, "nutriment" = 0.1, "sugar" = 0.1)
 

code/modules/hydroponics/grown/cannabis.dm

@@ -0,0 +1,125 @@
+// Cannabis
+/obj/item/seeds/cannabis
+	name = "pack of cannabis seeds"
+	desc = "Taxable."
+	icon_state = "seed-cannabis"
+	species = "cannabis"
+	plantname = "Cannabis Plant"
+	product = /obj/item/weapon/reagent_containers/food/snacks/grown/cannabis
+	maturation = 8
+	potency = 20
+	growthstages = 1
+	icon_grow = "cannabis-grow" // Uses one growth icons set for all the subtypes
+	icon_dead = "cannabis-dead" // Same for the dead icon
+	genes = list(/datum/plant_gene/trait/repeated_harvest)
+	mutatelist = list(/obj/item/seeds/cannabis/rainbow,
+						/obj/item/seeds/cannabis/death,
+						/obj/item/seeds/cannabis/white,
+						/obj/item/seeds/cannabis/ultimate)
+	reagents_add = list("space_drugs" = 0.15, "lipolicide" = 0.35) // gives u the munchies
+
+
+/obj/item/seeds/cannabis/rainbow
+	name = "pack of rainbow weed seeds"
+	desc = "These seeds grow into rainbow weed. Groovy."
+	icon_state = "seed-megacannabis"
+	species = "megacannabis"
+	plantname = "Rainbow Weed"
+	icon_grow = "megacannabis-grow"
+	icon_dead = "megacannabis-dead"
+	product = /obj/item/weapon/reagent_containers/food/snacks/grown/cannabis/rainbow
+	mutatelist = list()
+	reagents_add = list("mindbreaker" = 0.15, "lipolicide" = 0.35)
+	rarity = 40
+
+/obj/item/seeds/cannabis/death
+	name = "pack of deathweed seeds"
+	desc = "These seeds grow into deathweed. Not groovy."
+	icon_state = "seed-blackcannabis"
+	species = "blackcannabis"
+	plantname = "Deathweed"
+	icon_grow = "blackcannabis-grow"
+	icon_dead = "blackcannabis-dead"
+	product = /obj/item/weapon/reagent_containers/food/snacks/grown/cannabis/death
+	mutatelist = list()
+	reagents_add = list("cyanide" = 0.35, "space_drugs" = 0.15, "lipolicide" = 0.15)
+	rarity = 40
+
+/obj/item/seeds/cannabis/white
+	name = "pack of lifeweed seeds"
+	desc = "I will give unto him that is munchies of the fountain of the cravings of life, freely."
+	icon_state = "seed-whitecannabis"
+	species = "whitecannabis"
+	plantname = "Lifeweed"
+	icon_grow = "whitecannabis-grow"
+	icon_dead = "whitecannabis-dead"
+	product = /obj/item/weapon/reagent_containers/food/snacks/grown/cannabis/white
+	mutatelist = list()
+	reagents_add = list("omnizine" = 0.35, "space_drugs" = 0.15, "lipolicide" = 0.15)
+	rarity = 40
+
+
+/obj/item/seeds/cannabis/ultimate
+	name = "pack of omega weed seeds"
+	desc = "These seeds grow into omega weed."
+	icon_state = "seed-ocannabis"
+	species = "ocannabis"
+	plantname = "Omega Weed"
+	icon_grow = "ocannabis-grow"
+	icon_dead = "ocannabis-dead"
+	product = /obj/item/weapon/reagent_containers/food/snacks/grown/cannabis/ultimate
+	mutatelist = list()
+	reagents_add = list("space_drugs" = 0.3,
+						"mindbreaker" = 0.3,
+						"mercury" = 0.15,
+						"lithium" = 0.15,
+						"atropine" = 0.15,
+						"haloperidol" = 0.15,
+						"methamphetamine" = 0.15,
+						"capsaicin" = 0.15,
+						"barbers_aid" = 0.15,
+						"bath_salts" = 0.15,
+						"itching_powder" = 0.15,
+						"crank" = 0.15,
+						"krokodil" = 0.15,
+						"histamine" = 0.15,
+						"lipolicide" = 0.15)
+	rarity = 69
+
+
+// ---------------------------------------------------------------
+
+/obj/item/weapon/reagent_containers/food/snacks/grown/cannabis
+	seed = /obj/item/seeds/cannabis
+	icon = 'goon/icons/obj/hydroponics.dmi'
+	name = "cannabis leaf"
+	desc = "Recently legalized in most galaxies."
+	icon_state = "cannabis"
+	filling_color = "#00FF00"
+	bitesize_mod = 2
+
+
+/obj/item/weapon/reagent_containers/food/snacks/grown/cannabis/rainbow
+	seed = /obj/item/seeds/cannabis/rainbow
+	name = "rainbow cannabis leaf"
+	desc = "Is it supposed to be glowing like that...?"
+	icon_state = "megacannabis"
+
+/obj/item/weapon/reagent_containers/food/snacks/grown/cannabis/death
+	seed = /obj/item/seeds/cannabis/death
+	name = "death cannabis leaf"
+	desc = "Looks a bit dark. Oh well."
+	icon_state = "blackcannabis"
+
+/obj/item/weapon/reagent_containers/food/snacks/grown/cannabis/white
+	seed = /obj/item/seeds/cannabis/white
+	name = "white cannabis leaf"
+	desc = "It feels smooth and nice to the touch."
+	icon_state = "whitecannabis"
+
+/obj/item/weapon/reagent_containers/food/snacks/grown/cannabis/ultimate
+	seed = /obj/item/seeds/cannabis/ultimate
+	name = "omega cannibas leaf"
+	desc = "You feel dizzy looking at it. What the fuck?"
+	icon_state = "ocannabis"
+	volume = 420