Hydroponics rewrite, details will be in PR. Big commit.

Conflicts:
	baystation12.dme
	code/controllers/master_controller.dm
	code/game/gamemodes/events/spacevines.dm
	code/game/machinery/seed_extractor.dm
	code/modules/mob/living/carbon/brain/posibrain.dm
	code/modules/mob/mob.dm
	code/modules/reagents/Chemistry-Reagents.dm
	code/modules/reagents/reagent_containers/food/snacks/grown.dm
	icons/obj/hydroponics.dmi
	maps/tgstation2.dmm

code/WorkInProgress/Cael_Aislinn/Jungle/jungle_plants.dm

@@ -67,7 +67,6 @@ var/jungle_plants_init = 0
 	reagent_effects = shuffle(reagent_effects)
 
 /obj/item/weapon/reagent_containers/food/snacks/grown/jungle_fruit
-	seed = ""
 	name = "jungle fruit"
 	desc = "It smells weird and looks off."
 	icon = 'code/WorkInProgress/Cael_Aislinn/Jungle/jungle.dmi'

code/controllers/master_controller.dm

@@ -85,9 +85,6 @@ datum/controller/game_controller/proc/setup()
 
 	color_windows_init()
 
-	//Create the mining ore distribution map.
-	asteroid_ore_map = new /datum/ore_distribution()
-	asteroid_ore_map.populate_distribution_map()
 
 	spawn(0)
 		if(ticker)
@@ -117,6 +114,14 @@ datum/controller/game_controller/proc/setup_objects()
 			var/obj/machinery/atmospherics/unary/vent_scrubber/T = U
 			T.broadcast_status()
 
+	//Create the mining ore distribution map.
+	asteroid_ore_map = new /datum/ore_distribution()
+	asteroid_ore_map.populate_distribution_map()
+
+
+	//Set up roundstart seed list.
+	populate_seed_list()
+
 	world << "\red \b Initializations complete."
 	sleep(-1)
 

code/datums/supplypacks.dm

@@ -845,6 +845,7 @@ var/list/all_supply_groups = list("Operations","Security","Hospitality","Enginee
 	containername = "Arts and Crafts crate"
 	group = "Operations"
 
+
 /datum/supply_packs/randomised/contraband
 	num_contained = 6
 	contains = list(/obj/item/weapon/storage/pill_bottle/zoom,

code/defines/obj/weapon.dm

@@ -548,8 +548,8 @@
 
 /obj/item/weapon/scythe/afterattack(atom/A, mob/user as mob, proximity)
 	if(!proximity) return
-	if(istype(A, /obj/effect/spacevine))
-		for(var/obj/effect/spacevine/B in orange(A,1))
+	if(istype(A, /obj/effect/plantsegment))
+		for(var/obj/effect/plantsegment/B in orange(A,1))
 			if(prob(80))
 				del B
 		del A

code/game/gamemodes/events/spacevines.dm

@@ -1,260 +1,16 @@
-// SPACE VINES (Note that this code is very similar to Biomass code)
-/obj/effect/spacevine
-	name = "space vines"
-	desc = "An extremely expansionistic species of vine."
-	icon = 'icons/effects/spacevines.dmi'
-	icon_state = "Light1"
-	anchored = 1
-	density = 0
-	layer = 5
-	pass_flags = PASSTABLE | PASSGRILLE
-	var/energy = 0
-	var/obj/effect/spacevine_controller/master = null
-	var/mob/living/buckled_mob
-
-	New()
-		return
-
-	Del()
-		if(master)
-			master.vines -= src
-			master.growth_queue -= src
-		..()
-
-
-/obj/effect/spacevine/attackby(obj/item/weapon/W as obj, mob/user as mob)
-	if (!W || !user || !W.type) return
-	switch(W.type)
-		if(/obj/item/weapon/circular_saw) del src
-		if(/obj/item/weapon/kitchen/utensil/knife) del src
-		if(/obj/item/weapon/scalpel) del src
-		if(/obj/item/weapon/twohanded/fireaxe) del src
-		if(/obj/item/weapon/hatchet) del src
-		if(/obj/item/weapon/melee/energy) del src
-
-		//less effective weapons
-		if(/obj/item/weapon/wirecutters)
-			if(prob(25)) del src
-		if(/obj/item/weapon/shard)
-			if(prob(25)) del src
-
-		else //weapons with subtypes
-			if(istype(W, /obj/item/weapon/melee/energy/sword)) del src
-			else if(istype(W, /obj/item/weapon/weldingtool))
-				var/obj/item/weapon/weldingtool/WT = W
-				if(WT.remove_fuel(0, user)) del src
-			else
-				manual_unbuckle(user)
-				return
-		//Plant-b-gone damage is handled in its entry in chemistry-reagents.dm
-	..()
-
-
-/obj/effect/spacevine/attack_hand(mob/user as mob)
-	manual_unbuckle(user)
-
-
-/obj/effect/spacevine/attack_paw(mob/user as mob)
-	manual_unbuckle(user)
-
-/obj/effect/spacevine/proc/unbuckle()
-	if(buckled_mob)
-		if(buckled_mob.buckled == src)	//this is probably unneccesary, but it doesn't hurt
-			buckled_mob.buckled = null
-			buckled_mob.anchored = initial(buckled_mob.anchored)
-			buckled_mob.update_canmove()
-		buckled_mob = null
-	return
-
-/obj/effect/spacevine/proc/manual_unbuckle(mob/user as mob)
-	if(buckled_mob)
-		if(prob(50))
-			if(buckled_mob.buckled == src)
-				if(buckled_mob != user)
-					buckled_mob.visible_message(\
-						"<span class='notice'>[user.name] frees [buckled_mob.name] from the vines.</span>",\
-						"<span class='notice'>[user.name] frees you from the vines.</span>",\
-						"<span class='warning'>You hear shredding and ripping.</span>")
-				else
-					buckled_mob.visible_message(\
-						"<span class='notice'>[buckled_mob.name] struggles free of the vines.</span>",\
-						"<span class='notice'>You untangle the vines from around yourself.</span>",\
-						"<span class='warning'>You hear shredding and ripping.</span>")
-			unbuckle()
-		else
-			var/text = pick("rips","tears","pulls")
-			user.visible_message(\
-				"<span class='notice'>[user.name] [text] at the vines.</span>",\
-				"<span class='notice'>You [text] at the vines.</span>",\
-				"<span class='warning'>You hear shredding and ripping.</span>")
-	return
-
-/obj/effect/spacevine_controller
-	var/list/obj/effect/spacevine/vines = list()
-	var/list/growth_queue = list()
-	var/reached_collapse_size
-	var/reached_slowdown_size
-	//What this does is that instead of having the grow minimum of 1, required to start growing, the minimum will be 0,
-	//meaning if you get the spacevines' size to something less than 20 plots, it won't grow anymore.
-
-	New()
-		if(!istype(src.loc,/turf/simulated/floor))
-			del(src)
-
-		spawn_spacevine_piece(src.loc)
-		processing_objects.Add(src)
-
-	Del()
-		processing_objects.Remove(src)
-		..()
-
-	proc/spawn_spacevine_piece(var/turf/location)
-		var/obj/effect/spacevine/SV = new(location)
-		growth_queue += SV
-		vines += SV
-		SV.master = src
-
-	process()
-		if(!vines)
-			del(src) //space  vines exterminated. Remove the controller
-			return
-		if(!growth_queue)
-			del(src) //Sanity check
-			return
-		if(vines.len >= 250 && !reached_collapse_size)
-			reached_collapse_size = 1
-		if(vines.len >= 30 && !reached_slowdown_size )
-			reached_slowdown_size = 1
-
-		var/length = 0
-		if(reached_collapse_size)
-			length = 0
-		else if(reached_slowdown_size)
-			if(prob(25))
-				length = 1
-			else
-				length = 0
-		else
-			length = 1
-		length = min( 30 , max( length , vines.len / 5 ) )
-		var/i = 0
-		var/list/obj/effect/spacevine/queue_end = list()
-
-		for( var/obj/effect/spacevine/SV in growth_queue )
-			i++
-			queue_end += SV
-			growth_queue -= SV
-			if(SV.energy < 2) //If tile isn't fully grown
-				if(prob(20))
-					SV.grow()
-			else //If tile is fully grown
-				SV.buckle_mob()
-
-			//if(prob(25))
-			SV.spread()
-			if(i >= length)
-				break
-
-		growth_queue = growth_queue + queue_end
-		//sleep(5)
-		//src.process()
-
-/obj/effect/spacevine/proc/grow()
-	if(!energy)
-		src.icon_state = pick("Med1", "Med2", "Med3")
-		energy = 1
-		src.opacity = 1
-		layer = 5
-	else
-		src.icon_state = pick("Hvy1", "Hvy2", "Hvy3")
-		energy = 2
-
-/obj/effect/spacevine/proc/buckle_mob()
-	if(!buckled_mob && prob(25))
-		for(var/mob/living/carbon/V in src.loc)
-			if((V.stat != DEAD)  && (V.buckled != src)) //if mob not dead or captured
-				V.buckled = src
-				V.loc = src.loc
-				V.update_canmove()
-				src.buckled_mob = V
-				V << "<span class='danger'>The vines [pick("wind", "tangle", "tighten")] around you!</span>"
-				break //only capture one mob at a time.
-
-/obj/effect/spacevine/proc/spread()
-	var/direction = pick(cardinal)
-	var/step = get_step(src,direction)
-	if(istype(step,/turf/simulated/floor))
-		var/turf/simulated/floor/F = step
-		if(!locate(/obj/effect/spacevine,F))
-			if(F.Enter(src))
-				if(master)
-					master.spawn_spacevine_piece( F )
-
-/*
-/obj/effect/spacevine/proc/Life()
-	if (!src) return
-	var/Vspread
-	if (prob(50)) Vspread = locate(src.x + rand(-1,1),src.y,src.z)
-	else Vspread = locate(src.x,src.y + rand(-1, 1),src.z)
-	var/dogrowth = 1
-	if (!istype(Vspread, /turf/simulated/floor)) dogrowth = 0
-	for(var/obj/O in Vspread)
-		if (istype(O, /obj/structure/window) || istype(O, /obj/effect/forcefield) || istype(O, /obj/effect/blob) || istype(O, /obj/effect/alien/weeds) || istype(O, /obj/effect/spacevine)) dogrowth = 0
-		if (istype(O, /obj/machinery/door/))
-			if(O:p_open == 0 && prob(50)) O:open()
-			else dogrowth = 0
-	if (dogrowth == 1)
-		var/obj/effect/spacevine/B = new /obj/effect/spacevine(Vspread)
-		B.icon_state = pick("vine-light1", "vine-light2", "vine-light3")
-		spawn(20)
-			if(B)
-				B.Life()
-	src.growth += 1
-	if (src.growth == 10)
-		src.name = "Thick Space Kudzu"
-		src.icon_state = pick("vine-med1", "vine-med2", "vine-med3")
-		src.opacity = 1
-		src.waittime = 80
-	if (src.growth == 20)
-		src.name = "Dense Space Kudzu"
-		src.icon_state = pick("vine-hvy1", "vine-hvy2", "vine-hvy3")
-		src.density = 1
-	spawn(src.waittime)
-		if (src.growth < 20) src.Life()
-
-*/
-
-/obj/effect/spacevine/ex_act(severity)
-	switch(severity)
-		if(1.0)
-			qdel(src)
-			return
-		if(2.0)
-			if (prob(90))
-				qdel(src)
-				return
-		if(3.0)
-			if (prob(50))
-				qdel(src)
-				return
-	return
-
-/obj/effect/spacevine/fire_act(null, temp, volume) //hotspots kill vines
-	del src
-
-//Carn: Spacevines random event.
-/proc/spacevine_infestation()
-
-	spawn() //to stop the secrets panel hanging
-		var/list/turf/simulated/floor/turfs = list() //list of all the empty floor turfs in the hallway areas
-		for(var/areapath in typesof(/area/hallway))
-			var/area/A = locate(areapath)
-			for(var/area/B in A.related)
-				for(var/turf/simulated/floor/F in B.contents)
-					if(!F.contents.len)
-						turfs += F
-
-		if(turfs.len) //Pick a turf to spawn at if we can
-			var/turf/simulated/floor/T = pick(turfs)
-			new/obj/effect/spacevine_controller(T) //spawn a controller at turf
-			message_admins("\blue Event: Spacevines spawned at [T.loc] ([T.x],[T.y],[T.z])")
+//Carn: Spacevines random event.
+/proc/spacevine_infestation()
+
+	spawn() //to stop the secrets panel hanging
+		var/list/turf/simulated/floor/turfs = list() //list of all the empty floor turfs in the hallway areas
+		for(var/areapath in typesof(/area/hallway))
+			var/area/A = locate(areapath)
+			for(var/area/B in A.related)
+				for(var/turf/simulated/floor/F in B.contents)
+					if(!F.contents.len)
+						turfs += F
+
+		if(turfs.len) //Pick a turf to spawn at if we can
+			var/turf/simulated/floor/T = pick(turfs)
+			new/obj/effect/plant_controller(T) //spawn a controller at turf
+			message_admins("\blue Event: Spacevines spawned at [T.loc] ([T.x],[T.y],[T.z])")

code/game/machinery/bees_apiary.dm

@@ -170,13 +170,13 @@
 
 		//find some plants, harvest
 		for(var/obj/machinery/hydroponics/H in view(7, src))
-			if(H.planted && !H.dead && H.myseed && prob(owned_bee_swarms.len * 10))
+			if(H.seed && !H.dead && prob(owned_bee_swarms.len * 10))
 				src.nutrilevel++
 				H.nutrilevel++
-				if(mut < H.mutmod - 1)
-					mut = H.mutmod - 1
-				else if(mut > H.mutmod - 1)
-					H.mutmod = mut
+				if(mut < H.mutation_mod - 1)
+					mut = H.mutation_mod - 1
+				else if(mut > H.mutation_mod - 1)
+					H.mutation_mod = mut
 
 				//flowers give us pollen (nutrients)
 /* - All plants should be giving nutrients to the hive.
@@ -188,11 +188,11 @@
 				if(prob(10))
 					H.lastcycle -= 5
 				if(prob(10))
-					H.myseed.lifespan = max(initial(H.myseed.lifespan) * 1.5, H.myseed.lifespan + 1)
+					H.seed.lifespan = max(initial(H.seed.lifespan) * 1.5, H.seed.lifespan + 1)
 				if(prob(10))
-					H.myseed.endurance = max(initial(H.myseed.endurance) * 1.5, H.myseed.endurance + 1)
-				if(H.toxic && prob(10))
-					H.toxic = min(0, H.toxic - 1)
+					H.seed.endurance = max(initial(H.seed.endurance) * 1.5, H.seed.endurance + 1)
+				if(H.toxins && prob(10))
+					H.toxins = min(0, H.toxins - 1)
 					toxic++
 
 /obj/machinery/apiary/proc/die()

code/game/machinery/seed_extractor.dm

@@ -1,48 +1,3 @@
-/proc/seedify(var/obj/item/O as obj, var/t_max)
-	var/t_amount = 0
-	if(t_max == -1)
-		t_max = rand(1,4)
-
-	if(istype(O, /obj/item/weapon/reagent_containers/food/snacks/grown/))
-		var/obj/item/weapon/reagent_containers/food/snacks/grown/F = O
-		while(t_amount < t_max)
-			var/obj/item/seeds/t_prod = new F.seed(O.loc)
-			t_prod.species = F.species
-			t_prod.lifespan = F.lifespan
-			t_prod.endurance = F.endurance
-			t_prod.maturation = F.maturation
-			t_prod.production = F.production
-			t_prod.yield = F.yield
-			t_prod.potency = F.potency
-			t_amount++
-		del(O)
-		return 1
-
-	else if(istype(O, /obj/item/weapon/grown/))
-		var/obj/item/weapon/grown/F = O
-		while(t_amount < t_max)
-			var/obj/item/seeds/t_prod = new F.seed(O.loc)
-			t_prod.species = F.species
-			t_prod.lifespan = F.lifespan
-			t_prod.endurance = F.endurance
-			t_prod.maturation = F.maturation
-			t_prod.production = F.production
-			t_prod.yield = F.yield
-			t_prod.potency = F.potency
-			t_amount++
-		del(O)
-		return 1
-
-	else if(istype(O, /obj/item/stack/tile/grass))
-		var/obj/item/stack/tile/grass/S = O
-		new /obj/item/seeds/grassseed(O.loc)
-		S.use(1)
-		return 1
-
-	else
-		return 0
-
-
 /obj/machinery/seed_extractor
 	name = "seed extractor"
 	desc = "Extracts and bags seeds from produce."
@@ -52,14 +7,37 @@
 	anchored = 1
 
 obj/machinery/seed_extractor/attackby(var/obj/item/O as obj, var/mob/user as mob)
-	if(isrobot(user))
-		return
-	user.drop_item()
-	if(O && O.loc)
-		O.loc = src.loc
-	if(seedify(O,-1))
-		user << "<span class='notice'>You extract some seeds.</span>"
-	else
-		user << "<span class='notice'>You can't extract any seeds from that!</span>"
 
+	// Fruits and vegetables.
+	if(istype(O, /obj/item/weapon/reagent_containers/food/snacks/grown) || istype(O, /obj/item/weapon/grown))
 
+		user.drop_item(O)
+
+		var/datum/seed/new_seed_type
+		if(istype(O, /obj/item/weapon/grown))
+			var/obj/item/weapon/grown/F = O
+			new_seed_type = seed_types[F.plantname]
+		else
+			var/obj/item/weapon/reagent_containers/food/snacks/grown/F = O
+			new_seed_type = seed_types[F.plantname]
+
+		if(new_seed_type)
+			user << "<span class='notice'>You extract some seeds from [O].</span>"
+			var/produce = rand(1,4)
+			for(var/i = 0;i<=produce;i++)
+				var/obj/item/seeds/seeds = new(get_turf(src))
+				seeds.seed_type = new_seed_type.name
+				seeds.update_seed()
+		else
+			user << "[O] doesn't seem to have any usable seeds inside it."
+
+		del(O)
+
+	//Grass.
+	else if(istype(O, /obj/item/stack/tile/grass))
+		var/obj/item/stack/tile/grass/S = O
+		user << "<span class='notice'>You extract some seeds from the [S.name].</span>"
+		S.use(1)
+		new /obj/item/seeds/grassseed(loc)
+
+	return

code/game/machinery/vending.dm

@@ -758,7 +758,7 @@
 	product_ads = "We like plants!;Don't you want some?;The greenest thumbs ever.;We like big plants.;Soft soil..."
 	icon_state = "nutri"
 	icon_deny = "nutri-deny"
-	products = list(/obj/item/nutrient/ez = 35,/obj/item/nutrient/l4z = 25,/obj/item/nutrient/rh = 15,/obj/item/weapon/pestspray = 20,
+	products = list(/obj/item/nutrient/ez = 35,/obj/item/nutrient/l4z = 25,/obj/item/nutrient/rh = 15,/obj/item/weapon/plantspray/pests = 20,
 					/obj/item/weapon/reagent_containers/syringe = 5,/obj/item/weapon/storage/bag/plants = 5)
 	contraband = list(/obj/item/weapon/reagent_containers/glass/bottle/ammonia = 10,/obj/item/weapon/reagent_containers/glass/bottle/diethylamine = 5)
 
@@ -775,8 +775,7 @@
 					/obj/item/seeds/sunflowerseed = 3,/obj/item/seeds/tomatoseed = 3,/obj/item/seeds/towermycelium = 3,/obj/item/seeds/wheatseed = 3,/obj/item/seeds/appleseed = 3,
 					/obj/item/seeds/poppyseed = 3,/obj/item/seeds/ambrosiavulgarisseed = 3,/obj/item/seeds/whitebeetseed = 3,/obj/item/seeds/watermelonseed = 3,/obj/item/seeds/limeseed = 3,
 					/obj/item/seeds/lemonseed = 3,/obj/item/seeds/orangeseed = 3,/obj/item/seeds/grassseed = 3,/obj/item/seeds/cocoapodseed = 3,
-					/obj/item/seeds/cabbageseed = 3,/obj/item/seeds/grapeseed = 3,/obj/item/seeds/pumpkinseed = 3,/obj/item/seeds/cherryseed = 3,/obj/item/seeds/plastiseed = 3,/obj/item/seeds/riceseed = 3,
-					/obj/item/seeds/coffee_arabica_seed = 3, /obj/item/seeds/tobacco_seed = 3,/obj/item/seeds/tea_aspera_seed = 3)
+					/obj/item/seeds/cabbageseed = 3,/obj/item/seeds/grapeseed = 3,/obj/item/seeds/pumpkinseed = 3,/obj/item/seeds/cherryseed = 3,/obj/item/seeds/plastiseed = 3,/obj/item/seeds/riceseed = 3)
 
 	contraband = list(/obj/item/seeds/amanitamycelium = 2,/obj/item/seeds/glowshroom = 2,/obj/item/seeds/libertymycelium = 2,/obj/item/seeds/nettleseed = 2,
 						/obj/item/seeds/plumpmycelium = 2,/obj/item/seeds/reishimycelium = 2)

code/game/objects/items/stacks/sheets/sheet_types.dm

@@ -136,7 +136,6 @@ var/global/list/datum/stack_recipe/wood_recipes = list ( \
 	new/datum/stack_recipe("wooden door", /obj/structure/mineral_door/wood, 10, time = 20, one_per_turf = 1, on_floor = 1), \
 	new/datum/stack_recipe("coffin", /obj/structure/closet/coffin, 5, time = 15, one_per_turf = 1, on_floor = 1), \
 	new/datum/stack_recipe("apiary", /obj/item/apiary, 10, time = 25, one_per_turf = 0, on_floor = 0), \
-	new/datum/stack_recipe("drying rack", /obj/machinery/drying_rack, 10, time = 15, one_per_turf = 1, on_floor = 1), \
 	)
 
 /obj/item/stack/sheet/wood

code/game/objects/items/weapons/hydroponics.dm

@@ -143,14 +143,6 @@
 		M << "\red You are heated by the warmth of the of the [name]!"
 		M.bodytemperature += potency/2 * TEMPERATURE_DAMAGE_COEFFICIENT
 
-/obj/item/weapon/grown/novaflower/afterattack(atom/A as mob|obj, mob/user as mob,proximity)
-	if(!proximity) return
-	if(endurance > 0)
-		endurance -= rand(1,(endurance/3)+1)
-	else
-		usr << "All the petals have fallen off the [name] from violent whacking."
-		del(src)
-
 /obj/item/weapon/grown/novaflower/pickup(mob/living/carbon/human/user as mob)
 	if(!user.gloves)
 		user << "\red The [name] burns your bare hand!"

code/game/objects/items/weapons/storage/bags.dm

@@ -124,7 +124,7 @@
 	w_class = 1
 	can_hold = list("/obj/item/weapon/reagent_containers/food/snacks/grown","/obj/item/seeds","/obj/item/weapon/grown", "/obj/item/stack/tile/grass")
 
-
+/*
 /obj/item/weapon/storage/bag/plants/portaseeder
 	name = "Portable Seed Extractor"
 	desc = "For the enterprising botanist on the go. Less efficient than the stationary model, it creates one seed per plant."
@@ -140,7 +140,7 @@
 		for(var/mob/M in range(1))
 			if (M.s_active == src)
 				src.close(M)
-
+*/
 
 // -----------------------------
 //        Sheet Snatcher

code/game/objects/structures.dm

@@ -84,7 +84,7 @@
 
 			var/damage = rand(15,30)
 			var/mob/living/carbon/human/H = M
-			if(!istype(M))
+			if(!istype(H))
 				H << "\red You land heavily!"
 				M.adjustBruteLoss(damage)
 				return

code/modules/client/preferences.dm

@@ -13,7 +13,7 @@ var/global/list/special_roles = list( //keep synced with the defines BE_* in set
 	"alien candidate" = 1, //always show                 // 6
 	"pAI candidate" = 1, // -- TLE                       // 7
 	"cultist" = IS_MODE_COMPILED("cult"),                // 8
-	"infested monkey" = IS_MODE_COMPILED("monkey"),      // 9
+	"plant" = 1,										// 9
 	"ninja" = "true",									 // 10
 	"vox raider" = IS_MODE_COMPILED("heist"),			 // 11
 	"slime" = 1,                                         // 12

code/modules/hydroponics/hydro_tools.dm

@@ -1,22 +1,14 @@
-<<<<<<< HEAD:code/modules/hydroponics/hydroitemdefines.dm
-// Plant analyzer
-=======
 //Analyzer, pestkillers, weedkillers, nutrients, hatchets.
 
->>>>>>> 7fb8f30... New machines, adjusted Cael's seeds, rewrote space vines.:code/modules/hydroponics/hydro_tools.dm
 /obj/item/device/analyzer/plant_analyzer
 	name = "plant analyzer"
-	desc = "A scanner used to evaluate a plant's various areas of growth."
 	icon = 'icons/obj/device.dmi'
 	icon_state = "hydro"
 	item_state = "analyzer"
-	origin_tech = "magnets=1;biotech=1"
 
 /obj/item/device/analyzer/plant_analyzer/attack_self(mob/user as mob)
 	return 0
 
-<<<<<<< HEAD:code/modules/hydroponics/hydroitemdefines.dm
-=======
 /obj/item/device/analyzer/plant_analyzer/afterattack(obj/target, mob/user, flag)
 	if(!flag) return
 
@@ -161,7 +153,6 @@
 
 	return
 
->>>>>>> 7fb8f30... New machines, adjusted Cael's seeds, rewrote space vines.:code/modules/hydroponics/hydro_tools.dm
 // *************************************
 // Hydroponics Tools
 // *************************************
@@ -169,7 +160,7 @@
 /obj/item/weapon/plantspray
 	icon = 'icons/obj/hydroponics.dmi'
 	item_state = "spray"
-	flags = OPENCONTAINER
+	flags = TABLEPASS | OPENCONTAINER | FPRINT | NOBLUDGEON
 	slot_flags = SLOT_BELT
 	throwforce = 4
 	w_class = 2.0
@@ -179,13 +170,7 @@
 	var/pest_kill_str = 0
 	var/weed_kill_str = 0
 
-<<<<<<< HEAD:code/modules/hydroponics/hydroitemdefines.dm
-	suicide_act(mob/user)
-		viewers(user) << "<span class='suicide'>[user] is huffing the [src.name]! It looks like \he's trying to commit suicide.</span>"
-		return (TOXLOSS)
-=======
 /obj/item/weapon/plantspray/weeds // -- Skie
->>>>>>> 7fb8f30... New machines, adjusted Cael's seeds, rewrote space vines.:code/modules/hydroponics/hydro_tools.dm
 
 	name = "weed-spray"
 	desc = "It's a toxic mixture, in spray form, to kill small weeds."
@@ -196,21 +181,6 @@
 	name = "pest-spray"
 	desc = "It's some pest eliminator spray! <I>Do not inhale!</I>"
 	icon_state = "pestspray"
-<<<<<<< HEAD:code/modules/hydroponics/hydroitemdefines.dm
-	item_state = "spray"
-	flags = OPENCONTAINER
-	slot_flags = SLOT_BELT
-	throwforce = 4
-	w_class = 2.0
-	throw_speed = 2
-	throw_range = 10
-	var/toxicity = 4
-	var/PestKillStr = 2
-
-	suicide_act(mob/user)
-		viewers(user) << "<span class='suicide'>[user] is huffing the [src.name]! It looks like \he's trying to commit suicide.</span>"
-		return (TOXLOSS)
-=======
 	pest_kill_str = 2
 
 /obj/item/weapon/plantspray/pests/old
@@ -235,7 +205,6 @@
 	icon_state = "bottle15"
 	toxicity = 8
 	pest_kill_str = 7
->>>>>>> 7fb8f30... New machines, adjusted Cael's seeds, rewrote space vines.:code/modules/hydroponics/hydro_tools.dm
 
 /obj/item/weapon/minihoe // -- Numbers
 	name = "mini hoe"
@@ -243,15 +212,11 @@
 	icon = 'icons/obj/weapons.dmi'
 	icon_state = "hoe"
 	item_state = "hoe"
-	flags = CONDUCT
+	flags = FPRINT | TABLEPASS | CONDUCT | NOBLUDGEON
 	force = 5.0
 	throwforce = 7.0
 	w_class = 2.0
-	m_amt = 50
 	attack_verb = list("slashed", "sliced", "cut", "clawed")
-<<<<<<< HEAD:code/modules/hydroponics/hydroitemdefines.dm
-	hitsound = 'sound/weapons/bladeslice.ogg'
-=======
 
 
 // *************************************
@@ -290,7 +255,6 @@
 	toxicity = 8
 	weed_kill_str = 7
 
->>>>>>> 7fb8f30... New machines, adjusted Cael's seeds, rewrote space vines.:code/modules/hydroponics/hydro_tools.dm
 
 // *************************************
 // Nutrient defines for hydroponics
@@ -300,7 +264,8 @@
 	name = "bottle of nutrient"
 	icon = 'icons/obj/chemical.dmi'
 	icon_state = "bottle16"
-	w_class = 1.0
+	flags = FPRINT |  TABLEPASS
+	w_class = 2.0
 	var/mutmod = 0
 	var/yieldmod = 0
 	New()
@@ -311,6 +276,7 @@
 	name = "bottle of E-Z-Nutrient"
 	icon = 'icons/obj/chemical.dmi'
 	icon_state = "bottle16"
+	flags = FPRINT |  TABLEPASS
 	mutmod = 1
 	yieldmod = 1
 
@@ -318,33 +284,13 @@
 	name = "bottle of Left 4 Zed"
 	icon = 'icons/obj/chemical.dmi'
 	icon_state = "bottle18"
+	flags = FPRINT |  TABLEPASS
 	mutmod = 2
 
 /obj/item/nutrient/rh
 	name = "bottle of Robust Harvest"
 	icon = 'icons/obj/chemical.dmi'
 	icon_state = "bottle15"
-<<<<<<< HEAD:code/modules/hydroponics/hydroitemdefines.dm
-	mutmod = 0
-	yieldmod = 2
-	New()
-		src.pixel_x = rand(-5.0, 5)
-		src.pixel_y = rand(-5.0, 5)
-
-// *************************************
-// Pestkiller defines for hydroponics
-// *************************************
-
-/obj/item/pestkiller
-	name = "bottle of pestkiller"
-	icon = 'icons/obj/chemical.dmi'
-	icon_state = "bottle16"
-	var/toxicity = 0
-	var/PestKillStr = 0
-	New()
-		src.pixel_x = rand(-5.0, 5)
-		src.pixel_y = rand(-5.0, 5)
-=======
 	flags = FPRINT |  TABLEPASS
 	yieldmod = 2
 
@@ -362,74 +308,21 @@
 	throw_range = 4
 	sharp = 1
 	edge = 1
-	matter = list("metal" = 15000)
 	origin_tech = "materials=2;combat=1"
 	attack_verb = list("chopped", "torn", "cut")
->>>>>>> 7fb8f30... New machines, adjusted Cael's seeds, rewrote space vines.:code/modules/hydroponics/hydro_tools.dm
 
-/obj/item/pestkiller/carbaryl
-	name = "bottle of carbaryl"
-	icon = 'icons/obj/chemical.dmi'
-	icon_state = "bottle16"
-	toxicity = 4
-	PestKillStr = 2
-	New()
-		src.pixel_x = rand(-5.0, 5)
-		src.pixel_y = rand(-5.0, 5)
+/obj/item/weapon/hatchet/attack(mob/living/carbon/M as mob, mob/living/carbon/user as mob)
+	playsound(loc, 'sound/weapons/bladeslice.ogg', 50, 1, -1)
+	return ..()
 
-/obj/item/pestkiller/lindane
-	name = "bottle of lindane"
-	icon = 'icons/obj/chemical.dmi'
-	icon_state = "bottle18"
-	toxicity = 6
-	PestKillStr = 4
-	New()
-		src.pixel_x = rand(-5.0, 5)
-		src.pixel_y = rand(-5.0, 5)
+//If it's a hatchet it goes here. I guess
+/obj/item/weapon/hatchet/unathiknife
+	name = "duelling knife"
+	desc = "A length of leather-bound wood studded with razor-sharp teeth. How crude."
+	icon = 'icons/obj/weapons.dmi'
+	icon_state = "unathiknife"
+	attack_verb = list("ripped", "torn", "cut")
 
-<<<<<<< HEAD:code/modules/hydroponics/hydroitemdefines.dm
-/obj/item/pestkiller/phosmet
-	name = "bottle of phosmet"
-	icon = 'icons/obj/chemical.dmi'
-	icon_state = "bottle15"
-	toxicity = 8
-	PestKillStr = 7
-	New()
-		src.pixel_x = rand(-5.0, 5)
-		src.pixel_y = rand(-5.0, 5)
-
-// *************************************
-// Weedkiller defines for hydroponics
-// *************************************
-
-/obj/item/weedkiller
-	name = "bottle of weedkiller"
-	icon = 'icons/obj/chemical.dmi'
-	icon_state = "bottle16"
-	var/toxicity = 0
-	var/WeedKillStr = 0
-
-/obj/item/weedkiller/glyphosate
-	name = "bottle of glyphosate"
-	icon = 'icons/obj/chemical.dmi'
-	icon_state = "bottle16"
-	toxicity = 4
-	WeedKillStr = 2
-
-/obj/item/weedkiller/triclopyr
-	name = "bottle of triclopyr"
-	icon = 'icons/obj/chemical.dmi'
-	icon_state = "bottle18"
-	toxicity = 6
-	WeedKillStr = 4
-
-/obj/item/weedkiller/D24
-	name = "bottle of 2,4-D"
-	icon = 'icons/obj/chemical.dmi'
-	icon_state = "bottle15"
-	toxicity = 8
-	WeedKillStr = 7
-=======
 /obj/item/weapon/scythe
 	icon_state = "scythe0"
 	name = "scythe"
@@ -450,5 +343,4 @@
 		for(var/obj/effect/plantsegment/B in orange(A,1))
 			if(prob(80))
 				del B
-		del A
->>>>>>> 7fb8f30... New machines, adjusted Cael's seeds, rewrote space vines.:code/modules/hydroponics/hydro_tools.dm
+		del A

code/modules/mining/surprises/tg.dm

@@ -168,7 +168,6 @@
 
 	spawntypes = list(
 		/obj/item/weapon/gun/energy/floragun=1,
-		/obj/item/seeds/novaflowerseed=2,
 		/obj/item/seeds/bluespacetomatoseed=2
 	)
 	fluffitems = list(

code/modules/mob/living/simple_animal/bees.dm

@@ -166,10 +166,10 @@
 				turns_per_move = rand(1,3)
 			else if(feral < 0)
 				turns_since_move = 0
-			else if(!my_hydrotray || my_hydrotray.loc != src.loc || !my_hydrotray.planted || my_hydrotray.dead || !my_hydrotray.myseed)
+			else if(!my_hydrotray || my_hydrotray.loc != src.loc || my_hydrotray.dead || !my_hydrotray.seed)
 				var/obj/machinery/hydroponics/my_hydrotray = locate() in src.loc
 				if(my_hydrotray)
-					if(my_hydrotray.planted && !my_hydrotray.dead && my_hydrotray.myseed)
+					if(!my_hydrotray.dead && my_hydrotray.seed)
 						turns_per_move = rand(20,50)
 					else
 						my_hydrotray = null

code/modules/mob/living/simple_animal/friendly/farm_animals.dm

@@ -46,8 +46,8 @@
 			if(udder && prob(5))
 				udder.add_reagent("milk", rand(5, 10))
 
-		if(locate(/obj/effect/spacevine) in loc)
-			var/obj/effect/spacevine/SV = locate(/obj/effect/spacevine) in loc
+		if(locate(/obj/effect/plantsegment) in loc)
+			var/obj/effect/plantsegment/SV = locate(/obj/effect/plantsegment) in loc
 			del(SV)
 			if(prob(10))
 				say("Nom")
@@ -56,7 +56,7 @@
 			for(var/direction in shuffle(list(1,2,4,8,5,6,9,10)))
 				var/step = get_step(src, direction)
 				if(step)
-					if(locate(/obj/effect/spacevine) in step)
+					if(locate(/obj/effect/plantsegment) in step)
 						Move(step)
 
 /mob/living/simple_animal/hostile/retaliate/goat/Retaliate()
@@ -66,8 +66,8 @@
 /mob/living/simple_animal/hostile/retaliate/goat/Move()
 	..()
 	if(!stat)
-		if(locate(/obj/effect/spacevine) in loc)
-			var/obj/effect/spacevine/SV = locate(/obj/effect/spacevine) in loc
+		if(locate(/obj/effect/plantsegment) in loc)
+			var/obj/effect/plantsegment/SV = locate(/obj/effect/plantsegment) in loc
 			del(SV)
 			if(prob(10))
 				say("Nom")
@@ -350,4 +350,4 @@ var/global/chicken_count = 0
 	response_disarm = "gently pushes aside the"
 	response_harm   = "kicks the"
 	attacktext = "kicks"
-	health = 50
+	health = 50

code/modules/mob/mob.dm

@@ -910,7 +910,11 @@ var/list/slot_equipment_priority = list( \
 	else
 		lying = 0
 		canmove = 1
-	if(buckled && (!buckled.movable))
+	var/is_movable
+	if(buckled && istype(buckled))
+		is_movable = buckled.movable
+
+	if(buckled && !is_movable)
 		anchored = 1
 		canmove = 0
 		if( istype(buckled,/obj/structure/stool/bed/chair) )
@@ -923,7 +927,7 @@ var/list/slot_equipment_priority = list( \
 				lying = 1
 		else
 			lying = 1
-	else if(buckled && (buckled.movable))
+	else if(buckled && is_movable)
 		anchored = 0
 		canmove = 1
 		lying = 0
@@ -1225,4 +1229,4 @@ mob/proc/yank_out_object()
 
 	if(host)
 		host.ckey = src.ckey
-		host << "<span class='info'>You are now a mouse. Try to avoid interaction with players, and do not give hints away that you are more than a simple rodent.</span>"
+		host << "<span class='info'>You are now a mouse. Try to avoid interaction with players, and do not give hints away that you are more than a simple rodent.</span>"

code/modules/reagents/Chemistry-Machinery.dm

@@ -876,12 +876,6 @@
 		/obj/item/weapon/reagent_containers/food/snacks/grown/cherries = list("cherryjelly" = 0),
 		/obj/item/weapon/reagent_containers/food/snacks/grown/plastellium = list("plasticide" = 5),
 
-		//Grinder stuff, but only if dry
-		/obj/item/weapon/reagent_containers/food/snacks/grown/coffee_arabica = list("coffeepowder" = 0),
-		/obj/item/weapon/reagent_containers/food/snacks/grown/coffee_robusta = list("coffeepowder" = 0, "hyperzine" = 0),
-		/obj/item/weapon/reagent_containers/food/snacks/grown/tea_aspera = list("teapowder" = 0),
-		/obj/item/weapon/reagent_containers/food/snacks/grown/tea_astra = list("teapowder" = 0, "kelotane" = 0),
-
 
 		//archaeology!
 		/obj/item/weapon/rocksliver = list("ground_rock" = 50),
@@ -908,14 +902,6 @@
 		/obj/item/weapon/reagent_containers/food/snacks/grown/poisonberries = list("poisonberryjuice" = 0),
 	)
 
-	var/list/dried_items = list(
-
-		//Grinder stuff, but only if dry
-		/obj/item/weapon/reagent_containers/food/snacks/grown/coffee_arabica = list("coffeepowder" = 0),
-		/obj/item/weapon/reagent_containers/food/snacks/grown/coffee_robusta = list("coffeepowder" = 0, "hyperzine" = 0),
-		/obj/item/weapon/reagent_containers/food/snacks/grown/tea_aspera = list("teapowder" = 0),
-		/obj/item/weapon/reagent_containers/food/snacks/grown/tea_astra = list("teapowder" = 0, "kelotane" = 0),
-	)
 
 
 
@@ -969,11 +955,6 @@
 		src.updateUsrDialog()
 		return 0
 
-	if(is_type_in_list(O, dried_items))
-		if(!O:dry)
-			user << "You must dry that first!"
-			return 1
-
 
 	if (!is_type_in_list(O, blend_items) && !is_type_in_list(O, juice_items))
 		user << "Cannot refine into a reagent."

code/modules/reagents/Chemistry-Reagents.dm

@@ -1446,20 +1446,14 @@ datum
 					M.clean_blood()
 
 		plantbgone
-			name = "Atrazine"
+			scannable = 1
+			name = "Plant-B-Gone"
 			id = "plantbgone"
 			description = "A harmful toxic mixture to kill plantlife. Do not ingest!"
 			reagent_state = LIQUID
-			color = "#C8A5DC" // rgb: 200, 165, 220
+			color = "#49002E" // rgb: 73, 0, 46
 			toxod = TOX_OVERDOSE/2
 			burnod = BURN_OVERDOSE/2
-			scannable = 1
-
-			on_mob_life(var/mob/living/carbon/M)
-				if(!M) M = holder.my_atom
-				M.adjustToxLoss(2)
-				..()
-				return
 
 			// Clear off wallrot fungi
 			reaction_turf(var/turf/T, var/volume)
@@ -1479,10 +1473,9 @@ datum
 					alien_weeds.healthcheck()
 				else if(istype(O,/obj/effect/glowshroom)) //even a small amount is enough to kill it
 					del(O)
-				else if(istype(O,/obj/effect/spacevine))
+				else if(istype(O,/obj/effect/plantsegment))
 					if(prob(50)) del(O) //Kills kudzu too.
-				// Damage that is done to growing plants is separately
-				// at code/game/machinery/hydroponics at obj/item/hydroponics
+				// Damage that is done to growing plants is separately at code/game/machinery/hydroponics at obj/item/hydroponics
 
 			reaction_mob(var/mob/living/M, var/method=TOUCH, var/volume)
 				src = null
@@ -2308,26 +2301,25 @@ datum
 			reagent_state = LIQUID
 			color = "#664300" // rgb: 102, 67, 0
 
-			on_mob_life(var/mob/living/M as mob)
+			reaction_mob(var/mob/living/carbon/M, var/method=TOUCH, var/volume)
+				if(!..())	return
+				if(!istype(M) || !M.dna)	return  //No robots, AIs, aliens, Ians or other mobs should be affected by this.
+				src = null
+				if((method==TOUCH && prob(33)) || method==INGEST)
+					randmuti(M)
+					if(prob(98))	randmutb(M)
+					else			randmutg(M)
+					domutcheck(M, null)
+					M.UpdateAppearance()
+				return
+			on_mob_life(var/mob/living/carbon/M)
+				if(!istype(M))	return
 				if(!M) M = holder.my_atom
-				if(!data) data = 1
-				switch(data)
-					if(1)
-						M.confused += 2
-						M.drowsyness += 2
-					if(2 to 50)
-						M.sleeping += 1
-					if(51 to INFINITY)
-						M.sleeping += 1
-						M.adjustToxLoss(data - 50)
-				data++
-				// Sleep toxins should always be consumed pretty fast
-				holder.remove_reagent(src.id, 0.4)
+				M.apply_effect(10,IRRADIATE,0)
 				..()
 				return
 
 
-
 		potassium_chloride
 			name = "Potassium Chloride"
 			id = "potassium_chloride"

code/modules/reagents/reagent_containers/glass.dm

@@ -38,7 +38,7 @@
 		/obj/machinery/computer/centrifuge,
 		/obj/machinery/sleeper,
 		/obj/machinery/smartfridge/,
-		/obj/machinery/biogenerator,
+//		/obj/machinery/biogenerator,
 		/obj/machinery/hydroponics,
 		/obj/machinery/constructable_frame)
 

code/modules/research/xenoarchaeology/genetics/prehistoric_plants.dm

@@ -1,21 +1,3 @@
-
-/obj/item/seeds/telriis
-	name = "pack of telriis seeds"
-	desc = "These seeds grow into telriis grass. Not recommended for consumption by sentient species."
-	icon_state = "seed-alien1"
-	mypath = "/obj/item/seeds/telriis"
-	species = "telriis"
-	plantname = "Telriis grass"
-	productname = "/obj/item/weapon/telriis_clump"
-	lifespan = 50		//number of ticks
-	endurance = 50		//
-	maturation = 5		//ticks to full growth stage
-	production = 5		//ticks till ready to harvest
-	yield = 4			//number produced when harvest
-	potency = 5
-	plant_type = 1		//1=weed, 2=shroom, 0=normal
-	growthstages = 4
-
 /obj/item/weapon/reagent_containers/food/snacks/grown/telriis_clump
 	name = "telriis grass"
 	desc = "A clump of telriis grass, not recommended for consumption by sentients."
@@ -27,24 +9,6 @@
 		reagents.add_reagent("nutriment", potency)
 		bitesize = 1+round(reagents.total_volume / 2, 1)
 
-
-/obj/item/seeds/thaadra
-	name = "pack of thaa'dra seeds"
-	desc = "These seeds grow into Thaa'dra lichen. Likes the cold."
-	icon_state = "seed-alien3"
-	mypath = "/obj/item/seeds/thaadra"
-	species = "thaadra"
-	plantname = "Thaa'dra lichen"
-	productname = "/obj/item/weapon/reagent_containers/food/snacks/grown/thaadra"
-	lifespan = 20
-	endurance = 10
-	maturation = 5
-	production = 9
-	yield = 2
-	potency = 5
-	plant_type = 2
-	growthstages = 4
-
 /obj/item/weapon/reagent_containers/food/snacks/grown/thaadrabloom
 	name = "thaa'dra bloom"
 	desc = "Looks chewy, might be good to eat."
@@ -56,23 +20,6 @@
 		reagents.add_reagent("nutriment", potency)
 		bitesize = 1+round(reagents.total_volume / 2, 1)
 
-
-/obj/item/seeds/jurlmah
-	name = "pack of jurl'mah seeds"
-	desc = "These seeds grow into jurl'mah reeds, which produce large syrupy pods."
-	icon_state = "seed-alien3"
-	mypath = "/obj/item/seeds/jurlmah"
-	species = "jurlmah"
-	plantname = "jurl'mah reeds"
-	productname = "/obj/item/weapon/reagent_containers/food/snacks/grown/jurlmah"
-	lifespan = 20
-	endurance = 12
-	maturation = 8
-	production = 9
-	yield = 3
-	potency = 10
-	growthstages = 5
-
 /obj/item/weapon/reagent_containers/food/snacks/grown/jurlmah
 	name = "jurl'mah pod"
 	desc = "Bulbous and veiny, it appears to pulse slightly as you look at it."
@@ -84,23 +31,6 @@
 		reagents.add_reagent("nutriment", potency)
 		bitesize = 1+round(reagents.total_volume / 2, 1)
 
-
-/obj/item/seeds/amauri
-	name = "pack of amauri seeds"
-	desc = "Grows into a straight, dark plant with small round fruit."
-	icon_state = "seed-alien3"
-	mypath = "/obj/item/seeds/amauri"
-	species = "amauri"
-	plantname = "amauri plant"
-	productname = "/obj/item/weapon/reagent_containers/food/snacks/grown/amauri"
-	lifespan = 30
-	endurance = 10
-	maturation = 8
-	production = 9
-	yield = 4
-	potency = 10
-	growthstages = 3
-
 /obj/item/weapon/reagent_containers/food/snacks/grown/amauri
 	name = "amauri fruit"
 	desc = "It is small, round and hard. Its skin is a thick dark purple."
@@ -113,23 +43,6 @@
 		reagents.add_reagent("nutriment", potency)
 		bitesize = 1+round(reagents.total_volume / 2, 1)
 
-
-/obj/item/seeds/gelthi
-	name = "pack of gelthi seeds"
-	desc = "Grows into a bright, wavy plant with many small fruits."
-	icon_state = "seed-alien2"
-	mypath = "/obj/item/seeds/gelthi"
-	species = "gelthi"
-	plantname = "gelthi plant"
-	productname = "/obj/item/weapon/reagent_containers/food/snacks/grown/gelthi"
-	lifespan = 20
-	endurance = 15
-	maturation = 6
-	production = 6
-	yield = 2
-	potency = 1
-	growthstages = 3
-
 /obj/item/weapon/reagent_containers/food/snacks/grown/gelthi
 	name = "gelthi berries"
 	desc = "They feel fluffy and slightly warm to the touch."
@@ -143,23 +56,6 @@
 		reagents.add_reagent("nutriment", potency)
 		bitesize = 1+round(reagents.total_volume / 2, 1)
 
-
-/obj/item/seeds/vale
-	name = "pack of vale seeds"
-	desc = "The vale bush is often depicted in ancient heiroglyphs and is similar to cherry blossoms."
-	icon_state = "seed-alien2"
-	mypath = "/obj/item/seeds/vale"
-	species = "vale"
-	plantname = "vale bush"
-	productname = "/obj/item/weapon/reagent_containers/food/snacks/grown/vale"
-	lifespan = 25
-	endurance = 15
-	maturation = 8
-	production = 10
-	yield = 3
-	potency = 3
-	growthstages = 4
-
 /obj/item/weapon/reagent_containers/food/snacks/grown/vale
 	name = "vale leaves"
 	desc = "Small, curly leaves covered in a soft pale fur."
@@ -172,23 +68,6 @@
 		reagents.add_reagent("nutriment", potency)
 		bitesize = 1+round(reagents.total_volume / 2, 1)
 
-
-/obj/item/seeds/surik
-	name = "pack of surik seeds"
-	desc = "A spiky blue vine with large fruit resembling pig ears."
-	icon_state = "seed-alien3"
-	mypath = "/obj/item/seeds/surik"
-	species = "surik"
-	plantname = "surik vine"
-	productname = "/obj/item/weapon/reagent_containers/food/snacks/grown/surik"
-	lifespan = 30
-	endurance = 18
-	maturation = 7
-	production = 7
-	yield = 3
-	potency = 3
-	growthstages = 4
-
 /obj/item/weapon/reagent_containers/food/snacks/grown/surik
 	name = "surik fruit"
 	desc = "Multiple layers of blue skin peeling away to reveal a spongey core, vaguely resembling an ear."
@@ -199,4 +78,4 @@
 		reagents.add_reagent("impedrezene", potency * 3)
 		reagents.add_reagent("synaptizine", potency * 2)
 		reagents.add_reagent("nutriment", potency)
-		bitesize = 1+round(reagents.total_volume / 2, 1)
+		bitesize = 1+round(reagents.total_volume / 2, 1)

code/setup.dm

@@ -713,7 +713,7 @@ var/list/TAGGERLOCATIONS = list("Disposals",
 #define BE_ALIEN		64
 #define BE_PAI			128
 #define BE_CULTIST		256
-#define BE_MONKEY		512
+#define BE_PLANT		512
 #define BE_NINJA		1024
 #define BE_VOX			2048
 #define BE_SLIME		4096
@@ -730,7 +730,7 @@ var/list/be_special_flags = list(
 	"Xenomorph" = BE_ALIEN,
 	"pAI" = BE_PAI,
 	"Cultist" = BE_CULTIST,
-	"Monkey" = BE_MONKEY,
+	"Plant" = BE_PLANT,
 	"Ninja" = BE_NINJA,
 	"Vox" = BE_VOX,
 	"Slime" = BE_SLIME,