Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into outpost-power

code/modules/admin/admin.dm

@@ -993,6 +993,32 @@ var/global/floorIsLava = 0
 		else
 			return "Error: Invalid sabotage target: [target]"
 */
+
+/datum/admins/proc/spawn_fruit()
+	set category = "Debug"
+	set desc = "Spawn the product of a seed."
+	set name = "Spawn Fruit"
+
+	if(!check_rights(R_SPAWN))	return
+
+	var/seedtype = input("Select a seed type", "Spawn Fruit") as null|anything in plant_controller.seeds
+	if(!seedtype || !plant_controller.seeds[seedtype])
+		return
+	var/datum/seed/S = plant_controller.seeds[seedtype]
+	S.harvest(usr,0,0,1)
+
+/datum/admins/proc/spawn_plant()
+	set category = "Debug"
+	set desc = "Spawn a spreading plant effect."
+	set name = "Spawn Plant"
+
+	if(!check_rights(R_SPAWN))	return
+
+	var/seedtype = input("Select a seed type", "Spawn Plant") as null|anything in plant_controller.seeds
+	if(!seedtype || !plant_controller.seeds[seedtype])
+		return
+	new /obj/effect/plant(get_turf(usr), plant_controller.seeds[seedtype])
+
 /datum/admins/proc/spawn_atom(var/object as text)
 	set category = "Debug"
 	set desc = "(atom path) Spawn an atom"

code/modules/admin/admin_verbs.dm

@@ -107,6 +107,8 @@ var/list/admin_verbs_fun = list(
 	/client/proc/editappear
 	)
 var/list/admin_verbs_spawn = list(
+	/datum/admins/proc/spawn_fruit,
+	/datum/admins/proc/spawn_plant,
 	/datum/admins/proc/spawn_atom,		/*allows us to spawn instances*/
 	/client/proc/respawn_character,
 	/client/proc/FireLaser,

code/modules/admin/topic.dm

@@ -2432,11 +2432,6 @@
 				var/show_log = alert(usr, "Show ion message?", "Message", "Yes", "No")
 				if(show_log == "Yes")
 					command_announcement.Announce("Ion storm detected near the station. Please check all AI-controlled equipment for errors.", "Anomaly Alert", new_sound = 'sound/AI/ionstorm.ogg')
-			if("spacevines")
-				feedback_inc("admin_secrets_fun_used",1)
-				feedback_add_details("admin_secrets_fun_used","K")
-				new /datum/event/spacevine
-				message_admins("[key_name_admin(usr)] has spawned spacevines", 1)
 			if("onlyone")
 				feedback_inc("admin_secrets_fun_used",1)
 				feedback_add_details("admin_secrets_fun_used","OO")

code/modules/admin/verbs/debug.dm

@@ -662,7 +662,6 @@ But you can call procs that are of type /mob/living/carbon/human/proc/ for that
 			M.equip_to_slot_or_del(new /obj/item/device/radio/headset(M), slot_l_ear)
 			M.equip_to_slot_or_del(new /obj/item/clothing/glasses/thermal/monocle(M), slot_glasses)
 			M.equip_to_slot_or_del(new /obj/item/clothing/suit/chaplain_hoodie(M), slot_wear_suit)
-			M.equip_to_slot_or_del(new /obj/item/weapon/reagent_containers/food/snacks/grown/banana(M), slot_l_store)
 			M.equip_to_slot_or_del(new /obj/item/weapon/bikehorn(M), slot_r_store)
 
 			var/obj/item/weapon/card/id/W = new(M)

code/modules/alarm/alarm.dm

@@ -0,0 +1,138 @@
+#define ALARM_RESET_DELAY 100 // How long will the alarm/trigger remain active once origin/source has been found to be gone?
+
+/datum/alarm_source
+	var/source		= null	// The source trigger
+	var/source_name = ""	// The name of the source should it be lost (for example a destroyed camera)
+	var/duration	= 0		// How long this source will be alarming, 0 for indefinetely.
+	var/severity 	= 1		// How severe the alarm from this source is.
+	var/start_time	= 0		// When this source began alarming.
+	var/end_time	= 0		// Use to set when this trigger should clear, in case the source is lost.
+
+/datum/alarm_source/New(var/atom/source)
+	src.source = source
+	start_time = world.time
+	source_name = source.get_source_name()
+
+/datum/alarm
+	var/atom/origin					//Used to identify the alarm area.
+	var/list/sources = new()		//List of sources triggering the alarm. Used to determine when the alarm should be cleared.
+	var/list/sources_assoc = new()	//Associative list of source triggers. Used to efficiently acquire the alarm source.
+	var/list/cameras				//List of cameras that can be switched to, if the player has that capability.
+	var/area/last_area				//The last acquired area, used should origin be lost (for example a destroyed borg containing an alarming camera).
+	var/area/last_name				//The last acquired name, used should origin be lost
+	var/area/last_camera_area		//The last area in which cameras where fetched, used to see if the camera list should be updated.
+	var/end_time					//Used to set when this alarm should clear, in case the origin is lost.
+
+/datum/alarm/New(var/atom/origin, var/atom/source, var/duration, var/severity)
+	src.origin = origin
+
+	cameras()	// Sets up both cameras and last alarm area.
+	set_source_data(source, duration, severity)
+
+/datum/alarm/proc/process()
+	// Has origin gone missing?
+	if(!origin && !end_time)
+		end_time = world.time + ALARM_RESET_DELAY
+	for(var/datum/alarm_source/AS in sources)
+		// Has the alarm passed its best before date?
+		if((AS.end_time && world.time > AS.end_time) || (AS.duration && world.time > (AS.start_time + AS.duration)))
+			sources -= AS
+		// Has the source gone missing?	Then reset the normal duration and set end_time
+		if(!AS.source && !AS.end_time)	// end_time is used instead of duration to ensure the reset doesn't remain in the future indefinetely.
+			AS.duration = 0
+			AS.end_time = world.time + ALARM_RESET_DELAY
+
+/datum/alarm/proc/set_source_data(var/atom/source, var/duration, var/severity)
+	var/datum/alarm_source/AS = sources_assoc[source]
+	if(!AS)
+		AS = new/datum/alarm_source(source)
+		sources += AS
+		sources_assoc[source] = AS
+	// Currently only non-0 durations can be altered (normal alarms VS EMP blasts)
+	if(AS.duration)
+		duration = SecondsToTicks(duration)
+		AS.duration = duration
+	AS.severity = severity
+
+/datum/alarm/proc/clear(var/source)
+	var/datum/alarm_source/AS = sources_assoc[source]
+	sources -= AS
+	sources_assoc -= source
+
+/datum/alarm/proc/alarm_area()
+	if(!origin)
+		return last_area
+
+	last_area = origin.get_alarm_area()
+	return last_area
+
+/datum/alarm/proc/alarm_name()
+	if(!origin)
+		return last_name
+
+	last_name = origin.get_alarm_name()
+	return last_name
+
+/datum/alarm/proc/cameras()
+	// If the alarm origin has changed area, for example a borg containing an alarming camera, reset the list of cameras
+	if(cameras && (last_camera_area != alarm_area()))
+		cameras = null
+
+	// The list of cameras is also reset by /proc/invalidateCameraCache()
+	if(!cameras)
+		cameras = origin ? origin.get_alarm_cameras() : last_area.get_alarm_cameras()
+
+	last_camera_area = last_area
+	return cameras
+
+/datum/alarm/proc/max_severity()
+	var/max_severity = 0
+	for(var/datum/alarm_source/AS in sources)
+		max_severity = max(AS.severity, max_severity)
+
+	return max_severity
+
+/******************
+* Assisting procs *
+******************/
+/atom/proc/get_alarm_area()
+	var/area/A = get_area(src)
+	return A.master
+
+/area/get_alarm_area()
+	return src.master
+
+/atom/proc/get_alarm_name()
+	var/area/A = get_area(src)
+	return A.master.name
+
+/area/get_alarm_name()
+	return master.name
+
+/mob/get_alarm_name()
+	return name
+
+/atom/proc/get_source_name()
+	return name
+
+/obj/machinery/camera/get_source_name()
+	return c_tag
+
+/atom/proc/get_alarm_cameras()
+	var/area/A = get_area(src)
+	return A.get_cameras()
+
+/area/get_alarm_cameras()
+	return get_cameras()
+
+/mob/living/silicon/robot/get_alarm_cameras()
+	var/list/cameras = ..()
+	if(camera)
+		cameras += camera
+
+	return cameras
+
+/mob/living/silicon/robot/syndicate/get_alarm_cameras()
+	return list()
+
+#undef ALARM_LOSS_DELAY

code/modules/alarm/alarm_handler.dm

@@ -0,0 +1,99 @@
+#define ALARM_RAISED 1
+#define ALARM_CLEARED 0
+
+/datum/alarm_handler
+	var/category = ""
+	var/list/datum/alarm/alarms = new		// All alarms, to handle cases when an origin has been deleted with one or more active alarms
+	var/list/datum/alarm/alarms_assoc = new	// Associative list of alarms, to efficiently acquire them based on origin.
+	var/list/listeners = new				// A list of all objects interested in alarm changes.
+
+/datum/alarm_handler/proc/process()
+	for(var/datum/alarm/A in alarms)
+		A.process()
+		check_alarm_cleared(A)
+
+/datum/alarm_handler/proc/triggerAlarm(var/atom/origin, var/atom/source, var/duration = 0, var/severity = 1)
+	var/new_alarm
+	//Proper origin and source mandatory
+	if(!(origin && source))
+		return
+	origin = origin.get_alarm_origin()
+
+	new_alarm = 0
+	//see if there is already an alarm of this origin
+	var/datum/alarm/existing = alarms_assoc[origin]
+	if(existing)
+		existing.set_source_data(source, duration, severity)
+	else
+		existing = new/datum/alarm(origin, source, duration, severity)
+		new_alarm = 1
+
+	alarms |= existing
+	alarms_assoc[origin] = existing
+	if(new_alarm)
+		alarms = dd_sortedObjectList(alarms)
+		on_alarm_change(existing, ALARM_RAISED)
+
+	return new_alarm
+
+/datum/alarm_handler/proc/clearAlarm(var/atom/origin, var/source)
+	//Proper origin and source mandatory
+	if(!(origin && source))
+		return
+	origin = origin.get_alarm_origin()
+
+	var/datum/alarm/existing = alarms_assoc[origin]
+	if(existing)
+		existing.clear(source)
+		return check_alarm_cleared(existing)
+
+/datum/alarm_handler/proc/major_alarms()
+	return alarms
+
+/datum/alarm_handler/proc/minor_alarms()
+	return alarms
+
+/datum/alarm_handler/proc/check_alarm_cleared(var/datum/alarm/alarm)
+	if ((alarm.end_time && world.time > alarm.end_time) || !alarm.sources.len)
+		alarms -= alarm
+		alarms_assoc -= alarm.origin
+		on_alarm_change(alarm, ALARM_CLEARED)
+		return 1
+	return 0
+
+/datum/alarm_handler/proc/on_alarm_change(var/datum/alarm/alarm, var/was_raised)
+	for(var/obj/machinery/camera/C in alarm.cameras())
+		if(was_raised)
+			C.network.Add(category)
+			invalidateCameraCache()
+		else
+			C.network.Remove(category)
+	notify_listeners(alarm, was_raised)
+
+/datum/alarm_handler/proc/get_alarm_severity_for_origin(var/atom/origin)
+	if(!origin)
+		return
+
+	origin = origin.get_alarm_origin()
+	var/datum/alarm/existing = alarms_assoc[origin]
+	if(!existing)
+		return
+
+	return existing.max_severity()
+
+/atom/proc/get_alarm_origin()
+	return src
+
+/turf/get_alarm_origin()
+	var/area/area = get_area(src)
+	return area.master	// Very important to get area.master, as dynamic lightning can and will split areas.
+
+/datum/alarm_handler/proc/register(var/object, var/procName)
+	listeners[object] = procName
+
+/datum/alarm_handler/proc/unregister(var/object)
+	listeners -= object
+
+/datum/alarm_handler/proc/notify_listeners(var/alarm, var/was_raised)
+	for(var/listener in listeners)
+		call(listener, listeners[listener])(src, alarm, was_raised)

code/modules/alarm/atmosphere_alarm.dm

@@ -0,0 +1,19 @@
+/datum/alarm_handler/atmosphere
+	category = "Atmosphere Alarms"
+
+/datum/alarm_handler/atmosphere/triggerAlarm(var/atom/origin, var/atom/source, var/duration = 0, var/severity = 1)
+	..()
+
+/datum/alarm_handler/atmosphere/major_alarms()
+	var/list/major_alarms = new()
+	for(var/datum/alarm/A in alarms)
+		if(A.max_severity() > 1)
+			major_alarms.Add(A)
+	return major_alarms
+
+/datum/alarm_handler/atmosphere/minor_alarms()
+	var/list/minor_alarms = new()
+	for(var/datum/alarm/A in alarms)
+		if(A.max_severity() == 1)
+			minor_alarms.Add(A)
+	return minor_alarms

code/modules/alarm/camera_alarm.dm

@@ -0,0 +1,2 @@
+/datum/alarm_handler/camera
+	category = "Camera Alarms"

code/modules/alarm/fire_alarm.dm

@@ -0,0 +1,11 @@
+/datum/alarm_handler/fire
+	category = "Fire Alarms"
+
+/datum/alarm_handler/fire/on_alarm_change(var/datum/alarm/alarm, var/was_raised)
+	var/area/A = alarm.origin
+	if(istype(A))
+		if(was_raised)
+			A.fire_alert()
+		else
+			A.fire_reset()
+	..()

code/modules/alarm/motion_alarm.dm

@@ -0,0 +1,2 @@
+/datum/alarm_handler/motion
+	category = "Motion Alarms"

code/modules/alarm/power_alarm.dm

@@ -0,0 +1,10 @@
+/datum/alarm_handler/power
+	category = "Power Alarms"
+
+/datum/alarm_handler/power/on_alarm_change(var/datum/alarm/alarm, var/was_raised)
+	var/area/A = alarm.origin
+	if(istype(A))
+		A.power_alert(was_raised)
+	..()
+
+/area/proc/power_alert(var/alarming)

code/modules/clothing/clothing.dm

@@ -360,6 +360,9 @@ BLIND     // can't see anything
 	species_restricted = list("exclude","Unathi","Tajara")
 	sprite_sheets = list("Vox" = 'icons/mob/species/vox/shoes.dmi')
 
+/obj/item/clothing/shoes/proc/handle_movement(var/turf/walking, var/running)
+	return
+
 /obj/item/clothing/shoes/update_clothing_icon()
 	if (ismob(src.loc))
 		var/mob/M = src.loc

code/modules/clothing/shoes/miscellaneous.dm

@@ -71,6 +71,16 @@
 	var/footstep = 1	//used for squeeks whilst walking
 	species_restricted = null
 
+/obj/item/clothing/shoes/clown_shoes/handle_movement(var/turf/walking, var/running)
+	if(running)
+		if(footstep >= 2)
+			footstep = 0
+			playsound(src, "clownstep", 50, 1) // this will get annoying very fast.
+		else
+			footstep++
+	else
+		playsound(src, "clownstep", 20, 1)
+
 /obj/item/clothing/shoes/jackboots
 	name = "jackboots"
 	desc = "Nanotrasen-issue Security combat boots for combat scenarios or combat situations. All combat, all the time."

code/modules/clothing/spacesuits/rig/suits/merc.dm

@@ -24,4 +24,11 @@
 		/obj/item/rig_module/electrowarfare_suite,
 		/obj/item/rig_module/chem_dispenser/combat,
 		/obj/item/rig_module/fabricator/energy_net
+		)
+
+//Has most of the modules removed
+/obj/item/weapon/rig/merc/empty
+	initial_modules = list(
+		/obj/item/rig_module/ai_container,
+		/obj/item/rig_module/electrowarfare_suite, //might as well
 		)

code/modules/distillery/main.dm

@@ -1,268 +0,0 @@
-// This dreammaker file includes the food processing machines:
-// - I.   Mill
-// - II.  Fermenter
-// - III. Still
-// - IV.  Squeezer
-// - V.   Centrifuge
-
-// I. The mill is intended to be loaded with produce and returns ground up items. For example: Wheat should become flour and grapes should become raisins.
-/obj/machinery/mill
-	var/list/obj/item/weapon/reagent_containers/food/input  = list()
-	var/list/obj/item/weapon/reagent_containers/food/output = list()
-	var/obj/item/weapon/reagent_containers/food/milled_item
-	var/busy     = 0
-	var/progress = 0
-	var/error    = 0
-	name = "\improper Mill"
-	desc = "It is a machine that grinds produce."
-	icon_state = "autolathe"
-	density   = 1
-	anchored  = 1
-	use_power = 1
-	idle_power_usage   = 10
-	active_power_usage = 1000
-
-/obj/machinery/mill/process()
-	if (error)
-		return
-	
-	if (!busy)
-		use_power = 1
-		if (input.len)
-			milled_item = input[1]
-			input -= milled_item
-			progress = 0
-			busy = 1
-			use_power = 2
-		return
-	
-	progress++
-	if (progress < 10) // Edit this value to make milling faster or slower.
-		return // Not done yet.
-	
-	switch (milled_item.type)
-		if (/obj/item/weapon/reagent_containers/food/snacks/grown/wheat) // Wheat becomes flour.
-			var/obj/item/weapon/reagent_containers/food/snacks/flour/F = new(src)
-			output += F
-		if (/obj/item/weapon/reagent_containers/food/snacks/flour) // Flour is still flour.
-			var/obj/item/weapon/reagent_containers/food/snacks/flour/F = new(src)
-			output += F
-		else
-			error = 1
-	
-	del(milled_item)
-	busy = 0
-
-/obj/machinery/mill/attackby(var/obj/item/weapon/W as obj, mob/user as mob)
-	if (istype(W,/obj/item/weapon/reagent_containers/food))
-		user.u_equip(W)
-		W.loc = src
-		input += W
-	else
-		..()
-
-/obj/machinery/mill/attack_hand(var/mob/user as mob)
-	for (var/obj/item/weapon/reagent_containers/food/F in output)
-		F.loc = src.loc
-		output -= F
-
-// II. The fermenter is intended to be loaded with food items and returns medium-strength alcohol items, sucha s wine and beer.
-/obj/machinery/fermenter
-	var/list/obj/item/weapon/reagent_containers/food/input = list()
-	var/list/obj/item/weapon/reagent_containers/food/output = list()
-	var/obj/item/weapon/reagent_containers/food/fermenting_item
-	var/water_level = 0
-	var/busy = 0
-	var/progress = 0
-	var/error = 0
-	name = "\improper Fermenter"
-	desc = "It is a machine that ferments produce into alcoholic drinks."
-	icon_state = "autolathe"
-	density = 1
-	anchored = 1
-	use_power = 1
-	idle_power_usage = 10
-	active_power_usage = 500
-
-/obj/machinery/fermenter/process()
-	if (error)
-		return
-	
-	if (!busy)
-		use_power = 1
-		if (input.len)
-			fermenting_item = input[1]
-			input -= fermenting_item
-			progress = 0
-			busy = 1
-			use_power = 2
-		return
-	
-	if (!water_level)
-		return
-	
-	water_level--
-	
-	progress++
-	if (progress < 10) // Edit this value to make milling faster or slower.
-		return // Not done yet.
-	
-	switch (fermenting_item.type)
-		if (/obj/item/weapon/reagent_containers/food/snacks/flour) // Flour is still flour.
-			var/obj/item/weapon/reagent_containers/food/drinks/cans/beer/B = new(src)
-			output += B
-		else
-			error = 1
-	
-	del(fermenting_item)
-	busy = 0
-
-/obj/machinery/fermenter/attackby(var/obj/item/weapon/W as obj, mob/user as mob)
-	if (istype(W,/obj/item/weapon/reagent_containers/food))
-		user.u_equip(W)
-		W.loc = src
-		input += W
-	else
-		..()
-
-/obj/machinery/fermenter/attack_hand(var/mob/user as mob)
-	for (var/obj/item/weapon/reagent_containers/food/F in output)
-		F.loc = src.loc
-		output -= F
-
-// III. The still is a machine that is loaded with food items and returns hard liquor, such as vodka.
-/obj/machinery/still
-	var/list/obj/item/weapon/reagent_containers/food/input  = list()
-	var/list/obj/item/weapon/reagent_containers/food/output = list()
-	var/obj/item/weapon/reagent_containers/food/distilling_item
-	var/busy     = 0
-	var/progress = 0
-	var/error    = 0
-	name = "\improper Still"
-	desc = "It is a machine that produces hard liquor from alcoholic drinks."
-	icon_state = "autolathe"
-	density   = 1
-	anchored  = 1
-	use_power = 1
-	idle_power_usage = 10
-	active_power_usage = 10000
-
-/obj/machinery/still/process()
-	if (error)
-		return
-	
-	if (!busy)
-		use_power = 1
-		if (input.len)
-			distilling_item = input[1]
-			input -= distilling_item
-			progress = 0
-			busy = 1
-			use_power = 2
-		return
-	
-	progress++
-	if (progress < 10) // Edit this value to make distilling faster or slower.
-		return // Not done yet.
-	
-	switch (distilling_item.type)
-		if (/obj/item/weapon/reagent_containers/food/drinks/cans/beer) // Flour is still flour.
-			var/obj/item/weapon/reagent_containers/food/drinks/bottle/vodka/V = new(src)
-			output += V
-		else
-			error = 1
-	
-	del(distilling_item)
-	busy = 0
-
-/obj/machinery/still/attackby(var/obj/item/weapon/W as obj, mob/user as mob)
-	if (istype(W,/obj/item/weapon/reagent_containers/food))
-		user.u_equip(W)
-		W.loc = src
-		input += W
-	else
-		..()
-
-/obj/machinery/still/attack_hand(var/mob/user as mob)
-	for (var/obj/item/weapon/reagent_containers/food/F in output)
-		F.loc = src.loc
-		output -= F
-
-// IV. The squeezer is intended to destroy inserted food items, but return some of the reagents they contain.
-/obj/machinery/squeezer
-	var/list/obj/item/weapon/reagent_containers/food/input = list()
-	var/obj/item/weapon/reagent_containers/food/squeezed_item
-	var/water_level = 0
-	var/busy        = 0
-	var/progress    = 0
-	var/error       = 0
-	name = "\improper Squeezer"
-	desc = "It is a machine that squeezes extracts from produce."
-	icon_state = "autolathe"
-	density   = 1
-	anchored  = 1
-	use_power = 1
-	idle_power_usage   = 10
-	active_power_usage = 500
-
-// V. The centrifuge spins inserted food items. It is intended to squeeze out the reagents that are common food catalysts (enzymes currently)
-/obj/machinery/centrifuge
-	var/list/obj/item/weapon/reagent_containers/food/input = list()
-	var/list/obj/item/weapon/reagent_containers/food/output = list()
-	var/obj/item/weapon/reagent_containers/food/spinning_item
-	var/busy     = 0
-	var/progress = 0
-	var/error    = 0
-	var/enzymes  = 0
-	var/water    = 0
-	name = "\improper Centrifuge"
-	desc = "It is a machine that spins produce."
-	icon_state = "autolathe"
-	density   = 1
-	anchored  = 1
-	use_power = 1
-	idle_power_usage   = 10
-	active_power_usage = 10000
-
-/obj/machinery/centrifuge/process()
-	if (error)
-		return
-	
-	if (!busy)
-		use_power = 1
-		if (input.len)
-			spinning_item = input[1]
-			input -= spinning_item
-			progress = 0
-			busy = 1
-			use_power = 2
-		return
-	
-	progress++
-	if (progress < 10) // Edit this value to make milling faster or slower.
-		return // Not done yet.
-	
-	var/transfer_enzymes = spinning_item.reagents.get_reagent_amount("enzyme")
-	
-	if (transfer_enzymes)
-		enzymes += transfer_enzymes
-		spinning_item.reagents.remove_reagent("enzyme",transfer_enzymes)
-	
-	output += spinning_item
-	busy = 0
-
-/obj/machinery/centrifuge/attackby(var/obj/item/weapon/W as obj, mob/user as mob)
-	if (istype(W,/obj/item/weapon/reagent_containers/food))
-		user.u_equip(W)
-		W.loc = src
-		input += W
-	else
-		..()
-
-/obj/machinery/centrifuge/attack_hand(var/mob/user as mob)
-	for (var/obj/item/weapon/reagent_containers/food/F in output)
-		F.loc = src.loc
-		output -= F
-	while (enzymes >= 50)
-		enzymes -= 50
-		new/obj/item/weapon/reagent_containers/food/condiment/enzyme(src.loc)

code/modules/events/spacevine.dm

@@ -1,9 +1,5 @@
 /var/global/spacevines_spawned = 0
 
 /datum/event/spacevine/start()
-	//biomass is basically just a resprited version of space vines
-	if(prob(50))
-		spacevine_infestation()
-	else
-		biomass_infestation()
+	spacevine_infestation()
 	spacevines_spawned = 1

code/modules/food/recipes_microwave.dm

@@ -34,24 +34,11 @@ I said no!
 	result = /obj/item/weapon/reagent_containers/food/snacks/boiledegg
 
 /datum/recipe/dionaroast
+	fruit = list("apple" = 1)
 	reagents = list("pacid" = 5) //It dissolves the carapace. Still poisonous, though.
-	items = list(
-		/obj/item/weapon/holder/diona,
-		/obj/item/weapon/reagent_containers/food/snacks/grown/apple
-	)
+	items = list(/obj/item/weapon/holder/diona)
 	result = /obj/item/weapon/reagent_containers/food/snacks/dionaroast
 
-
-/*
-/datum/recipe/bananaphone
-	reagents = list("psilocybin" = 5) //Trippin' balls, man.
-	items = list(
-		/obj/item/weapon/reagent_containers/food/snacks/grown/banana,
-		/obj/item/device/radio
-	)
-	result = /obj/item/weapon/reagent_containers/food/snacks/bananaphone
-*/
-
 /datum/recipe/jellydonut
 	reagents = list("berryjuice" = 5, "sugar" = 5)
 	items = list(
@@ -80,7 +67,7 @@ I said no!
 	)
 	result = /obj/item/weapon/reagent_containers/food/snacks/donut/normal
 
-/datum/recipe/human/burger
+/datum/recipe/humanburger
 	items = list(
 		/obj/item/weapon/reagent_containers/food/snacks/meat/human,
 		/obj/item/weapon/reagent_containers/food/snacks/bun
@@ -110,7 +97,7 @@ I said no!
 
 /datum/recipe/roburger
 	items = list(
-		/obj/item/weapon/reagent_containers/food/snacks/flour,
+		/obj/item/weapon/reagent_containers/food/snacks/bun,
 		/obj/item/robot_parts/head
 	)
 	result = /obj/item/weapon/reagent_containers/food/snacks/roburger
@@ -146,8 +133,7 @@ I said no!
 /datum/recipe/clownburger
 	items = list(
 		/obj/item/weapon/reagent_containers/food/snacks/bun,
-		/obj/item/clothing/mask/gas/clown_hat,
-		/* /obj/item/weapon/reagent_containers/food/snacks/grown/banana, */
+		/obj/item/clothing/mask/gas/clown_hat
 	)
 	result = /obj/item/weapon/reagent_containers/food/snacks/clownburger
 
@@ -241,12 +227,12 @@ I said no!
 	result = /obj/item/weapon/reagent_containers/food/snacks/sliceable/xenomeatbread
 
 /datum/recipe/bananabread
+	fruit = list("banana" = 1)
 	reagents = list("milk" = 5, "sugar" = 15)
 	items = list(
 		/obj/item/weapon/reagent_containers/food/snacks/dough,
 		/obj/item/weapon/reagent_containers/food/snacks/dough,
-		/obj/item/weapon/reagent_containers/food/snacks/dough,
-		/obj/item/weapon/reagent_containers/food/snacks/grown/banana,
+		/obj/item/weapon/reagent_containers/food/snacks/dough
 	)
 	result = /obj/item/weapon/reagent_containers/food/snacks/sliceable/bananabread
 
@@ -267,64 +253,26 @@ I said no!
 	result = /obj/item/weapon/reagent_containers/food/snacks/muffin
 
 /datum/recipe/eggplantparm
+	fruit = list("eggplant" = 1)
 	items = list(
 		/obj/item/weapon/reagent_containers/food/snacks/cheesewedge,
-		/obj/item/weapon/reagent_containers/food/snacks/cheesewedge,
-		/obj/item/weapon/reagent_containers/food/snacks/grown/eggplant
-	)
+		/obj/item/weapon/reagent_containers/food/snacks/cheesewedge
+		)
 	result = /obj/item/weapon/reagent_containers/food/snacks/eggplantparm
 
 /datum/recipe/soylenviridians
-	items = list(
-		/obj/item/weapon/reagent_containers/food/snacks/flour,
-		/obj/item/weapon/reagent_containers/food/snacks/flour,
-		/obj/item/weapon/reagent_containers/food/snacks/flour,
-		/obj/item/weapon/reagent_containers/food/snacks/grown/soybeans
-	)
+	fruit = list("soybeans" = 1)
+	reagents = list("flour" = 10)
 	result = /obj/item/weapon/reagent_containers/food/snacks/soylenviridians
 
 /datum/recipe/soylentgreen
+	reagents = list("flour" = 10)
 	items = list(
-		/obj/item/weapon/reagent_containers/food/snacks/flour,
-		/obj/item/weapon/reagent_containers/food/snacks/flour,
-		/obj/item/weapon/reagent_containers/food/snacks/flour,
-		/obj/item/weapon/reagent_containers/food/snacks/meat/human,
 		/obj/item/weapon/reagent_containers/food/snacks/meat/human,
+		/obj/item/weapon/reagent_containers/food/snacks/meat/human
 	)
 	result = /obj/item/weapon/reagent_containers/food/snacks/soylentgreen
 
-/datum/recipe/carrotcake
-	reagents = list("milk" = 5, "sugar" = 15)
-	items = list(
-		/obj/item/weapon/reagent_containers/food/snacks/dough,
-		/obj/item/weapon/reagent_containers/food/snacks/dough,
-		/obj/item/weapon/reagent_containers/food/snacks/dough,
-		/obj/item/weapon/reagent_containers/food/snacks/grown/carrot,
-		/obj/item/weapon/reagent_containers/food/snacks/grown/carrot,
-		/obj/item/weapon/reagent_containers/food/snacks/grown/carrot,
-	)
-	result = /obj/item/weapon/reagent_containers/food/snacks/sliceable/carrotcake
-
-/datum/recipe/cheesecake
-	reagents = list("milk" = 5, "sugar" = 15)
-	items = list(
-		/obj/item/weapon/reagent_containers/food/snacks/dough,
-		/obj/item/weapon/reagent_containers/food/snacks/dough,
-		/obj/item/weapon/reagent_containers/food/snacks/dough,
-		/obj/item/weapon/reagent_containers/food/snacks/cheesewedge,
-		/obj/item/weapon/reagent_containers/food/snacks/cheesewedge,
-	)
-	result = /obj/item/weapon/reagent_containers/food/snacks/sliceable/cheesecake
-
-/datum/recipe/plaincake
-	reagents = list("milk" = 5, "sugar" = 15)
-	items = list(
-		/obj/item/weapon/reagent_containers/food/snacks/dough,
-		/obj/item/weapon/reagent_containers/food/snacks/dough,
-		/obj/item/weapon/reagent_containers/food/snacks/dough,
-	)
-	result = /obj/item/weapon/reagent_containers/food/snacks/sliceable/plaincake
-
 /datum/recipe/meatpie
 	items = list(
 		/obj/item/weapon/reagent_containers/food/snacks/sliceable/flatdough,
@@ -347,25 +295,23 @@ I said no!
 	result = /obj/item/weapon/reagent_containers/food/snacks/xemeatpie
 
 /datum/recipe/pie
+	fruit = list("banana" = 1)
 	reagents = list("sugar" = 5)
-	items = list(
-		/obj/item/weapon/reagent_containers/food/snacks/sliceable/flatdough,
-		/obj/item/weapon/reagent_containers/food/snacks/grown/banana,
-	)
+	items = list(/obj/item/weapon/reagent_containers/food/snacks/sliceable/flatdough)
 	result = /obj/item/weapon/reagent_containers/food/snacks/pie
 
 /datum/recipe/cherrypie
+	fruit = list("cherries" = 1)
 	reagents = list("sugar" = 10)
 	items = list(
 		/obj/item/weapon/reagent_containers/food/snacks/sliceable/flatdough,
-		/obj/item/weapon/reagent_containers/food/snacks/grown/cherries,
 	)
 	result = /obj/item/weapon/reagent_containers/food/snacks/cherrypie
 
 /datum/recipe/berryclafoutis
+	fruit = list("berries" = 1)
 	items = list(
 		/obj/item/weapon/reagent_containers/food/snacks/sliceable/flatdough,
-		/obj/item/weapon/reagent_containers/food/snacks/grown/berries,
 	)
 	result = /obj/item/weapon/reagent_containers/food/snacks/berryclafoutis
 
@@ -383,7 +329,7 @@ I said no!
 	)
 	result = /obj/item/weapon/reagent_containers/food/snacks/donut/chaos
 
-/datum/recipe/human/kabob
+/datum/recipe/humankabob
 	items = list(
 		/obj/item/stack/rods,
 		/obj/item/weapon/reagent_containers/food/snacks/meat/human,
@@ -430,10 +376,8 @@ I said no!
 	result = /obj/item/weapon/reagent_containers/food/snacks/sliceable/tofubread
 
 /datum/recipe/loadedbakedpotato
-	items = list(
-		/obj/item/weapon/reagent_containers/food/snacks/grown/potato,
-		/obj/item/weapon/reagent_containers/food/snacks/cheesewedge,
-	)
+	fruit = list("potato" = 1)
+	items = list(/obj/item/weapon/reagent_containers/food/snacks/cheesewedge)
 	result = /obj/item/weapon/reagent_containers/food/snacks/loadedbakedpotato
 
 /datum/recipe/cheesyfries
@@ -444,20 +388,17 @@ I said no!
 	result = /obj/item/weapon/reagent_containers/food/snacks/cheesyfries
 
 /datum/recipe/cubancarp
+	fruit = list("chili" = 1)
 	items = list(
 		/obj/item/weapon/reagent_containers/food/snacks/dough,
-		/obj/item/weapon/reagent_containers/food/snacks/grown/chili,
-		/obj/item/weapon/reagent_containers/food/snacks/carpmeat,
+		/obj/item/weapon/reagent_containers/food/snacks/carpmeat
 	)
 	result = /obj/item/weapon/reagent_containers/food/snacks/cubancarp
 
 /datum/recipe/popcorn
-	items = list(
-		/obj/item/weapon/reagent_containers/food/snacks/grown/corn
-	)
+	fruit = list("corn" = 1)
 	result = /obj/item/weapon/reagent_containers/food/snacks/popcorn
 
-
 /datum/recipe/cookie
 	reagents = list("milk" = 5, "sugar" = 5)
 	items = list(
@@ -490,91 +431,69 @@ I said no!
 
 /datum/recipe/meatsteak
 	reagents = list("sodiumchloride" = 1, "blackpepper" = 1)
-	items = list(
-		/obj/item/weapon/reagent_containers/food/snacks/meat
-	)
+	items = list(/obj/item/weapon/reagent_containers/food/snacks/meat)
 	result = /obj/item/weapon/reagent_containers/food/snacks/meatsteak
 
 /datum/recipe/syntisteak
 	reagents = list("sodiumchloride" = 1, "blackpepper" = 1)
-	items = list(
-		/obj/item/weapon/reagent_containers/food/snacks/meat/syntiflesh
-	)
+	items = list(/obj/item/weapon/reagent_containers/food/snacks/meat/syntiflesh)
 	result = /obj/item/weapon/reagent_containers/food/snacks/meatsteak
 
 /datum/recipe/pizzamargherita
+	fruit = list("tomato" = 1)
 	items = list(
 		/obj/item/weapon/reagent_containers/food/snacks/sliceable/flatdough,
 		/obj/item/weapon/reagent_containers/food/snacks/cheesewedge,
 		/obj/item/weapon/reagent_containers/food/snacks/cheesewedge,
 		/obj/item/weapon/reagent_containers/food/snacks/cheesewedge,
-		/obj/item/weapon/reagent_containers/food/snacks/cheesewedge,
-		/obj/item/weapon/reagent_containers/food/snacks/grown/tomato,
+		/obj/item/weapon/reagent_containers/food/snacks/cheesewedge
 	)
 	result = /obj/item/weapon/reagent_containers/food/snacks/sliceable/pizza/margherita
 
 /datum/recipe/meatpizza
+	fruit = list("tomato" = 1)
 	items = list(
 		/obj/item/weapon/reagent_containers/food/snacks/sliceable/flatdough,
 		/obj/item/weapon/reagent_containers/food/snacks/meat,
 		/obj/item/weapon/reagent_containers/food/snacks/meat,
 		/obj/item/weapon/reagent_containers/food/snacks/meat,
-		/obj/item/weapon/reagent_containers/food/snacks/cheesewedge,
-		/obj/item/weapon/reagent_containers/food/snacks/grown/tomato,
+		/obj/item/weapon/reagent_containers/food/snacks/cheesewedge
 	)
 	result = /obj/item/weapon/reagent_containers/food/snacks/sliceable/pizza/meatpizza
 
 /datum/recipe/syntipizza
+	fruit = list("tomato" = 1)
 	items = list(
 		/obj/item/weapon/reagent_containers/food/snacks/sliceable/flatdough,
 		/obj/item/weapon/reagent_containers/food/snacks/meat/syntiflesh,
 		/obj/item/weapon/reagent_containers/food/snacks/meat/syntiflesh,
 		/obj/item/weapon/reagent_containers/food/snacks/meat/syntiflesh,
-		/obj/item/weapon/reagent_containers/food/snacks/cheesewedge,
-		/obj/item/weapon/reagent_containers/food/snacks/grown/tomato,
+		/obj/item/weapon/reagent_containers/food/snacks/cheesewedge
 	)
 	result = /obj/item/weapon/reagent_containers/food/snacks/sliceable/pizza/meatpizza
 
 /datum/recipe/mushroompizza
+	fruit = list("mushroom" = 5, "tomato" = 1)
 	items = list(
 		/obj/item/weapon/reagent_containers/food/snacks/sliceable/flatdough,
-		/obj/item/weapon/reagent_containers/food/snacks/grown/mushroom,
-		/obj/item/weapon/reagent_containers/food/snacks/grown/mushroom,
-		/obj/item/weapon/reagent_containers/food/snacks/grown/mushroom,
-		/obj/item/weapon/reagent_containers/food/snacks/grown/mushroom,
-		/obj/item/weapon/reagent_containers/food/snacks/grown/mushroom,
-		/obj/item/weapon/reagent_containers/food/snacks/cheesewedge,
-		/obj/item/weapon/reagent_containers/food/snacks/grown/tomato,
+		/obj/item/weapon/reagent_containers/food/snacks/cheesewedge
 	)
 	result = /obj/item/weapon/reagent_containers/food/snacks/sliceable/pizza/mushroompizza
 
 /datum/recipe/vegetablepizza
+	fruit = list("eggplant" = 1, "carrot" = 1, "corn" = 1, "tomato" = 1)
 	items = list(
 		/obj/item/weapon/reagent_containers/food/snacks/sliceable/flatdough,
-		/obj/item/weapon/reagent_containers/food/snacks/grown/eggplant,
-		/obj/item/weapon/reagent_containers/food/snacks/grown/carrot,
-		/obj/item/weapon/reagent_containers/food/snacks/grown/corn,
-		/obj/item/weapon/reagent_containers/food/snacks/grown/tomato,
-		/obj/item/weapon/reagent_containers/food/snacks/cheesewedge,
+		/obj/item/weapon/reagent_containers/food/snacks/cheesewedge
 	)
 	result = /obj/item/weapon/reagent_containers/food/snacks/sliceable/pizza/vegetablepizza
 
 /datum/recipe/spacylibertyduff
-	reagents = list("water" = 5, "vodka" = 5)
-	items = list(
-		/obj/item/weapon/reagent_containers/food/snacks/grown/mushroom/libertycap,
-		/obj/item/weapon/reagent_containers/food/snacks/grown/mushroom/libertycap,
-		/obj/item/weapon/reagent_containers/food/snacks/grown/mushroom/libertycap,
-	)
+	reagents = list("water" = 5, "vodka" = 5, "psilocybin" = 5)
 	result = /obj/item/weapon/reagent_containers/food/snacks/spacylibertyduff
 
 /datum/recipe/amanitajelly
-	reagents = list("water" = 5, "vodka" = 5)
-	items = list(
-		/obj/item/weapon/reagent_containers/food/snacks/grown/mushroom/amanita,
-		/obj/item/weapon/reagent_containers/food/snacks/grown/mushroom/amanita,
-		/obj/item/weapon/reagent_containers/food/snacks/grown/mushroom/amanita,
-	)
+	reagents = list("water" = 5, "vodka" = 5, "amatoxin" = 5)
 	result = /obj/item/weapon/reagent_containers/food/snacks/amanitajelly
 	make_food(var/obj/container as obj)
 		var/obj/item/weapon/reagent_containers/food/snacks/amanitajelly/being_cooked = ..(container)
@@ -582,30 +501,21 @@ I said no!
 		return being_cooked
 
 /datum/recipe/meatballsoup
+	fruit = list("carrot" = 1, "potato" = 1)
 	reagents = list("water" = 10)
-	items = list(
-		/obj/item/weapon/reagent_containers/food/snacks/meatball ,
-		/obj/item/weapon/reagent_containers/food/snacks/grown/carrot,
-		/obj/item/weapon/reagent_containers/food/snacks/grown/potato,
-	)
+	items = list(/obj/item/weapon/reagent_containers/food/snacks/meatball)
 	result = /obj/item/weapon/reagent_containers/food/snacks/meatballsoup
 
 /datum/recipe/vegetablesoup
+	fruit = list("carrot" = 1, "potato" = 1, "corn" = 1, "eggplant" = 1)
 	reagents = list("water" = 10)
-	items = list(
-		/obj/item/weapon/reagent_containers/food/snacks/grown/carrot,
-		/obj/item/weapon/reagent_containers/food/snacks/grown/corn,
-		/obj/item/weapon/reagent_containers/food/snacks/grown/eggplant,
-		/obj/item/weapon/reagent_containers/food/snacks/grown/potato,
-	)
 	result = /obj/item/weapon/reagent_containers/food/snacks/vegetablesoup
 
 /datum/recipe/nettlesoup
+	fruit = list("nettle" = 1, "potato" = 1)
 	reagents = list("water" = 10)
 	items = list(
-		/obj/item/weapon/grown/nettle,
-		/obj/item/weapon/reagent_containers/food/snacks/grown/potato,
-		/obj/item/weapon/reagent_containers/food/snacks/egg,
+		/obj/item/weapon/reagent_containers/food/snacks/egg
 	)
 	result = /obj/item/weapon/reagent_containers/food/snacks/nettlesoup
 
@@ -614,33 +524,23 @@ I said no!
 	result= /obj/item/weapon/reagent_containers/food/snacks/wishsoup
 
 /datum/recipe/hotchili
-	items = list(
-		/obj/item/weapon/reagent_containers/food/snacks/meat,
-		/obj/item/weapon/reagent_containers/food/snacks/grown/chili,
-		/obj/item/weapon/reagent_containers/food/snacks/grown/tomato,
-	)
+	fruit = list("chili" = 1, "tomato" = 1)
+	items = list(/obj/item/weapon/reagent_containers/food/snacks/meat)
 	result = /obj/item/weapon/reagent_containers/food/snacks/hotchili
 
 /datum/recipe/coldchili
-	items = list(
-		/obj/item/weapon/reagent_containers/food/snacks/meat,
-		/obj/item/weapon/reagent_containers/food/snacks/grown/icepepper,
-		/obj/item/weapon/reagent_containers/food/snacks/grown/tomato,
-	)
+	fruit = list("icechili" = 1, "tomato" = 1)
+	items = list(/obj/item/weapon/reagent_containers/food/snacks/meat)
 	result = /obj/item/weapon/reagent_containers/food/snacks/coldchili
 
 /datum/recipe/amanita_pie
-	items = list(
-		/obj/item/weapon/reagent_containers/food/snacks/sliceable/flatdough,
-		/obj/item/weapon/reagent_containers/food/snacks/grown/mushroom/amanita,
-	)
+	reagents = list("amatoxin" = 5)
+	items = list(/obj/item/weapon/reagent_containers/food/snacks/sliceable/flatdough)
 	result = /obj/item/weapon/reagent_containers/food/snacks/amanita_pie
 
 /datum/recipe/plump_pie
-	items = list(
-		/obj/item/weapon/reagent_containers/food/snacks/sliceable/flatdough,
-		/obj/item/weapon/reagent_containers/food/snacks/grown/mushroom/plumphelmet,
-	)
+	fruit = list("plumphelmet" = 1)
+	items = list(/obj/item/weapon/reagent_containers/food/snacks/sliceable/flatdough)
 	result = /obj/item/weapon/reagent_containers/food/snacks/plump_pie
 
 /datum/recipe/spellburger
@@ -668,30 +568,24 @@ I said no!
 	result = /obj/item/weapon/reagent_containers/food/snacks/bigbiteburger
 
 /datum/recipe/enchiladas
-	items = list(
-		/obj/item/weapon/reagent_containers/food/snacks/cutlet,
-		/obj/item/weapon/reagent_containers/food/snacks/grown/chili,
-		/obj/item/weapon/reagent_containers/food/snacks/grown/chili,
-		/obj/item/weapon/reagent_containers/food/snacks/grown/corn,
-	)
+	fruit = list("chili" = 2, "corn" = 1)
+	items = list(/obj/item/weapon/reagent_containers/food/snacks/cutlet)
 	result = /obj/item/weapon/reagent_containers/food/snacks/enchiladas
 
 /datum/recipe/creamcheesebread
 	items = list(
-		/obj/item/weapon/reagent_containers/food/snacks/flour,
-		/obj/item/weapon/reagent_containers/food/snacks/flour,
-		/obj/item/weapon/reagent_containers/food/snacks/flour,
+		/obj/item/weapon/reagent_containers/food/snacks/dough,
+		/obj/item/weapon/reagent_containers/food/snacks/dough,
 		/obj/item/weapon/reagent_containers/food/snacks/cheesewedge,
 		/obj/item/weapon/reagent_containers/food/snacks/cheesewedge,
 	)
 	result = /obj/item/weapon/reagent_containers/food/snacks/sliceable/creamcheesebread
 
 /datum/recipe/monkeysdelight
-	reagents = list("sodiumchloride" = 1, "blackpepper" = 1)
+	fruit = list("banana" = 1)
+	reagents = list("sodiumchloride" = 1, "blackpepper" = 1, "flour" = 10)
 	items = list(
-		/obj/item/weapon/reagent_containers/food/snacks/flour,
-		/obj/item/weapon/reagent_containers/food/snacks/monkeycube,
-		/obj/item/weapon/reagent_containers/food/snacks/grown/banana,
+		/obj/item/weapon/reagent_containers/food/snacks/monkeycube
 	)
 	result = /obj/item/weapon/reagent_containers/food/snacks/monkeysdelight
 
@@ -710,16 +604,6 @@ I said no!
 	)
 	result = /obj/item/weapon/reagent_containers/food/snacks/fishandchips
 
-/datum/recipe/birthdaycake
-	reagents = list("milk" = 5, "sugar" = 5)
-	items = list(
-		/obj/item/weapon/reagent_containers/food/snacks/dough,
-		/obj/item/weapon/reagent_containers/food/snacks/dough,
-		/obj/item/weapon/reagent_containers/food/snacks/dough,
-		/obj/item/clothing/head/cakehat
-	)
-	result = /obj/item/weapon/reagent_containers/food/snacks/sliceable/birthdaycake
-
 /datum/recipe/bread
 	items = list(
 		/obj/item/weapon/reagent_containers/food/snacks/dough,
@@ -751,11 +635,8 @@ I said no!
 	result = /obj/item/weapon/reagent_containers/food/snacks/grilledcheese
 
 /datum/recipe/tomatosoup
+	fruit = list("tomato" = 2)
 	reagents = list("water" = 10)
-	items = list(
-		/obj/item/weapon/reagent_containers/food/snacks/grown/tomato,
-		/obj/item/weapon/reagent_containers/food/snacks/grown/tomato,
-	)
 	result = /obj/item/weapon/reagent_containers/food/snacks/tomatosoup
 
 /datum/recipe/rofflewaffles
@@ -767,15 +648,9 @@ I said no!
 	result = /obj/item/weapon/reagent_containers/food/snacks/rofflewaffles
 
 /datum/recipe/stew
+	fruit = list("potato" = 1, "tomato" = 1, "carrot" = 1, "eggplant" = 1, "mushroom" = 1)
 	reagents = list("water" = 10)
-	items = list(
-		/obj/item/weapon/reagent_containers/food/snacks/grown/tomato,
-		/obj/item/weapon/reagent_containers/food/snacks/meat,
-		/obj/item/weapon/reagent_containers/food/snacks/grown/potato,
-		/obj/item/weapon/reagent_containers/food/snacks/grown/carrot,
-		/obj/item/weapon/reagent_containers/food/snacks/grown/eggplant,
-		/obj/item/weapon/reagent_containers/food/snacks/grown/mushroom,
-	)
+	items = list(/obj/item/weapon/reagent_containers/food/snacks/meat)
 	result = /obj/item/weapon/reagent_containers/food/snacks/stew
 
 /datum/recipe/slimetoast
@@ -803,11 +678,10 @@ I said no!
 	result = /obj/item/weapon/reagent_containers/food/snacks/milosoup
 
 /datum/recipe/stewedsoymeat
+	fruit = list("carrot" = 1, "tomato" = 1)
 	items = list(
 		/obj/item/weapon/reagent_containers/food/snacks/soydope,
-		/obj/item/weapon/reagent_containers/food/snacks/soydope,
-		/obj/item/weapon/reagent_containers/food/snacks/grown/carrot,
-		/obj/item/weapon/reagent_containers/food/snacks/grown/tomato,
+		/obj/item/weapon/reagent_containers/food/snacks/soydope
 	)
 	result = /obj/item/weapon/reagent_containers/food/snacks/stewedsoymeat
 
@@ -833,19 +707,14 @@ I said no!
 	result = /obj/item/weapon/reagent_containers/food/snacks/ricepudding
 
 /datum/recipe/pastatomato
+	fruit = list("tomato" = 2)
 	reagents = list("water" = 5)
-	items = list(
-		/obj/item/weapon/reagent_containers/food/snacks/spagetti,
-		/obj/item/weapon/reagent_containers/food/snacks/grown/tomato,
-		/obj/item/weapon/reagent_containers/food/snacks/grown/tomato,
-	)
+	items = list(/obj/item/weapon/reagent_containers/food/snacks/spagetti)
 	result = /obj/item/weapon/reagent_containers/food/snacks/pastatomato
 
 /datum/recipe/poppypretzel
-	items = list(
-		/obj/item/weapon/reagent_containers/food/snacks/grown/poppy,
-		/obj/item/weapon/reagent_containers/food/snacks/dough,
-	)
+	fruit = list("poppy" = 1)
+	items = list(/obj/item/weapon/reagent_containers/food/snacks/dough)
 	result = /obj/item/weapon/reagent_containers/food/snacks/poppypretzel
 
 /datum/recipe/meatballspagetti
@@ -869,42 +738,27 @@ I said no!
 	result = /obj/item/weapon/reagent_containers/food/snacks/spesslaw
 
 /datum/recipe/superbiteburger
+	fruit = list("tomato" = 1)
 	reagents = list("sodiumchloride" = 5, "blackpepper" = 5)
 	items = list(
 		/obj/item/weapon/reagent_containers/food/snacks/bigbiteburger,
 		/obj/item/weapon/reagent_containers/food/snacks/dough,
 		/obj/item/weapon/reagent_containers/food/snacks/meat,
-		/obj/item/weapon/reagent_containers/food/snacks/grown/tomato,
 		/obj/item/weapon/reagent_containers/food/snacks/cheesewedge,
 		/obj/item/weapon/reagent_containers/food/snacks/boiledegg,
 	)
 	result = /obj/item/weapon/reagent_containers/food/snacks/superbiteburger
 
 /datum/recipe/candiedapple
+	fruit = list("apple" = 1)
 	reagents = list("water" = 5, "sugar" = 5)
-	items = list(
-		/obj/item/weapon/reagent_containers/food/snacks/grown/apple
-	)
 	result = /obj/item/weapon/reagent_containers/food/snacks/candiedapple
 
 /datum/recipe/applepie
-	items = list(
-		/obj/item/weapon/reagent_containers/food/snacks/sliceable/flatdough,
-		/obj/item/weapon/reagent_containers/food/snacks/grown/apple,
-	)
+	fruit = list("apple" = 1)
+	items = list(/obj/item/weapon/reagent_containers/food/snacks/sliceable/flatdough)
 	result = /obj/item/weapon/reagent_containers/food/snacks/applepie
 
-/datum/recipe/applecake
-	reagents = list("milk" = 5, "sugar" = 5)
-	items = list(
-		/obj/item/weapon/reagent_containers/food/snacks/dough,
-		/obj/item/weapon/reagent_containers/food/snacks/dough,
-		/obj/item/weapon/reagent_containers/food/snacks/dough,
-		/obj/item/weapon/reagent_containers/food/snacks/grown/apple,
-		/obj/item/weapon/reagent_containers/food/snacks/grown/apple,
-	)
-	result = /obj/item/weapon/reagent_containers/food/snacks/sliceable/applecake
-
 /datum/recipe/slimeburger
 	reagents = list("slimejelly" = 5)
 	items = list(
@@ -943,68 +797,8 @@ I said no!
 	)
 	result = /obj/item/weapon/reagent_containers/food/snacks/jellysandwich/cherry
 
-/datum/recipe/orangecake
-	reagents = list("milk" = 5)
-	items = list(
-		/obj/item/weapon/reagent_containers/food/snacks/flour,
-		/obj/item/weapon/reagent_containers/food/snacks/flour,
-		/obj/item/weapon/reagent_containers/food/snacks/flour,
-		/obj/item/weapon/reagent_containers/food/snacks/egg,
-		/obj/item/weapon/reagent_containers/food/snacks/egg,
-		/obj/item/weapon/reagent_containers/food/snacks/egg,
-		/obj/item/weapon/reagent_containers/food/snacks/grown/orange,
-		/obj/item/weapon/reagent_containers/food/snacks/grown/orange,
-	)
-	result = /obj/item/weapon/reagent_containers/food/snacks/sliceable/orangecake
-
-/datum/recipe/limecake
-	reagents = list("milk" = 5)
-	items = list(
-		/obj/item/weapon/reagent_containers/food/snacks/flour,
-		/obj/item/weapon/reagent_containers/food/snacks/flour,
-		/obj/item/weapon/reagent_containers/food/snacks/flour,
-		/obj/item/weapon/reagent_containers/food/snacks/egg,
-		/obj/item/weapon/reagent_containers/food/snacks/egg,
-		/obj/item/weapon/reagent_containers/food/snacks/egg,
-		/obj/item/weapon/reagent_containers/food/snacks/grown/lime,
-		/obj/item/weapon/reagent_containers/food/snacks/grown/lime,
-	)
-	result = /obj/item/weapon/reagent_containers/food/snacks/sliceable/limecake
-
-/datum/recipe/lemoncake
-	reagents = list("milk" = 5)
-	items = list(
-		/obj/item/weapon/reagent_containers/food/snacks/flour,
-		/obj/item/weapon/reagent_containers/food/snacks/flour,
-		/obj/item/weapon/reagent_containers/food/snacks/flour,
-		/obj/item/weapon/reagent_containers/food/snacks/egg,
-		/obj/item/weapon/reagent_containers/food/snacks/egg,
-		/obj/item/weapon/reagent_containers/food/snacks/egg,
-		/obj/item/weapon/reagent_containers/food/snacks/grown/lemon,
-		/obj/item/weapon/reagent_containers/food/snacks/grown/lemon,
-	)
-	result = /obj/item/weapon/reagent_containers/food/snacks/sliceable/lemoncake
-
-/datum/recipe/chocolatecake
-	reagents = list("milk" = 5)
-	items = list(
-		/obj/item/weapon/reagent_containers/food/snacks/flour,
-		/obj/item/weapon/reagent_containers/food/snacks/flour,
-		/obj/item/weapon/reagent_containers/food/snacks/flour,
-		/obj/item/weapon/reagent_containers/food/snacks/egg,
-		/obj/item/weapon/reagent_containers/food/snacks/egg,
-		/obj/item/weapon/reagent_containers/food/snacks/egg,
-		/obj/item/weapon/reagent_containers/food/snacks/chocolatebar,
-		/obj/item/weapon/reagent_containers/food/snacks/chocolatebar,
-	)
-	result = /obj/item/weapon/reagent_containers/food/snacks/sliceable/chocolatecake
-
 /datum/recipe/bloodsoup
-	reagents = list("blood" = 10)
-	items = list(
-		/obj/item/weapon/reagent_containers/food/snacks/grown/bloodtomato,
-		/obj/item/weapon/reagent_containers/food/snacks/grown/bloodtomato,
-	)
+	reagents = list("blood" = 30)
 	result = /obj/item/weapon/reagent_containers/food/snacks/bloodsoup
 
 /datum/recipe/slimesoup
@@ -1019,19 +813,6 @@ I said no!
 	)
 	result = /obj/item/weapon/reagent_containers/food/snacks/boiledslimecore
 
-/datum/recipe/braincake
-	reagents = list("milk" = 5)
-	items = list(
-		/obj/item/weapon/reagent_containers/food/snacks/flour,
-		/obj/item/weapon/reagent_containers/food/snacks/flour,
-		/obj/item/weapon/reagent_containers/food/snacks/flour,
-		/obj/item/weapon/reagent_containers/food/snacks/egg,
-		/obj/item/weapon/reagent_containers/food/snacks/egg,
-		/obj/item/weapon/reagent_containers/food/snacks/egg,
-		/obj/item/organ/brain
-	)
-	result = /obj/item/weapon/reagent_containers/food/snacks/sliceable/braincake
-
 /datum/recipe/chocolateegg
 	items = list(
 		/obj/item/weapon/reagent_containers/food/snacks/egg,
@@ -1047,9 +828,8 @@ I said no!
 	result = /obj/item/weapon/reagent_containers/food/snacks/sausage
 
 /datum/recipe/fishfingers
+	reagents = list("flour" = 10)
 	items = list(
-		/obj/item/weapon/reagent_containers/food/snacks/flour,
-		/obj/item/weapon/reagent_containers/food/snacks/flour,
 		/obj/item/weapon/reagent_containers/food/snacks/egg,
 		/obj/item/weapon/reagent_containers/food/snacks/carpmeat,
 	)
@@ -1066,84 +846,53 @@ I said no!
 	result = /obj/item/weapon/reagent_containers/food/snacks/mysterysoup
 
 /datum/recipe/pumpkinpie
-	reagents = list("milk" = 5, "sugar" = 5)
-	items = list(
-		/obj/item/weapon/reagent_containers/food/snacks/flour,
-		/obj/item/weapon/reagent_containers/food/snacks/grown/pumpkin,
-		/obj/item/weapon/reagent_containers/food/snacks/egg,
-	)
+	fruit = list("pumpkin" = 1)
+	reagents = list("milk" = 5, "sugar" = 5, "egg" = 3, "flour" = 10)
 	result = /obj/item/weapon/reagent_containers/food/snacks/sliceable/pumpkinpie
 
 /datum/recipe/plumphelmetbiscuit
-	reagents = list("water" = 5)
-	items = list(
-		/obj/item/weapon/reagent_containers/food/snacks/flour,
-		/obj/item/weapon/reagent_containers/food/snacks/grown/mushroom/plumphelmet,
-	)
+	fruit = list("plumphelmet" = 1)
+	reagents = list("water" = 5, "flour" = 5)
 	result = /obj/item/weapon/reagent_containers/food/snacks/plumphelmetbiscuit
 
 /datum/recipe/mushroomsoup
+	fruit = list("mushroom" = 1)
 	reagents = list("water" = 5, "milk" = 5)
-	items = list(
-		/obj/item/weapon/reagent_containers/food/snacks/grown/mushroom/chanterelle,
-	)
 	result = /obj/item/weapon/reagent_containers/food/snacks/mushroomsoup
 
 /datum/recipe/chawanmushi
+	fruit = list("mushroom" = 1)
 	reagents = list("water" = 5, "soysauce" = 5)
 	items = list(
 		/obj/item/weapon/reagent_containers/food/snacks/egg,
-		/obj/item/weapon/reagent_containers/food/snacks/egg,
-		/obj/item/weapon/reagent_containers/food/snacks/grown/mushroom/chanterelle,
+		/obj/item/weapon/reagent_containers/food/snacks/egg
 	)
 	result = /obj/item/weapon/reagent_containers/food/snacks/chawanmushi
 
 /datum/recipe/beetsoup
+	fruit = list("whitebeet" = 1, "cabbage" = 1)
 	reagents = list("water" = 10)
-	items = list(
-		/obj/item/weapon/reagent_containers/food/snacks/grown/whitebeet,
-		/obj/item/weapon/reagent_containers/food/snacks/grown/cabbage,
-	)
 	result = /obj/item/weapon/reagent_containers/food/snacks/beetsoup
 
 /datum/recipe/appletart
-	reagents = list("sugar" = 5, "milk" = 5)
+	fruit = list("goldapple" = 1)
+	reagents = list("sugar" = 5, "milk" = 5, "flour" = 10)
 	items = list(
-		/obj/item/weapon/reagent_containers/food/snacks/flour,
-		/obj/item/weapon/reagent_containers/food/snacks/flour,
-		/obj/item/weapon/reagent_containers/food/snacks/flour,
-		/obj/item/weapon/reagent_containers/food/snacks/egg,
-		/obj/item/weapon/reagent_containers/food/snacks/grown/goldapple,
+		/obj/item/weapon/reagent_containers/food/snacks/egg
 	)
 	result = /obj/item/weapon/reagent_containers/food/snacks/appletart
 
 /datum/recipe/tossedsalad
-	items = list(
-		/obj/item/weapon/reagent_containers/food/snacks/grown/cabbage,
-		/obj/item/weapon/reagent_containers/food/snacks/grown/cabbage,
-		/obj/item/weapon/reagent_containers/food/snacks/grown/tomato,
-		/obj/item/weapon/reagent_containers/food/snacks/grown/carrot,
-		/obj/item/weapon/reagent_containers/food/snacks/grown/apple,
-	)
+	fruit = list("cabbage" = 2, "tomato" = 1, "carrot" = 1, "apple" = 1)
 	result = /obj/item/weapon/reagent_containers/food/snacks/tossedsalad
 
 /datum/recipe/aesirsalad
-	items = list(
-		/obj/item/weapon/reagent_containers/food/snacks/grown/ambrosiadeus,
-		/obj/item/weapon/reagent_containers/food/snacks/grown/ambrosiadeus,
-		/obj/item/weapon/reagent_containers/food/snacks/grown/ambrosiadeus,
-		/obj/item/weapon/reagent_containers/food/snacks/grown/goldapple,
-	)
+	fruit = list("goldapple" = 1, "ambrosiadeus" = 1)
 	result = /obj/item/weapon/reagent_containers/food/snacks/aesirsalad
 
 /datum/recipe/validsalad
-	items = list(
-		/obj/item/weapon/reagent_containers/food/snacks/grown/ambrosiavulgaris,
-		/obj/item/weapon/reagent_containers/food/snacks/grown/ambrosiavulgaris,
-		/obj/item/weapon/reagent_containers/food/snacks/grown/ambrosiavulgaris,
-		/obj/item/weapon/reagent_containers/food/snacks/grown/potato,
-		/obj/item/weapon/reagent_containers/food/snacks/meatball,
-	)
+	fruit = list("potato" = 1, "ambrosia" = 3)
+	items = list(/obj/item/weapon/reagent_containers/food/snacks/meatball)
 	result = /obj/item/weapon/reagent_containers/food/snacks/validsalad
 	make_food(var/obj/container as obj)
 		var/obj/item/weapon/reagent_containers/food/snacks/validsalad/being_cooked = ..(container)
@@ -1226,3 +975,50 @@ I said no!
 	result = /obj/item/weapon/reagent_containers/food/snacks/mint
 
 
+// Cakes.
+/datum/recipe/cake
+	reagents = list("milk" = 5, "flour" = 15, "sugar" = 15, "egg" = 9)
+	result = /obj/item/weapon/reagent_containers/food/snacks/sliceable/plaincake
+
+/datum/recipe/cake/carrot
+	fruit = list("carrot" = 3)
+	result = /obj/item/weapon/reagent_containers/food/snacks/sliceable/carrotcake
+
+/datum/recipe/cake/cheese
+	items = list(
+		/obj/item/weapon/reagent_containers/food/snacks/cheesewedge,
+		/obj/item/weapon/reagent_containers/food/snacks/cheesewedge
+	)
+	result = /obj/item/weapon/reagent_containers/food/snacks/sliceable/cheesecake
+
+/datum/recipe/cake/orange
+	fruit = list("orange" = 1)
+	reagents = list("milk" = 5, "flour" = 15, "egg" = 9, "orangejuice" = 3, "sugar" = 5)
+	result = /obj/item/weapon/reagent_containers/food/snacks/sliceable/orangecake
+
+/datum/recipe/cake/lime
+	fruit = list("lime" = 1)
+	reagents = list("milk" = 5, "flour" = 15, "egg" = 9, "limejuice" = 3, "sugar" = 5)
+	result = /obj/item/weapon/reagent_containers/food/snacks/sliceable/limecake
+
+/datum/recipe/cake/lemon
+	fruit = list("lemon" = 1)
+	reagents = list("milk" = 5, "flour" = 15, "egg" = 9, "lemonjuice" = 3, "sugar" = 5)
+	result = /obj/item/weapon/reagent_containers/food/snacks/sliceable/lemoncake
+
+/datum/recipe/cake/chocolate
+	items = list(/obj/item/weapon/reagent_containers/food/snacks/chocolatebar)
+	reagents = list("milk" = 5, "flour" = 15, "egg" = 9, "coco" = 4, "sugar" = 5)
+	result = /obj/item/weapon/reagent_containers/food/snacks/sliceable/chocolatecake
+
+/datum/recipe/cake/birthday
+	items = list(/obj/item/clothing/head/cakehat)
+	result = /obj/item/weapon/reagent_containers/food/snacks/sliceable/birthdaycake
+
+/datum/recipe/cake/apple
+	fruit = list("apple" = 2)
+	result = /obj/item/weapon/reagent_containers/food/snacks/sliceable/applecake
+
+/datum/recipe/cake/brain
+	items = list(/obj/item/organ/brain)
+	result = /obj/item/weapon/reagent_containers/food/snacks/sliceable/braincake

code/modules/hydroponics/_hydro_setup.dm

@@ -0,0 +1,58 @@
+//Misc
+#define DEAD_PLANT_COLOUR "#C2A180"
+
+// Definitions for genes (trait groupings)
+#define GENE_BIOCHEMISTRY "biochemistry"
+#define GENE_HARDINESS "hardiness"
+#define GENE_ENVIRONMENT "environment"
+#define GENE_METABOLISM "metabolism"
+#define GENE_STRUCTURE "appearance"
+#define GENE_DIET "diet"
+#define GENE_PIGMENT "pigment"
+#define GENE_OUTPUT "output"
+#define GENE_ATMOSPHERE "atmosphere"
+#define GENE_VIGOUR "vigour"
+#define GENE_FRUIT "fruit"
+#define GENE_SPECIAL "special"
+
+#define ALL_GENES list(GENE_BIOCHEMISTRY,GENE_HARDINESS,GENE_ENVIRONMENT,GENE_METABOLISM,GENE_STRUCTURE,GENE_DIET,GENE_PIGMENT,GENE_OUTPUT,GENE_ATMOSPHERE,GENE_VIGOUR,GENE_FRUIT,GENE_SPECIAL)
+
+//Definitions for traits (individual descriptors)
+#define TRAIT_CHEMS                1
+#define TRAIT_EXUDE_GASSES         2
+#define TRAIT_ALTER_TEMP           3
+#define TRAIT_POTENCY              4
+#define TRAIT_HARVEST_REPEAT       5
+#define TRAIT_PRODUCES_POWER       6
+#define TRAIT_JUICY                7
+#define TRAIT_PRODUCT_ICON         8
+#define TRAIT_PLANT_ICON           0
+#define TRAIT_CONSUME_GASSES       10
+#define TRAIT_REQUIRES_NUTRIENTS   11
+#define TRAIT_NUTRIENT_CONSUMPTION 12
+#define TRAIT_REQUIRES_WATER       13
+#define TRAIT_WATER_CONSUMPTION    14
+#define TRAIT_CARNIVOROUS          15
+#define TRAIT_PARASITE             16
+#define TRAIT_STINGS               17
+#define TRAIT_IDEAL_HEAT           18
+#define TRAIT_HEAT_TOLERANCE       19
+#define TRAIT_IDEAL_LIGHT          20
+#define TRAIT_LIGHT_TOLERANCE      21
+#define TRAIT_LOWKPA_TOLERANCE     22
+#define TRAIT_HIGHKPA_TOLERANCE    23
+#define TRAIT_EXPLOSIVE            24
+#define TRAIT_TOXINS_TOLERANCE     25
+#define TRAIT_PEST_TOLERANCE       26
+#define TRAIT_WEED_TOLERANCE       27
+#define TRAIT_ENDURANCE            28
+#define TRAIT_YIELD                29
+#define TRAIT_SPREAD               30
+#define TRAIT_MATURATION           31
+#define TRAIT_PRODUCTION           32
+#define TRAIT_TELEPORTING          33
+#define TRAIT_PLANT_COLOUR         34
+#define TRAIT_PRODUCT_COLOUR       35
+#define TRAIT_BIOLUM               36
+#define TRAIT_BIOLUM_COLOUR        37
+#define TRAIT_IMMUTABLE            38

code/modules/hydroponics/biogenerator.dm

@@ -1,255 +0,0 @@
-/obj/machinery/biogenerator
-	name = "Biogenerator"
-	desc = ""
-	icon = 'icons/obj/biogenerator.dmi'
-	icon_state = "biogen-stand"
-	density = 1
-	anchored = 1
-	use_power = 1
-	idle_power_usage = 40
-	var/processing = 0
-	var/obj/item/weapon/reagent_containers/glass/beaker = null
-	var/points = 0
-	var/menustat = "menu"
-	var/build_eff = 1
-	var/eat_eff = 1
-
-/obj/machinery/biogenerator/New()
-	..()
-	var/datum/reagents/R = new/datum/reagents(1000)
-	reagents = R
-	R.my_atom = src
-	beaker = new /obj/item/weapon/reagent_containers/glass/bottle(src)
-
-	component_parts = list()
-	component_parts += new /obj/item/weapon/circuitboard/biogenerator(src)
-	component_parts += new /obj/item/weapon/stock_parts/matter_bin(src)
-	component_parts += new /obj/item/weapon/stock_parts/manipulator(src)
-
-	RefreshParts()
-
-/obj/machinery/biogenerator/on_reagent_change()			//When the reagents change, change the icon as well.
-	update_icon()
-
-/obj/machinery/biogenerator/update_icon()
-	if(!beaker)
-		icon_state = "biogen-empty"
-	else if(!processing)
-		icon_state = "biogen-stand"
-	else
-		icon_state = "biogen-work"
-	return
-
-/obj/machinery/biogenerator/attackby(var/obj/item/O as obj, var/mob/user as mob)
-	if(default_deconstruction_screwdriver(user, O))
-		return
-	if(default_deconstruction_crowbar(user, O))
-		return
-	if(default_part_replacement(user, O))
-		return
-	if(istype(O, /obj/item/weapon/reagent_containers/glass))
-		if(beaker)
-			user << "<span class='notice'>]The [src] is already loaded.</span>"
-		else
-			user.before_take_item(O)
-			O.loc = src
-			beaker = O
-			updateUsrDialog()
-	else if(processing)
-		user << "<span class='notice'>\The [src] is currently processing.</span>"
-	else if(istype(O, /obj/item/weapon/storage/bag/plants))
-		var/i = 0
-		for(var/obj/item/weapon/reagent_containers/food/snacks/grown/G in contents)
-			i++
-		if(i >= 10)
-			user << "<span class='notice'>\The [src] is already full! Activate it.</span>"
-		else
-			for(var/obj/item/weapon/reagent_containers/food/snacks/grown/G in O.contents)
-				G.loc = src
-				i++
-				if(i >= 10)
-					user << "<span class='notice'>You fill \the [src] to its capacity.</span>"
-					break
-			if(i < 10)
-				user << "<span class='notice'>You empty \the [O] into \the [src].</span>"
-
-	else if(!istype(O, /obj/item/weapon/reagent_containers/food/snacks/grown))
-		user << "<span class='notice'>You cannot put this in \the [src].</span>"
-	else
-		var/i = 0
-		for(var/obj/item/weapon/reagent_containers/food/snacks/grown/G in contents)
-			i++
-		if(i >= 10)
-			user << "<span class='notice'>\The [src] is full! Activate it.</span>"
-		else
-			user.before_take_item(O)
-			O.loc = src
-			user << "<span class='notice'>You put \the [O] in \the [src]</span>"
-	update_icon()
-	return
-
-/obj/machinery/biogenerator/interact(mob/user as mob)
-	if(stat & BROKEN)
-		return
-	user.set_machine(src)
-	var/dat = "<TITLE>Biogenerator</TITLE>Biogenerator:<BR>"
-	if (processing)
-		dat += "<FONT COLOR=red>Biogenerator is processing! Please wait...</FONT>"
-	else
-		dat += "Biomass: [points] points.<HR>"
-		switch(menustat)
-			if("menu")
-				if (beaker)
-					dat += "<A href='?src=\ref[src];action=activate'>Activate Biogenerator!</A><BR>"
-					dat += "<A href='?src=\ref[src];action=detach'>Detach Container</A><BR><BR>"
-					dat += "Food<BR>"
-					dat += "<A href='?src=\ref[src];action=create;item=milk;cost=20'>10 milk</A> <FONT COLOR=blue>([round(20/build_eff)])</FONT><BR>"
-					dat += "<A href='?src=\ref[src];action=create;item=meat;cost=50'>Slab of meat</A> <FONT COLOR=blue>([round(50/build_eff)])</FONT><BR>"
-					dat += "Nutrient<BR>"
-					dat += "<A href='?src=\ref[src];action=create;item=ez;cost=10'>E-Z-Nutrient</A> <FONT COLOR=blue>([round(10/build_eff)])</FONT> | <A href='?src=\ref[src];action=create;item=ez5;cost=50'>x5</A><BR>"
-					dat += "<A href='?src=\ref[src];action=create;item=l4z;cost=20'>Left 4 Zed</A> <FONT COLOR=blue>([round(20/build_eff)])</FONT> | <A href='?src=\ref[src];action=create;item=l4z5;cost=100'>x5</A><BR>"
-					dat += "<A href='?src=\ref[src];action=create;item=rh;cost=25'>Robust Harvest</A> <FONT COLOR=blue>([round(25/build_eff)])</FONT> | <A href='?src=\ref[src];action=create;item=rh5;cost=125'>x5</A><BR>"
-					dat += "Leather<BR>"
-					dat += "<A href='?src=\ref[src];action=create;item=wallet;cost=100'>Wallet</A> <FONT COLOR=blue>([round(100/build_eff)])</FONT><BR>"
-					dat += "<A href='?src=\ref[src];action=create;item=gloves;cost=250'>Botanical gloves</A> <FONT COLOR=blue>([round(250/build_eff)])</FONT><BR>"
-					dat += "<A href='?src=\ref[src];action=create;item=tbelt;cost=300'>Utility belt</A> <FONT COLOR=blue>([round(300/build_eff)])</FONT><BR>"
-					dat += "<A href='?src=\ref[src];action=create;item=satchel;cost=400'>Leather Satchel</A> <FONT COLOR=blue>([round(400/build_eff)])</FONT><BR>"
-					dat += "<A href='?src=\ref[src];action=create;item=cashbag;cost=400'>Cash Bag</A> <FONT COLOR=blue>([round(400/build_eff)])</FONT><BR>"
-					//dat += "Other<BR>"
-					//dat += "<A href='?src=\ref[src];action=create;item=monkey;cost=500'>Monkey</A> <FONT COLOR=blue>(500)</FONT><BR>"
-				else
-					dat += "<BR><FONT COLOR=red>No beaker inside. Please insert a beaker.</FONT><BR>"
-			if("nopoints")
-				dat += "You do not have biomass to create products.<BR>Please, put growns into reactor and activate it.<BR>"
-				dat += "<A href='?src=\ref[src];action=menu'>Return to menu</A>"
-			if("complete")
-				dat += "Operation complete.<BR>"
-				dat += "<A href='?src=\ref[src];action=menu'>Return to menu</A>"
-			if("void")
-				dat += "<FONT COLOR=red>Error: No growns inside.</FONT><BR>Please, put growns into reactor.<BR>"
-				dat += "<A href='?src=\ref[src];action=menu'>Return to menu</A>"
-	user << browse(dat, "window=biogenerator")
-	onclose(user, "biogenerator")
-	return
-
-/obj/machinery/biogenerator/attack_hand(mob/user as mob)
-	interact(user)
-
-/obj/machinery/biogenerator/proc/activate()
-	if (usr.stat)
-		return
-	if (stat) //NOPOWER etc
-		return
-	if(processing)
-		usr << "<span class='notice'>The biogenerator is in the process of working.</span>"
-		return
-	var/S = 0
-	for(var/obj/item/weapon/reagent_containers/food/snacks/grown/I in contents)
-		S += 5
-		if(I.reagents.get_reagent_amount("nutriment") < 0.1)
-			points += 1
-		else points += I.reagents.get_reagent_amount("nutriment") * 10 * eat_eff
-		del(I)
-	if(S)
-		processing = 1
-		update_icon()
-		updateUsrDialog()
-		playsound(src.loc, 'sound/machines/blender.ogg', 50, 1)
-		use_power(S * 30)
-		sleep((S + 15) / eat_eff)
-		processing = 0
-		update_icon()
-	else
-		menustat = "void"
-	return
-
-/obj/machinery/biogenerator/proc/create_product(var/item, var/cost)
-	cost = round(cost/build_eff)
-	if(cost > points)
-		menustat = "nopoints"
-		return 0
-	processing = 1
-	update_icon()
-	updateUsrDialog()
-	points -= cost
-	sleep(30)
-	switch(item)
-		if("milk")
-			beaker.reagents.add_reagent("milk", 10)
-		if("meat")
-			new/obj/item/weapon/reagent_containers/food/snacks/meat(loc)
-		if("ez")
-			new/obj/item/weapon/reagent_containers/glass/fertilizer/ez(loc)
-		if("l4z")
-			new/obj/item/weapon/reagent_containers/glass/fertilizer/l4z(loc)
-		if("rh")
-			new/obj/item/weapon/reagent_containers/glass/fertilizer/rh(loc)
-		if("ez5") //It's not an elegant method, but it's safe and easy. -Cheridan
-			new/obj/item/weapon/reagent_containers/glass/fertilizer/ez(loc)
-			new/obj/item/weapon/reagent_containers/glass/fertilizer/ez(loc)
-			new/obj/item/weapon/reagent_containers/glass/fertilizer/ez(loc)
-			new/obj/item/weapon/reagent_containers/glass/fertilizer/ez(loc)
-			new/obj/item/weapon/reagent_containers/glass/fertilizer/ez(loc)
-		if("l4z5")
-			new/obj/item/weapon/reagent_containers/glass/fertilizer/l4z(loc)
-			new/obj/item/weapon/reagent_containers/glass/fertilizer/l4z(loc)
-			new/obj/item/weapon/reagent_containers/glass/fertilizer/l4z(loc)
-			new/obj/item/weapon/reagent_containers/glass/fertilizer/l4z(loc)
-			new/obj/item/weapon/reagent_containers/glass/fertilizer/l4z(loc)
-		if("rh5")
-			new/obj/item/weapon/reagent_containers/glass/fertilizer/rh(loc)
-			new/obj/item/weapon/reagent_containers/glass/fertilizer/rh(loc)
-			new/obj/item/weapon/reagent_containers/glass/fertilizer/rh(loc)
-			new/obj/item/weapon/reagent_containers/glass/fertilizer/rh(loc)
-			new/obj/item/weapon/reagent_containers/glass/fertilizer/rh(loc)
-		if("wallet")
-			new/obj/item/weapon/storage/wallet(loc)
-		if("gloves")
-			new/obj/item/clothing/gloves/botanic_leather(loc)
-		if("tbelt")
-			new/obj/item/weapon/storage/belt/utility(loc)
-		if("satchel")
-			new/obj/item/weapon/storage/backpack/satchel(loc)
-		if("cashbag")
-			new/obj/item/weapon/storage/bag/cash(loc)
-		if("monkey")
-			new/mob/living/carbon/monkey(loc)
-	processing = 0
-	menustat = "complete"
-	update_icon()
-	return 1
-
-/obj/machinery/biogenerator/Topic(href, href_list)
-	if(stat & BROKEN) return
-	if(usr.stat || usr.restrained()) return
-	if(!in_range(src, usr)) return
-
-	usr.set_machine(src)
-
-	switch(href_list["action"])
-		if("activate")
-			activate()
-		if("detach")
-			if(beaker)
-				beaker.loc = src.loc
-				beaker = null
-				update_icon()
-		if("create")
-			create_product(href_list["item"], text2num(href_list["cost"]))
-		if("menu")
-			menustat = "menu"
-	updateUsrDialog()
-
-/obj/machinery/biogenerator/RefreshParts()
-	..()
-	var/man_rating = 0
-	var/bin_rating = 0
-
-	for(var/obj/item/weapon/stock_parts/P in component_parts)
-		if(istype(P, /obj/item/weapon/stock_parts/matter_bin))
-			bin_rating += P.rating
-		if(istype(P, /obj/item/weapon/stock_parts/manipulator))
-			man_rating += P.rating
-
-	build_eff = man_rating
-	eat_eff = bin_rating

code/modules/hydroponics/grown.dm

@@ -0,0 +1,352 @@
+//Grown foods.
+/obj/item/weapon/reagent_containers/food/snacks/grown
+
+	name = "fruit"
+	icon = 'icons/obj/hydroponics_products.dmi'
+	icon_state = "blank"
+	desc = "Nutritious! Probably."
+
+	var/plantname
+	var/datum/seed/seed
+	var/potency = -1
+
+/obj/item/weapon/reagent_containers/food/snacks/grown/New(newloc,planttype)
+
+	..()
+
+	src.pixel_x = rand(-5.0, 5)
+	src.pixel_y = rand(-5.0, 5)
+
+	// Fill the object up with the appropriate reagents.
+	if(planttype)
+		plantname = planttype
+
+	if(!plantname)
+		return
+
+	if(!plant_controller)
+		sleep(250) // ugly hack, should mean roundstart plants are fine.
+	if(!plant_controller)
+		world << "<span class='danger'>Plant controller does not exist and [src] requires it. Aborting.</span>"
+		del(src)
+		return
+
+	seed = plant_controller.seeds[plantname]
+
+	if(!seed)
+		return
+
+	name = "[seed.seed_name]"
+
+	update_icon()
+
+	if(!seed.chems)
+		return
+
+	potency = seed.get_trait(TRAIT_POTENCY)
+
+	for(var/rid in seed.chems)
+		var/list/reagent_data = seed.chems[rid]
+		if(reagent_data && reagent_data.len)
+			var/rtotal = reagent_data[1]
+			if(reagent_data.len > 1 && potency > 0)
+				rtotal += round(potency/reagent_data[2])
+			reagents.add_reagent(rid,max(1,rtotal))
+	update_desc()
+	if(reagents.total_volume > 0)
+		bitesize = 1+round(reagents.total_volume / 2, 1)
+
+/obj/item/weapon/reagent_containers/food/snacks/grown/proc/update_desc()
+
+	if(!seed)
+		return
+	if(!plant_controller)
+		sleep(250) // ugly hack, should mean roundstart plants are fine.
+	if(!plant_controller)
+		world << "<span class='danger'>Plant controller does not exist and [src] requires it. Aborting.</span>"
+		del(src)
+		return
+
+	if(plant_controller.product_descs["[seed.uid]"])
+		desc = plant_controller.product_descs["[seed.uid]"]
+	else
+		var/list/descriptors = list()
+		if(reagents.has_reagent("sugar") || reagents.has_reagent("cherryjelly") || reagents.has_reagent("honey") || reagents.has_reagent("berryjuice"))
+			descriptors |= "sweet"
+		if(reagents.has_reagent("anti_toxin"))
+			descriptors |= "astringent"
+		if(reagents.has_reagent("frostoil"))
+			descriptors |= "numbing"
+		if(reagents.has_reagent("nutriment"))
+			descriptors |= "nutritious"
+		if(reagents.has_reagent("condensedcapsaicin") || reagents.has_reagent("capsaicin"))
+			descriptors |= "spicy"
+		if(reagents.has_reagent("coco"))
+			descriptors |= "bitter"
+		if(reagents.has_reagent("orangejuice") || reagents.has_reagent("lemonjuice") || reagents.has_reagent("limejuice"))
+			descriptors |= "sweet-sour"
+		if(reagents.has_reagent("radium") || reagents.has_reagent("uranium"))
+			descriptors |= "radioactive"
+		if(reagents.has_reagent("amatoxin") || reagents.has_reagent("toxin"))
+			descriptors |= "poisonous"
+		if(reagents.has_reagent("psilocybin") || reagents.has_reagent("space_drugs"))
+			descriptors |= "hallucinogenic"
+		if(reagents.has_reagent("bicaridine"))
+			descriptors |= "medicinal"
+		if(reagents.has_reagent("gold"))
+			descriptors |= "shiny"
+		if(reagents.has_reagent("lube"))
+			descriptors |= "slippery"
+		if(reagents.has_reagent("pacid") || reagents.has_reagent("sacid"))
+			descriptors |= "acidic"
+		if(seed.get_trait(TRAIT_JUICY))
+			descriptors |= "juicy"
+		if(seed.get_trait(TRAIT_STINGS))
+			descriptors |= "stinging"
+		if(seed.get_trait(TRAIT_TELEPORTING))
+			descriptors |= "glowing"
+		if(seed.get_trait(TRAIT_EXPLOSIVE))
+			descriptors |= "bulbous"
+
+		var/descriptor_num = rand(2,4)
+		var/descriptor_count = descriptor_num
+		desc = "A"
+		while(descriptors.len && descriptor_num > 0)
+			var/chosen = pick(descriptors)
+			descriptors -= chosen
+			desc += "[(descriptor_count>1 && descriptor_count!=descriptor_num) ? "," : "" ] [chosen]"
+			descriptor_num--
+		if(seed.seed_noun == "spores")
+			desc += " mushroom"
+		else
+			desc += " fruit"
+		plant_controller.product_descs["[seed.uid]"] = desc
+	desc += ". Delicious! Probably."
+
+/obj/item/weapon/reagent_containers/food/snacks/grown/update_icon()
+	if(!seed || !plant_controller || !plant_controller.plant_icon_cache)
+		return
+	overlays.Cut()
+	var/image/plant_icon
+	var/icon_key = "fruit-[seed.get_trait(TRAIT_PRODUCT_ICON)]-[seed.get_trait(TRAIT_PRODUCT_COLOUR)]-[seed.get_trait(TRAIT_PLANT_COLOUR)]"
+	if(plant_controller.plant_icon_cache[icon_key])
+		plant_icon = plant_controller.plant_icon_cache[icon_key]
+	else
+		plant_icon = image('icons/obj/hydroponics_products.dmi',"blank")
+		var/image/fruit_base = image('icons/obj/hydroponics_products.dmi',"[seed.get_trait(TRAIT_PRODUCT_ICON)]-product")
+		fruit_base.color = "[seed.get_trait(TRAIT_PRODUCT_COLOUR)]"
+		plant_icon.overlays |= fruit_base
+		if("[seed.get_trait(TRAIT_PRODUCT_ICON)]-leaf" in icon_states('icons/obj/hydroponics_products.dmi'))
+			var/image/fruit_leaves = image('icons/obj/hydroponics_products.dmi',"[seed.get_trait(TRAIT_PRODUCT_ICON)]-leaf")
+			fruit_leaves.color = "[seed.get_trait(TRAIT_PLANT_COLOUR)]"
+			plant_icon.overlays |= fruit_leaves
+		plant_controller.plant_icon_cache[icon_key] = plant_icon
+	overlays |= plant_icon
+
+/obj/item/weapon/reagent_containers/food/snacks/grown/Crossed(var/mob/living/M)
+	if(seed && seed.get_trait(TRAIT_JUICY) == 2)
+		if(istype(M))
+
+			if(M.buckled)
+				return
+
+			if(istype(M,/mob/living/carbon/human))
+				var/mob/living/carbon/human/H = M
+				if(H.shoes && H.shoes.flags & NOSLIP)
+					return
+
+			M.stop_pulling()
+			M << "<span class='notice'>You slipped on the [name]!</span>"
+			playsound(src.loc, 'sound/misc/slip.ogg', 50, 1, -3)
+			M.Stun(8)
+			M.Weaken(5)
+			seed.thrown_at(src,M)
+			sleep(-1)
+			if(src) del(src)
+			return
+
+/obj/item/weapon/reagent_containers/food/snacks/grown/throw_impact(atom/hit_atom)
+	..()
+	if(seed) seed.thrown_at(src,hit_atom)
+
+/obj/item/weapon/reagent_containers/food/snacks/grown/attackby(var/obj/item/weapon/W, var/mob/user)
+
+	if(seed)
+		if(seed.get_trait(TRAIT_PRODUCES_POWER) && istype(W, /obj/item/stack/cable_coil))
+			var/obj/item/stack/cable_coil/C = W
+			if(C.use(5))
+				//TODO: generalize this.
+				user << "<span class='notice'>You add some cable to the [src.name] and slide it inside the battery casing.</span>"
+				var/obj/item/weapon/cell/potato/pocell = new /obj/item/weapon/cell/potato(get_turf(user))
+				if(src.loc == user && !(user.l_hand && user.r_hand) && istype(user,/mob/living/carbon/human))
+					user.put_in_hands(pocell)
+				pocell.maxcharge = src.potency * 10
+				pocell.charge = pocell.maxcharge
+				del(src)
+				return
+		else if(W.sharp)
+			if(seed.kitchen_tag == "pumpkin") // Ugggh these checks are awful.
+				user.show_message("<span class='notice'>You carve a face into [src]!</span>", 1)
+				new /obj/item/clothing/head/pumpkinhead (user.loc)
+				del(src)
+				return
+			else if(seed.chems)
+				if(istype(W,/obj/item/weapon/hatchet) && !isnull(seed.chems["woodpulp"]))
+					user.show_message("<span class='notice'>You make planks out of \the [src]!</span>", 1)
+					for(var/i=0,i<2,i++)
+						var/obj/item/stack/sheet/wood/NG = new (user.loc)
+						NG.color = seed.get_trait(TRAIT_PRODUCT_COLOUR)
+						for (var/obj/item/stack/sheet/wood/G in user.loc)
+							if(G==NG)
+								continue
+							if(G.amount>=G.max_amount)
+								continue
+							G.attackby(NG, user)
+						user << "You add the newly-formed wood to the stack. It now contains [NG.amount] planks."
+					del(src)
+					return
+				else if(!isnull(seed.chems["potato"]))
+					user << "You slice \the [src] into sticks."
+					new /obj/item/weapon/reagent_containers/food/snacks/rawsticks(get_turf(src))
+					del(src)
+					return
+				else if(!isnull(seed.chems["carrotjuice"]))
+					user << "You slice \the [src] into sticks."
+					new /obj/item/weapon/reagent_containers/food/snacks/carrotfries(get_turf(src))
+					del(src)
+					return
+				else if(!isnull(seed.chems["soymilk"]))
+					user << "You roughly chop up \the [src]."
+					new /obj/item/weapon/reagent_containers/food/snacks/soydope(get_turf(src))
+					del(src)
+					return
+	..()
+
+/obj/item/weapon/reagent_containers/food/snacks/grown/attack(var/mob/living/carbon/M, var/mob/user, var/def_zone)
+	if(user == M)
+		return ..()
+
+	if(user.a_intent == "hurt")
+
+		// This is being copypasted here because reagent_containers (WHY DOES FOOD DESCEND FROM THAT) overrides it completely.
+		// TODO: refactor all food paths to be less horrible and difficult to work with in this respect. ~Z
+		if(!istype(M) || (can_operate(M) && do_surgery(M,user,src))) return 0
+
+		user.lastattacked = M
+		M.lastattacker = user
+		user.attack_log += "\[[time_stamp()]\]<font color='red'> Attacked [M.name] ([M.ckey]) with [name] (INTENT: [uppertext(user.a_intent)]) (DAMTYE: [uppertext(damtype)])</font>"
+		M.attack_log += "\[[time_stamp()]\]<font color='orange'> Attacked by [user.name] ([user.ckey]) with [name] (INTENT: [uppertext(user.a_intent)]) (DAMTYE: [uppertext(damtype)])</font>"
+		msg_admin_attack("[key_name(user)] attacked [key_name(M)] with [name] (INTENT: [uppertext(user.a_intent)]) (DAMTYE: [uppertext(damtype)])" )
+
+		if(istype(M, /mob/living/carbon/human))
+			var/mob/living/carbon/human/H = M
+			var/hit = H.attacked_by(src, user, def_zone)
+			if(hit && hitsound)
+				playsound(loc, hitsound, 50, 1, -1)
+			return hit
+		else
+			if(attack_verb.len)
+				user.visible_message("<span class='danger'>[M] has been [pick(attack_verb)] with [src] by [user]!</span>")
+			else
+				user.visible_message("<span class='danger'>[M] has been attacked with [src] by [user]!</span>")
+
+			if (hitsound)
+				playsound(loc, hitsound, 50, 1, -1)
+			switch(damtype)
+				if("brute")
+					M.take_organ_damage(force)
+					if(prob(33))
+						var/turf/simulated/location = get_turf(M)
+						if(istype(location)) location.add_blood_floor(M)
+				if("fire")
+					if (!(COLD_RESISTANCE in M.mutations))
+						M.take_organ_damage(0, force)
+			M.updatehealth()
+
+		if(seed && seed.get_trait(TRAIT_STINGS))
+			if(!reagents || reagents.total_volume <= 0)
+				return
+			reagents.remove_any(rand(1,3))
+			seed.thrown_at(src,M)
+			sleep(-1)
+			if(!src)
+				return
+			if(prob(35))
+				if(user)
+					user << "<span class='danger'>\The [src] has fallen to bits.</span>"
+					user.drop_from_inventory(src)
+				del(src)
+
+		add_fingerprint(user)
+		return 1
+
+	else
+		..()
+
+/obj/item/weapon/reagent_containers/food/snacks/grown/attack_self(mob/user as mob)
+
+	if(!seed)
+		return
+
+	if(istype(user.loc,/turf/space))
+		return
+
+	if(user.a_intent == "hurt")
+		user.visible_message("<span class='danger'>\The [user] squashes \the [src]!</span>")
+		seed.thrown_at(src,user)
+		sleep(-1)
+		if(src) del(src)
+		return
+
+	if(seed.get_trait(TRAIT_SPREAD) > 0)
+		user << "<span class='notice'>You plant the [src.name].</span>"
+		new /obj/machinery/portable_atmospherics/hydroponics/soil/invisible(get_turf(user),src.seed)
+		del(src)
+		return
+
+	if(seed.kitchen_tag)
+		switch(seed.kitchen_tag)
+			if("shand")
+				var/obj/item/stack/medical/bruise_pack/tajaran/poultice = new /obj/item/stack/medical/bruise_pack/tajaran(user.loc)
+				poultice.heal_brute = potency
+				user << "<span class='notice'>You mash the leaves into a poultice.</span>"
+				del(src)
+				return
+			if("mtear")
+				var/obj/item/stack/medical/ointment/tajaran/poultice = new /obj/item/stack/medical/ointment/tajaran(user.loc)
+				poultice.heal_burn = potency
+				user << "<span class='notice'>You mash the petals into a poultice.</span>"
+				del(src)
+				return
+
+/obj/item/weapon/reagent_containers/food/snacks/grown/pickup(mob/user)
+	..()
+	if(!seed)
+		return
+	if(seed.get_trait(TRAIT_BIOLUM))
+		user.SetLuminosity(user.luminosity + seed.get_trait(TRAIT_BIOLUM))
+		SetLuminosity(0)
+	if(seed.get_trait(TRAIT_STINGS))
+		var/mob/living/carbon/human/H = user
+		if(istype(H) && H.gloves)
+			return
+		if(!reagents || reagents.total_volume <= 0)
+			return
+		reagents.remove_any(rand(1,3)) //Todo, make it actually remove the reagents the seed uses.
+		seed.do_thorns(H,src)
+		seed.do_sting(H,src,pick("r_hand","l_hand"))
+
+/obj/item/weapon/reagent_containers/food/snacks/grown/dropped(mob/user)
+	if(!..() || !seed)
+		return
+	if(seed.get_trait(TRAIT_BIOLUM))
+		user.SetLuminosity(user.luminosity - seed.get_trait(TRAIT_BIOLUM))
+		SetLuminosity(seed.get_trait(TRAIT_BIOLUM))
+
+// Predefined types for placing on the map.
+
+/obj/item/weapon/reagent_containers/food/snacks/grown/mushroom/libertycap
+	plantname = "libertycap"
+
+/obj/item/weapon/reagent_containers/food/snacks/grown/ambrosiavulgaris
+	plantname = "ambrosia"

code/modules/hydroponics/grown_inedible.dm

@@ -8,7 +8,7 @@
 	var/plantname
 	var/potency = 1
 
-/obj/item/weapon/grown/New()
+/obj/item/weapon/grown/New(newloc,planttype)
 
 	..()
 
@@ -17,158 +17,25 @@
 	R.my_atom = src
 
 	//Handle some post-spawn var stuff.
-	spawn(1)
-		// Fill the object up with the appropriate reagents.
-		if(!isnull(plantname))
-			var/datum/seed/S = seed_types[plantname]
-			if(!S || !S.chems)
-				return
-
-			potency = S.potency
-
-			for(var/rid in S.chems)
-				var/list/reagent_data = S.chems[rid]
-				var/rtotal = reagent_data[1]
-				if(reagent_data.len > 1 && potency > 0)
-					rtotal += round(potency/reagent_data[2])
-				reagents.add_reagent(rid,max(1,rtotal))
-
-/obj/item/weapon/grown/log
-	name = "towercap"
-	name = "tower-cap log"
-	desc = "It's better than bad, it's good!"
-	icon = 'icons/obj/harvest.dmi'
-	icon_state = "logs"
-	force = 5
-	throwforce = 5
-	w_class = 3.0
-	throw_speed = 3
-	throw_range = 3
-	origin_tech = "materials=1"
-	attack_verb = list("bashed", "battered", "bludgeoned", "whacked")
-
-	attackby(obj/item/weapon/W as obj, mob/user as mob)
-		if(istype(W, /obj/item/weapon/circular_saw) || istype(W, /obj/item/weapon/hatchet) || (istype(W, /obj/item/weapon/twohanded/fireaxe) && W:wielded) || istype(W, /obj/item/weapon/melee/energy))
-			user.show_message("<span class='notice'>You make planks out of \the [src]!</span>", 1)
-			for(var/i=0,i<2,i++)
-				var/obj/item/stack/sheet/wood/NG = new (user.loc)
-				for (var/obj/item/stack/sheet/wood/G in user.loc)
-					if(G==NG)
-						continue
-					if(G.amount>=G.max_amount)
-						continue
-					G.attackby(NG, user)
-					usr << "You add the newly-formed wood to the stack. It now contains [NG.amount] planks."
-			del(src)
+	if(planttype)
+		plantname = planttype
+		var/datum/seed/S = plant_controller.seeds[plantname]
+		if(!S || !S.chems)
 			return
 
-/obj/item/weapon/grown/sunflower // FLOWER POWER!
-	plantname = "sunflowers"
-	name = "sunflower"
-	desc = "It's beautiful! A certain person might beat you to death if you trample these."
-	icon = 'icons/obj/harvest.dmi'
-	icon_state = "sunflower"
-	damtype = "fire"
-	force = 0
-	throwforce = 1
-	w_class = 1.0
-	throw_speed = 1
-	throw_range = 3
+		potency = S.get_trait(TRAIT_POTENCY)
 
-/obj/item/weapon/grown/sunflower/attack(mob/M as mob, mob/user as mob)
-	M << "<font color='green'><b> [user] smacks you with a sunflower!</font><font color='yellow'><b>FLOWER POWER<b></font>"
-	user << "<font color='green'> Your sunflower's </font><font color='yellow'><b>FLOWER POWER</b></font><font color='green'> strikes [M]</font>"
-
-/obj/item/weapon/grown/nettle // -- Skie
-	plantname = "nettle"
-	desc = "It's probably <B>not</B> wise to touch it with bare hands..."
-	icon = 'icons/obj/weapons.dmi'
-	name = "nettle"
-	icon_state = "nettle"
-	damtype = "fire"
-	force = 15
-	throwforce = 1
-	w_class = 2.0
-	throw_speed = 1
-	throw_range = 3
-	origin_tech = "combat=1"
-	attack_verb = list("stung")
-	hitsound = ""
-
-	var/potency_divisior = 5
-
-/obj/item/weapon/grown/nettle/New()
-	..()
-	spawn(5)
-		force = round((5+potency/potency_divisior), 1)
-
-/obj/item/weapon/grown/nettle/pickup(mob/living/carbon/human/user as mob)
-	if(istype(user) && !user.gloves)
-		user << "\red The nettle burns your bare hand!"
-		if(istype(user, /mob/living/carbon/human))
-			var/organ = ((user.hand ? "l_":"r_") + "arm")
-			var/datum/organ/external/affecting = user.get_organ(organ)
-			if(affecting.take_damage(0,force))
-				user.UpdateDamageIcon()
-		else
-			user.take_organ_damage(0,force)
-		return 1
-	return 0
-
-/obj/item/weapon/grown/nettle/proc/lose_leaves(var/mob/user)
-	if(force > 0)
-		playsound(loc, 'sound/weapons/bladeslice.ogg', 50, 1, -1)
-		force -= rand(1,(force/3)+1) // When you whack someone with it, leaves fall off
-
-	sleep(1)
-
-	if(force <= 0)
-		if(user)
-			user << "All the leaves have fallen off \the [src] from violent whacking."
-			user.drop_from_inventory(src)
-		del(src)
-
-/obj/item/weapon/grown/nettle/death // -- Skie
-	plantname = "deathnettle"
-	desc = "The \red glowing \black nettle incites \red<B>rage</B>\black in you just from looking at it!"
-	name = "deathnettle"
-	icon_state = "deathnettle"
-	origin_tech = "combat=3"
-	potency_divisior = 2.5
-
-/obj/item/weapon/grown/nettle/death/pickup(mob/living/carbon/human/user as mob)
-
-	if(..() && prob(50))
-		user.Paralyse(5)
-		user << "\red You are stunned by the deathnettle when you try picking it up!"
-
-/obj/item/weapon/grown/nettle/attack(mob/living/carbon/M as mob, mob/user as mob)
-
-	if(!..()) return
-
-	lose_leaves(user)
-
-/obj/item/weapon/grown/nettle/death/attack(mob/living/carbon/M as mob, mob/user as mob)
-
-	if(!..()) return
-
-	if(istype(M, /mob/living))
-		M << "\red You are stunned by the powerful acid of the deathnettle!"
-
-		M.attack_log += text("\[[time_stamp()]\] <font color='orange'>Had the [src.name] used on them by [user.name] ([user.ckey])</font>")
-		user.attack_log += text("\[[time_stamp()]\] <font color='red'>Used the [src.name] on [M.name] ([M.ckey])</font>")
-		msg_admin_attack("[user.name] ([user.ckey]) used the [src.name] on [M.name] ([M.ckey]) (<A HREF='?_src_=holder;adminplayerobservecoodjump=1;X=[user.x];Y=[user.y];Z=[user.z]'>JMP</a>)")
-
-		M.eye_blurry += force/7
-		if(prob(20))
-			M.Paralyse(force/6)
-			M.Weaken(force/15)
-		M.drop_item()
+		for(var/rid in S.chems)
+			var/list/reagent_data = S.chems[rid]
+			var/rtotal = reagent_data[1]
+			if(reagent_data.len > 1 && potency > 0)
+				rtotal += round(potency/reagent_data[2])
+			reagents.add_reagent(rid,max(1,rtotal))
 
 /obj/item/weapon/corncob
 	name = "corn cob"
 	desc = "A reminder of meals gone by."
-	icon = 'icons/obj/harvest.dmi'
+	icon = 'icons/obj/trash.dmi'
 	icon_state = "corncob"
 	item_state = "corncob"
 	w_class = 2.0
@@ -183,3 +50,14 @@
 		new /obj/item/clothing/mask/smokable/pipe/cobpipe (user.loc)
 		del(src)
 		return
+
+/obj/item/weapon/bananapeel
+	name = "banana peel"
+	desc = "A peel from a banana."
+	icon = 'icons/obj/items.dmi'
+	icon_state = "banana_peel"
+	item_state = "banana_peel"
+	w_class = 2.0
+	throwforce = 0
+	throw_speed = 4
+	throw_range = 20

code/modules/hydroponics/grown_predefined.dm

@@ -0,0 +1,5 @@
+/obj/item/weapon/reagent_containers/food/snacks/grown/ambrosiavulgaris
+	plantname = "ambrosia"
+
+/obj/item/weapon/reagent_containers/food/snacks/grown/ambrosiadeus
+	plantname = "ambrosiadeus"

code/modules/hydroponics/hydro_tools.dm

@@ -1,366 +0,0 @@
-//Analyzer, pestkillers, weedkillers, nutrients, hatchets, cutters.
-
-/obj/item/weapon/wirecutters/clippers
-	name = "plant clippers"
-	desc = "A tool used to take samples from plants."
-
-/obj/item/device/analyzer/plant_analyzer
-	name = "plant analyzer"
-	icon = 'icons/obj/device.dmi'
-	icon_state = "hydro"
-	item_state = "analyzer"
-
-/obj/item/device/analyzer/plant_analyzer/attack_self(mob/user as mob)
-	return 0
-
-/obj/item/device/analyzer/plant_analyzer/afterattack(obj/target, mob/user, flag)
-	if(!flag) return
-
-	var/datum/seed/grown_seed
-	var/datum/reagents/grown_reagents
-	if(istype(target,/obj/structure/table))
-		return ..()
-	else if(istype(target,/obj/item/weapon/reagent_containers/food/snacks/grown))
-
-		var/obj/item/weapon/reagent_containers/food/snacks/grown/G = target
-		grown_seed = seed_types[G.plantname]
-		grown_reagents = G.reagents
-
-	else if(istype(target,/obj/item/weapon/grown))
-
-		var/obj/item/weapon/grown/G = target
-		grown_seed = seed_types[G.plantname]
-		grown_reagents = G.reagents
-
-	else if(istype(target,/obj/item/seeds))
-
-		var/obj/item/seeds/S = target
-		grown_seed = S.seed
-
-	else if(istype(target,/obj/machinery/portable_atmospherics/hydroponics))
-
-		var/obj/machinery/portable_atmospherics/hydroponics/H = target
-		grown_seed = H.seed
-		grown_reagents = H.reagents
-
-	if(!grown_seed)
-		user << "\red [src] can tell you nothing about [target]."
-		return
-
-	var/dat = "<h3>Plant data for [target]</h3>"
-	user.visible_message("\blue [user] runs the scanner over [target].")
-
-	dat += "<h2>General Data</h2>"
-
-	dat += "<table>"
-	dat += "<tr><td><b>Endurance</b></td><td>[grown_seed.endurance]</td></tr>"
-	dat += "<tr><td><b>Yield</b></td><td>[grown_seed.yield]</td></tr>"
-	dat += "<tr><td><b>Lifespan</b></td><td>[grown_seed.lifespan]</td></tr>"
-	dat += "<tr><td><b>Maturation time</b></td><td>[grown_seed.maturation]</td></tr>"
-	dat += "<tr><td><b>Production time</b></td><td>[grown_seed.production]</td></tr>"
-	dat += "<tr><td><b>Potency</b></td><td>[grown_seed.potency]</td></tr>"
-	dat += "</table>"
-
-	if(grown_reagents && grown_reagents.reagent_list && grown_reagents.reagent_list.len)
-		dat += "<h2>Reagent Data</h2>"
-
-		dat += "<br>This sample contains: "
-		for(var/datum/reagent/R in grown_reagents.reagent_list)
-			dat += "<br>- [R.id], [grown_reagents.get_reagent_amount(R.id)] unit(s)"
-
-	dat += "<h2>Other Data</h2>"
-
-	if(grown_seed.harvest_repeat)
-		dat += "This plant can be harvested repeatedly.<br>"
-
-	if(grown_seed.immutable == -1)
-		dat += "This plant is highly mutable.<br>"
-	else if(grown_seed.immutable > 0)
-		dat += "This plant does not possess genetics that are alterable.<br>"
-
-	if(grown_seed.products && grown_seed.products.len)
-		dat += "The mature plant will produce [grown_seed.products.len == 1 ? "fruit" : "[grown_seed.products.len] varieties of fruit"].<br>"
-
-	if(grown_seed.requires_nutrients)
-		if(grown_seed.nutrient_consumption < 0.05)
-			dat += "It consumes a small amount of nutrient fluid.<br>"
-		else if(grown_seed.nutrient_consumption > 0.2)
-			dat += "It requires a heavy supply of nutrient fluid.<br>"
-		else
-			dat += "It requires a supply of nutrient fluid.<br>"
-
-	if(grown_seed.requires_water)
-		if(grown_seed.water_consumption < 1)
-			dat += "It requires very little water.<br>"
-		else if(grown_seed.water_consumption > 5)
-			dat += "It requires a large amount of water.<br>"
-		else
-			dat += "It requires a stable supply of water.<br>"
-
-	if(grown_seed.mutants && grown_seed.mutants.len)
-		dat += "It exhibits a high degree of potential subspecies shift.<br>"
-
-	dat += "It thrives in a temperature of [grown_seed.ideal_heat] Kelvin."
-
-	if(grown_seed.lowkpa_tolerance < 20)
-		dat += "<br>It is well adapted to low pressure levels."
-	if(grown_seed.highkpa_tolerance > 220)
-		dat += "<br>It is well adapted to high pressure levels."
-
-	if(grown_seed.heat_tolerance > 30)
-		dat += "<br>It is well adapted to a range of temperatures."
-	else if(grown_seed.heat_tolerance < 10)
-		dat += "<br>It is very sensitive to temperature shifts."
-
-	dat += "<br>It thrives in a light level of [grown_seed.ideal_light] lumen\s."
-
-	if(grown_seed.light_tolerance > 10)
-		dat += "<br>It is well adapted to a range of light levels."
-	else if(grown_seed.light_tolerance < 3)
-		dat += "<br>It is very sensitive to light level shifts."
-
-	if(grown_seed.toxins_tolerance < 3)
-		dat += "<br>It is highly sensitive to toxins."
-	else if(grown_seed.toxins_tolerance > 6)
-		dat += "<br>It is remarkably resistant to toxins."
-
-	if(grown_seed.pest_tolerance < 3)
-		dat += "<br>It is highly sensitive to pests."
-	else if(grown_seed.pest_tolerance > 6)
-		dat += "<br>It is remarkably resistant to pests."
-
-	if(grown_seed.weed_tolerance < 3)
-		dat += "<br>It is highly sensitive to weeds."
-	else if(grown_seed.weed_tolerance > 6)
-		dat += "<br>It is remarkably resistant to weeds."
-
-	switch(grown_seed.spread)
-		if(1)
-			dat += "<br>It is capable of growing beyond the confines of a tray."
-		if(2)
-			dat += "<br>It is a robust and vigorous vine that will spread rapidly."
-
-	switch(grown_seed.carnivorous)
-		if(1)
-			dat += "<br>It is carniovorous and will eat tray pests for sustenance."
-		if(2)
-			dat	+= "<br>It is carnivorous and poses a significant threat to living things around it."
-
-	if(grown_seed.parasite)
-		dat += "<br>It is capable of parisitizing and gaining sustenance from tray weeds."
-	if(grown_seed.alter_temp)
-		dat += "<br>It will periodically alter the local temperature by [grown_seed.alter_temp] degrees Kelvin."
-
-	if(grown_seed.biolum)
-		dat += "<br>It is [grown_seed.biolum_colour ? "<font color='[grown_seed.biolum_colour]'>bio-luminescent</font>" : "bio-luminescent"]."
-	if(grown_seed.flowers)
-		dat += "<br>It has [grown_seed.flower_colour ? "<font color='[grown_seed.flower_colour]'>flowers</font>" : "flowers"]."
-
-	if(dat)
-		user << browse(dat,"window=plant_analyzer")
-
-	return
-
-// *************************************
-// Hydroponics Tools
-// *************************************
-
-/obj/item/weapon/plantspray
-	icon = 'icons/obj/hydroponics.dmi'
-	item_state = "spray"
-	flags = NOBLUDGEON
-	slot_flags = SLOT_BELT
-	throwforce = 4
-	w_class = 2.0
-	throw_speed = 2
-	throw_range = 10
-	var/toxicity = 4
-	var/pest_kill_str = 0
-	var/weed_kill_str = 0
-
-/obj/item/weapon/plantspray/weeds // -- Skie
-
-	name = "weed-spray"
-	desc = "It's a toxic mixture, in spray form, to kill small weeds."
-	icon_state = "weedspray"
-	weed_kill_str = 6
-
-/obj/item/weapon/plantspray/pests
-	name = "pest-spray"
-	desc = "It's some pest eliminator spray! <I>Do not inhale!</I>"
-	icon_state = "pestspray"
-	pest_kill_str = 6
-
-/obj/item/weapon/plantspray/pests/old
-	name = "bottle of pestkiller"
-	icon = 'icons/obj/chemical.dmi'
-	icon_state = "bottle16"
-
-/obj/item/weapon/plantspray/pests/old/carbaryl
-	name = "bottle of carbaryl"
-	icon_state = "bottle16"
-	toxicity = 4
-	pest_kill_str = 2
-
-/obj/item/weapon/plantspray/pests/old/lindane
-	name = "bottle of lindane"
-	icon_state = "bottle18"
-	toxicity = 6
-	pest_kill_str = 4
-
-/obj/item/weapon/plantspray/pests/old/phosmet
-	name = "bottle of phosmet"
-	icon_state = "bottle15"
-	toxicity = 8
-	pest_kill_str = 7
-
-/obj/item/weapon/minihoe // -- Numbers
-	name = "mini hoe"
-	desc = "It's used for removing weeds or scratching your back."
-	icon = 'icons/obj/weapons.dmi'
-	icon_state = "hoe"
-	item_state = "hoe"
-	flags = CONDUCT | NOBLUDGEON
-	force = 5.0
-	throwforce = 7.0
-	w_class = 2.0
-	matter = list("metal" = 50)
-	attack_verb = list("slashed", "sliced", "cut", "clawed")
-
-
-// *************************************
-// Weedkiller defines for hydroponics
-// *************************************
-
-/obj/item/weedkiller
-	name = "bottle of weedkiller"
-	icon = 'icons/obj/chemical.dmi'
-	icon_state = "bottle16"
-	var/toxicity = 0
-	var/weed_kill_str = 0
-
-/obj/item/weedkiller/triclopyr
-	name = "bottle of glyphosate"
-	icon = 'icons/obj/chemical.dmi'
-	icon_state = "bottle16"
-	toxicity = 4
-	weed_kill_str = 2
-
-/obj/item/weedkiller/lindane
-	name = "bottle of triclopyr"
-	icon = 'icons/obj/chemical.dmi'
-	icon_state = "bottle18"
-	toxicity = 6
-	weed_kill_str = 4
-
-/obj/item/weedkiller/D24
-	name = "bottle of 2,4-D"
-	icon = 'icons/obj/chemical.dmi'
-	icon_state = "bottle15"
-	toxicity = 8
-	weed_kill_str = 7
-
-
-// *************************************
-// Nutrient defines for hydroponics
-// *************************************
-
-/obj/item/weapon/reagent_containers/glass/fertilizer
-	name = "fertilizer bottle"
-	desc = "A small glass bottle. Can hold up to 10 units."
-	icon = 'icons/obj/chemical.dmi'
-	icon_state = "bottle-4"
-	flags = 0
-	possible_transfer_amounts = null
-	w_class = 2.0
-
-	var/fertilizer //Reagent contained, if any.
-
-	//Like a shot glass!
-	amount_per_transfer_from_this = 10
-	volume = 10
-
-/obj/item/weapon/reagent_containers/glass/fertilizer/New()
-	..()
-
-	src.pixel_x = rand(-5.0, 5)
-	src.pixel_y = rand(-5.0, 5)
-
-	if(fertilizer)
-		reagents.add_reagent(fertilizer,10)
-		update_icon()
-
-/obj/item/weapon/reagent_containers/glass/fertilizer/ez
-	name = "bottle of E-Z-Nutrient"
-	icon_state = "bottle-4"
-	fertilizer = "eznutrient"
-
-/obj/item/weapon/reagent_containers/glass/fertilizer/l4z
-	name = "bottle of Left 4 Zed"
-	icon_state = "bottle-4"
-	fertilizer = "left4zed"
-
-/obj/item/weapon/reagent_containers/glass/fertilizer/rh
-	name = "bottle of Robust Harvest"
-	icon_state = "bottle-4"
-	fertilizer = "robustharvest"
-
-//Hatchets and things to kill kudzu
-/obj/item/weapon/hatchet
-	name = "hatchet"
-	desc = "A very sharp axe blade upon a short fibremetal handle. It has a long history of chopping things, but now it is used for chopping wood."
-	icon = 'icons/obj/weapons.dmi'
-	icon_state = "hatchet"
-	flags = CONDUCT
-	force = 12.0
-	w_class = 2.0
-	throwforce = 15.0
-	throw_speed = 4
-	throw_range = 4
-	sharp = 1
-	edge = 1
-	matter = list("metal" = 15000)
-	origin_tech = "materials=2;combat=1"
-	attack_verb = list("chopped", "torn", "cut")
-
-/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 ..()
-
-//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")
-
-/obj/item/weapon/hatchet/tacknife
-	name = "tactical knife"
-	desc = "You'd be killing loads of people if this was Medal of Valor: Heroes of Nyx."
-	icon = 'icons/obj/weapons.dmi'
-	icon_state = "tacknife"
-	item_state = "knife"
-	attack_verb = list("stabbed", "chopped", "cut")
-
-/obj/item/weapon/scythe
-	icon_state = "scythe0"
-	name = "scythe"
-	desc = "A sharp and curved blade on a long fibremetal handle, this tool makes it easy to reap what you sow."
-	force = 13.0
-	throwforce = 5.0
-	throw_speed = 1
-	throw_range = 3
-	w_class = 4.0
-	flags = NOSHIELD
-	slot_flags = SLOT_BACK
-	origin_tech = "materials=2;combat=2"
-	attack_verb = list("chopped", "sliced", "cut", "reaped")
-
-/obj/item/weapon/scythe/afterattack(atom/A, mob/user as mob, proximity)
-	if(!proximity) return
-	if(istype(A, /obj/effect/plantsegment))
-		for(var/obj/effect/plantsegment/B in orange(A,1))
-			if(prob(80))
-				del B
-		del A

code/modules/hydroponics/seed.dm

@@ -0,0 +1,733 @@
+/datum/plantgene
+	var/genetype    // Label used when applying trait.
+	var/list/values // Values to copy into the target seed datum.
+
+/datum/seed
+	//Tracking.
+	var/uid                        // Unique identifier.
+	var/name                       // Index for global list.
+	var/seed_name                  // Plant name for seed packet.
+	var/seed_noun = "seeds"        // Descriptor for packet.
+	var/display_name               // Prettier name.
+	var/roundstart                 // If set, seed will not display variety number.
+	var/mysterious                 // Only used for the random seed packets.
+	var/can_self_harvest = 0       // Mostly used for living mobs.
+	var/growth_stages = 0          // Number of stages the plant passes through before it is mature.
+	var/list/traits = list()       // Initialized in New()
+	var/list/mutants               // Possible predefined mutant varieties, if any.
+	var/list/chems                 // Chemicals that plant produces in products/injects into victim.
+	var/list/consume_gasses        // The plant will absorb these gasses during its life.
+	var/list/exude_gasses          // The plant will exude these gasses during its life.
+	var/kitchen_tag                // Used by the reagent grinder.
+	var/trash_type                 // Garbage item produced when eaten.
+	var/splat_type = /obj/effect/decal/cleanable/fruit_smudge // Graffiti decal.
+	var/has_mob_product
+
+/datum/seed/New()
+
+	set_trait(TRAIT_IMMUTABLE,            0)            // If set, plant will never mutate. If -1, plant is highly mutable.
+	set_trait(TRAIT_HARVEST_REPEAT,       0)            // If 1, this plant will fruit repeatedly.
+	set_trait(TRAIT_PRODUCES_POWER,       0)            // Can be used to make a battery.
+	set_trait(TRAIT_JUICY,                0)            // When thrown, causes a splatter decal.
+	set_trait(TRAIT_EXPLOSIVE,            0)            // When thrown, acts as a grenade.
+	set_trait(TRAIT_CARNIVOROUS,          0)            // 0 = none, 1 = eat pests in tray, 2 = eat living things  (when a vine).
+	set_trait(TRAIT_PARASITE,             0)            // 0 = no, 1 = gain health from weed level.
+	set_trait(TRAIT_STINGS,               0)            // Can cause damage/inject reagents when thrown or handled.
+	set_trait(TRAIT_YIELD,                0)            // Amount of product.
+	set_trait(TRAIT_SPREAD,               0)            // 0 limits plant to tray, 1 = creepers, 2 = vines.
+	set_trait(TRAIT_MATURATION,           0)            // Time taken before the plant is mature.
+	set_trait(TRAIT_PRODUCTION,           0)            // Time before harvesting can be undertaken again.
+	set_trait(TRAIT_TELEPORTING,          0)            // Uses the bluespace tomato effect.
+	set_trait(TRAIT_BIOLUM,               0)            // Plant is bioluminescent.
+	set_trait(TRAIT_ALTER_TEMP,           0)            // If set, the plant will periodically alter local temp by this amount.
+	set_trait(TRAIT_PRODUCT_ICON,         0)            // Icon to use for fruit coming from this plant.
+	set_trait(TRAIT_PLANT_ICON,           0)            // Icon to use for the plant growing in the tray.
+	set_trait(TRAIT_PRODUCT_COLOUR,       0)            // Colour to apply to product icon.
+	set_trait(TRAIT_BIOLUM_COLOUR,        0)            // The colour of the plant's radiance.
+	set_trait(TRAIT_POTENCY,              1)            // General purpose plant strength value.
+	set_trait(TRAIT_REQUIRES_NUTRIENTS,   1)            // The plant can starve.
+	set_trait(TRAIT_REQUIRES_WATER,       1)            // The plant can become dehydrated.
+	set_trait(TRAIT_WATER_CONSUMPTION,    3)            // Plant drinks this much per tick.
+	set_trait(TRAIT_LIGHT_TOLERANCE,      5)            // Departure from ideal that is survivable.
+	set_trait(TRAIT_TOXINS_TOLERANCE,     5)            // Resistance to poison.
+	set_trait(TRAIT_PEST_TOLERANCE,       5)            // Threshold for pests to impact health.
+	set_trait(TRAIT_WEED_TOLERANCE,       5)            // Threshold for weeds to impact health.
+	set_trait(TRAIT_IDEAL_LIGHT,          8)            // Preferred light level in luminosity.
+	set_trait(TRAIT_HEAT_TOLERANCE,       20)           // Departure from ideal that is survivable.
+	set_trait(TRAIT_LOWKPA_TOLERANCE,     25)           // Low pressure capacity.
+	set_trait(TRAIT_ENDURANCE,            100)          // Maximum plant HP when growing.
+	set_trait(TRAIT_HIGHKPA_TOLERANCE,    200)          // High pressure capacity.
+	set_trait(TRAIT_IDEAL_HEAT,           293)          // Preferred temperature in Kelvin.
+	set_trait(TRAIT_NUTRIENT_CONSUMPTION, 0.25)         // Plant eats this much per tick.
+	set_trait(TRAIT_PLANT_COLOUR,         "#6EF86A")    // Colour of the plant icon.
+
+	spawn(5)
+		sleep(-1)
+		update_growth_stages()
+
+/datum/seed/proc/get_trait(var/trait)
+	return traits["[trait]"]
+
+/datum/seed/proc/set_trait(var/trait,var/nval,var/ubound,var/lbound, var/degrade)
+	if(!isnull(degrade)) nval *= degrade
+	if(!isnull(ubound))  nval = min(nval,ubound)
+	if(!isnull(lbound))  nval = max(nval,lbound)
+	traits["[trait]"] =  nval
+
+/datum/seed/proc/create_spores(var/turf/T)
+	if(!T)
+		return
+	if(!istype(T))
+		T = get_turf(T)
+	if(!T)
+		return
+
+	var/datum/reagents/R = new/datum/reagents(100)
+	if(chems.len)
+		for(var/rid in chems)
+			var/injecting = min(5,max(1,get_trait(TRAIT_POTENCY)/3))
+			R.add_reagent(rid,injecting)
+
+	var/datum/effect/effect/system/smoke_spread/chem/spores/S = new(name)
+	S.attach(T)
+	S.set_up(R, round(get_trait(TRAIT_POTENCY)/4), 0, T)
+	S.start()
+
+// Does brute damage to a target.
+/datum/seed/proc/do_thorns(var/mob/living/carbon/human/target, var/obj/item/fruit, var/target_limb)
+
+	if(!get_trait(TRAIT_CARNIVOROUS))
+		return
+
+	if(!istype(target))
+		if(istype(target, /mob/living/simple_animal/mouse))
+			new /obj/effect/decal/remains/mouse(get_turf(target))
+			del(target)
+		else if(istype(target, /mob/living/simple_animal/lizard))
+			new /obj/effect/decal/remains/lizard(get_turf(target))
+			del(target)
+		return
+
+
+	if(!target_limb) target_limb = pick("l_foot","r_foot","l_leg","r_leg","l_hand","r_hand","l_arm", "r_arm","head","chest","groin")
+	var/datum/organ/external/affecting = target.get_organ(target_limb)
+	var/damage = 0
+
+	if(get_trait(TRAIT_CARNIVOROUS))
+		if(get_trait(TRAIT_CARNIVOROUS) == 2)
+			if(affecting)
+				target << "<span class='danger'>\The [fruit]'s thorns pierce your [affecting.display_name] greedily!</span>"
+			else
+				target << "<span class='danger'>\The [fruit]'s thorns pierce your flesh greedily!</span>"
+			damage = get_trait(TRAIT_POTENCY)/2
+		else
+			if(affecting)
+				target << "<span class='danger'>\The [fruit]'s thorns dig deeply into your [affecting.display_name]!</span>"
+			else
+				target << "<span class='danger'>\The [fruit]'s thorns dig deeply into your flesh!</span>"
+			damage = get_trait(TRAIT_POTENCY)/5
+	else
+		return
+
+	if(affecting)
+		affecting.take_damage(damage, 0)
+		affecting.add_autopsy_data("Thorns",damage)
+	else
+		target.adjustBruteLoss(damage)
+	target.UpdateDamageIcon()
+	target.updatehealth()
+
+// Adds reagents to a target.
+/datum/seed/proc/do_sting(var/mob/living/carbon/human/target, var/obj/item/fruit)
+	if(!get_trait(TRAIT_STINGS))
+		return
+	if(chems && chems.len)
+		target << "<span class='danger'>You are stung by \the [fruit]!</span>"
+		for(var/rid in chems)
+			var/injecting = min(5,max(1,get_trait(TRAIT_POTENCY)/5))
+			target.reagents.add_reagent(rid,injecting)
+
+//Splatter a turf.
+/datum/seed/proc/splatter(var/turf/T,var/obj/item/thrown)
+	if(splat_type)
+		var/obj/effect/plant/splat = new splat_type(T, src)
+		if(!istype(splat)) // Plants handle their own stuff.
+			splat.name = "[thrown.name] [pick("smear","smudge","splatter")]"
+			if(get_trait(TRAIT_BIOLUM))
+				if(get_trait(TRAIT_BIOLUM_COLOUR))
+					splat.l_color = get_trait(TRAIT_BIOLUM_COLOUR)
+				splat.SetLuminosity(get_trait(TRAIT_BIOLUM))
+			if(get_trait(TRAIT_PRODUCT_COLOUR))
+				splat.color = get_trait(TRAIT_PRODUCT_COLOUR)
+
+	if(chems)
+		for(var/mob/living/M in T.contents)
+			if(!M.reagents)
+				continue
+			for(var/chem in chems)
+				var/injecting = min(5,max(1,get_trait(TRAIT_POTENCY)/3))
+				M.reagents.add_reagent(chem,injecting)
+
+//Applies an effect to a target atom.
+/datum/seed/proc/thrown_at(var/obj/item/thrown,var/atom/target, var/force_explode)
+
+	var/splatted
+	var/turf/origin_turf = get_turf(target)
+
+	if(force_explode || get_trait(TRAIT_EXPLOSIVE))
+
+		create_spores(origin_turf)
+
+		var/flood_dist = min(10,max(1,get_trait(TRAIT_POTENCY)/15))
+		var/list/open_turfs = list()
+		var/list/closed_turfs = list()
+		var/list/valid_turfs = list()
+		open_turfs |= origin_turf
+
+		// Flood fill to get affected turfs.
+		while(open_turfs.len)
+			var/turf/T = pick(open_turfs)
+			open_turfs -= T
+			closed_turfs |= T
+			valid_turfs |= T
+
+			for(var/dir in alldirs)
+				var/turf/neighbor = get_step(T,dir)
+				if(!neighbor || (neighbor in closed_turfs) || (neighbor in open_turfs))
+					continue
+				if(neighbor.density || get_dist(neighbor,origin_turf) > flood_dist || istype(neighbor,/turf/space))
+					closed_turfs |= neighbor
+					continue
+				// Check for windows.
+				var/no_los
+				var/turf/last_turf = origin_turf
+				for(var/turf/target_turf in getline(origin_turf,neighbor))
+					if(!last_turf.Enter(target_turf) || target_turf.density)
+						no_los = 1
+						break
+					last_turf = target_turf
+				if(!no_los && !origin_turf.Enter(neighbor))
+					no_los = 1
+				if(no_los)
+					closed_turfs |= neighbor
+					continue
+				open_turfs |= neighbor
+
+		for(var/turf/T in valid_turfs)
+			for(var/mob/living/M in T.contents)
+				apply_special_effect(M)
+			splatter(T,thrown)
+		origin_turf.visible_message("<span class='danger'>The [thrown.name] explodes!</span>")
+		del(thrown)
+		return
+
+	if(istype(target,/mob/living))
+		splatted = apply_special_effect(target,thrown)
+	else if(istype(target,/turf))
+		splatted = 1
+		for(var/mob/living/M in target.contents)
+			apply_special_effect(M)
+
+	if(get_trait(TRAIT_JUICY) && splatted)
+		splatter(origin_turf,thrown)
+		origin_turf.visible_message("<span class='danger'>The [thrown.name] splatters against [target]!</span>")
+		del(thrown)
+
+/datum/seed/proc/handle_environment(var/turf/current_turf, var/datum/gas_mixture/environment, var/light_supplied, var/check_only)
+
+	var/health_change = 0
+	// Handle gas consumption.
+	if(consume_gasses && consume_gasses.len)
+		var/missing_gas = 0
+		for(var/gas in consume_gasses)
+			if(environment && environment.gas && environment.gas[gas] && \
+			 environment.gas[gas] >= consume_gasses[gas])
+				if(!check_only)
+					environment.adjust_gas(gas,-consume_gasses[gas],1)
+			else
+				missing_gas++
+
+		if(missing_gas > 0)
+			health_change += missing_gas * HYDRO_SPEED_MULTIPLIER
+
+	// Process it.
+	var/pressure = environment.return_pressure()
+	if(pressure < get_trait(TRAIT_LOWKPA_TOLERANCE)|| pressure > get_trait(TRAIT_HIGHKPA_TOLERANCE))
+		health_change += rand(1,3) * HYDRO_SPEED_MULTIPLIER
+
+	if(abs(environment.temperature - get_trait(TRAIT_IDEAL_HEAT)) > get_trait(TRAIT_HEAT_TOLERANCE))
+		health_change += rand(1,3) * HYDRO_SPEED_MULTIPLIER
+
+	// Handle gas production.
+	if(exude_gasses && exude_gasses.len && !check_only)
+		for(var/gas in exude_gasses)
+			environment.adjust_gas(gas, max(1,round((exude_gasses[gas]*(get_trait(TRAIT_POTENCY)/5))/exude_gasses.len)))
+
+	// Handle light requirements.
+	if(!light_supplied)
+		var/area/A = get_area(current_turf)
+		if(A)
+			if(A.lighting_use_dynamic)
+				light_supplied = max(0,min(10,current_turf.lighting_lumcount)-5)
+			else
+				light_supplied =  5
+	if(light_supplied)
+		if(abs(light_supplied - get_trait(TRAIT_IDEAL_LIGHT)) > get_trait(TRAIT_LIGHT_TOLERANCE))
+			health_change += rand(1,3) * HYDRO_SPEED_MULTIPLIER
+
+	return health_change
+
+/datum/seed/proc/apply_special_effect(var/mob/living/target,var/obj/item/thrown)
+
+	var/impact = 1
+	do_sting(target,thrown)
+	do_thorns(target,thrown)
+
+	// Bluespace tomato code copied over from grown.dm.
+	if(get_trait(TRAIT_TELEPORTING))
+
+		//Plant potency determines radius of teleport.
+		var/outer_teleport_radius = get_trait(TRAIT_POTENCY)/5
+		var/inner_teleport_radius = get_trait(TRAIT_POTENCY)/15
+
+		var/list/turfs = list()
+		if(inner_teleport_radius > 0)
+			for(var/turf/T in orange(target,outer_teleport_radius))
+				if(get_dist(target,T) >= inner_teleport_radius)
+					turfs |= T
+
+		if(turfs.len)
+			// Moves the mob, causes sparks.
+			var/datum/effect/effect/system/spark_spread/s = new /datum/effect/effect/system/spark_spread
+			s.set_up(3, 1, get_turf(target))
+			s.start()
+			var/turf/picked = get_turf(pick(turfs))                      // Just in case...
+			new/obj/effect/decal/cleanable/molten_item(get_turf(target)) // Leave a pile of goo behind for dramatic effect...
+			target.loc = picked                                          // And teleport them to the chosen location.
+
+			impact = 1
+
+	return impact
+
+//Creates a random seed. MAKE SURE THE LINE HAS DIVERGED BEFORE THIS IS CALLED.
+/datum/seed/proc/randomize()
+
+	roundstart = 0
+	seed_name = "strange plant"     // TODO: name generator.
+	display_name = "strange plants" // TODO: name generator.
+	mysterious = 1
+	seed_noun = pick("spores","nodes","cuttings","seeds")
+
+	set_trait(TRAIT_POTENCY,rand(5,30),200,0)
+	set_trait(TRAIT_PRODUCT_ICON,pick(plant_controller.plant_product_sprites))
+	set_trait(TRAIT_PLANT_ICON,pick(plant_controller.plant_sprites))
+	set_trait(TRAIT_PLANT_COLOUR,"#[get_random_colour(0,75,190)]")
+	set_trait(TRAIT_PRODUCT_COLOUR,"#[get_random_colour(0,75,190)]")
+	update_growth_stages()
+
+	if(prob(20))
+		set_trait(TRAIT_HARVEST_REPEAT,1)
+
+	if(prob(15))
+		if(prob(15))
+			set_trait(TRAIT_JUICY,2)
+		else
+			set_trait(TRAIT_JUICY,1)
+
+	if(prob(5))
+		set_trait(TRAIT_STINGS,1)
+
+	if(prob(5))
+		set_trait(TRAIT_PRODUCES_POWER,1)
+
+	if(prob(1))
+		set_trait(TRAIT_EXPLOSIVE,1)
+	else if(prob(1))
+		set_trait(TRAIT_TELEPORTING,1)
+
+	if(prob(5))
+		consume_gasses = list()
+		var/gas = pick("oxygen","nitrogen","phoron","carbon_dioxide")
+		consume_gasses[gas] = rand(3,9)
+
+	if(prob(5))
+		exude_gasses = list()
+		var/gas = pick("oxygen","nitrogen","phoron","carbon_dioxide")
+		exude_gasses[gas] = rand(3,9)
+
+	chems = list()
+	if(prob(80))
+		chems["nutriment"] = list(rand(1,10),rand(10,20))
+
+	var/additional_chems = rand(0,5)
+
+	if(additional_chems)
+		var/list/possible_chems = list(
+			"woodpulp",
+			"bicaridine",
+			"hyperzine",
+			"cryoxadone",
+			"blood",
+			"water",
+			"potassium",
+			"plasticide",
+			"mutationtoxin",
+			"amutationtoxin",
+			"inaprovaline",
+			"space_drugs",
+			"paroxetine",
+			"mercury",
+			"sugar",
+			"radium",
+			"ryetalyn",
+			"alkysine",
+			"thermite",
+			"tramadol",
+			"cryptobiolin",
+			"dermaline",
+			"dexalin",
+			"phoron",
+			"synaptizine",
+			"impedrezene",
+			"hyronalin",
+			"peridaxon",
+			"toxin",
+			"rezadone",
+			"ethylredoxrazine",
+			"slimejelly",
+			"cyanide",
+			"mindbreaker",
+			"stoxin"
+			)
+
+		for(var/x=1;x<=additional_chems;x++)
+			if(!possible_chems.len)
+				break
+			var/new_chem = pick(possible_chems)
+			possible_chems -= new_chem
+			chems[new_chem] = list(rand(1,10),rand(10,20))
+
+	if(prob(90))
+		set_trait(TRAIT_REQUIRES_NUTRIENTS,1)
+		set_trait(TRAIT_NUTRIENT_CONSUMPTION,rand(25)/25)
+	else
+		set_trait(TRAIT_REQUIRES_NUTRIENTS,0)
+
+	if(prob(90))
+		set_trait(TRAIT_REQUIRES_WATER,1)
+		set_trait(TRAIT_WATER_CONSUMPTION,rand(10))
+	else
+		set_trait(TRAIT_REQUIRES_WATER,0)
+
+	set_trait(TRAIT_IDEAL_HEAT,       rand(100,400))
+	set_trait(TRAIT_HEAT_TOLERANCE,   rand(10,30))
+	set_trait(TRAIT_IDEAL_LIGHT,      rand(2,10))
+	set_trait(TRAIT_LIGHT_TOLERANCE,  rand(2,7))
+	set_trait(TRAIT_TOXINS_TOLERANCE, rand(2,7))
+	set_trait(TRAIT_PEST_TOLERANCE,   rand(2,7))
+	set_trait(TRAIT_WEED_TOLERANCE,   rand(2,7))
+	set_trait(TRAIT_LOWKPA_TOLERANCE, rand(10,50))
+	set_trait(TRAIT_HIGHKPA_TOLERANCE,rand(100,300))
+
+	if(prob(5))
+		set_trait(TRAIT_ALTER_TEMP,rand(-5,5))
+
+	if(prob(1))
+		set_trait(TRAIT_IMMUTABLE,-1)
+
+	var/carnivore_prob = rand(100)
+	if(carnivore_prob < 5)
+		set_trait(TRAIT_CARNIVOROUS,2)
+	else if(carnivore_prob < 10)
+		set_trait(TRAIT_CARNIVOROUS,1)
+
+	if(prob(10))
+		set_trait(TRAIT_PARASITE,1)
+
+	var/vine_prob = rand(100)
+	if(vine_prob < 5)
+		set_trait(TRAIT_SPREAD,2)
+	else if(vine_prob < 10)
+		set_trait(TRAIT_SPREAD,1)
+
+	if(prob(5))
+		set_trait(TRAIT_BIOLUM,1)
+		set_trait(TRAIT_BIOLUM_COLOUR,"#[get_random_colour(0,75,190)]")
+
+	set_trait(TRAIT_ENDURANCE,rand(60,100))
+	set_trait(TRAIT_YIELD,rand(3,15))
+	set_trait(TRAIT_MATURATION,rand(5,15))
+	set_trait(TRAIT_PRODUCTION,get_trait(TRAIT_MATURATION)+rand(2,5))
+
+//Returns a key corresponding to an entry in the global seed list.
+/datum/seed/proc/get_mutant_variant()
+	if(!mutants || !mutants.len || get_trait(TRAIT_IMMUTABLE) > 0) return 0
+	return pick(mutants)
+
+//Mutates the plant overall (randomly).
+/datum/seed/proc/mutate(var/degree,var/turf/source_turf)
+
+	if(!degree || get_trait(TRAIT_IMMUTABLE) > 0) return
+
+	source_turf.visible_message("<span class='notice'>\The [display_name] quivers!</span>")
+
+	//This looks like shit, but it's a lot easier to read/change this way.
+	var/total_mutations = rand(1,1+degree)
+	for(var/i = 0;i<total_mutations;i++)
+		switch(rand(0,11))
+			if(0) //Plant cancer!
+				set_trait(TRAIT_ENDURANCE,get_trait(TRAIT_ENDURANCE)-rand(10,20),null,0)
+				source_turf.visible_message("<span class='danger'>\The [display_name] withers rapidly!</span>")
+			if(1)
+				set_trait(TRAIT_NUTRIENT_CONSUMPTION,get_trait(TRAIT_NUTRIENT_CONSUMPTION)+rand(-(degree*0.1),(degree*0.1)),5,0)
+				set_trait(TRAIT_WATER_CONSUMPTION,   get_trait(TRAIT_WATER_CONSUMPTION)   +rand(-degree,degree),50,0)
+				set_trait(TRAIT_JUICY,              !get_trait(TRAIT_JUICY))
+				set_trait(TRAIT_STINGS,             !get_trait(TRAIT_STINGS))
+			if(2)
+				set_trait(TRAIT_IDEAL_HEAT,          get_trait(TRAIT_IDEAL_HEAT) +      (rand(-5,5)*degree),800,70)
+				set_trait(TRAIT_HEAT_TOLERANCE,      get_trait(TRAIT_HEAT_TOLERANCE) +  (rand(-5,5)*degree),800,70)
+				set_trait(TRAIT_LOWKPA_TOLERANCE,    get_trait(TRAIT_LOWKPA_TOLERANCE)+ (rand(-5,5)*degree),80,0)
+				set_trait(TRAIT_HIGHKPA_TOLERANCE,   get_trait(TRAIT_HIGHKPA_TOLERANCE)+(rand(-5,5)*degree),500,110)
+				set_trait(TRAIT_EXPLOSIVE,1)
+			if(3)
+				set_trait(TRAIT_IDEAL_LIGHT,         get_trait(TRAIT_IDEAL_LIGHT)+(rand(-1,1)*degree),30,0)
+				set_trait(TRAIT_LIGHT_TOLERANCE,     get_trait(TRAIT_LIGHT_TOLERANCE)+(rand(-2,2)*degree),10,0)
+			if(4)
+				set_trait(TRAIT_TOXINS_TOLERANCE,    get_trait(TRAIT_TOXINS_TOLERANCE)+(rand(-2,2)*degree),10,0)
+			if(5)
+				set_trait(TRAIT_WEED_TOLERANCE,      get_trait(TRAIT_WEED_TOLERANCE)+(rand(-2,2)*degree),10, 0)
+				if(prob(degree*5))
+					set_trait(TRAIT_CARNIVOROUS,     get_trait(TRAIT_CARNIVOROUS)+rand(-degree,degree),2, 0)
+					if(get_trait(TRAIT_CARNIVOROUS))
+						source_turf.visible_message("<span class='notice'>\The [display_name] shudders hungrily.</span>")
+			if(6)
+				set_trait(TRAIT_WEED_TOLERANCE,      get_trait(TRAIT_WEED_TOLERANCE)+(rand(-2,2)*degree),10, 0)
+				if(prob(degree*5))
+					set_trait(TRAIT_PARASITE,!get_trait(TRAIT_PARASITE))
+			if(7)
+				if(get_trait(TRAIT_YIELD) != -1)
+					set_trait(TRAIT_YIELD,           get_trait(TRAIT_YIELD)+(rand(-2,2)*degree),10,0)
+			if(8)
+				set_trait(TRAIT_ENDURANCE,           get_trait(TRAIT_ENDURANCE)+(rand(-5,5)*degree),100,10)
+				set_trait(TRAIT_PRODUCTION,          get_trait(TRAIT_PRODUCTION)+(rand(-1,1)*degree),10, 1)
+				set_trait(TRAIT_POTENCY,             get_trait(TRAIT_POTENCY)+(rand(-20,20)*degree),200, 0)
+				if(prob(degree*5))
+					set_trait(TRAIT_SPREAD,          get_trait(TRAIT_SPREAD)+rand(-1,1),2, 0)
+					source_turf.visible_message("<span class='notice'>\The [display_name] spasms visibly, shifting in the tray.</span>")
+			if(9)
+				set_trait(TRAIT_MATURATION,          get_trait(TRAIT_MATURATION)+(rand(-1,1)*degree),30, 0)
+				if(prob(degree*5))
+					set_trait(TRAIT_HARVEST_REPEAT, !get_trait(TRAIT_HARVEST_REPEAT))
+			if(10)
+				if(prob(degree*2))
+					set_trait(TRAIT_BIOLUM,         !get_trait(TRAIT_BIOLUM))
+					if(get_trait(TRAIT_BIOLUM))
+						source_turf.visible_message("<span class='notice'>\The [display_name] begins to glow!</span>")
+						if(prob(degree*2))
+							set_trait(TRAIT_BIOLUM_COLOUR,"#[get_random_colour(0,75,190)]")
+							source_turf.visible_message("<span class='notice'>\The [display_name]'s glow </span><font color='[get_trait(TRAIT_BIOLUM_COLOUR)]'>changes colour</font>!")
+					else
+						source_turf.visible_message("<span class='notice'>\The [display_name]'s glow dims...</span>")
+			if(11)
+				set_trait(TRAIT_TELEPORTING,1)
+
+	return
+
+//Mutates a specific trait/set of traits.
+/datum/seed/proc/apply_gene(var/datum/plantgene/gene)
+
+	if(!gene || !gene.values || get_trait(TRAIT_IMMUTABLE) > 0) return
+
+	// Splicing products has some detrimental effects on yield and lifespan.
+	// We handle this before we do the rest of the looping, as normal traits don't really include lists.
+	switch(gene.genetype)
+		if(GENE_BIOCHEMISTRY)
+			for(var/trait in list(TRAIT_YIELD, TRAIT_ENDURANCE))
+				if(get_trait(trait) > 0) set_trait(trait,get_trait(trait),null,1,0.85)
+
+			if(!chems) chems = list()
+
+			var/list/gene_value = gene.values["[TRAIT_CHEMS]"]
+			for(var/rid in gene_value)
+
+				var/list/gene_chem = gene_value[rid]
+
+				if(!chems[rid])
+					chems[rid] = gene_chem.Copy()
+					continue
+
+				for(var/i=1;i<=gene_chem.len;i++)
+
+					if(isnull(gene_chem[i])) gene_chem[i] = 0
+
+					if(chems[rid][i])
+						chems[rid][i] = max(1,round((gene_chem[i] + chems[rid][i])/2))
+					else
+						chems[rid][i] = gene_chem[i]
+
+			var/list/new_gasses = gene.values["[TRAIT_EXUDE_GASSES]"]
+			if(islist(new_gasses))
+				if(!exude_gasses) exude_gasses = list()
+				exude_gasses |= new_gasses
+				for(var/gas in exude_gasses)
+					exude_gasses[gas] = max(1,round(exude_gasses[gas]*0.8))
+
+			gene.values["[TRAIT_EXUDE_GASSES]"] = null
+			gene.values["[TRAIT_CHEMS]"] = null
+
+		if(GENE_DIET)
+			var/list/new_gasses = gene.values["[TRAIT_CONSUME_GASSES]"]
+			consume_gasses |= new_gasses
+			gene.values["[TRAIT_CONSUME_GASSES]"] = null
+		if(GENE_METABOLISM)
+			has_mob_product = gene.values["mob_product"]
+			gene.values["mob_product"] = null
+
+	for(var/trait in gene.values)
+		set_trait(trait,gene.values["[trait]"])
+
+	update_growth_stages()
+
+//Returns a list of the desired trait values.
+/datum/seed/proc/get_gene(var/genetype)
+
+	if(!genetype) return 0
+
+	var/list/traits_to_copy
+	var/datum/plantgene/P = new()
+	P.genetype = genetype
+	P.values = list()
+
+	switch(genetype)
+		if(GENE_BIOCHEMISTRY)
+			P.values["[TRAIT_CHEMS]"] =        chems
+			P.values["[TRAIT_EXUDE_GASSES]"] = exude_gasses
+			traits_to_copy = list(TRAIT_POTENCY)
+		if(GENE_OUTPUT)
+			traits_to_copy = list(TRAIT_PRODUCES_POWER,TRAIT_BIOLUM)
+		if(GENE_ATMOSPHERE)
+			traits_to_copy = list(TRAIT_HEAT_TOLERANCE,TRAIT_LOWKPA_TOLERANCE,TRAIT_HIGHKPA_TOLERANCE)
+		if(GENE_HARDINESS)
+			traits_to_copy = list(TRAIT_TOXINS_TOLERANCE,TRAIT_PEST_TOLERANCE,TRAIT_WEED_TOLERANCE,TRAIT_ENDURANCE)
+		if(GENE_METABOLISM)
+			P.values["mob_product"] = has_mob_product
+			traits_to_copy = list(TRAIT_REQUIRES_NUTRIENTS,TRAIT_REQUIRES_WATER,TRAIT_ALTER_TEMP)
+		if(GENE_VIGOUR)
+			traits_to_copy = list(TRAIT_PRODUCTION,TRAIT_MATURATION,TRAIT_YIELD,TRAIT_SPREAD)
+		if(GENE_DIET)
+			P.values["[TRAIT_CONSUME_GASSES]"] = consume_gasses
+			traits_to_copy = list(TRAIT_CARNIVOROUS,TRAIT_PARASITE,TRAIT_NUTRIENT_CONSUMPTION,TRAIT_WATER_CONSUMPTION)
+		if(GENE_ENVIRONMENT)
+			traits_to_copy = list(TRAIT_IDEAL_HEAT,TRAIT_IDEAL_LIGHT,TRAIT_LIGHT_TOLERANCE)
+		if(GENE_PIGMENT)
+			traits_to_copy = list(TRAIT_PLANT_COLOUR,TRAIT_PRODUCT_COLOUR,TRAIT_BIOLUM_COLOUR)
+		if(GENE_STRUCTURE)
+			traits_to_copy = list(TRAIT_PLANT_ICON,TRAIT_PRODUCT_ICON,TRAIT_HARVEST_REPEAT)
+		if(GENE_FRUIT)
+			traits_to_copy = list(TRAIT_STINGS,TRAIT_EXPLOSIVE,TRAIT_JUICY)
+		if(GENE_SPECIAL)
+			traits_to_copy = list(TRAIT_TELEPORTING)
+
+	for(var/trait in traits_to_copy)
+		P.values["[trait]"] = get_trait(trait)
+	return (P ? P : 0)
+
+//Place the plant products at the feet of the user.
+/datum/seed/proc/harvest(var/mob/user,var/yield_mod,var/harvest_sample,var/force_amount)
+
+	if(!user)
+		return
+
+	if(!force_amount && get_trait(TRAIT_YIELD) == 0 && !harvest_sample)
+		if(istype(user)) user << "<span class='danger'>You fail to harvest anything useful.</span>"
+	else
+		if(istype(user)) user << "You [harvest_sample ? "take a sample" : "harvest"] from the [display_name]."
+
+		//This may be a new line. Update the global if it is.
+		if(name == "new line" || !(name in plant_controller.seeds))
+			uid = plant_controller.seeds.len + 1
+			name = "[uid]"
+			plant_controller.seeds[name] = src
+
+		if(harvest_sample)
+			var/obj/item/seeds/seeds = new(get_turf(user))
+			seeds.seed_type = name
+			seeds.update_seed()
+			return
+
+		var/total_yield = 0
+		if(!isnull(force_amount))
+			total_yield = force_amount
+		else
+			if(get_trait(TRAIT_YIELD) > -1)
+				if(isnull(yield_mod) || yield_mod < 1)
+					yield_mod = 0
+					total_yield = get_trait(TRAIT_YIELD)
+				else
+					total_yield = get_trait(TRAIT_YIELD) + rand(yield_mod)
+				total_yield = max(1,total_yield)
+
+		currently_querying = list()
+		for(var/i = 0;i<total_yield;i++)
+			var/obj/item/product
+			if(has_mob_product)
+				product = new has_mob_product(get_turf(user),name)
+			else
+				product = new /obj/item/weapon/reagent_containers/food/snacks/grown(get_turf(user),name)
+			if(get_trait(TRAIT_PRODUCT_COLOUR))
+				product.color = get_trait(TRAIT_PRODUCT_COLOUR)
+				if(istype(product,/obj/item/weapon/reagent_containers/food))
+					var/obj/item/weapon/reagent_containers/food/food = product
+					food.filling_color = get_trait(TRAIT_PRODUCT_COLOUR)
+
+			if(mysterious)
+				product.name += "?"
+				product.desc += " On second thought, something about this one looks strange."
+
+			if(get_trait(TRAIT_BIOLUM))
+				if(get_trait(TRAIT_BIOLUM_COLOUR))
+					product.l_color = get_trait(TRAIT_BIOLUM_COLOUR)
+				product.SetLuminosity(get_trait(TRAIT_BIOLUM))
+
+			//Handle spawning in living, mobile products (like dionaea).
+			if(istype(product,/mob/living))
+				product.visible_message("<span class='notice'>The pod disgorges [product]!</span>")
+				handle_living_product(product)
+				if(istype(product,/mob/living/simple_animal/mushroom)) // Gross.
+					var/mob/living/simple_animal/mushroom/mush = product
+					mush.seed = src
+
+// When the seed in this machine mutates/is modified, the tray seed value
+// is set to a new datum copied from the original. This datum won't actually
+// be put into the global datum list until the product is harvested, though.
+/datum/seed/proc/diverge(var/modified)
+
+	if(get_trait(TRAIT_IMMUTABLE) > 0) return
+
+	//Set up some basic information.
+	var/datum/seed/new_seed = new
+	new_seed.name =            "new line"
+	new_seed.uid =              0
+	new_seed.roundstart =       0
+	new_seed.can_self_harvest = can_self_harvest
+	new_seed.kitchen_tag =      kitchen_tag
+	new_seed.trash_type =       trash_type
+	new_seed.has_mob_product =  has_mob_product
+	//Copy over everything else.
+	if(mutants)        new_seed.mutants = mutants.Copy()
+	if(chems)          new_seed.chems = chems.Copy()
+	if(consume_gasses) new_seed.consume_gasses = consume_gasses.Copy()
+	if(exude_gasses)   new_seed.exude_gasses = exude_gasses.Copy()
+
+	new_seed.seed_name =            "[(roundstart ? "[(modified ? "modified" : "mutant")] " : "")][seed_name]"
+	new_seed.display_name =         "[(roundstart ? "[(modified ? "modified" : "mutant")] " : "")][display_name]"
+	new_seed.seed_noun =            seed_noun
+	new_seed.traits = traits.Copy()
+	new_seed.update_growth_stages()
+	return new_seed
+
+/datum/seed/proc/update_growth_stages()
+	if(get_trait(TRAIT_PLANT_ICON))
+		growth_stages = plant_controller.plant_sprites[get_trait(TRAIT_PLANT_ICON)]
+	else
+		growth_stages = 0

code/modules/hydroponics/seed_controller.dm

@@ -0,0 +1,148 @@
+// Attempts to offload processing for the spreading plants from the MC.
+// Processes vines/spreading plants.
+
+#define PLANTS_PER_TICK 500 // Cap on number of plant segments processed.
+#define PLANT_TICK_TIME 25  // Number of ticks between the plant processor cycling.
+
+// Debug for testing seed genes.
+/client/proc/show_plant_genes()
+	set category = "Debug"
+	set name = "Show Plant Genes"
+	set desc = "Prints the round's plant gene masks."
+
+	if(!holder)	return
+
+	if(!plant_controller || !plant_controller.gene_tag_masks)
+		usr << "Gene masks not set."
+		return
+
+	for(var/mask in plant_controller.gene_tag_masks)
+		usr << "[mask]: [plant_controller.gene_tag_masks[mask]]"
+
+var/global/datum/controller/plants/plant_controller // Set in New().
+
+/datum/controller/plants
+
+	var/plants_per_tick = PLANTS_PER_TICK
+	var/plant_tick_time = PLANT_TICK_TIME
+	var/list/product_descs = list()         // Stores generated fruit descs.
+	var/list/plant_queue = list()           // All queued plants.
+	var/list/seeds = list()                 // All seed data stored here.
+	var/list/gene_tag_masks = list()        // Gene obfuscation for delicious trial and error goodness.
+	var/list/plant_icon_cache = list()      // Stores images of growth, fruits and seeds.
+	var/list/plant_sprites = list()         // List of all harvested product sprites.
+	var/list/plant_product_sprites = list() // List of all growth sprites plus number of growth stages.
+	var/processing = 0                      // Off/on.
+
+/datum/controller/plants/New()
+	if(plant_controller && plant_controller != src)
+		log_debug("Rebuilding plant controller.")
+		del(plant_controller)
+	plant_controller = src
+	setup()
+	process()
+
+// Predefined/roundstart varieties use a string key to make it
+// easier to grab the new variety when mutating. Post-roundstart
+// and mutant varieties use their uid converted to a string instead.
+// Looks like shit but it's sort of necessary.
+/datum/controller/plants/proc/setup()
+
+	// Build the icon lists.
+	for(var/icostate in icon_states('icons/obj/hydroponics_growing.dmi'))
+		var/split = findtext(icostate,"-")
+		if(!split)
+			// invalid icon_state
+			continue
+
+		var/ikey = copytext(icostate,(split+1))
+		if(ikey == "dead")
+			// don't count dead icons
+			continue
+		ikey = text2num(ikey)
+		var/base = copytext(icostate,1,split)
+
+		if(!(plant_sprites[base]) || (plant_sprites[base]<ikey))
+			plant_sprites[base] = ikey
+
+	for(var/icostate in icon_states('icons/obj/hydroponics_products.dmi'))
+		plant_product_sprites |= icostate
+
+	// Populate the global seed datum list.
+	for(var/type in typesof(/datum/seed)-/datum/seed)
+		var/datum/seed/S = new type
+		seeds[S.name] = S
+		S.uid = "[seeds.len]"
+		S.roundstart = 1
+
+	// Make sure any seed packets that were mapped in are updated
+	// correctly (since the seed datums did not exist a tick ago).
+	for(var/obj/item/seeds/S in world)
+		S.update_seed()
+
+	//Might as well mask the gene types while we're at it.
+	var/list/used_masks = list()
+	var/list/plant_traits = ALL_GENES
+	while(plant_traits && plant_traits.len)
+		var/gene_tag = pick(plant_traits)
+		var/gene_mask = "[uppertext(num2hex(rand(0,255)))]"
+
+		while(gene_mask in used_masks)
+			gene_mask = "[uppertext(num2hex(rand(0,255)))]"
+
+		used_masks += gene_mask
+		plant_traits -= gene_tag
+		gene_tag_masks[gene_tag] = gene_mask
+
+// Proc for creating a random seed type.
+/datum/controller/plants/proc/create_random_seed(var/survive_on_station)
+	var/datum/seed/seed = new()
+	seed.randomize()
+	seed.uid = plant_controller.seeds.len + 1
+	seed.name = "[seed.uid]"
+	seeds[seed.name] = seed
+
+	if(survive_on_station)
+		if(seed.consume_gasses)
+			seed.consume_gasses["phoron"] = null
+			seed.consume_gasses["carbon_dioxide"] = null
+		if(seed.chems && !isnull(seed.chems["pacid"]))
+			seed.chems["pacid"] = null // Eating through the hull will make these plants completely inviable, albeit very dangerous.
+			seed.chems -= null // Setting to null does not actually remove the entry, which is weird.
+		seed.set_trait(TRAIT_IDEAL_HEAT,293)
+		seed.set_trait(TRAIT_HEAT_TOLERANCE,20)
+		seed.set_trait(TRAIT_IDEAL_LIGHT,8)
+		seed.set_trait(TRAIT_LIGHT_TOLERANCE,5)
+		seed.set_trait(TRAIT_LOWKPA_TOLERANCE,25)
+		seed.set_trait(TRAIT_HIGHKPA_TOLERANCE,200)
+	return seed
+
+/datum/controller/plants/proc/process()
+	processing = 1
+	spawn(0)
+		set background = 1
+		var/processed = 0
+		while(1)
+			if(!processing)
+				sleep(plant_tick_time)
+			else
+				processed = 0
+				if(plant_queue.len)
+					var/target_to_process = min(plant_queue.len,plants_per_tick)
+					for(var/x=0;x<target_to_process;x++)
+						if(!plant_queue.len)
+							break
+						var/obj/effect/plant/plant = pick(plant_queue)
+						plant_queue -= plant
+						if(!istype(plant))
+							continue
+						plant.process()
+						processed++
+						sleep(1) // Stagger processing out so previous tick can resolve (overlapping plant segments etc)
+				sleep(max(1,(plant_tick_time-processed)))
+
+/datum/controller/plants/proc/add_plant(var/obj/effect/plant/plant)
+	plant_queue |= plant
+
+/datum/controller/plants/proc/remove_plant(var/obj/effect/plant/plant)
+	plant_queue -= plant

code/modules/hydroponics/seed_machines.dm

@@ -1,7 +1,7 @@
 /obj/item/weapon/disk/botany
 	name = "flora data disk"
 	desc = "A small disk used for carrying data on plant genetics."
-	icon = 'icons/obj/hydroponics.dmi'
+	icon = 'icons/obj/hydroponics_machines.dmi'
 	icon_state = "disk"
 	w_class = 1.0
 
@@ -16,7 +16,7 @@
 /obj/item/weapon/disk/botany/attack_self(var/mob/user as mob)
 	if(genes.len)
 		var/choice = alert(user, "Are you sure you want to wipe the disk?", "Xenobotany Data", "No", "Yes")
-		if(src && user && genes && choice == "Yes")
+		if(src && user && genes && choice && choice == "Yes" && user.Adjacent(get_turf(src)))
 			user << "You wipe the disk data."
 			name = initial(name)
 			desc = initial(name)
@@ -33,7 +33,7 @@
 		new /obj/item/weapon/disk/botany(src)
 
 /obj/machinery/botany
-	icon = 'icons/obj/hydroponics.dmi'
+	icon = 'icons/obj/hydroponics_machines.dmi'
 	icon_state = "hydrotray3"
 	density = 1
 	anchored = 1
@@ -44,7 +44,7 @@
 
 	var/open = 0
 	var/active = 0
-	var/action_time = 50
+	var/action_time = 5
 	var/last_action = 0
 	var/eject_disk = 0
 	var/failed_task = 0
@@ -85,7 +85,7 @@
 			user << "There is already a seed loaded."
 			return
 		var/obj/item/seeds/S =W
-		if(S.seed && S.seed.immutable > 0)
+		if(S.seed && S.seed.get_trait(TRAIT_IMMUTABLE) > 0)
 			user << "That seed is not compatible with our genetics technology."
 		else
 			user.drop_item(W)
@@ -96,7 +96,7 @@
 
 	if(istype(W,/obj/item/weapon/screwdriver))
 		open = !open
-		user << "\blue You [open ? "open" : "close"] the maintenance panel."
+		user << "<span class='notice'>You [open ? "open" : "close"] the maintenance panel.</span>"
 		return
 
 	if(open)
@@ -144,8 +144,8 @@
 	var/list/data = list()
 
 	var/list/geneMasks[0]
-	for(var/gene_tag in gene_tag_masks)
-		geneMasks.Add(list(list("tag" = gene_tag, "mask" = gene_tag_masks[gene_tag])))
+	for(var/gene_tag in plant_controller.gene_tag_masks)
+		geneMasks.Add(list(list("tag" = gene_tag, "mask" = plant_controller.gene_tag_masks[gene_tag])))
 	data["geneMasks"] = geneMasks
 
 	data["activity"] = active
@@ -186,10 +186,10 @@
 		if(!seed) return
 		seed.loc = get_turf(src)
 
-		if(seed.seed.name == "new line" || isnull(seed_types[seed.seed.name]))
-			seed.seed.uid = seed_types.len + 1
+		if(seed.seed.name == "new line" || isnull(plant_controller.seeds[seed.seed.name]))
+			seed.seed.uid = plant_controller.seeds.len + 1
 			seed.seed.name = "[seed.seed.uid]"
-			seed_types[seed.seed.name] = seed.seed
+			plant_controller.seeds[seed.seed.name] = seed.seed
 
 		seed.update_seed()
 		visible_message("\icon[src] [src] beeps and spits out [seed].")
@@ -242,8 +242,8 @@
 		if(!genetics.roundstart)
 			loaded_disk.genesource += " (variety #[genetics.uid])"
 
-		loaded_disk.name += " ([gene_tag_masks[href_list["get_gene"]]], #[genetics.uid])"
-		loaded_disk.desc += " The label reads \'gene [gene_tag_masks[href_list["get_gene"]]], sampled from [genetics.display_name]\'."
+		loaded_disk.name += " ([plant_controller.gene_tag_masks[href_list["get_gene"]]], #[genetics.uid])"
+		loaded_disk.desc += " The label reads \'gene [plant_controller.gene_tag_masks[href_list["get_gene"]]], sampled from [genetics.display_name]\'."
 		eject_disk = 1
 
 		degradation += rand(20,60)
@@ -288,7 +288,7 @@
 
 		for(var/datum/plantgene/P in loaded_disk.genes)
 			if(data["locus"] != "") data["locus"] += ", "
-			data["locus"] += "[gene_tag_masks[P.genetype]]"
+			data["locus"] += "[plant_controller.gene_tag_masks[P.genetype]]"
 
 	else
 		data["disk"] = 0
@@ -318,7 +318,7 @@
 		last_action = world.time
 		active = 1
 
-		if(!isnull(seed_types[seed.seed.name]))
+		if(!isnull(plant_controller.seeds[seed.seed.name]))
 			seed.seed = seed.seed.diverge(1)
 			seed.seed_type = seed.seed.name
 			seed.update_seed()

code/modules/hydroponics/seed_mobs.dm

@@ -1,5 +1,4 @@
 /datum/seed
-	var/product_requires_player // If yes, product will ask for a player among the ghosts.
 	var/list/currently_querying // Used to avoid asking the same ghost repeatedly.
 
 // The following procs are used to grab players for mobs produced by a seed (mostly for dionaea).
@@ -7,20 +6,21 @@
 
 	if(!host || !istype(host)) return
 
-	if(product_requires_player)
-		spawn(0)
-			request_player(host)
-		spawn(75)
-			if(!host.ckey && !host.client)
-				host.death()  // This seems redundant, but a lot of mobs don't
-				host.stat = 2 // handle death() properly. Better safe than etc.
-				host.visible_message("\red <b>[host] is malformed and unable to survive. It expires pitifully, leaving behind some seeds.")
+	spawn(0)
+		request_player(host)
+	if(istype(host,/mob/living/simple_animal))
+		return
+	spawn(75)
+		if(!host.ckey && !host.client)
+			host.death()  // This seems redundant, but a lot of mobs don't
+			host.stat = 2 // handle death() properly. Better safe than etc.
+			host.visible_message("<span class='danger'>[host] is malformed and unable to survive. It expires pitifully, leaving behind some seeds.</span>")
 
-				var/total_yield = rand(1,3)
-				for(var/j = 0;j<=total_yield;j++)
-					var/obj/item/seeds/S = new(get_turf(host))
-					S.seed_type = name
-					S.update_seed()
+			var/total_yield = rand(1,3)
+			for(var/j = 0;j<=total_yield;j++)
+				var/obj/item/seeds/S = new(get_turf(host))
+				S.seed_type = name
+				S.update_seed()
 
 /datum/seed/proc/request_player(var/mob/living/host)
 	if(!host) return

code/modules/hydroponics/seed_packets.dm

@@ -1,8 +1,10 @@
+var/global/list/plant_seed_sprites = list()
+
 //Seed packet object/procs.
 /obj/item/seeds
 	name = "packet of seeds"
 	icon = 'icons/obj/seeds.dmi'
-	icon_state = "seed"
+	icon_state = "blank"
 	w_class = 2.0
 
 	var/seed_type
@@ -15,16 +17,45 @@
 
 //Grabs the appropriate seed datum from the global list.
 /obj/item/seeds/proc/update_seed()
-	if(!seed && seed_type && !isnull(seed_types) && seed_types[seed_type])
-		seed = seed_types[seed_type]
+	if(!seed && seed_type && !isnull(plant_controller.seeds) && plant_controller.seeds[seed_type])
+		seed = plant_controller.seeds[seed_type]
 	update_appearance()
 
 //Updates strings and icon appropriately based on seed datum.
 /obj/item/seeds/proc/update_appearance()
 	if(!seed) return
-	icon_state = seed.packet_icon
-	src.name = "packet of [seed.seed_name] [seed.seed_noun]"
-	src.desc = "It has a picture of [seed.display_name] on the front."
+
+	// Update icon.
+	overlays.Cut()
+	var/is_seeds = ((seed.seed_noun in list("seeds","pits","nodes")) ? 1 : 0)
+	var/image/seed_mask
+	var/seed_base_key = "base-[is_seeds ? seed.get_trait(TRAIT_PLANT_COLOUR) : "spores"]"
+	if(plant_seed_sprites[seed_base_key])
+		seed_mask = plant_seed_sprites[seed_base_key]
+	else
+		seed_mask = image('icons/obj/seeds.dmi',"[is_seeds ? "seed" : "spore"]-mask")
+		if(is_seeds) // Spore glass bits aren't coloured.
+			seed_mask.color = seed.get_trait(TRAIT_PLANT_COLOUR)
+		plant_seed_sprites[seed_base_key] = seed_mask
+
+	var/image/seed_overlay
+	var/seed_overlay_key = "[seed.get_trait(TRAIT_PRODUCT_ICON)]-[seed.get_trait(TRAIT_PRODUCT_COLOUR)]"
+	if(plant_seed_sprites[seed_overlay_key])
+		seed_overlay = plant_seed_sprites[seed_overlay_key]
+	else
+		seed_overlay = image('icons/obj/seeds.dmi',"[seed.get_trait(TRAIT_PRODUCT_ICON)]")
+		seed_overlay.color = seed.get_trait(TRAIT_PRODUCT_COLOUR)
+		plant_seed_sprites[seed_overlay_key] = seed_overlay
+
+	overlays |= seed_mask
+	overlays |= seed_overlay
+
+	if(is_seeds)
+		src.name = "packet of [seed.seed_name] [seed.seed_noun]"
+		src.desc = "It has a picture of [seed.display_name] on the front."
+	else
+		src.name = "sample of [seed.seed_name] [seed.seed_noun]"
+		src.desc = "It's labelled as coming from [seed.display_name]."
 
 /obj/item/seeds/examine(mob/user)
 	..(user)
@@ -43,13 +74,8 @@
 	seed_type = null
 
 /obj/item/seeds/random/New()
-	seed = new()
-	seed.randomize()
-
-	seed.uid = seed_types.len + 1
-	seed.name = "[seed.uid]"
-	seed_types[seed.name] = seed
-
+	seed = plant_controller.create_random_seed()
+	seed_type = seed.name
 	update_seed()
 
 /obj/item/seeds/replicapod
@@ -91,9 +117,6 @@
 /obj/item/seeds/eggplantseed
 	seed_type = "eggplant"
 
-/obj/item/seeds/eggyseed
-	seed_type = "realeggplant"
-
 /obj/item/seeds/bloodtomatoseed
 	seed_type = "bloodtomato"
 
@@ -233,4 +256,25 @@
 	seed_type = "tobacco"
 
 /obj/item/seeds/kudzuseed
-	seed_type = "kudzu"
+	seed_type = "kudzu"
+
+/obj/item/seeds/jurlmah
+	seed_type = "jurlmah"
+
+/obj/item/seeds/amauri
+	seed_type = "amauri"
+
+/obj/item/seeds/gelthi
+	seed_type = "gelthi"
+
+/obj/item/seeds/vale
+	seed_type = "vale"
+
+/obj/item/seeds/surik
+	seed_type = "surik"
+
+/obj/item/seeds/telriis
+	seed_type = "telriis"
+
+/obj/item/seeds/thaadra
+	seed_type = "thaadra"

code/modules/hydroponics/seed_storage.dm

@@ -34,7 +34,7 @@
 
 /obj/machinery/seed_storage/random // This is mostly for testing, but I guess admins could spawn it
 	name = "Random seed storage"
-	scanner = list("stats", "produce", "soil", "temperature", "light", "mutants")
+	scanner = list("stats", "produce", "soil", "temperature", "light")
 	starting_seeds = list(/obj/item/seeds/random = 50)
 
 /obj/machinery/seed_storage/garden
@@ -44,7 +44,7 @@
 
 /obj/machinery/seed_storage/xenobotany
 	name = "Xenobotany seed storage"
-	scanner = list("stats", "produce", "soil", "temperature", "light", "mutants")
+	scanner = list("stats", "produce", "soil", "temperature", "light")
 	starting_seeds = list(/obj/item/seeds/ambrosiavulgarisseed = 3, /obj/item/seeds/appleseed = 3, /obj/item/seeds/amanitamycelium = 2, /obj/item/seeds/bananaseed = 3, /obj/item/seeds/berryseed = 3, /obj/item/seeds/cabbageseed = 3, /obj/item/seeds/carrotseed = 3, /obj/item/seeds/chantermycelium = 3, /obj/item/seeds/cherryseed = 3, /obj/item/seeds/chiliseed = 3, /obj/item/seeds/cocoapodseed = 3, /obj/item/seeds/cornseed = 3, /obj/item/seeds/replicapod = 3, /obj/item/seeds/eggplantseed = 3, /obj/item/seeds/glowshroom = 2, /obj/item/seeds/grapeseed = 3, /obj/item/seeds/grassseed = 3, /obj/item/seeds/lemonseed = 3, /obj/item/seeds/libertymycelium = 2, /obj/item/seeds/limeseed = 3, /obj/item/seeds/mtearseed = 2, /obj/item/seeds/nettleseed = 2, /obj/item/seeds/orangeseed = 3, /obj/item/seeds/peanutseed = 3, /obj/item/seeds/plastiseed = 3, /obj/item/seeds/plumpmycelium = 3, /obj/item/seeds/poppyseed = 3, /obj/item/seeds/potatoseed = 3, /obj/item/seeds/pumpkinseed = 3, /obj/item/seeds/reishimycelium = 2, /obj/item/seeds/riceseed = 3, /obj/item/seeds/soyaseed = 3, /obj/item/seeds/sugarcaneseed = 3, /obj/item/seeds/sunflowerseed = 3, /obj/item/seeds/shandseed = 2, /obj/item/seeds/tobaccoseed = 3, /obj/item/seeds/tomatoseed = 3, /obj/item/seeds/towermycelium = 3, /obj/item/seeds/watermelonseed = 3, /obj/item/seeds/wheatseed = 3, /obj/item/seeds/whitebeetseed = 3)
 
 /obj/machinery/seed_storage/attack_hand(mob/user as mob)
@@ -59,7 +59,7 @@
 		for(var/typepath in starting_seeds)
 			var/amount = starting_seeds[typepath]
 			if(isnull(amount)) amount = 1
-			
+
 			for (var/i = 1 to amount)
 				var/O = new typepath
 				add(O)
@@ -69,12 +69,10 @@
 	if (piles.len == 0)
 		dat += "<font color='red'>No seeds</font>"
 	else
-		dat += "<table style='text-align:center;'><tr><td>Name</td>"
+		dat += "<table style='text-align:center;border-style:solid;border-width:1px;padding:4px'><tr><td>Name</td>"
 		dat += "<td>Variety</td>"
 		if ("stats" in scanner)
-			dat += "<td>E</td><td>Y</td><td>L</td><td>M</td><td>Pr</td><td>Pt</td><td>Harvest</td>"
-		if ("produce" in scanner)
-			dat += "<td>Produce</td>"
+			dat += "<td>E</td><td>Y</td><td>M</td><td>Pr</td><td>Pt</td><td>Harvest</td>"
 		if ("temperature" in scanner)
 			dat += "<td>Temp</td>"
 		if ("light" in scanner)
@@ -84,100 +82,88 @@
 		dat += "<td>Notes</td><td>Amount</td><td></td></tr>"
 		for (var/datum/seed_pile/S in piles)
 			var/datum/seed/seed = S.seed_type
+			if(!seed)
+				continue
 			dat += "<tr>"
-			dat += "<td>[S.name]</td>"
+			dat += "<td>[seed.seed_name]</td>"
 			dat += "<td>#[seed.uid]</td>"
 			if ("stats" in scanner)
-				dat += "<td>[seed.endurance]</td><td>[seed.yield]</td><td>[seed.lifespan]</td><td>[seed.maturation]</td><td>[seed.production]</td><td>[seed.potency]</td>"
-				if(seed.harvest_repeat)
+				dat += "<td>[seed.get_trait(TRAIT_ENDURANCE)]</td><td>[seed.get_trait(TRAIT_YIELD)]</td><td>[seed.get_trait(TRAIT_MATURATION)]</td><td>[seed.get_trait(TRAIT_PRODUCTION)]</td><td>[seed.get_trait(TRAIT_POTENCY)]</td>"
+				if(seed.get_trait(TRAIT_HARVEST_REPEAT))
 					dat += "<td>Multiple</td>"
 				else
 					dat += "<td>Single</td>"
-			if ("produce" in scanner)
-				if (seed.products && seed.products.len)
-					dat += "<td>Fruit: [seed.products.len]</td>"
-				else
-					dat += "<td>N/A</td>"
 			if ("temperature" in scanner)
-				dat += "<td>[seed.ideal_heat] K</td>"
+				dat += "<td>[seed.get_trait(TRAIT_IDEAL_HEAT)] K</td>"
 			if ("light" in scanner)
-				dat += "<td>[seed.ideal_light] L</td>"
+				dat += "<td>[seed.get_trait(TRAIT_IDEAL_LIGHT)] L</td>"
 			if ("soil" in scanner)
-				if(seed.requires_nutrients)
-					if(seed.nutrient_consumption < 0.05)
+				if(seed.get_trait(TRAIT_REQUIRES_NUTRIENTS))
+					if(seed.get_trait(TRAIT_NUTRIENT_CONSUMPTION) < 0.05)
 						dat += "<td>Low</td>"
-					else if(seed.nutrient_consumption > 0.2)
+					else if(seed.get_trait(TRAIT_REQUIRES_NUTRIENTS) > 0.2)
 						dat += "<td>High</td>"
 					else
 						dat += "<td>Norm</td>"
 				else
 					dat += "<td>No</td>"
-				if(seed.requires_water)
-					if(seed.water_consumption < 1)
+				if(seed.get_trait(TRAIT_REQUIRES_WATER))
+					if(seed.get_trait(TRAIT_WATER_CONSUMPTION) < 1)
 						dat += "<td>Low</td>"
-					else if(seed.water_consumption > 5)
+					else if(seed.get_trait(TRAIT_WATER_CONSUMPTION) > 5)
 						dat += "<td>High</td>"
 					else
 						dat += "<td>Norm</td>"
 				else
 					dat += "<td>No</td>"
-			
+
 			dat += "<td>"
-			if ("mutants" in scanner)
-				if(seed.mutants && seed.mutants.len)
-					dat += "SUBSP "
-				if(seed.immutable == -1)
-					dat += "MUT "
-				else if(seed.immutable > 0)
-					dat += "NOMUT "
-			switch(seed.carnivorous)
+			switch(seed.get_trait(TRAIT_CARNIVOROUS))
 				if(1)
 					dat += "CARN "
 				if(2)
 					dat	+= "<font color='red'>CARN </font>"
-			switch(seed.spread)
+			switch(seed.get_trait(TRAIT_SPREAD))
 				if(1)
 					dat += "VINE "
 				if(2)
 					dat	+= "<font color='red'>VINE </font>"
 			if ("pressure" in scanner)
-				if(seed.lowkpa_tolerance < 20)
+				if(seed.get_trait(TRAIT_LOWKPA_TOLERANCE) < 20)
 					dat += "LP "
-				if(seed.highkpa_tolerance > 220)
+				if(seed.get_trait(TRAIT_HIGHKPA_TOLERANCE) > 220)
 					dat += "HP "
 			if ("temperature" in scanner)
-				if(seed.heat_tolerance > 30)
+				if(seed.get_trait(TRAIT_HEAT_TOLERANCE) > 30)
 					dat += "TEMRES "
-				else if(seed.heat_tolerance < 10)
+				else if(seed.get_trait(TRAIT_HEAT_TOLERANCE) < 10)
 					dat += "TEMSEN "
 			if ("light" in scanner)
-				if(seed.light_tolerance > 10)
+				if(seed.get_trait(TRAIT_LIGHT_TOLERANCE) > 10)
 					dat += "LIGRES "
-				else if(seed.light_tolerance < 3)
+				else if(seed.get_trait(TRAIT_LIGHT_TOLERANCE) < 3)
 					dat += "LIGSEN "
-			if(seed.toxins_tolerance < 3)
+			if(seed.get_trait(TRAIT_TOXINS_TOLERANCE) < 3)
 				dat += "TOXSEN "
-			else if(seed.toxins_tolerance > 6)
+			else if(seed.get_trait(TRAIT_TOXINS_TOLERANCE) > 6)
 				dat += "TOXRES "
-			if(seed.pest_tolerance < 3)
+			if(seed.get_trait(TRAIT_PEST_TOLERANCE) < 3)
 				dat += "PESTSEN "
-			else if(seed.pest_tolerance > 6)
+			else if(seed.get_trait(TRAIT_PEST_TOLERANCE) > 6)
 				dat += "PESTRES "
-			if(seed.weed_tolerance < 3)
+			if(seed.get_trait(TRAIT_WEED_TOLERANCE) < 3)
 				dat += "WEEDSEN "
-			else if(seed.weed_tolerance > 6)
+			else if(seed.get_trait(TRAIT_WEED_TOLERANCE) > 6)
 				dat += "WEEDRES "
-			if(seed.parasite)
+			if(seed.get_trait(TRAIT_PARASITE))
 				dat += "PAR "
 			if ("temperature" in scanner)
-				if(seed.alter_temp > 0)
+				if(seed.get_trait(TRAIT_ALTER_TEMP) > 0)
 					dat += "TEMP+ "
-				if(seed.alter_temp < 0)
+				if(seed.get_trait(TRAIT_ALTER_TEMP) < 0)
 					dat += "TEMP- "
-			if(seed.biolum)
+			if(seed.get_trait(TRAIT_BIOLUM))
 				dat += "LUM "
-			if(seed.flowers)
-				dat += "<br>[seed.flower_colour ? "<font color='[seed.flower_colour]'>FLOW</font>" : "FLOW"]."
 			dat += "</td>"
 			dat += "<td>[S.amount]</td>"
 			dat += "<td><a href='byond://?src=\ref[src];task=vend;id=[S.ID]'>Vend</a> <a href='byond://?src=\ref[src];task=purge;id=[S.ID]'>Purge</a></td>"

code/modules/hydroponics/spreading/spreading.dm

@@ -0,0 +1,259 @@
+#define DEFAULT_SEED "glowshroom"
+#define VINE_GROWTH_STAGES 5
+
+/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)
+			var/datum/seed/seed = plant_controller.create_random_seed(1)
+			seed.set_trait(TRAIT_SPREAD,2)             // So it will function properly as vines.
+			seed.set_trait(TRAIT_POTENCY,rand(70,100)) // Guarantee a wide spread and powerful effects.
+			new /obj/effect/plant(T,seed)
+			message_admins("<span class='notice'>Event: Spacevines spawned at [T.loc] ([T.x],[T.y],[T.z])</span>")
+
+/obj/effect/dead_plant
+	anchored = 1
+	opacity = 0
+	density = 0
+	color = DEAD_PLANT_COLOUR
+
+/obj/effect/dead_plant/attack_hand()
+	del(src)
+
+/obj/effect/dead_plant/attackby()
+	..()
+	for(var/obj/effect/plant/neighbor in range(1))
+		neighbor.update_neighbors()
+	del(src)
+
+/obj/effect/plant
+	name = "plant"
+	anchored = 1
+	opacity = 0
+	density = 0
+	icon = 'icons/obj/hydroponics_growing.dmi'
+	icon_state = "bush4-1"
+	layer = 3
+	pass_flags = PASSTABLE
+
+	var/health = 10
+	var/max_health = 100
+	var/growth_threshold = 0
+	var/growth_type = 0
+	var/max_growth = 0
+
+	var/list/neighbors = list()
+	var/obj/effect/plant/parent
+	var/datum/seed/seed
+	var/floor = 0
+	var/spread_chance = 40
+	var/spread_distance = 3
+	var/evolve_chance = 2
+	var/last_tick = 0
+	var/obj/machinery/portable_atmospherics/hydroponics/soil/invisible/plant
+
+/obj/effect/plant/Del()
+	if(plant_controller)
+		plant_controller.remove_plant(src)
+	for(var/obj/effect/plant/neighbor in range(1,src))
+		plant_controller.add_plant(neighbor)
+	..()
+/obj/effect/plant/single
+	spread_chance = 0
+
+/obj/effect/plant/New(var/newloc, var/datum/seed/newseed, var/obj/effect/plant/newparent)
+	..()
+
+	if(!newparent)
+		parent = src
+	else
+		parent = newparent
+
+	if(!plant_controller)
+		sleep(250) // ugly hack, should mean roundstart plants are fine.
+	if(!plant_controller)
+		world << "<span class='danger'>Plant controller does not exist and [src] requires it. Aborting.</span>"
+		del(src)
+		return
+
+	if(!istype(newseed))
+		newseed = plant_controller.seeds[DEFAULT_SEED]
+	seed = newseed
+	if(!seed)
+		del(src)
+		return
+
+	name = seed.display_name
+	max_health = round(seed.get_trait(TRAIT_ENDURANCE)/2)
+	if(seed.get_trait(TRAIT_SPREAD)==2)
+		max_growth = VINE_GROWTH_STAGES
+		growth_threshold = max_health/VINE_GROWTH_STAGES
+		icon = 'icons/obj/hydroponics_vines.dmi'
+		growth_type = 2 // Vines by default.
+		if(seed.get_trait(TRAIT_CARNIVOROUS) == 2)
+			growth_type = 1 // WOOOORMS.
+		else if(!(seed.seed_noun in list("seeds","pits")))
+			if(seed.seed_noun == "nodes")
+				growth_type = 3 // Biomass
+			else
+				growth_type = 4 // Mold
+	else
+		max_growth = seed.growth_stages
+		growth_threshold = max_health/seed.growth_stages
+
+	if(max_growth > 2 && prob(50))
+		max_growth-- //Ensure some variation in final sprite, makes the carpet of crap look less wonky.
+
+	spread_chance = seed.get_trait(TRAIT_POTENCY)
+	spread_distance = ((growth_type>0) ? round(spread_chance*0.6) : round(spread_chance*0.3))
+	update_icon()
+
+	spawn(1) // Plants will sometimes be spawned in the turf adjacent to the one they need to end up in, for the sake of correct dir/etc being set.
+		set_dir(calc_dir())
+		update_icon()
+		plant_controller.add_plant(src)
+		// Some plants eat through plating.
+		if(!isnull(seed.chems["pacid"]))
+			var/turf/T = get_turf(src)
+			T.ex_act(prob(80) ? 3 : 2)
+
+/obj/effect/plant/update_icon()
+	//TODO: should really be caching this.
+	refresh_icon()
+	if(growth_type == 0 && !floor)
+		src.transform = null
+		var/matrix/M = matrix()
+		// should make the plant flush against the wall it's meant to be growing from.
+		M.Translate(0,-(rand(12,14)))
+		switch(dir)
+			if(WEST)
+				M.Turn(90)
+			if(NORTH)
+				M.Turn(180)
+			if(EAST)
+				M.Turn(270)
+		src.transform = M
+	var/icon_colour = seed.get_trait(TRAIT_PLANT_COLOUR)
+	if(icon_colour)
+		color = icon_colour
+	// Apply colour and light from seed datum.
+	if(seed.get_trait(TRAIT_BIOLUM))
+		SetLuminosity(1+round(seed.get_trait(TRAIT_POTENCY)/20))
+		if(seed.get_trait(TRAIT_BIOLUM_COLOUR))
+			l_color = seed.get_trait(TRAIT_BIOLUM_COLOUR)
+		else
+			l_color = null
+		return
+	else
+		SetLuminosity(0)
+
+/obj/effect/plant/proc/refresh_icon()
+	var/growth = min(max_growth,round(health/growth_threshold))
+	var/at_fringe = get_dist(src,parent)
+	if(spread_distance > 5)
+		if(at_fringe >= (spread_distance-3))
+			max_growth--
+		if(at_fringe >= (spread_distance-2))
+			max_growth--
+	max_growth = max(1,max_growth)
+	if(growth_type > 0)
+		switch(growth_type)
+			if(1)
+				icon_state = "worms"
+			if(2)
+				icon_state = "vines-[growth]"
+			if(3)
+				icon_state = "mass-[growth]"
+			if(4)
+				icon_state = "mold-[growth]"
+	else
+		icon_state = "[seed.get_trait(TRAIT_PLANT_ICON)]-[growth]"
+
+	if(growth>2 && growth == max_growth)
+		layer = 5
+		opacity = 1
+		if(!isnull(seed.chems["woodpulp"]))
+			density = 1
+	else
+		layer = 3
+		density = 0
+
+/obj/effect/plant/proc/calc_dir(turf/location = loc)
+	set background = 1
+	var/direction = 16
+
+	for(var/wallDir in cardinal)
+		var/turf/newTurf = get_step(location,wallDir)
+		if(newTurf.density)
+			direction |= wallDir
+
+	for(var/obj/effect/plant/shroom in location)
+		if(shroom == src)
+			continue
+		if(shroom.floor) //special
+			direction &= ~16
+		else
+			direction &= ~shroom.dir
+
+	var/list/dirList = list()
+
+	for(var/i=1,i<=16,i <<= 1)
+		if(direction & i)
+			dirList += i
+
+	if(dirList.len)
+		var/newDir = pick(dirList)
+		if(newDir == 16)
+			floor = 1
+			newDir = 1
+		return newDir
+
+	floor = 1
+	return 1
+
+/obj/effect/plant/attackby(var/obj/item/weapon/W, var/mob/user)
+
+	plant_controller.add_plant(src)
+
+	if(istype(W, /obj/item/weapon/wirecutters) || istype(W, /obj/item/weapon/scalpel))
+		if(!seed)
+			user << "There is nothing to take a sample from."
+			return
+		seed.harvest(user,0,1)
+		health -= (rand(3,5)*10)
+	else
+		..()
+		if(W.force)
+			health -= W.force
+	check_health()
+
+/obj/effect/plant/ex_act(severity)
+	switch(severity)
+		if(1.0)
+			die_off()
+			return
+		if(2.0)
+			if (prob(50))
+				die_off()
+				return
+		if(3.0)
+			if (prob(5))
+				die_off()
+				return
+		else
+	return
+
+/obj/effect/plant/proc/check_health()
+	if(health <= 0)
+		die_off()
+
+/obj/effect/plant/proc/is_mature()
+	return (health >= (max_health/3))

code/modules/hydroponics/spreading/spreading_growth.dm

@@ -0,0 +1,89 @@
+#define NEIGHBOR_REFRESH_TIME 100
+
+/obj/effect/plant/proc/update_neighbors()
+	// Update our list of valid neighboring turfs.
+	neighbors = list()
+	for(var/turf/simulated/floor/floor in range(1,src))
+		if(get_dist(parent, floor) > spread_distance)
+			continue
+		if((locate(/obj/effect/plant) in floor.contents) || (locate(/obj/effect/dead_plant) in floor.contents) )
+			continue
+		if(floor.density)
+			if(!isnull(seed.chems["pacid"]))
+				spawn(rand(5,25)) floor.ex_act(3)
+			continue
+		else if(!floor.Enter(src))
+			continue
+		neighbors |= floor
+	// Update all of our friends.
+	var/turf/T = get_turf(src)
+	for(var/obj/effect/plant/neighbor in range(1,src))
+		neighbor.neighbors -= T
+
+/obj/effect/plant/process()
+
+	// Something is very wrong, kill ourselves.
+	if(!seed)
+		die_off()
+		return 0
+
+	// Handle life.
+	var/turf/simulated/T = get_turf(src)
+	if(istype(T))
+		health -= seed.handle_environment(T,T.return_air(),null,1)
+	if(health < max_health)
+		health += rand(3,5)
+		refresh_icon()
+		if(health > max_health)
+			health = max_health
+	else if(health == max_health && !plant)
+		plant = new(T,seed)
+		plant.dir = src.dir
+		plant.transform = src.transform
+		plant.age = seed.get_trait(TRAIT_MATURATION)-1
+		plant.update_icon()
+		if(growth_type==0) //Vines do not become invisible.
+			invisibility = INVISIBILITY_MAXIMUM
+		else
+			plant.layer = layer + 0.1
+
+	if(buckled_mob)
+		seed.do_sting(buckled_mob,src)
+		if(seed.get_trait(TRAIT_CARNIVOROUS))
+			seed.do_thorns(buckled_mob,src)
+
+	if(world.time >= last_tick+NEIGHBOR_REFRESH_TIME)
+		last_tick = world.time
+		update_neighbors()
+
+	if(is_mature() && neighbors.len && prob(spread_chance))
+		for(var/i=1,i<=seed.get_trait(TRAIT_YIELD),i++)
+			if(prob(spread_chance))
+				sleep(rand(3,5))
+				if(!neighbors.len)
+					break
+				var/turf/target_turf = pick(neighbors)
+				var/obj/effect/plant/child = new(get_turf(src),seed,parent)
+				spawn(1) // This should do a little bit of animation.
+					child.loc = target_turf
+					child.update_icon()
+				// Update neighboring squares.
+				for(var/obj/effect/plant/neighbor in range(1,target_turf))
+					neighbor.neighbors -= target_turf
+
+	// We shouldn't have spawned if the controller doesn't exist.
+	check_health()
+	if(neighbors.len || health != max_health)
+		plant_controller.add_plant(src)
+
+/obj/effect/plant/proc/die_off()
+	// Kill off our plant.
+	if(plant) plant.die()
+	// This turf is clear now, let our buddies know.
+	var/turf/T = get_turf(src)
+	for(var/obj/effect/plant/neighbor in range(1,src))
+		neighbor.neighbors |= T
+		plant_controller.add_plant(neighbor)
+	spawn(1) if(src) del(src)
+
+#undef NEIGHBOR_REFRESH_TIME

code/modules/hydroponics/spreading/spreading_response.dm

@@ -0,0 +1,70 @@
+/obj/effect/plant/HasProximity(var/atom/movable/AM)
+
+	if(!is_mature() || seed.get_trait(TRAIT_SPREAD) != 2)
+		return
+
+	var/mob/living/M = AM
+	if(!istype(M))
+		return
+
+	if(!buckled_mob && !M.buckled && !M.anchored && (M.small || prob(round(seed.get_trait(TRAIT_POTENCY)/2))))
+		entangle(M)
+
+/obj/effect/plant/attack_hand(mob/user as mob)
+	// Todo, cause damage.
+	manual_unbuckle(user)
+
+/obj/effect/plant/proc/trodden_on(var/mob/living/victim)
+	if(!is_mature())
+		return
+	var/mob/living/carbon/human/H = victim
+	if(istype(H) && H.shoes)
+		return
+	seed.do_thorns(victim,src)
+	seed.do_sting(victim,src,pick("r_foot","l_foot","r_leg","l_leg"))
+
+/obj/effect/plant/proc/unbuckle()
+	if(buckled_mob)
+		if(buckled_mob.buckled == src)
+			buckled_mob.buckled = null
+			buckled_mob.anchored = initial(buckled_mob.anchored)
+			buckled_mob.update_canmove()
+		buckled_mob = null
+	return
+
+/obj/effect/plant/proc/manual_unbuckle(mob/user as mob)
+	if(buckled_mob)
+		if(prob(seed ? min(max(0,100 - seed.get_trait(TRAIT_POTENCY)/2),100) : 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 [src].</span>",\
+						"<span class='notice'>[user.name] frees you from \the [src].</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 [src].</span>",\
+						"<span class='notice'>You untangle \the [src] from around yourself.</span>",\
+						"<span class='warning'>You hear shredding and ripping.</span>")
+			unbuckle()
+		else
+			var/text = pick("rip","tear","pull")
+			user.visible_message(\
+				"<span class='notice'>[user.name] [text]s at \the [src].</span>",\
+				"<span class='notice'>You [text] at \the [src].</span>",\
+				"<span class='warning'>You hear shredding and ripping.</span>")
+	return
+
+/obj/effect/plant/proc/entangle(var/mob/living/victim)
+
+	if(buckled_mob)
+		return
+
+	victim.buckled = src
+	victim.update_canmove()
+	buckled_mob = victim
+
+	if(victim.loc != src.loc)
+		src.visible_message("<span class='danger'>Tendrils lash out from \the [src] and drag \the [victim] in!</span>")
+		victim.loc = src.loc
+	victim << "<span class='danger'>Tendrils [pick("wind", "tangle", "tighten")] around you!</span>"

code/modules/hydroponics/trays/tray.dm

@@ -1,15 +1,14 @@
-#define HYDRO_SPEED_MULTIPLIER 1
-
 /obj/machinery/portable_atmospherics/hydroponics
 	name = "hydroponics tray"
-	icon = 'icons/obj/hydroponics.dmi'
+	icon = 'icons/obj/hydroponics_machines.dmi'
 	icon_state = "hydrotray3"
 	density = 1
 	anchored = 1
 	flags = OPENCONTAINER
 	volume = 100
 
-	var/draw_warnings = 1 //Set to 0 to stop it from drawing the alert lights.
+	var/mechanical = 1         // Set to 0 to stop it from drawing the alert lights.
+	var/base_name = "tray"
 
 	// Plant maintenance vars.
 	var/waterlevel = 100       // Water (max 100)
@@ -21,13 +20,14 @@
 	var/dead = 0               // Is it dead?
 	var/harvest = 0            // Is it ready to harvest?
 	var/age = 0                // Current plant age
-	var/sampled = 0            // Have wa taken a sample?
+	var/sampled = 0            // Have we taken a sample?
 
 	// Harvest/mutation mods.
 	var/yield_mod = 0          // Modifier to yield
 	var/mutation_mod = 0       // Modifier to mutation chance
 	var/toxins = 0             // Toxicity in the tray?
 	var/mutation_level = 0     // When it hits 100, the plant mutates.
+	var/tray_light = 1         // Supplied lighting.
 
 	// Mechanical concerns.
 	var/health = 0             // Plant health.
@@ -37,6 +37,7 @@
 	var/closed_system          // If set, the tray will attempt to take atmos from a pipe.
 	var/force_update           // Set this to bypass the cycle time check.
 	var/obj/temp_chem_holder   // Something to hold reagents during process_reagents()
+	var/labelled
 
 	// Seed details/line data.
 	var/datum/seed/seed = null // The currently planted seed
@@ -122,6 +123,12 @@
 		"mutagen" = 15
 		)
 
+/obj/machinery/portable_atmospherics/hydroponics/AltClick()
+	if(mechanical && !usr.stat && !usr.lying && Adjacent(usr))
+		close_lid(usr)
+		return
+	return ..()
+
 /obj/machinery/portable_atmospherics/hydroponics/attack_generic(var/mob/user)
 	if(istype(user,/mob/living/carbon/alien/diona))
 		var/mob/living/carbon/alien/diona/nymph = user
@@ -146,13 +153,14 @@
 	temp_chem_holder = new()
 	temp_chem_holder.create_reagents(10)
 	create_reagents(200)
-	connect()
+	if(mechanical)
+		connect()
 	update_icon()
 
 /obj/machinery/portable_atmospherics/hydroponics/bullet_act(var/obj/item/projectile/Proj)
 
 	//Don't act on seeds like dionaea that shouldn't change.
-	if(seed && seed.immutable > 0)
+	if(seed && seed.get_trait(TRAIT_IMMUTABLE) > 0)
 		return
 
 	//Override for somatoray projectiles.
@@ -173,174 +181,18 @@
 	else
 		return 0
 
-/obj/machinery/portable_atmospherics/hydroponics/process()
-
-	//Do this even if we're not ready for a plant cycle.
-	process_reagents()
-
-	// Update values every cycle rather than every process() tick.
-	if(force_update)
-		force_update = 0
-	else if(world.time < (lastcycle + cycledelay))
-		return
-	lastcycle = world.time
-
-	// Mutation level drops each main tick.
-	mutation_level -= rand(2,4)
-
-	// Weeds like water and nutrients, there's a chance the weed population will increase.
-	// Bonus chance if the tray is unoccupied.
-	if(waterlevel > 10 && nutrilevel > 2 && prob(isnull(seed) ? 5 : 1))
-		weedlevel += 1 * HYDRO_SPEED_MULTIPLIER
-
-	// There's a chance for a weed explosion to happen if the weeds take over.
-	// Plants that are themselves weeds (weed_tolerance > 10) are unaffected.
-	if (weedlevel >= 10 && prob(10))
-		if(!seed || weedlevel >= seed.weed_tolerance)
-			weed_invasion()
-
-	// If there is no seed data (and hence nothing planted),
-	// or the plant is dead, process nothing further.
-	if(!seed || dead)
-		if(draw_warnings) update_icon() //Harvesting would fail to set alert icons properly.
-		return
-
-	// Advance plant age.
-	if(prob(30)) age += 1 * HYDRO_SPEED_MULTIPLIER
-
-	//Highly mutable plants have a chance of mutating every tick.
-	if(seed.immutable == -1)
-		var/mut_prob = rand(1,100)
-		if(mut_prob <= 5) mutate(mut_prob == 1 ? 2 : 1)
-
-	// Other plants also mutate if enough mutagenic compounds have been added.
-	if(!seed.immutable)
-		if(prob(min(mutation_level,100)))
-			mutate((rand(100) < 15) ? 2 : 1)
-			mutation_level = 0
-
-	// Maintain tray nutrient and water levels.
-	if(seed.nutrient_consumption > 0 && nutrilevel > 0 && prob(25))
-		nutrilevel -= max(0,seed.nutrient_consumption * HYDRO_SPEED_MULTIPLIER)
-	if(seed.water_consumption > 0 && waterlevel > 0  && prob(25))
-		waterlevel -= max(0,seed.water_consumption * HYDRO_SPEED_MULTIPLIER)
-
-	// Make sure the plant is not starving or thirsty. Adequate
-	// water and nutrients will cause a plant to become healthier.
-	var/healthmod = rand(1,3) * HYDRO_SPEED_MULTIPLIER
-	if(seed.requires_nutrients && prob(35))
-		health += (nutrilevel < 2 ? -healthmod : healthmod)
-	if(seed.requires_water && prob(35))
-		health += (waterlevel < 10 ? -healthmod : healthmod)
-
-	// Check that pressure, heat and light are all within bounds.
-	// First, handle an open system or an unconnected closed system.
-
-	var/turf/T = loc
-	var/datum/gas_mixture/environment
-
-	// If we're closed, take from our internal sources.
-	if(closed_system && (connected_port || holding))
-		environment = air_contents
-
-	// If atmos input is not there, grab from turf.
-	if(!environment)
-		if(istype(T))
-			environment = T.return_air()
-
-	if(!environment) return
-
-	// Handle gas consumption.
-	if(seed.consume_gasses && seed.consume_gasses.len)
-		var/missing_gas = 0
-		for(var/gas in seed.consume_gasses)
-			if(environment && environment.gas && environment.gas[gas] && \
-			 environment.gas[gas] >= seed.consume_gasses[gas])
-				environment.adjust_gas(gas,-seed.consume_gasses[gas],1)
-			else
-				missing_gas++
-
-		if(missing_gas > 0)
-			health -= missing_gas * HYDRO_SPEED_MULTIPLIER
-
-	// Process it.
-	var/pressure = environment.return_pressure()
-	if(pressure < seed.lowkpa_tolerance || pressure > seed.highkpa_tolerance)
-		health -= healthmod
-
-	if(abs(environment.temperature - seed.ideal_heat) > seed.heat_tolerance)
-		health -= healthmod
-
-	// Handle gas production.
-	if(seed.exude_gasses && seed.exude_gasses.len)
-		for(var/gas in seed.exude_gasses)
-			environment.adjust_gas(gas, max(1,round((seed.exude_gasses[gas]*seed.potency)/seed.exude_gasses.len)))
-
-	// If we're attached to a pipenet, then we should let the pipenet know we might have modified some gasses
-	if (closed_system && connected_port)
-		update_connected_network()
-
-	// Handle light requirements.
-	var/area/A = T.loc
-	if(A)
-		var/light_available
-		if(A.lighting_use_dynamic)
-			light_available = max(0,min(10,T.lighting_lumcount)-5)
-		else
-			light_available =  5
-		if(abs(light_available - seed.ideal_light) > seed.light_tolerance)
-			health -= healthmod
-
-	// Toxin levels beyond the plant's tolerance cause damage, but
-	// toxins are sucked up each tick and slowly reduce over time.
-	if(toxins > 0)
-		var/toxin_uptake = max(1,round(toxins/10))
-		if(toxins > seed.toxins_tolerance)
-			health -= toxin_uptake
-		toxins -= toxin_uptake
-
-	// Check for pests and weeds.
-	// Some carnivorous plants happily eat pests.
-	if(pestlevel > 0)
-		if(seed.carnivorous)
-			health += HYDRO_SPEED_MULTIPLIER
-			pestlevel -= HYDRO_SPEED_MULTIPLIER
-		else if (pestlevel >= seed.pest_tolerance)
-			health -= HYDRO_SPEED_MULTIPLIER
-
-	// Some plants thrive and live off of weeds.
-	if(weedlevel > 0)
-		if(seed.parasite)
-			health += HYDRO_SPEED_MULTIPLIER
-			weedlevel -= HYDRO_SPEED_MULTIPLIER
-		else if (weedlevel >= seed.weed_tolerance)
-			health -= HYDRO_SPEED_MULTIPLIER
-
-	// Handle life and death.
-	// If the plant is too old, it loses health fast.
-	if(age > seed.lifespan)
-		health -= rand(3,5) * HYDRO_SPEED_MULTIPLIER
-
-	// When the plant dies, weeds thrive and pests die off.
-	if(health <= 0)
-		dead = 1
-		mutation_level = 0
-		harvest = 0
-		weedlevel += 1 * HYDRO_SPEED_MULTIPLIER
-		pestlevel = 0
-
-	// If enough time (in cycles, not ticks) has passed since the plant was harvested, we're ready to harvest again.
-	else if(seed.products && seed.products.len && age > seed.production && \
-	 (age - lastproduce) > seed.production && (!harvest && !dead))
-		harvest = 1
-		lastproduce = age
-
-	if(prob(3))  // On each tick, there's a chance the pest population will increase
-		pestlevel += 0.1 * HYDRO_SPEED_MULTIPLIER
-
+/obj/machinery/portable_atmospherics/hydroponics/proc/check_health()
+	if(seed && !dead && health <= 0)
+		die()
 	check_level_sanity()
 	update_icon()
-	return
+
+/obj/machinery/portable_atmospherics/hydroponics/proc/die()
+	dead = 1
+	mutation_level = 0
+	harvest = 0
+	weedlevel += 1 * HYDRO_SPEED_MULTIPLIER
+	pestlevel = 0
 
 //Process reagents being input into the tray.
 /obj/machinery/portable_atmospherics/hydroponics/proc/process_reagents()
@@ -391,27 +243,29 @@
 			toxins -= round(water_added/4)
 
 	temp_chem_holder.reagents.clear_reagents()
-	check_level_sanity()
-	update_icon()
+	check_health()
 
 //Harvests the product of a plant.
 /obj/machinery/portable_atmospherics/hydroponics/proc/harvest(var/mob/user)
 
 	//Harvest the product of the plant,
-	if(!seed || !harvest || !user)
+	if(!seed || !harvest)
 		return
 
 	if(closed_system)
-		user << "You can't harvest from the plant while the lid is shut."
+		if(user) user << "You can't harvest from the plant while the lid is shut."
 		return
 
-	seed.harvest(user,yield_mod)
+	if(user)
+		seed.harvest(user,yield_mod)
+	else
+		seed.harvest(get_turf(src),yield_mod)
 
 	// Reset values.
 	harvest = 0
 	lastproduce = age
 
-	if(!seed.harvest_repeat)
+	if(!seed.get_trait(TRAIT_HARVEST_REPEAT))
 		yield_mod = 0
 		seed = null
 		dead = 0
@@ -419,8 +273,7 @@
 		sampled = 0
 		mutation_mod = 0
 
-	check_level_sanity()
-	update_icon()
+	check_health()
 	return
 
 //Clears out a dead plant.
@@ -438,85 +291,28 @@
 	yield_mod = 0
 	mutation_mod = 0
 
-	user << "You remove the dead plant from the [src]."
-	check_level_sanity()
-	update_icon()
+	user << "You remove the dead plant."
+	check_health()
 	return
 
-//Refreshes the icon and sets the luminosity
-/obj/machinery/portable_atmospherics/hydroponics/update_icon()
-
-	overlays.Cut()
-
-	// Updates the plant overlay.
-	if(!isnull(seed))
-
-		if(draw_warnings && health <= (seed.endurance / 2))
-			overlays += "over_lowhealth3"
-
-		if(dead)
-			overlays += "[seed.plant_icon]-dead"
-		else if(harvest)
-			overlays += "[seed.plant_icon]-harvest"
-		else if(age < seed.maturation)
-
-			var/t_growthstate
-			if(age >= seed.maturation)
-				t_growthstate = seed.growth_stages
-			else
-				t_growthstate = round(seed.maturation / seed.growth_stages)
-
-			overlays += "[seed.plant_icon]-grow[t_growthstate]"
-			lastproduce = age
-		else
-			overlays += "[seed.plant_icon]-grow[seed.growth_stages]"
-
-	//Draw the cover.
-	if(closed_system)
-		overlays += "hydrocover"
-
-	//Updated the various alert icons.
-	if(draw_warnings)
-		if(waterlevel <= 10)
-			overlays += "over_lowwater3"
-		if(nutrilevel <= 2)
-			overlays += "over_lownutri3"
-		if(weedlevel >= 5 || pestlevel >= 5 || toxins >= 40)
-			overlays += "over_alert3"
-		if(harvest)
-			overlays += "over_harvest3"
-
-	// Update bioluminescence.
-	if(seed)
-		if(seed.biolum)
-			SetLuminosity(round(seed.potency/10))
-			if(seed.biolum_colour)
-				l_color = seed.biolum_colour
-			else
-				l_color = null
-			return
-
-	SetLuminosity(0)
-	return
-
- // If a weed growth is sufficient, this proc is called.
+// If a weed growth is sufficient, this proc is called.
 /obj/machinery/portable_atmospherics/hydroponics/proc/weed_invasion()
 
 	//Remove the seed if something is already planted.
 	if(seed) seed = null
-	seed = seed_types[pick(list("reishi","nettles","amanita","mushrooms","plumphelmet","towercap","harebells","weeds"))]
+	seed = plant_controller.seeds[pick(list("reishi","nettles","amanita","mushrooms","plumphelmet","towercap","harebells","weeds"))]
 	if(!seed) return //Weed does not exist, someone fucked up.
 
 	dead = 0
 	age = 0
-	health = seed.endurance
+	health = seed.get_trait(TRAIT_ENDURANCE)
 	lastcycle = world.time
 	harvest = 0
 	weedlevel = 0
 	pestlevel = 0
 	sampled = 0
 	update_icon()
-	visible_message("\blue [src] has been overtaken by [seed.display_name].")
+	visible_message("<span class='notice'>[src] has been overtaken by [seed.display_name].</span>")
 
 	return
 
@@ -534,16 +330,40 @@
 	// We need to make sure we're not modifying one of the global seed datums.
 	// If it's not in the global list, then no products of the line have been
 	// harvested yet and it's safe to assume it's restricted to this tray.
-	if(!isnull(seed_types[seed.name]))
+	if(!isnull(plant_controller.seeds[seed.name]))
 		seed = seed.diverge()
 	seed.mutate(severity,get_turf(src))
 
 	return
 
+/obj/machinery/portable_atmospherics/hydroponics/verb/remove_label()
+
+	set name = "Remove Label"
+	set category = "Object"
+	set src in view(1)
+
+	if(labelled)
+		usr << "You remove the label."
+		labelled = null
+		update_icon()
+	else
+		usr << "There is no label to remove."
+	return
+
+/obj/machinery/portable_atmospherics/hydroponics/verb/set_light()
+	set name = "Set Light"
+	set category = "Object"
+	set src in view(1)
+
+	var/new_light = input("Specify a light level.") as null|anything in list(0,1,2,3,4,5,6,7,8,9,10)
+	if(new_light)
+		tray_light = new_light
+		usr << "You set the tray to a light level of [tray_light] lumens."
+
 /obj/machinery/portable_atmospherics/hydroponics/proc/check_level_sanity()
 	//Make sure various values are sane.
 	if(seed)
-		health =     max(0,min(seed.endurance,health))
+		health =     max(0,min(seed.get_trait(TRAIT_ENDURANCE),health))
 	else
 		health = 0
 		dead = 0
@@ -559,21 +379,21 @@
 
 	var/previous_plant = seed.display_name
 	var/newseed = seed.get_mutant_variant()
-	if(newseed in seed_types)
-		seed = seed_types[newseed]
+	if(newseed in plant_controller.seeds)
+		seed = plant_controller.seeds[newseed]
 	else
 		return
 
 	dead = 0
 	mutate(1)
 	age = 0
-	health = seed.endurance
+	health = seed.get_trait(TRAIT_ENDURANCE)
 	lastcycle = world.time
 	harvest = 0
 	weedlevel = 0
 
 	update_icon()
-	visible_message("\red The \blue [previous_plant] \red has suddenly mutated into \blue [seed.display_name]!")
+	visible_message("<span class='danger'>The </span><span class='notice'>[previous_plant]</span><span class='danger'> has suddenly mutated into </span><span class='notice'>[seed.display_name]!</span>")
 
 	return
 
@@ -604,7 +424,7 @@
 			sampled = 1
 
 		// Bookkeeping.
-		check_level_sanity()
+		check_health()
 		force_update = 1
 		process()
 
@@ -641,42 +461,28 @@
 				return
 
 			user << "You plant the [S.seed.seed_name] [S.seed.seed_noun]."
-
-			if(S.seed.spread == 1)
-				msg_admin_attack("[key_name(user)] has planted a creeper packet.")
-				var/obj/effect/plant_controller/creeper/PC = new(get_turf(src))
-				if(PC)
-					PC.seed = S.seed
-			else if(S.seed.spread == 2)
-				msg_admin_attack("[key_name(user)] has planted a spreading vine packet.")
-				var/obj/effect/plant_controller/PC = new(get_turf(src))
-				if(PC)
-					PC.seed = S.seed
-			else
-				seed = S.seed //Grab the seed datum.
-				dead = 0
-				age = 1
-				//Snowflakey, maybe move this to the seed datum
-				health = (istype(S, /obj/item/seeds/cutting) ? round(seed.endurance/rand(2,5)) : seed.endurance)
-
-				lastcycle = world.time
+			seed = S.seed //Grab the seed datum.
+			dead = 0
+			age = 1
+			//Snowflakey, maybe move this to the seed datum
+			health = (istype(S, /obj/item/seeds/cutting) ? round(seed.get_trait(TRAIT_ENDURANCE)/rand(2,5)) : seed.get_trait(TRAIT_ENDURANCE))
+			lastcycle = world.time
 
 			del(O)
 
-			check_level_sanity()
-			update_icon()
+			check_health()
 
 		else
-			user << "\red \The [src] already has seeds in it!"
+			user << "<span class='danger'>\The [src] already has seeds in it!</span>"
 
 	else if (istype(O, /obj/item/weapon/minihoe))  // The minihoe
 
 		if(weedlevel > 0)
-			user.visible_message("\red [user] starts uprooting the weeds.", "\red You remove the weeds from the [src].")
+			user.visible_message("<span class='danger'>[user] starts uprooting the weeds.</span>", "<span class='danger'>You remove the weeds from the [src].</span>")
 			weedlevel = 0
 			update_icon()
 		else
-			user << "\red This plot is completely devoid of weeds. It doesn't need uprooting."
+			user << "<span class='danger'>This plot is completely devoid of weeds. It doesn't need uprooting.</span>"
 
 	else if (istype(O, /obj/item/weapon/storage/bag/plants))
 
@@ -698,11 +504,9 @@
 		user << "You spray [src] with [O]."
 		playsound(loc, 'sound/effects/spray3.ogg', 50, 1, -6)
 		del(O)
+		check_health()
 
-		check_level_sanity()
-		update_icon()
-
-	else if(istype(O, /obj/item/weapon/wrench))
+	else if(mechanical && istype(O, /obj/item/weapon/wrench))
 
 		//If there's a connector here, the portable_atmospherics setup can handle it.
 		if(locate(/obj/machinery/atmospherics/portables_connector/) in loc)
@@ -715,7 +519,7 @@
 	else if(istype(O, /obj/item/apiary))
 
 		if(seed)
-			user << "\red [src] is already occupied!"
+			user << "<span class='danger'>[src] is already occupied!</span>"
 		else
 			user.drop_item()
 			del(O)
@@ -725,15 +529,18 @@
 			A.icon_state = src.icon_state
 			A.hydrotray_type = src.type
 			del(src)
+	else if(O.force && seed)
+		user.visible_message("<span class='danger'>\The [seed.display_name] has been attacked by [user] with \the [O]!</span>")
+		if(!dead)
+			health -= O.force
+			check_health()
 	return
 
 /obj/machinery/portable_atmospherics/hydroponics/attack_tk(mob/user as mob)
-
-	if(harvest)
-		harvest(user)
-
-	else if(dead)
+	if(dead)
 		remove_dead(user)
+	else if(harvest)
+		harvest(user)
 
 /obj/machinery/portable_atmospherics/hydroponics/attack_hand(mob/user as mob)
 
@@ -745,76 +552,66 @@
 	else if(dead)
 		remove_dead(user)
 
-	else
-		if(seed && !dead)
-			usr << "[src] has \blue [seed.display_name] \black planted."
-			if(health <= (seed.endurance / 2))
-				usr << "The plant looks \red unhealthy."
-		else
-			usr << "[src] is empty."
-		usr << "Water: [round(waterlevel,0.1)]/100"
-		usr << "Nutrient: [round(nutrilevel,0.1)]/10"
-		if(weedlevel >= 5)
-			usr << "[src] is \red filled with weeds!"
-		if(pestlevel >= 5)
-			usr << "[src] is \red filled with tiny worms!"
+/obj/machinery/portable_atmospherics/hydroponics/examine()
 
-		if(!istype(src,/obj/machinery/portable_atmospherics/hydroponics/soil))
+	..()
 
-			var/turf/T = loc
-			var/datum/gas_mixture/environment
+	if(!seed)
+		usr << "[src] is empty."
+		return
 
-			if(closed_system && (connected_port || holding))
-				environment = air_contents
+	usr << "<span class='notice'>[seed.display_name]</span> are growing here.</span>"
 
-			if(!environment)
-				if(istype(T))
-					environment = T.return_air()
+	if(!Adjacent(usr))
+		return
 
-			if(!environment) //We're in a crate or nullspace, bail out.
-				return
+	usr << "Water: [round(waterlevel,0.1)]/100"
+	usr << "Nutrient: [round(nutrilevel,0.1)]/10"
 
-			var/area/A = T.loc
-			var/light_available
-			if(A)
-				if(A.lighting_use_dynamic)
-					light_available = max(0,min(10,T.lighting_lumcount)-5)
-				else
-					light_available =  5
+	if(weedlevel >= 5)
+		usr << "\The [src] is <span class='danger'>infested with weeds</span>!"
+	if(pestlevel >= 5)
+		usr << "\The [src] is <span class='danger'>infested with tiny worms</span>!"
 
-			usr << "The tray's sensor suite is reporting a light level of [light_available] lumens and a temperature of [environment.temperature]K."
+	if(dead)
+		usr << "<span class='danger'>The plant is dead.</span>"
+	else if(health <= (seed.get_trait(TRAIT_ENDURANCE)/ 2))
+		usr << "The plant looks <span class='danger'>unhealthy</span>."
 
-/obj/machinery/portable_atmospherics/hydroponics/verb/close_lid()
+	if(mechanical)
+		var/turf/T = loc
+		var/datum/gas_mixture/environment
+
+		if(closed_system && (connected_port || holding))
+			environment = air_contents
+
+		if(!environment)
+			if(istype(T))
+				environment = T.return_air()
+
+		if(!environment) //We're in a crate or nullspace, bail out.
+			return
+
+		var/area/A = T.loc
+		var/light_available
+		if(A)
+			if(A.lighting_use_dynamic)
+				light_available = max(0,min(10,T.lighting_lumcount)-5)
+			else
+				light_available =  5
+
+		usr << "The tray's sensor suite is reporting a light level of [light_available] lumens and a temperature of [environment.temperature]K."
+
+/obj/machinery/portable_atmospherics/hydroponics/verb/close_lid_verb()
 	set name = "Toggle Tray Lid"
 	set category = "Object"
 	set src in view(1)
+	close_lid(usr)
 
-	if(!usr || usr.stat || usr.restrained())
+/obj/machinery/portable_atmospherics/hydroponics/proc/close_lid(var/mob/living/user)
+	if(!user || user.stat || user.restrained())
 		return
 
 	closed_system = !closed_system
-	usr << "You [closed_system ? "close" : "open"] the tray's lid."
+	user << "You [closed_system ? "close" : "open"] the tray's lid."
 	update_icon()
-
-/obj/machinery/portable_atmospherics/hydroponics/soil
-	name = "soil"
-	icon = 'icons/obj/hydroponics.dmi'
-	icon_state = "soil"
-	density = 0
-	use_power = 0
-	draw_warnings = 0
-
-/obj/machinery/portable_atmospherics/hydroponics/soil/attackby(var/obj/item/O as obj, var/mob/user as mob)
-	if(istype(O, /obj/item/weapon/shovel))
-		user << "You clear up [src]!"
-		del(src)
-	else if(istype(O,/obj/item/weapon/shovel) || istype(O,/obj/item/weapon/tank))
-		return
-	else
-		..()
-
-/obj/machinery/portable_atmospherics/hydroponics/soil/New()
-	..()
-	verbs -= /obj/machinery/portable_atmospherics/hydroponics/verb/close_lid
-
-#undef HYDRO_SPEED_MULTIPLIER

code/modules/hydroponics/trays/tray_apiary.dm

@@ -0,0 +1,240 @@
+//http://www.youtube.com/watch?v=-1GadTfGFvU
+//i could have done these as just an ordinary plant, but fuck it - there would have been too much snowflake code
+
+/obj/machinery/apiary
+	name = "apiary tray"
+	icon = 'icons/obj/hydroponics_machines.dmi'
+	icon_state = "hydrotray3"
+	density = 1
+	anchored = 1
+	var/nutrilevel = 0
+	var/yieldmod = 1
+	var/mut = 1
+	var/toxic = 0
+	var/dead = 0
+	var/health = -1
+	var/maxhealth = 100
+	var/lastcycle = 0
+	var/cycledelay = 100
+	var/harvestable_honey = 0
+	var/beezeez = 0
+	var/swarming = 0
+
+	var/bees_in_hive = 0
+	var/list/owned_bee_swarms = list()
+	var/hydrotray_type = /obj/machinery/portable_atmospherics/hydroponics
+
+//overwrite this after it's created if the apiary needs a custom machinery sprite
+/obj/machinery/apiary/New()
+	..()
+	overlays += image('icons/obj/apiary_bees_etc.dmi', icon_state="apiary")
+
+/obj/machinery/apiary/bullet_act(var/obj/item/projectile/Proj) //Works with the Somatoray to modify plant variables.
+	if(istype(Proj ,/obj/item/projectile/energy/floramut))
+		mut++
+	else if(istype(Proj ,/obj/item/projectile/energy/florayield))
+		if(!yieldmod)
+			yieldmod += 1
+			//world << "Yield increased by 1, from 0, to a total of [myseed.yield]"
+		else if (prob(1/(yieldmod * yieldmod) *100))//This formula gives you diminishing returns based on yield. 100% with 1 yield, decreasing to 25%, 11%, 6, 4, 2...
+			yieldmod += 1
+			//world << "Yield increased by 1, to a total of [myseed.yield]"
+	else
+		..()
+		return
+
+/obj/machinery/apiary/attackby(var/obj/item/O as obj, var/mob/user as mob)
+	if(istype(O, /obj/item/queen_bee))
+		if(health > 0)
+			user << "\red There is already a queen in there."
+		else
+			health = 10
+			nutrilevel += 10
+			user.drop_item()
+			del(O)
+			user << "\blue You carefully insert the queen into [src], she gets busy making a hive."
+			bees_in_hive = 0
+	else if(istype(O, /obj/item/beezeez))
+		beezeez += 100
+		nutrilevel += 10
+		user.drop_item()
+		if(health > 0)
+			user << "\blue You insert [O] into [src]. A relaxed humming appears to pick up."
+		else
+			user << "\blue You insert [O] into [src]. Now it just needs some bees."
+		del(O)
+	else if(istype(O, /obj/item/weapon/minihoe))
+		if(health > 0)
+			user << "\red <b>You begin to dislodge the apiary from the tray, the bees don't like that.</b>"
+			angry_swarm(user)
+		else
+			user << "\blue You begin to dislodge the dead apiary from the tray."
+		if(do_after(user, 50))
+			new hydrotray_type(src.loc)
+			new /obj/item/apiary(src.loc)
+			user << "\red You dislodge the apiary from the tray."
+			del(src)
+	else if(istype(O, /obj/item/weapon/bee_net))
+		var/obj/item/weapon/bee_net/N = O
+		if(N.caught_bees > 0)
+			user << "\blue You empty the bees into the apiary."
+			bees_in_hive += N.caught_bees
+			N.caught_bees = 0
+		else
+			user << "\blue There are no more bees in the net."
+	else if(istype(O, /obj/item/weapon/reagent_containers/glass))
+		var/obj/item/weapon/reagent_containers/glass/G = O
+		if(harvestable_honey > 0)
+			if(health > 0)
+				user << "\red You begin to harvest the honey. The bees don't seem to like it."
+				angry_swarm(user)
+			else
+				user << "\blue You begin to harvest the honey."
+			if(do_after(user,50))
+				G.reagents.add_reagent("honey",harvestable_honey)
+				harvestable_honey = 0
+				user << "\blue You successfully harvest the honey."
+		else
+			user << "\blue There is no honey left to harvest."
+	else
+		angry_swarm(user)
+		..()
+
+/obj/machinery/apiary/CanPass(atom/movable/mover, turf/target, height=0, air_group=0)
+	if(air_group || (height==0)) return 1
+
+	if(istype(mover) && mover.checkpass(PASSTABLE))
+		return 1
+	else
+		return 0
+
+/obj/machinery/apiary/process()
+
+	if(swarming > 0)
+		swarming -= 1
+		if(swarming <= 0)
+			for(var/mob/living/simple_animal/bee/B in src.loc)
+				bees_in_hive += B.strength
+				del(B)
+	else if(bees_in_hive < 10)
+		for(var/mob/living/simple_animal/bee/B in src.loc)
+			bees_in_hive += B.strength
+			del(B)
+
+	if(world.time > (lastcycle + cycledelay))
+		lastcycle = world.time
+		if(health < 0)
+			return
+
+		//magical bee formula
+		if(beezeez > 0)
+			beezeez -= 1
+
+			nutrilevel += 2
+			health += 1
+			toxic = max(0, toxic - 1)
+
+		//handle nutrients
+		nutrilevel -= bees_in_hive / 10 + owned_bee_swarms.len / 5
+		if(nutrilevel > 0)
+			bees_in_hive += 1 * yieldmod
+			if(health < maxhealth)
+				health++
+		else
+			//nutrilevel is less than 1, so we're effectively subtracting here
+			health += max(nutrilevel - 1, round(-health / 2))
+			bees_in_hive += max(nutrilevel - 1, round(-bees_in_hive / 2))
+			if(owned_bee_swarms.len)
+				var/mob/living/simple_animal/bee/B = pick(owned_bee_swarms)
+				B.target_turf = get_turf(src)
+
+		//clear out some toxins
+		if(toxic > 0)
+			toxic -= 1
+			health -= 1
+
+		if(health <= 0)
+			return
+
+		//make a bit of honey
+		if(harvestable_honey < 50)
+			harvestable_honey += 0.5
+
+		//make some new bees
+		if(bees_in_hive >= 10 && prob(bees_in_hive * 10))
+			var/mob/living/simple_animal/bee/B = new(get_turf(src), src)
+			owned_bee_swarms.Add(B)
+			B.mut = mut
+			B.toxic = toxic
+			bees_in_hive -= 1
+
+		//find some plants, harvest
+		for(var/obj/machinery/portable_atmospherics/hydroponics/H in view(7, src))
+			if(H.seed && !H.dead && prob(owned_bee_swarms.len * 10))
+				src.nutrilevel++
+				H.nutrilevel++
+				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.
+				if(H.myseed.type == /obj/item/seeds/harebell || H.myseed.type == /obj/item/seeds/sunflowerseed)
+					src.nutrilevel++
+					H.nutrilevel++
+*/
+				//have a few beneficial effects on nearby plants
+				if(prob(10))
+					H.lastcycle -= 5
+				if(prob(10))
+					H.seed.set_trait(TRAIT_ENDURANCE,max(H.seed.get_trait(TRAIT_ENDURANCE)*1.5,H.seed.get_trait(TRAIT_ENDURANCE)+1))
+				if(H.toxins && prob(10))
+					H.toxins = min(0, H.toxins - 1)
+					toxic++
+
+/obj/machinery/apiary/proc/die()
+	if(owned_bee_swarms.len)
+		var/mob/living/simple_animal/bee/B = pick(owned_bee_swarms)
+		B.target_turf = get_turf(src)
+		B.strength -= 1
+		if(B.strength <= 0)
+			del(B)
+		else if(B.strength <= 5)
+			B.icon_state = "bees[B.strength]"
+	bees_in_hive = 0
+	health = 0
+
+/obj/machinery/apiary/proc/angry_swarm(var/mob/M)
+	for(var/mob/living/simple_animal/bee/B in owned_bee_swarms)
+		B.feral = 25
+		B.target_mob = M
+
+	swarming = 25
+
+	while(bees_in_hive > 0)
+		var/spawn_strength = bees_in_hive
+		if(bees_in_hive >= 5)
+			spawn_strength = 6
+
+		var/mob/living/simple_animal/bee/B = new(get_turf(src), src)
+		B.target_mob = M
+		B.strength = spawn_strength
+		B.feral = 25
+		B.mut = mut
+		B.toxic = toxic
+		bees_in_hive -= spawn_strength
+
+/obj/machinery/apiary/verb/harvest_honeycomb()
+	set src in oview(1)
+	set name = "Harvest honeycomb"
+	set category = "Object"
+
+	while(health > 15)
+		health -= 15
+		var/obj/item/weapon/reagent_containers/food/snacks/honeycomb/H = new(src.loc)
+		if(toxic > 0)
+			H.reagents.add_reagent("toxin", toxic)
+
+	usr << "\blue You harvest the honeycomb from the hive. There is a wild buzzing!"
+	angry_swarm(usr)

code/modules/hydroponics/trays/tray_process.dm

@@ -0,0 +1,126 @@
+/obj/machinery/portable_atmospherics/hydroponics/process()
+
+	//Do this even if we're not ready for a plant cycle.
+	process_reagents()
+
+	// Update values every cycle rather than every process() tick.
+	if(force_update)
+		force_update = 0
+	else if(world.time < (lastcycle + cycledelay))
+		return
+	lastcycle = world.time
+
+	// Mutation level drops each main tick.
+	mutation_level -= rand(2,4)
+
+	// Weeds like water and nutrients, there's a chance the weed population will increase.
+	// Bonus chance if the tray is unoccupied.
+	if(waterlevel > 10 && nutrilevel > 2 && prob(isnull(seed) ? 5 : 1))
+		weedlevel += 1 * HYDRO_SPEED_MULTIPLIER
+
+	// There's a chance for a weed explosion to happen if the weeds take over.
+	// Plants that are themselves weeds (weed_tolerance > 10) are unaffected.
+	if (weedlevel >= 10 && prob(10))
+		if(!seed || weedlevel >= seed.get_trait(TRAIT_WEED_TOLERANCE))
+			weed_invasion()
+
+	// If there is no seed data (and hence nothing planted),
+	// or the plant is dead, process nothing further.
+	if(!seed || dead)
+		if(mechanical) update_icon() //Harvesting would fail to set alert icons properly.
+		return
+
+	// Advance plant age.
+	if(prob(30)) age += 1 * HYDRO_SPEED_MULTIPLIER
+
+	//Highly mutable plants have a chance of mutating every tick.
+	if(seed.get_trait(TRAIT_IMMUTABLE) == -1)
+		var/mut_prob = rand(1,100)
+		if(mut_prob <= 5) mutate(mut_prob == 1 ? 2 : 1)
+
+	// Other plants also mutate if enough mutagenic compounds have been added.
+	if(!seed.get_trait(TRAIT_IMMUTABLE))
+		if(prob(min(mutation_level,100)))
+			mutate((rand(100) < 15) ? 2 : 1)
+			mutation_level = 0
+
+	// Maintain tray nutrient and water levels.
+	if(seed.get_trait(TRAIT_NUTRIENT_CONSUMPTION) > 0 && nutrilevel > 0 && prob(25))
+		nutrilevel -= max(0,seed.get_trait(TRAIT_NUTRIENT_CONSUMPTION) * HYDRO_SPEED_MULTIPLIER)
+	if(seed.get_trait(TRAIT_WATER_CONSUMPTION) > 0 && waterlevel > 0 && prob(25))
+		waterlevel -= max(0,seed.get_trait(TRAIT_WATER_CONSUMPTION) * HYDRO_SPEED_MULTIPLIER)
+
+	// Make sure the plant is not starving or thirsty. Adequate
+	// water and nutrients will cause a plant to become healthier.
+	var/healthmod = rand(1,3) * HYDRO_SPEED_MULTIPLIER
+	if(seed.get_trait(TRAIT_REQUIRES_NUTRIENTS) && prob(35))
+		health += (nutrilevel < 2 ? -healthmod : healthmod)
+	if(seed.get_trait(TRAIT_REQUIRES_WATER) && prob(35))
+		health += (waterlevel < 10 ? -healthmod : healthmod)
+
+	// Check that pressure, heat and light are all within bounds.
+	// First, handle an open system or an unconnected closed system.
+	var/turf/T = loc
+	var/datum/gas_mixture/environment
+	// If we're closed, take from our internal sources.
+	if(closed_system && (connected_port || holding))
+		environment = air_contents
+	// If atmos input is not there, grab from turf.
+	if(!environment && istype(T)) environment = T.return_air()
+	if(!environment) return
+
+	// Seed datum handles gasses, light and pressure.
+	if(mechanical && closed_system)
+		health -= seed.handle_environment(T,environment,tray_light)
+	else
+		health -= seed.handle_environment(T,environment)
+
+	// If we're attached to a pipenet, then we should let the pipenet know we might have modified some gasses
+	if (closed_system && connected_port)
+		update_connected_network()
+
+	// Toxin levels beyond the plant's tolerance cause damage, but
+	// toxins are sucked up each tick and slowly reduce over time.
+	if(toxins > 0)
+		var/toxin_uptake = max(1,round(toxins/10))
+		if(toxins > seed.get_trait(TRAIT_TOXINS_TOLERANCE))
+			health -= toxin_uptake
+		toxins -= toxin_uptake
+
+	// Check for pests and weeds.
+	// Some carnivorous plants happily eat pests.
+	if(pestlevel > 0)
+		if(seed.get_trait(TRAIT_CARNIVOROUS))
+			health += HYDRO_SPEED_MULTIPLIER
+			pestlevel -= HYDRO_SPEED_MULTIPLIER
+		else if (pestlevel >= seed.get_trait(TRAIT_PEST_TOLERANCE))
+			health -= HYDRO_SPEED_MULTIPLIER
+
+	// Some plants thrive and live off of weeds.
+	if(weedlevel > 0)
+		if(seed.get_trait(TRAIT_PARASITE))
+			health += HYDRO_SPEED_MULTIPLIER
+			weedlevel -= HYDRO_SPEED_MULTIPLIER
+		else if (weedlevel >= seed.get_trait(TRAIT_WEED_TOLERANCE))
+			health -= HYDRO_SPEED_MULTIPLIER
+
+	// Handle life and death.
+	// When the plant dies, weeds thrive and pests die off.
+	check_health()
+
+	// If enough time (in cycles, not ticks) has passed since the plant was harvested, we're ready to harvest again.
+	if((age > seed.get_trait(TRAIT_MATURATION)) && \
+	 ((age - lastproduce) > seed.get_trait(TRAIT_PRODUCTION)) && \
+	 (!harvest && !dead))
+		harvest = 1
+		lastproduce = age
+
+	if(prob(3))  // On each tick, there's a chance the pest population will increase
+		pestlevel += 0.1 * HYDRO_SPEED_MULTIPLIER
+
+	// Some seeds will self-harvest if you don't keep a lid on them.
+	if(seed && seed.can_self_harvest && harvest && !closed_system && prob(5))
+		harvest()
+
+	check_health()
+	return

code/modules/hydroponics/trays/tray_reagents.dm

@@ -0,0 +1,138 @@
+
+/obj/item/weapon/plantspray
+	icon = 'icons/obj/hydroponics_machines.dmi'
+	item_state = "spray"
+	flags = NOBLUDGEON
+	slot_flags = SLOT_BELT
+	throwforce = 4
+	w_class = 2.0
+	throw_speed = 2
+	throw_range = 10
+	var/toxicity = 4
+	var/pest_kill_str = 0
+	var/weed_kill_str = 0
+
+/obj/item/weapon/plantspray/weeds // -- Skie
+
+	name = "weed-spray"
+	desc = "It's a toxic mixture, in spray form, to kill small weeds."
+	icon_state = "weedspray"
+	weed_kill_str = 6
+
+/obj/item/weapon/plantspray/pests
+	name = "pest-spray"
+	desc = "It's some pest eliminator spray! <I>Do not inhale!</I>"
+	icon_state = "pestspray"
+	pest_kill_str = 6
+
+/obj/item/weapon/plantspray/pests/old
+	name = "bottle of pestkiller"
+	icon = 'icons/obj/chemical.dmi'
+	icon_state = "bottle16"
+
+/obj/item/weapon/plantspray/pests/old/carbaryl
+	name = "bottle of carbaryl"
+	icon_state = "bottle16"
+	toxicity = 4
+	pest_kill_str = 2
+
+/obj/item/weapon/plantspray/pests/old/lindane
+	name = "bottle of lindane"
+	icon_state = "bottle18"
+	toxicity = 6
+	pest_kill_str = 4
+
+/obj/item/weapon/plantspray/pests/old/phosmet
+	name = "bottle of phosmet"
+	icon_state = "bottle15"
+	toxicity = 8
+	pest_kill_str = 7
+
+/obj/item/weapon/minihoe // -- Numbers
+	name = "mini hoe"
+	desc = "It's used for removing weeds or scratching your back."
+	icon = 'icons/obj/weapons.dmi'
+	icon_state = "hoe"
+	item_state = "hoe"
+	flags = CONDUCT | NOBLUDGEON
+	force = 5.0
+	throwforce = 7.0
+	w_class = 2.0
+	matter = list("metal" = 50)
+	attack_verb = list("slashed", "sliced", "cut", "clawed")
+
+
+// *************************************
+// Weedkiller defines for hydroponics
+// *************************************
+
+/obj/item/weedkiller
+	name = "bottle of weedkiller"
+	icon = 'icons/obj/chemical.dmi'
+	icon_state = "bottle16"
+	var/toxicity = 0
+	var/weed_kill_str = 0
+
+/obj/item/weedkiller/triclopyr
+	name = "bottle of glyphosate"
+	icon = 'icons/obj/chemical.dmi'
+	icon_state = "bottle16"
+	toxicity = 4
+	weed_kill_str = 2
+
+/obj/item/weedkiller/lindane
+	name = "bottle of triclopyr"
+	icon = 'icons/obj/chemical.dmi'
+	icon_state = "bottle18"
+	toxicity = 6
+	weed_kill_str = 4
+
+/obj/item/weedkiller/D24
+	name = "bottle of 2,4-D"
+	icon = 'icons/obj/chemical.dmi'
+	icon_state = "bottle15"
+	toxicity = 8
+	weed_kill_str = 7
+
+// *************************************
+// Nutrient defines for hydroponics
+// *************************************
+
+/obj/item/weapon/reagent_containers/glass/fertilizer
+	name = "fertilizer bottle"
+	desc = "A small glass bottle. Can hold up to 10 units."
+	icon = 'icons/obj/chemical.dmi'
+	icon_state = "bottle16"
+	flags = OPENCONTAINER
+	possible_transfer_amounts = null
+	w_class = 2.0
+
+	var/fertilizer //Reagent contained, if any.
+
+	//Like a shot glass!
+	amount_per_transfer_from_this = 10
+	volume = 10
+
+/obj/item/weapon/reagent_containers/glass/fertilizer/New()
+	..()
+
+	src.pixel_x = rand(-5.0, 5)
+	src.pixel_y = rand(-5.0, 5)
+
+	if(fertilizer)
+		reagents.add_reagent(fertilizer,10)
+
+/obj/item/weapon/reagent_containers/glass/fertilizer/ez
+	name = "bottle of E-Z-Nutrient"
+	icon_state = "bottle16"
+	fertilizer = "eznutrient"
+
+/obj/item/weapon/reagent_containers/glass/fertilizer/l4z
+	name = "bottle of Left 4 Zed"
+	icon_state = "bottle18"
+	fertilizer = "left4zed"
+
+/obj/item/weapon/reagent_containers/glass/fertilizer/rh
+	name = "bottle of Robust Harvest"
+	icon_state = "bottle15"
+	fertilizer = "robustharvest"

code/modules/hydroponics/trays/tray_soil.dm

@@ -0,0 +1,67 @@
+/obj/machinery/portable_atmospherics/hydroponics/soil
+	name = "soil"
+	icon_state = "soil"
+	density = 0
+	use_power = 0
+	mechanical = 0
+	tray_light = 0
+
+/obj/machinery/portable_atmospherics/hydroponics/soil/attackby(var/obj/item/O as obj, var/mob/user as mob)
+	if(istype(O,/obj/item/weapon/tank))
+		return
+	else
+		..()
+
+/obj/machinery/portable_atmospherics/hydroponics/soil/New()
+	..()
+	verbs -= /obj/machinery/portable_atmospherics/hydroponics/verb/close_lid_verb
+	verbs -= /obj/machinery/portable_atmospherics/hydroponics/verb/remove_label
+	verbs -= /obj/machinery/portable_atmospherics/hydroponics/verb/set_light
+
+/obj/machinery/portable_atmospherics/hydroponics/soil/CanPass()
+	return 1
+
+// Holder for vine plants.
+// Icons for plants are generated as overlays, so setting it to invisible wouldn't work.
+// Hence using a blank icon.
+/obj/machinery/portable_atmospherics/hydroponics/soil/invisible
+	name = "plant"
+	icon = 'icons/obj/seeds.dmi'
+	icon_state = "blank"
+
+/obj/machinery/portable_atmospherics/hydroponics/soil/invisible/New(var/newloc,var/datum/seed/newseed)
+	..()
+	seed = newseed
+	dead = 0
+	age = 1
+	health = seed.get_trait(TRAIT_ENDURANCE)
+	lastcycle = world.time
+	pixel_y = rand(-5,5)
+	check_health()
+
+/obj/machinery/portable_atmospherics/hydroponics/soil/invisible/remove_dead()
+	..()
+	del(src)
+
+/obj/machinery/portable_atmospherics/hydroponics/soil/invisible/harvest()
+	..()
+	if(!seed) // Repeat harvests are a thing.
+		del(src)
+
+/obj/machinery/portable_atmospherics/hydroponics/soil/invisible/die()
+	del(src)
+
+/obj/machinery/portable_atmospherics/hydroponics/soil/invisible/process()
+	if(!seed)
+		del(src)
+		return
+	else if(name=="plant")
+		name = seed.display_name
+	..()
+
+/obj/machinery/portable_atmospherics/hydroponics/soil/invisible/Del()
+	// Check if we're masking a decal that needs to be visible again.
+	for(var/obj/effect/plant/plant in get_turf(src))
+		if(plant.invisibility == INVISIBILITY_MAXIMUM)
+			plant.invisibility = initial(plant.invisibility)
+	..()

code/modules/hydroponics/trays/tray_tools.dm

@@ -0,0 +1,271 @@
+//Analyzer, pestkillers, weedkillers, nutrients, hatchets, cutters.
+
+/obj/item/weapon/wirecutters/clippers
+	name = "plant clippers"
+	desc = "A tool used to take samples from plants."
+
+/obj/item/device/analyzer/plant_analyzer
+	name = "plant analyzer"
+	icon = 'icons/obj/device.dmi'
+	icon_state = "hydro"
+	item_state = "analyzer"
+	var/form_title
+	var/last_data
+
+/obj/item/device/analyzer/plant_analyzer/proc/print_report_verb()
+	set name = "Print Plant Report"
+	set category = "Object"
+	set src = usr
+
+	if(usr.stat || usr.restrained() || usr.lying)
+		return
+	print_report(usr)
+
+/obj/item/device/analyzer/plant_analyzer/Topic(href, href_list)
+	if(..())
+		return
+	if(href_list["print"])
+		print_report(usr)
+
+/obj/item/device/analyzer/plant_analyzer/proc/print_report(var/mob/living/user)
+	if(!last_data)
+		user << "There is no scan data to print."
+		return
+	var/obj/item/weapon/paper/P = new /obj/item/weapon/paper(get_turf(src))
+	P.name = "paper - [form_title]"
+	P.info = "[last_data]"
+	if(istype(user,/mob/living/carbon/human) && !(user.l_hand && user.r_hand))
+		user.put_in_hands(P)
+	user.visible_message("\The [src] spits out a piece of paper.")
+	return
+
+/obj/item/device/analyzer/plant_analyzer/attack_self(mob/user as mob)
+	print_report(user)
+	return 0
+
+/obj/item/device/analyzer/plant_analyzer/afterattack(obj/target, mob/user, flag)
+	if(!flag) return
+
+	var/datum/seed/grown_seed
+	var/datum/reagents/grown_reagents
+	if(istype(target,/obj/structure/table))
+		return ..()
+	else if(istype(target,/obj/item/weapon/reagent_containers/food/snacks/grown))
+
+		var/obj/item/weapon/reagent_containers/food/snacks/grown/G = target
+		grown_seed = plant_controller.seeds[G.plantname]
+		grown_reagents = G.reagents
+
+	else if(istype(target,/obj/item/weapon/grown))
+
+		var/obj/item/weapon/grown/G = target
+		grown_seed = plant_controller.seeds[G.plantname]
+		grown_reagents = G.reagents
+
+	else if(istype(target,/obj/item/seeds))
+
+		var/obj/item/seeds/S = target
+		grown_seed = S.seed
+
+	else if(istype(target,/obj/machinery/portable_atmospherics/hydroponics))
+
+		var/obj/machinery/portable_atmospherics/hydroponics/H = target
+		grown_seed = H.seed
+		grown_reagents = H.reagents
+
+	if(!grown_seed)
+		user << "<span class='danger'>[src] can tell you nothing about \the [target].</span>"
+		return
+
+	form_title = "[grown_seed.seed_name] (#[grown_seed.uid])"
+	var/dat = "<h3>Plant data for [form_title]</h3>"
+	user.visible_message("<span class='notice'>[user] runs the scanner over \the [target].</span>")
+
+	dat += "<h2>General Data</h2>"
+
+	dat += "<table>"
+	dat += "<tr><td><b>Endurance</b></td><td>[grown_seed.get_trait(TRAIT_ENDURANCE)]</td></tr>"
+	dat += "<tr><td><b>Yield</b></td><td>[grown_seed.get_trait(TRAIT_YIELD)]</td></tr>"
+	dat += "<tr><td><b>Maturation time</b></td><td>[grown_seed.get_trait(TRAIT_MATURATION)]</td></tr>"
+	dat += "<tr><td><b>Production time</b></td><td>[grown_seed.get_trait(TRAIT_PRODUCTION)]</td></tr>"
+	dat += "<tr><td><b>Potency</b></td><td>[grown_seed.get_trait(TRAIT_POTENCY)]</td></tr>"
+	dat += "</table>"
+
+	if(grown_reagents && grown_reagents.reagent_list && grown_reagents.reagent_list.len)
+		dat += "<h2>Reagent Data</h2>"
+
+		dat += "<br>This sample contains: "
+		for(var/datum/reagent/R in grown_reagents.reagent_list)
+			dat += "<br>- [R.id], [grown_reagents.get_reagent_amount(R.id)] unit(s)"
+
+	dat += "<h2>Other Data</h2>"
+
+	if(grown_seed.get_trait(TRAIT_HARVEST_REPEAT))
+		dat += "This plant can be harvested repeatedly.<br>"
+
+	if(grown_seed.get_trait(TRAIT_IMMUTABLE) == -1)
+		dat += "This plant is highly mutable.<br>"
+	else if(grown_seed.get_trait(TRAIT_IMMUTABLE) > 0)
+		dat += "This plant does not possess genetics that are alterable.<br>"
+
+	if(grown_seed.get_trait(TRAIT_REQUIRES_NUTRIENTS))
+		if(grown_seed.get_trait(TRAIT_NUTRIENT_CONSUMPTION) < 0.05)
+			dat += "It consumes a small amount of nutrient fluid.<br>"
+		else if(grown_seed.get_trait(TRAIT_NUTRIENT_CONSUMPTION) > 0.2)
+			dat += "It requires a heavy supply of nutrient fluid.<br>"
+		else
+			dat += "It requires a supply of nutrient fluid.<br>"
+
+	if(grown_seed.get_trait(TRAIT_REQUIRES_WATER))
+		if(grown_seed.get_trait(TRAIT_WATER_CONSUMPTION) < 1)
+			dat += "It requires very little water.<br>"
+		else if(grown_seed.get_trait(TRAIT_WATER_CONSUMPTION) > 5)
+			dat += "It requires a large amount of water.<br>"
+		else
+			dat += "It requires a stable supply of water.<br>"
+
+	if(grown_seed.mutants && grown_seed.mutants.len)
+		dat += "It exhibits a high degree of potential subspecies shift.<br>"
+
+	dat += "It thrives in a temperature of [grown_seed.get_trait(TRAIT_IDEAL_HEAT)] Kelvin."
+
+	if(grown_seed.get_trait(TRAIT_LOWKPA_TOLERANCE) < 20)
+		dat += "<br>It is well adapted to low pressure levels."
+	if(grown_seed.get_trait(TRAIT_HIGHKPA_TOLERANCE) > 220)
+		dat += "<br>It is well adapted to high pressure levels."
+
+	if(grown_seed.get_trait(TRAIT_HEAT_TOLERANCE) > 30)
+		dat += "<br>It is well adapted to a range of temperatures."
+	else if(grown_seed.get_trait(TRAIT_HEAT_TOLERANCE) < 10)
+		dat += "<br>It is very sensitive to temperature shifts."
+
+	dat += "<br>It thrives in a light level of [grown_seed.get_trait(TRAIT_IDEAL_LIGHT)] lumen[grown_seed.get_trait(TRAIT_IDEAL_LIGHT) == 1 ? "" : "s"]."
+
+	if(grown_seed.get_trait(TRAIT_LIGHT_TOLERANCE) > 10)
+		dat += "<br>It is well adapted to a range of light levels."
+	else if(grown_seed.get_trait(TRAIT_LIGHT_TOLERANCE) < 3)
+		dat += "<br>It is very sensitive to light level shifts."
+
+	if(grown_seed.get_trait(TRAIT_TOXINS_TOLERANCE) < 3)
+		dat += "<br>It is highly sensitive to toxins."
+	else if(grown_seed.get_trait(TRAIT_TOXINS_TOLERANCE) > 6)
+		dat += "<br>It is remarkably resistant to toxins."
+
+	if(grown_seed.get_trait(TRAIT_PEST_TOLERANCE) < 3)
+		dat += "<br>It is highly sensitive to pests."
+	else if(grown_seed.get_trait(TRAIT_PEST_TOLERANCE) > 6)
+		dat += "<br>It is remarkably resistant to pests."
+
+	if(grown_seed.get_trait(TRAIT_WEED_TOLERANCE) < 3)
+		dat += "<br>It is highly sensitive to weeds."
+	else if(grown_seed.get_trait(TRAIT_WEED_TOLERANCE) > 6)
+		dat += "<br>It is remarkably resistant to weeds."
+
+	switch(grown_seed.get_trait(TRAIT_SPREAD))
+		if(1)
+			dat += "<br>It is able to be planted outside of a tray."
+		if(2)
+			dat += "<br>It is a robust and vigorous vine that will spread rapidly."
+
+	switch(grown_seed.get_trait(TRAIT_CARNIVOROUS))
+		if(1)
+			dat += "<br>It is carniovorous and will eat tray pests for sustenance."
+		if(2)
+			dat	+= "<br>It is carnivorous and poses a significant threat to living things around it."
+
+	if(grown_seed.get_trait(TRAIT_PARASITE))
+		dat += "<br>It is capable of parisitizing and gaining sustenance from tray weeds."
+	if(grown_seed.get_trait(TRAIT_ALTER_TEMP))
+		dat += "<br>It will periodically alter the local temperature by [grown_seed.get_trait(TRAIT_ALTER_TEMP)] degrees Kelvin."
+
+	if(grown_seed.get_trait(TRAIT_BIOLUM))
+		dat += "<br>It is [grown_seed.get_trait(TRAIT_BIOLUM_COLOUR)  ? "<font color='[grown_seed.get_trait(TRAIT_BIOLUM_COLOUR)]'>bio-luminescent</font>" : "bio-luminescent"]."
+
+	if(grown_seed.get_trait(TRAIT_PRODUCES_POWER))
+		dat += "<br>The fruit will function as a battery if prepared appropriately."
+
+	if(grown_seed.get_trait(TRAIT_STINGS))
+		dat += "<br>The fruit is covered in stinging spines."
+
+	if(grown_seed.get_trait(TRAIT_JUICY) == 1)
+		dat += "<br>The fruit is soft-skinned and juicy."
+	else if(grown_seed.get_trait(TRAIT_JUICY) == 2)
+		dat += "<br>The fruit is excessively juicy."
+
+	if(grown_seed.get_trait(TRAIT_EXPLOSIVE))
+		dat += "<br>The fruit is internally unstable."
+
+	if(grown_seed.get_trait(TRAIT_TELEPORTING))
+		dat += "<br>The fruit is temporal/spatially unstable."
+
+	dat += "<br><br>\[<a href='?src=\ref[src];print=1'>print report</a>\]"
+	if(dat)
+		user << browse(dat,"window=plant_analyzer")
+		last_data = dat
+
+	return
+
+/obj/item/weapon/minihoe // -- Numbers
+	name = "mini hoe"
+	desc = "It's used for removing weeds or scratching your back."
+	icon = 'icons/obj/weapons.dmi'
+	icon_state = "hoe"
+	item_state = "hoe"
+	flags = CONDUCT | NOBLUDGEON
+	force = 5.0
+	throwforce = 7.0
+	w_class = 2.0
+	matter = list("metal" = 50)
+	attack_verb = list("slashed", "sliced", "cut", "clawed")
+
+//Hatchets and things to kill kudzu
+/obj/item/weapon/hatchet
+	name = "hatchet"
+	desc = "A very sharp axe blade upon a short fibremetal handle. It has a long history of chopping things, but now it is used for chopping wood."
+	icon = 'icons/obj/weapons.dmi'
+	icon_state = "hatchet"
+	flags = CONDUCT
+	force = 12.0
+	w_class = 2.0
+	throwforce = 15.0
+	throw_speed = 4
+	throw_range = 4
+	sharp = 1
+	edge = 1
+	matter = list("metal" = 15000)
+	origin_tech = "materials=2;combat=1"
+	attack_verb = list("chopped", "torn", "cut")
+
+/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 ..()
+
+//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")
+
+/obj/item/weapon/scythe
+	icon_state = "scythe0"
+	name = "scythe"
+	desc = "A sharp and curved blade on a long fibremetal handle, this tool makes it easy to reap what you sow."
+	force = 13.0
+	throwforce = 5.0
+	throw_speed = 1
+	throw_range = 3
+	w_class = 4.0
+	flags = NOSHIELD
+	slot_flags = SLOT_BACK
+	origin_tech = "materials=2;combat=2"
+	attack_verb = list("chopped", "sliced", "cut", "reaped")
+
+/obj/item/weapon/scythe/afterattack(atom/A, mob/user as mob, proximity)
+	if(!proximity) return
+	if(istype(A, /obj/effect/plant))
+		for(var/obj/effect/plant/B in orange(A,1))
+			if(prob(80))
+				B.die_off(1)
+		del A

code/modules/hydroponics/trays/tray_update_icons.dm

@@ -0,0 +1,83 @@
+//Refreshes the icon and sets the luminosity
+/obj/machinery/portable_atmospherics/hydroponics/update_icon()
+	// Update name.
+	if(seed)
+		if(mechanical)
+			name = "[base_name] (#[seed.uid])"
+		else
+			name = "[seed.seed_name]"
+	else
+		name = initial(name)
+
+	if(labelled)
+		name += " ([labelled])"
+
+	overlays.Cut()
+	// Updates the plant overlay.
+	if(!isnull(seed))
+
+		if(mechanical && health <= (seed.get_trait(TRAIT_ENDURANCE) / 2))
+			overlays += "over_lowhealth3"
+
+		if(dead)
+			var/ikey = "[seed.get_trait(TRAIT_PLANT_ICON)]-dead"
+			var/image/dead_overlay = plant_controller.plant_icon_cache["[ikey]"]
+			if(!dead_overlay)
+				dead_overlay = image('icons/obj/hydroponics_growing.dmi', "[ikey]")
+				dead_overlay.color = DEAD_PLANT_COLOUR
+			overlays |= dead_overlay
+		else
+			if(!seed.growth_stages)
+				seed.update_growth_stages()
+			if(!seed.growth_stages)
+				world << "<span class='danger'>Seed type [seed.get_trait(TRAIT_PLANT_ICON)] cannot find a growth stage value.</span>"
+				return
+			var/overlay_stage = 1
+			if(age >= seed.get_trait(TRAIT_MATURATION))
+				overlay_stage = seed.growth_stages
+			else
+				overlay_stage = max(1,round(age/round(seed.get_trait(TRAIT_MATURATION)/seed.growth_stages)))
+			var/ikey = "[seed.get_trait(TRAIT_PLANT_ICON)]-[overlay_stage]"
+			var/image/plant_overlay = plant_controller.plant_icon_cache["[ikey]-[seed.get_trait(TRAIT_PLANT_COLOUR)]"]
+			if(!plant_overlay)
+				plant_overlay = image('icons/obj/hydroponics_growing.dmi', "[ikey]")
+				plant_overlay.color = seed.get_trait(TRAIT_PLANT_COLOUR)
+				plant_controller.plant_icon_cache["[ikey]-[seed.get_trait(TRAIT_PLANT_COLOUR)]"] = plant_overlay
+			overlays |= plant_overlay
+
+			if(harvest && overlay_stage == seed.growth_stages)
+				ikey = "[seed.get_trait(TRAIT_PRODUCT_ICON)]"
+				var/image/harvest_overlay = plant_controller.plant_icon_cache["product-[ikey]-[seed.get_trait(TRAIT_PLANT_COLOUR)]"]
+				if(!harvest_overlay)
+					harvest_overlay = image('icons/obj/hydroponics_products.dmi', "[ikey]")
+					harvest_overlay.color = seed.get_trait(TRAIT_PRODUCT_COLOUR)
+					plant_controller.plant_icon_cache["product-[ikey]-[seed.get_trait(TRAIT_PRODUCT_COLOUR)]"] = harvest_overlay
+				overlays |= harvest_overlay
+
+	//Draw the cover.
+	if(closed_system)
+		overlays += "hydrocover"
+
+	//Updated the various alert icons.
+	if(mechanical)
+		if(waterlevel <= 10)
+			overlays += "over_lowwater3"
+		if(nutrilevel <= 2)
+			overlays += "over_lownutri3"
+		if(weedlevel >= 5 || pestlevel >= 5 || toxins >= 40)
+			overlays += "over_alert3"
+		if(harvest)
+			overlays += "over_harvest3"
+
+	// Update bioluminescence.
+	if(seed)
+		if(seed.get_trait(TRAIT_BIOLUM))
+			SetLuminosity(round(seed.get_trait(TRAIT_POTENCY)/10))
+			if(seed.get_trait(TRAIT_BIOLUM_COLOUR))
+				l_color = seed.get_trait(TRAIT_BIOLUM_COLOUR)
+			else
+				l_color = null
+			return
+
+	SetLuminosity(0)
+	return

code/modules/hydroponics/vines.dm

@@ -1,352 +0,0 @@
-// SPACE VINES (Note that this code is very similar to Biomass code)
-/obj/effect/plantsegment
-	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
-
-	// Vars used by vines with seed data.
-	var/age = 0
-	var/lastproduce = 0
-	var/harvest = 0
-	var/list/chems
-	var/plant_damage_noun = "Thorns"
-	var/limited_growth = 0
-
-	// Life vars/
-	var/energy = 0
-	var/obj/effect/plant_controller/master = null
-	var/datum/seed/seed
-
-/obj/effect/plantsegment/New()
-	return
-
-/obj/effect/plantsegment/Del()
-	if(master)
-		master.vines -= src
-		master.growth_queue -= src
-	..()
-
-/obj/effect/plantsegment/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
-		if(/obj/item/weapon/pickaxe/plasmacutter) 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
-
-		// Weapons with subtypes
-		else
-			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
-				user_unbuckle_mob(user)
-				return
-		// Plant-b-gone damage is handled in its entry in chemistry-reagents.dm
-	..()
-
-
-/obj/effect/plantsegment/attack_hand(mob/user as mob)
-
-	if(user.a_intent == "help" && seed && harvest)
-		seed.harvest(user,1)
-		harvest = 0
-		lastproduce = age
-		update()
-		return
-
-	user_unbuckle_mob(user)
-
-/obj/effect/plantsegment/proc/grow()
-
-	if(!energy)
-		src.icon_state = pick("Med1", "Med2", "Med3")
-		energy = 1
-
-		//Low-lying creepers do not block vision or grow thickly.
-		if(limited_growth)
-			energy = 2
-			return
-
-		src.opacity = 1
-		layer = 5
-	else if(!limited_growth)
-		src.icon_state = pick("Hvy1", "Hvy2", "Hvy3")
-		energy = 2
-
-/obj/effect/plantsegment/proc/entangle_mob()
-
-	if(limited_growth)
-		return
-
-	if(prob(seed ? seed.potency : 25))
-
-		if(!buckled_mob)
-			var/mob/living/carbon/V = locate() in src.loc
-			if(V && (V.stat != DEAD) && (V.buckled != src)) // If mob exists and is 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>"
-
-		// FEED ME, SEYMOUR.
-		if(buckled_mob && seed && (buckled_mob.stat != DEAD)) //Don't bother with a dead mob.
-
-			var/mob/living/M = buckled_mob
-			if(!istype(M)) return
-			var/mob/living/carbon/human/H = buckled_mob
-
-			// Drink some blood/cause some brute.
-			if(seed.carnivorous == 2)
-				buckled_mob << "<span class='danger'>\The [src] pierces your flesh greedily!</span>"
-
-				var/damage = rand(round(seed.potency/2),seed.potency)
-				if(!istype(H))
-					H.adjustBruteLoss(damage)
-					return
-
-				var/datum/organ/external/affecting = H.get_organ(pick("l_foot","r_foot","l_leg","r_leg","l_hand","r_hand","l_arm", "r_arm","head","chest","groin"))
-
-				if(affecting)
-					affecting.take_damage(damage, 0)
-					if(affecting.parent)
-						affecting.parent.add_autopsy_data("[plant_damage_noun]", damage)
-				else
-					H.adjustBruteLoss(damage)
-
-				H.UpdateDamageIcon()
-				H.updatehealth()
-
-			// Inject some chems.
-			if(seed.chems && seed.chems.len && istype(H))
-				H << "<span class='danger'>You feel something seeping into your skin!</span>"
-				for(var/rid in seed.chems)
-					var/injecting = min(5,max(1,seed.potency/5))
-					H.reagents.add_reagent(rid,injecting)
-
-/obj/effect/plantsegment/proc/update()
-	if(!seed) return
-
-	// Update bioluminescence.
-	if(seed.biolum)
-		SetLuminosity(1+round(seed.potency/10))
-		if(seed.biolum_colour)
-			l_color = seed.biolum_colour
-		else
-			l_color = null
-		return
-	else
-		SetLuminosity(0)
-
-	// Update flower/product overlay.
-	overlays.Cut()
-	if(age >= seed.maturation)
-		if(prob(20) && seed.products && seed.products.len && !harvest && ((age-lastproduce) > seed.production))
-			harvest = 1
-			lastproduce = age
-
-		if(harvest)
-			var/image/fruit_overlay = image('icons/obj/hydroponics.dmi',"")
-			if(seed.product_colour)
-				fruit_overlay.color = seed.product_colour
-			overlays += fruit_overlay
-
-		if(seed.flowers)
-			var/image/flower_overlay = image('icons/obj/hydroponics.dmi',"[seed.flower_icon]")
-			if(seed.flower_colour)
-				flower_overlay.color = seed.flower_colour
-			overlays += flower_overlay
-
-/obj/effect/plantsegment/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/plantsegment,F))
-			if(F.Enter(src))
-				if(master)
-					master.spawn_piece( F )
-
-// Explosion damage.
-/obj/effect/plantsegment/ex_act(severity)
-	switch(severity)
-		if(1.0)
-			die()
-			return
-		if(2.0)
-			if (prob(90))
-				die()
-				return
-		if(3.0)
-			if (prob(50))
-				die()
-				return
-	return
-
-// Hotspots kill vines.
-/obj/effect/plantsegment/fire_act(null, temp, volume)
-	del src
-
-/obj/effect/plantsegment/proc/die()
-	if(seed && harvest && rand(5))
-		seed.harvest(src,1)
-		del(src)
-
-/obj/effect/plantsegment/proc/life()
-
-	if(!seed)
-		return
-
-	if(prob(30))
-		age++
-
-	var/turf/T = loc
-	var/datum/gas_mixture/environment
-	if(T) environment = T.return_air()
-
-	if(!environment)
-		return
-
-	var/pressure = environment.return_pressure()
-	if(pressure < seed.lowkpa_tolerance || pressure > seed.highkpa_tolerance)
-		die()
-		return
-
-	if(abs(environment.temperature - seed.ideal_heat) > seed.heat_tolerance)
-		die()
-		return
-
-	var/area/A = T.loc
-	if(A)
-		var/light_available
-		if(A.lighting_use_dynamic)
-			light_available = max(0,min(10,T.lighting_lumcount)-5)
-		else
-			light_available =  5
-		if(abs(light_available - seed.ideal_light) > seed.light_tolerance)
-			die()
-			return
-
-/obj/effect/plant_controller
-
-	//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.
-
-	var/list/obj/effect/plantsegment/vines = list()
-	var/list/growth_queue = list()
-	var/reached_collapse_size
-	var/reached_slowdown_size
-	var/datum/seed/seed
-
-	var/collapse_limit = 250
-	var/slowdown_limit = 30
-	var/limited_growth = 0
-
-/obj/effect/plant_controller/creeper
-	collapse_limit = 6
-	slowdown_limit = 3
-	limited_growth = 1
-
-/obj/effect/plant_controller/New()
-	if(!istype(src.loc,/turf/simulated/floor))
-		del(src)
-
-	spawn(0)
-		spawn_piece(src.loc)
-
-	processing_objects.Add(src)
-
-/obj/effect/plant_controller/Del()
-	processing_objects.Remove(src)
-	..()
-
-/obj/effect/plant_controller/proc/spawn_piece(var/turf/location)
-	var/obj/effect/plantsegment/SV = new(location)
-	SV.limited_growth = src.limited_growth
-	growth_queue += SV
-	vines += SV
-	SV.master = src
-	if(seed)
-		SV.seed = seed
-		SV.name = "[seed.seed_name] vines"
-		SV.update()
-
-/obj/effect/plant_controller/process()
-
-	// Space vines exterminated. Remove the controller
-	if(!vines)
-		del(src)
-		return
-
-	// Sanity check.
-	if(!growth_queue)
-		del(src)
-		return
-
-	// Check if we're too big for our own good.
-	if(vines.len >= (seed ? seed.potency * collapse_limit : 250) && !reached_collapse_size)
-		reached_collapse_size = 1
-	if(vines.len >= (seed ? seed.potency * slowdown_limit : 30) && !reached_slowdown_size )
-		reached_slowdown_size = 1
-
-	var/length = 0
-	if(reached_collapse_size)
-		length = 0
-	else if(reached_slowdown_size)
-		if(prob(seed ? seed.potency : 25))
-			length = 1
-		else
-			length = 0
-	else
-		length = 1
-
-	length = min(30, max(length, vines.len/5))
-
-	// Update as many pieces of vine as we're allowed to.
-	// Append updated vines to the end of the growth queue.
-	var/i = 0
-	var/list/obj/effect/plantsegment/queue_end = list()
-	for(var/obj/effect/plantsegment/SV in growth_queue)
-		i++
-		queue_end += SV
-		growth_queue -= SV
-
-		SV.life()
-
-		if(!SV) continue
-
-		if(SV.energy < 2) //If tile isn't fully grown
-			var/chance
-			if(seed)
-				chance = limited_growth ? round(seed.potency/2,1) : seed.potency
-			else
-				chance = 20
-
-			if(prob(chance))
-				SV.grow()
-
-		else if(!seed || !limited_growth) //If tile is fully grown and not just a creeper.
-			SV.entangle_mob()
-
-		SV.update()
-		SV.spread()
-		if(i >= length)
-			break
-
-	growth_queue = growth_queue + queue_end

code/modules/mob/living/carbon/human/life.dm

@@ -1240,7 +1240,7 @@
 			if(!druggy)		see_invisible = SEE_INVISIBLE_LEVEL_TWO
 			if(healths)		healths.icon_state = "health7"	//DEAD healthmeter
 			if(client)
-				if(client.view != world.view) // If mob moves while zoomed in with device, unzoom them.
+				if(client.view != world.view) // If mob dies while zoomed in with device, unzoom them.
 					for(var/obj/item/item in contents)
 						if(item.zoom)
 							item.zoom()

code/modules/mob/living/carbon/metroid/items.dm

@@ -26,8 +26,9 @@
 			del(O)
 
 /obj/item/slime_extract/New()
-		..()
-		create_reagents(100)
+	..()
+	create_reagents(100)
+	reagents.add_reagent("slimejelly", 30)
 
 /obj/item/slime_extract/grey
 	name = "grey slime extract"

code/modules/mob/living/silicon/ai/ai.dm

@@ -3,7 +3,6 @@
 
 var/list/ai_list = list()
 var/list/ai_verbs_default = list(
-	/mob/living/silicon/ai/proc/ai_alerts,
 	/mob/living/silicon/ai/proc/ai_announcement,
 	/mob/living/silicon/ai/proc/ai_call_shuttle,
 	// /mob/living/silicon/ai/proc/ai_recall_shuttle,
@@ -23,10 +22,7 @@ var/list/ai_verbs_default = list(
 	/mob/living/silicon/ai/proc/sensor_mode,
 	/mob/living/silicon/ai/proc/show_laws_verb,
 	/mob/living/silicon/ai/proc/toggle_acceleration,
-	/mob/living/silicon/ai/proc/toggle_camera_light,
-	/mob/living/silicon/ai/proc/nano_rcon,
-	/mob/living/silicon/ai/proc/nano_crew_monitor,
-	/mob/living/silicon/ai/proc/nano_power_monitor
+	/mob/living/silicon/ai/proc/toggle_camera_light
 )
 
 //Not sure why this is necessary...
@@ -83,9 +79,11 @@ var/list/ai_verbs_default = list(
 
 /mob/living/silicon/ai/proc/add_ai_verbs()
 	src.verbs |= ai_verbs_default
+	src.verbs |= ai_verbs_subsystems
 
 /mob/living/silicon/ai/proc/remove_ai_verbs()
 	src.verbs -= ai_verbs_default
+	src.verbs -= ai_verbs_subsystems
 
 /mob/living/silicon/ai/New(loc, var/datum/ai_laws/L, var/obj/item/device/mmi/B, var/safety = 0)
 	announcement = new()
@@ -166,8 +164,6 @@ var/list/ai_verbs_default = list(
 	hud_list[IMPTRACK_HUD]    = image('icons/mob/hud.dmi', src, "hudblank")
 	hud_list[SPECIALROLE_HUD] = image('icons/mob/hud.dmi', src, "hudblank")
 
-	init_subsystems()
-
 	ai_list += src
 	..()
 	return
@@ -325,36 +321,6 @@ var/list/ai_verbs_default = list(
 	if(malf && malf.apcs >= 3)
 		stat(null, "Time until station control secured: [max(malf.AI_win_timeleft/(malf.apcs/3), 0)] seconds")
 
-/mob/living/silicon/ai/proc/ai_alerts()
-	set category = "AI Commands"
-	set name = "Show Alerts"
-
-	var/dat = "<HEAD><TITLE>Current Station Alerts</TITLE><META HTTP-EQUIV='Refresh' CONTENT='10'></HEAD><BODY>\n"
-	dat += "<A HREF='?src=\ref[src];mach_close=aialerts'>Close</A><BR><BR>"
-	for (var/cat in alarms)
-		dat += text("<B>[]</B><BR>\n", cat)
-		var/list/alarmlist = alarms[cat]
-		if (alarmlist.len)
-			for (var/area_name in alarmlist)
-				var/datum/alarm/alarm = alarmlist[area_name]
-				dat += "<NOBR>"
-
-				var/cameratext = ""
-				if (alarm.cameras)
-					for (var/obj/machinery/camera/I in alarm.cameras)
-						cameratext += text("[]<A HREF=?src=\ref[];switchcamera=\ref[]>[]</A>", (cameratext=="") ? "" : " | ", src, I, I.c_tag)
-				dat += text("-- [] ([])", alarm.area.name, (cameratext)? cameratext : "No Camera")
-
-				if (alarm.sources.len > 1)
-					dat += text(" - [] sources", alarm.sources.len)
-				dat += "</NOBR><BR>\n"
-		else
-			dat += "-- All Systems Nominal<BR>\n"
-		dat += "<BR>\n"
-
-	viewalerts = 1
-	src << browse(dat, "window=aialerts&can_close=0")
-
 // this verb lets the ai see the stations manifest
 /mob/living/silicon/ai/proc/ai_roster()
 	set category = "AI Commands"
@@ -451,7 +417,7 @@ var/list/ai_verbs_default = list(
 	if (href_list["switchcamera"])
 		switchCamera(locate(href_list["switchcamera"])) in cameranet.cameras
 	if (href_list["showalerts"])
-		ai_alerts()
+		subsystem_alarm_monitor()
 	//Carn: holopad requests
 	if (href_list["jumptoholopad"])
 		var/obj/machinery/hologram/holopad/H = locate(href_list["jumptoholopad"])
@@ -526,29 +492,6 @@ var/list/ai_verbs_default = list(
 
 	return 1
 
-/mob/living/silicon/ai/triggerAlarm(var/class, area/A, list/cameralist, var/source)
-	if (stat == 2)
-		return 1
-
-	..()
-
-	var/cameratext = ""
-	for (var/obj/machinery/camera/C in cameralist)
-		cameratext += "[(cameratext == "")? "" : "|"]<A HREF=?src=\ref[src];switchcamera=\ref[C]>[C.c_tag]</A>"
-
-	queueAlarm("--- [class] alarm detected in [A.name]! ([(cameratext)? cameratext : "No Camera"])", class)
-
-	if (viewalerts) ai_alerts()
-
-/mob/living/silicon/ai/cancelAlarm(var/class, area/A as area, var/source)
-	var/has_alarm = ..()
-
-	if (!has_alarm)
-		queueAlarm(text("--- [] alarm in [] has been cleared.", class, A.name), class, 0)
-		if (viewalerts) ai_alerts()
-
-	return has_alarm
-
 /mob/living/silicon/ai/cancel_camera()
 	set category = "AI Commands"
 	set name = "Cancel Camera View"

code/modules/mob/living/silicon/ai/life.dm

@@ -171,6 +171,7 @@
 							sleep(50)
 							theAPC = null
 
+	process_queued_alarms()
 	regular_hud_updates()
 	switch(src.sensor_mode)
 		if (SEC_HUD)

code/modules/mob/living/silicon/ai/nano.dm

@@ -1,27 +0,0 @@
-var/obj/nano_module/crew_monitor/crew_monitor
-var/obj/nano_module/rcon/rcon
-var/obj/nano_module/power_monitor/power_monitor
-
-/mob/living/silicon/ai/proc/init_subsystems()
-	crew_monitor = new(src)
-	rcon = new(src)
-	power_monitor = new(src)
-
-/mob/living/silicon/ai/proc/nano_crew_monitor()
-	set category = "AI Subystems"
-	set name = "Crew Monitor"
-
-	crew_monitor.ui_interact(usr)
-
-/mob/living/silicon/ai/proc/nano_power_monitor()
-	set category = "AI Subystems"
-	set name = "Power Monitor"
-
-	power_monitor.ui_interact(usr)
-
-
-/mob/living/silicon/ai/proc/nano_rcon()
-	set category = "AI Subystems"
-	set name = "RCON"
-
-	rcon.ui_interact(usr)

code/modules/mob/living/silicon/ai/subsystems.dm

@@ -0,0 +1,44 @@
+var/list/ai_verbs_subsystems = list(
+	/mob/living/silicon/ai/proc/subsystem_alarm_monitor,
+	/mob/living/silicon/ai/proc/subsystem_crew_monitor,
+	/mob/living/silicon/ai/proc/subsystem_power_monitor,
+	/mob/living/silicon/ai/proc/subsystem_rcon
+)
+
+/mob/living/silicon/ai
+	var/
+	var/obj/nano_module/crew_monitor/crew_monitor
+	var/obj/nano_module/rcon/rcon
+	var/obj/nano_module/power_monitor/power_monitor
+
+/mob/living/silicon/ai/init_subsystems()
+	..()
+	del(alarm_monitor)
+	alarm_monitor = new/obj/nano_module/alarm_monitor/ai(src)
+	crew_monitor = new(src)
+	rcon = new(src)
+	power_monitor = new(src)
+
+/mob/living/silicon/ai/proc/subsystem_alarm_monitor()
+	set name = "Alarm Monitor"
+	set category = "AI Subystems"
+
+	alarm_monitor.ui_interact(usr)
+
+/mob/living/silicon/ai/proc/subsystem_crew_monitor()
+	set category = "AI Subystems"
+	set name = "Crew Monitor"
+
+	crew_monitor.ui_interact(usr)
+
+/mob/living/silicon/ai/proc/subsystem_power_monitor()
+	set category = "AI Subystems"
+	set name = "Power Monitor"
+
+	power_monitor.ui_interact(usr)
+
+/mob/living/silicon/ai/proc/subsystem_rcon()
+	set category = "AI Subystems"
+	set name = "RCON"
+
+	rcon.ui_interact(usr)

code/modules/mob/living/silicon/alarm.dm

@@ -1,111 +0,0 @@
-/datum/alarm
-	var/area/area		//the area associated with the alarm. Used to identify the alarm
-	var/list/sources	//list of things triggering the alarm. Used to determine when the alarm should be cleared.
-	var/list/cameras	//list of cameras that can be switched to, if the player has that capability.
-
-/datum/alarm/New(area/A, list/sourcelist=list(), list/cameralist=list())
-	area = A
-	sources = sourcelist
-	cameras = cameralist
-	
-/mob/living/silicon
-	var/alarms = list("Motion"=list(), "Fire"=list(), "Atmosphere"=list(), "Power"=list(), "Camera"=list())	//each sublist stores alarms keyed by the area name
-	var/list/alarms_to_show = list()
-	var/list/alarms_to_clear = list()
-	var/list/alarm_types_show = list("Motion" = 0, "Fire" = 0, "Atmosphere" = 0, "Power" = 0, "Camera" = 0)
-	var/list/alarm_types_clear = list("Motion" = 0, "Fire" = 0, "Atmosphere" = 0, "Power" = 0, "Camera" = 0)
-
-/mob/living/silicon/proc/triggerAlarm(var/class, area/A, list/cameralist, var/source)
-	var/list/alarmlist = alarms[class]
-	
-	//see if there is already an alarm of this class for this area
-	if (A.name in alarmlist)
-		var/datum/alarm/existing = alarmlist[A.name]
-		existing.sources += source
-		existing.cameras |= cameralist
-	else
-		alarmlist[A.name] = new /datum/alarm(A, list(source), cameralist)
-
-/mob/living/silicon/proc/cancelAlarm(var/class, area/A as area, var/source)
-	var/cleared = 0
-	var/list/alarmlist = alarms[class]
-	
-	if (A.name in alarmlist)
-		var/datum/alarm/alarm = alarmlist[A.name]
-		alarm.sources -= source
-		
-		if (!(alarm.sources.len))
-			cleared = 1
-			alarmlist -= A.name
-
-	return !cleared
-
-/mob/living/silicon/proc/queueAlarm(var/message, var/type, var/incoming = 1)
-	var/in_cooldown = (alarms_to_show.len > 0 || alarms_to_clear.len > 0)
-	if(incoming)
-		alarms_to_show += message
-		alarm_types_show[type] += 1
-	else
-		alarms_to_clear += message
-		alarm_types_clear[type] += 1
-
-	if(!in_cooldown)
-		spawn(10 * 10) // 10 seconds
-
-			if(alarms_to_show.len < 5)
-				for(var/msg in alarms_to_show)
-					src << msg
-			else if(alarms_to_show.len)
-
-				var/msg = "--- "
-
-				if(alarm_types_show["Motion"])
-					msg += "MOTION: [alarm_types_show["Motion"]] alarms detected. - "
-
-				if(alarm_types_show["Fire"])
-					msg += "FIRE: [alarm_types_show["Fire"]] alarms detected. - "
-
-				if(alarm_types_show["Atmosphere"])
-					msg += "ATMOSPHERE: [alarm_types_show["Atmosphere"]] alarms detected. - "
-
-				if(alarm_types_show["Power"])
-					msg += "POWER: [alarm_types_show["Power"]] alarms detected. - "
-
-				if(alarm_types_show["Camera"])
-					msg += "CAMERA: [alarm_types_show["Power"]] alarms detected. - "
-
-				msg += "<A href=?src=\ref[src];showalerts=1'>\[Show Alerts\]</a>"
-				src << msg
-
-			if(alarms_to_clear.len < 3)
-				for(var/msg in alarms_to_clear)
-					src << msg
-
-			else if(alarms_to_clear.len)
-				var/msg = "--- "
-
-				if(alarm_types_clear["Motion"])
-					msg += "MOTION: [alarm_types_clear["Motion"]] alarms cleared. - "
-
-				if(alarm_types_clear["Fire"])
-					msg += "FIRE: [alarm_types_clear["Fire"]] alarms cleared. - "
-
-				if(alarm_types_clear["Atmosphere"])
-					msg += "ATMOSPHERE: [alarm_types_clear["Atmosphere"]] alarms cleared. - "
-
-				if(alarm_types_clear["Power"])
-					msg += "POWER: [alarm_types_clear["Power"]] alarms cleared. - "
-
-				if(alarm_types_show["Camera"])
-					msg += "CAMERA: [alarm_types_show["Power"]] alarms detected. - "
-
-				msg += "<A href=?src=\ref[src];showalerts=1'>\[Show Alerts\]</a>"
-				src << msg
-
-
-			alarms_to_show = list()
-			alarms_to_clear = list()
-			for(var/i = 1; i < alarm_types_show.len; i++)
-				alarm_types_show[i] = 0
-			for(var/i = 1; i < alarm_types_clear.len; i++)
-				alarm_types_clear[i] = 0

code/modules/mob/living/silicon/robot/life.dm

@@ -18,6 +18,7 @@
 		use_power()
 		process_killswitch()
 		process_locks()
+		process_queued_alarms()
 	update_canmove()
 
 /mob/living/silicon/robot/proc/clamp_values()

code/modules/mob/living/silicon/robot/robot.dm

@@ -437,39 +437,12 @@ var/list/robot_verbs_default = list(
 		updatename()
 		updateicon()
 
-/mob/living/silicon/robot/verb/cmd_robot_alerts()
-	set category = "Robot Commands"
-	set name = "Show Alerts"
-	robot_alerts()
-
 // this verb lets cyborgs see the stations manifest
 /mob/living/silicon/robot/verb/cmd_station_manifest()
 	set category = "Robot Commands"
 	set name = "Show Crew Manifest"
 	show_station_manifest()
 
-
-/mob/living/silicon/robot/proc/robot_alerts()
-	var/dat = "<HEAD><TITLE>Current Station Alerts</TITLE><META HTTP-EQUIV='Refresh' CONTENT='10'></HEAD><BODY>\n"
-	dat += "<A HREF='?src=\ref[src];mach_close=robotalerts'>Close</A><BR><BR>"
-	for (var/cat in alarms)
-		dat += text("<B>[cat]</B><BR>\n")
-		var/list/alarmlist = alarms[cat]
-		if (alarmlist.len)
-			for (var/area_name in alarmlist)
-				var/datum/alarm/alarm = alarmlist[area_name]
-				dat += "<NOBR>"
-				dat += text("-- [area_name]")
-				if (alarm.sources.len > 1)
-					dat += text("- [alarm.sources.len] sources")
-				dat += "</NOBR><BR>\n"
-		else
-			dat += "-- All Systems Nominal<BR>\n"
-		dat += "<BR>\n"
-
-	viewalerts = 1
-	src << browse(dat, "window=robotalerts&can_close=0")
-
 /mob/living/silicon/robot/proc/self_diagnosis()
 	if(!is_component_functioning("diagnosis unit"))
 		return null
@@ -639,25 +612,6 @@ var/list/robot_verbs_default = list(
 		return
 	return
 
-
-/mob/living/silicon/robot/triggerAlarm(var/class, area/A, list/cameralist, var/source)
-	if (stat == 2)
-		return 1
-
-	..()
-
-	queueAlarm(text("--- [class] alarm detected in [A.name]!"), class)
-
-
-/mob/living/silicon/robot/cancelAlarm(var/class, area/A as area, obj/origin)
-	var/has_alarm = ..()
-
-	if (!has_alarm)
-		queueAlarm(text("--- [class] alarm in [A.name] has been cleared."), class, 0)
-//		if (viewalerts) robot_alerts()
-	return has_alarm
-
-
 /mob/living/silicon/robot/attackby(obj/item/weapon/W as obj, mob/user as mob)
 	if (istype(W, /obj/item/weapon/handcuffs)) // fuck i don't even know why isrobot() in handcuff code isn't working so this will have to do
 		return
@@ -1043,30 +997,31 @@ var/list/robot_verbs_default = list(
 
 /mob/living/silicon/robot/Topic(href, href_list)
 	if(..())
-		return
+		return 1
 	if(usr != src)
-		return
+		return 1
 
 	if (href_list["showalerts"])
-		robot_alerts()
-		return
+		subsystem_alarm_monitor()
+		return 1
 
 	if (href_list["mod"])
 		var/obj/item/O = locate(href_list["mod"])
 		if (istype(O) && (O.loc == src))
 			O.attack_self(src)
+		return 1
 
 	if (href_list["act"])
 		var/obj/item/O = locate(href_list["act"])
 		if (!istype(O))
-			return
+			return 1
 
 		if(!((O in src.module.modules) || (O == src.module.emag)))
-			return
+			return 1
 
 		if(activated(O))
 			src << "Already activated"
-			return
+			return 1
 		if(!module_state_1)
 			module_state_1 = O
 			O.layer = 20
@@ -1088,6 +1043,7 @@ var/list/robot_verbs_default = list(
 		else
 			src << "You need to disable a module first!"
 		installed_modules()
+		return 1
 
 	if (href_list["deact"])
 		var/obj/item/O = locate(href_list["deact"])
@@ -1106,6 +1062,7 @@ var/list/robot_verbs_default = list(
 		else
 			src << "Module isn't activated"
 		installed_modules()
+		return 1
 
 	if (href_list["lawc"]) // Toggling whether or not a law gets stated by the State Laws verb --NeoFite
 		var/L = text2num(href_list["lawc"])
@@ -1114,6 +1071,7 @@ var/list/robot_verbs_default = list(
 			if ("No") lawcheck[L+1] = "Yes"
 //		src << text ("Switching Law [L]'s report status to []", lawcheck[L+1])
 		checklaws()
+		return 1
 
 	if (href_list["lawi"]) // Toggling whether or not a law gets stated by the State Laws verb --NeoFite
 		var/L = text2num(href_list["lawi"])
@@ -1122,9 +1080,11 @@ var/list/robot_verbs_default = list(
 			if ("No") ioncheck[L] = "Yes"
 //		src << text ("Switching Law [L]'s report status to []", lawcheck[L+1])
 		checklaws()
+		return 1
 
 	if (href_list["laws"]) // With how my law selection code works, I changed statelaws from a verb to a proc, and call it through my law selection panel. --NeoFite
 		statelaws()
+		return 1
 	return
 
 /mob/living/silicon/robot/proc/radio_menu()
@@ -1257,9 +1217,11 @@ var/list/robot_verbs_default = list(
 
 /mob/living/silicon/robot/proc/add_robot_verbs()
 	src.verbs |= robot_verbs_default
+	src.verbs |= robot_verbs_subsystems
 
 /mob/living/silicon/robot/proc/remove_robot_verbs()
 	src.verbs -= robot_verbs_default
+	src.verbs -= robot_verbs_subsystems
 
 // Uses power from cyborg's cell. Returns 1 on success or 0 on failure.
 // Properly converts using CELLRATE now! Amount is in Joules.

code/modules/mob/living/silicon/robot/subsystems.dm

@@ -0,0 +1,9 @@
+var/list/robot_verbs_subsystems = list(
+	/mob/living/silicon/robot/proc/subsystem_alarm_monitor
+)
+
+/mob/living/silicon/robot/proc/subsystem_alarm_monitor()
+	set name = "Alarm Monitor"
+	set category = "Robot Subystems"
+
+	alarm_monitor.ui_interact(usr)

code/modules/mob/living/silicon/silicon.dm

@@ -22,13 +22,26 @@
 	var/obj/item/device/camera/siliconcam/aiCamera = null //photography
 	var/local_transmit //If set, can only speak to others of the same type within a short range.
 
+	// Subsystems
+	var/obj/nano_module/alarm_monitor = null
+
 	var/sensor_mode = 0 //Determines the current HUD.
+
+	var/next_alarm_notice
+	var/list/datum/alarm/queued_alarms = new()
+
 	#define SEC_HUD 1 //Security HUD mode
 	#define MED_HUD 2 //Medical HUD mode
 
 /mob/living/silicon/New()
 	..()
 	add_language("Galactic Common")
+	init_subsystems()
+
+/mob/living/silicon/Del()
+	for(var/datum/alarm_handler/AH in alarm_manager.all_handlers)
+		AH.unregister(src)
+	..()
 
 /mob/living/silicon/proc/SetName(pickedName as text)
 	real_name = pickedName
@@ -243,7 +256,8 @@
 	return 1
 
 /mob/living/silicon/Topic(href, href_list)
-	..()
+	if(..())
+		return 1
 
 	if (href_list["lawr"]) // Selects on which channel to state laws
 		var/list/channels = list(MAIN_CHANNEL)
@@ -282,3 +296,62 @@
 				adjustBruteLoss(30)
 
 	updatehealth()
+
+/mob/living/silicon/proc/init_subsystems()
+	alarm_monitor = new/obj/nano_module/alarm_monitor/borg(src)
+	for(var/datum/alarm_handler/AH in alarm_manager.all_handlers)
+		AH.register(src, /mob/living/silicon/proc/receive_alarm)
+		queued_alarms[AH] = list()	// Makes sure alarms remain listed in consistent order
+
+/mob/living/silicon/proc/receive_alarm(var/datum/alarm_handler/alarm_handler, var/datum/alarm/alarm, was_raised)
+	if(!next_alarm_notice)
+		next_alarm_notice = world.time + SecondsToTicks(10)
+
+	var/list/alarms = queued_alarms[alarm_handler]
+	if(was_raised)
+		// Raised alarms are always set
+		alarms[alarm] = 1
+	else
+		// Alarms that were raised but then cleared before the next notice are instead removed
+		if(alarm in alarms)
+			alarms -= alarm
+		// And alarms that have only been cleared thus far are set as such
+		else
+			alarms[alarm] = -1
+
+/mob/living/silicon/proc/process_queued_alarms()
+	if(next_alarm_notice && (world.time > next_alarm_notice))
+		next_alarm_notice = 0
+
+		for(var/datum/alarm_handler/AH in queued_alarms)
+			var/list/alarms = queued_alarms[AH]
+			var/reported = 0
+			for(var/datum/alarm/A in alarms)
+				if(alarms[A] == 1)
+					if(!reported)
+						reported = 1
+						src << "<span class='warning'>--- [AH.category] Detected ---</span>"
+					raised_alarm(A)
+
+		for(var/datum/alarm_handler/AH in queued_alarms)
+			var/list/alarms = queued_alarms[AH]
+			var/reported = 0
+			for(var/datum/alarm/A in alarms)
+				if(alarms[A] == -1)
+					if(!reported)
+						reported = 1
+						src << "<span class='notice'>--- [AH.category] Cleared ---</span>"
+					src << "\The [A.alarm_name()]."
+
+		for(var/datum/alarm_handler/AH in queued_alarms)
+			var/list/alarms = queued_alarms[AH]
+			alarms.Cut()
+
+/mob/living/silicon/proc/raised_alarm(var/datum/alarm/A)
+	src << "[A.alarm_name()]!"
+
+/mob/living/silicon/ai/raised_alarm(var/datum/alarm/A)
+	var/cameratext = ""
+	for(var/obj/machinery/camera/C in A.cameras())
+		cameratext += "[(cameratext == "")? "" : "|"]<A HREF=?src=\ref[src];switchcamera=\ref[C]>[C.c_tag]</A>"
+	src << "[A.alarm_name()]! ([(cameratext)? cameratext : "No Camera"])"

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

@@ -45,17 +45,15 @@
 			if(udder && prob(5))
 				udder.add_reagent("milk", rand(5, 10))
 
-		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")
+		if(locate(/obj/effect/plant) in loc)
+			var/obj/effect/plant/SV = locate() in loc
+			SV.die_off(1)
 
 		if(!pulledby)
 			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/plantsegment) in step)
+					if(locate(/obj/effect/plant) in step)
 						Move(step)
 
 /mob/living/simple_animal/hostile/retaliate/goat/Retaliate()
@@ -65,11 +63,8 @@
 /mob/living/simple_animal/hostile/retaliate/goat/Move()
 	..()
 	if(!stat)
-		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")
+		for(var/obj/effect/plant/SV in loc)
+			SV.die_off(1)
 
 /mob/living/simple_animal/hostile/retaliate/goat/attackby(var/obj/item/O as obj, var/mob/user as mob)
 	var/obj/item/weapon/reagent_containers/glass/G = O
@@ -227,15 +222,18 @@ var/global/chicken_count = 0
 	chicken_count -= 1
 
 /mob/living/simple_animal/chicken/attackby(var/obj/item/O as obj, var/mob/user as mob)
-	if(istype(O, /obj/item/weapon/reagent_containers/food/snacks/grown/wheat)) //feedin' dem chickens
-		if(!stat && eggsleft < 8)
-			user.visible_message("\blue [user] feeds [O] to [name]! It clucks happily.","\blue You feed [O] to [name]! It clucks happily.")
-			user.drop_item()
-			del(O)
-			eggsleft += rand(1, 4)
-			//world << eggsleft
+	if(istype(O, /obj/item/weapon/reagent_containers/food/snacks/grown)) //feedin' dem chickens
+		var/obj/item/weapon/reagent_containers/food/snacks/grown/G = O
+		if(G.seed && G.seed.kitchen_tag == "wheat")
+			if(!stat && eggsleft < 8)
+				user.visible_message("\blue [user] feeds [O] to [name]! It clucks happily.","\blue You feed [O] to [name]! It clucks happily.")
+				user.drop_item()
+				del(O)
+				eggsleft += rand(1, 4)
+			else
+				user << "\blue [name] doesn't seem hungry!"
 		else
-			user << "\blue [name] doesn't seem hungry!"
+			user << "[name] doesn't seem interested in that."
 	else
 		..()
 

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

@@ -13,4 +13,42 @@
 	response_help  = "pets"
 	response_disarm = "gently pushes aside"
 	response_harm   = "whacks"
-	harm_intent_damage = 5
+	harm_intent_damage = 5
+	var/datum/seed/seed
+
+/mob/living/simple_animal/mushroom/verb/spawn_spores()
+
+	set name = "Explode"
+	set category = "Abilities"
+	set desc = "Spread your spores!"
+	set src = usr
+
+	if(stat == 2)
+		usr << "<span class='danger'>You are dead; it is too late for that.</span>"
+		return
+
+	if(!seed)
+		usr << "<span class='danger'>You are sterile!</span>"
+		return
+
+	spore_explode()
+
+/mob/living/simple_animal/mushroom/death()
+	if(prob(30))
+		spore_explode()
+		return
+	..()
+
+/mob/living/simple_animal/mushroom/proc/spore_explode()
+
+	if(!seed)
+		return
+
+	var/list/target_turfs = list()
+	for(var/turf/new_turf in orange(1,src))
+		if(prob(60) && !new_turf.density && src.Adjacent(new_turf)) target_turfs |= new_turf
+	for(var/turf/target_turf in target_turfs)
+		new /obj/machinery/portable_atmospherics/hydroponics/soil/invisible(target_turf,seed)
+	seed.thrown_at(src,get_turf(src),1)
+	if(src)
+		gib()

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

@@ -12,4 +12,7 @@
 	response_help  = "prods"
 	response_disarm = "pushes aside"
 	response_harm   = "smacks"
-	harm_intent_damage = 5
+	harm_intent_damage = 5
+	melee_damage_upper = 15
+	melee_damage_lower = 10
+	attacktext = "mauled"

code/modules/mob/mob.dm

@@ -792,26 +792,25 @@ note dizziness decrements automatically in the mob's Life() proc.
 /mob/Stat()
 	..()
 
-	if(statpanel("MC"))	//not looking at that panel
-
-		if(client && client.holder)
+	if(client && client.holder)
+		if(statpanel("Status"))
 			stat(null,"Location:\t([x], [y], [z])")
 			stat(null,"CPU:\t[world.cpu]")
 			stat(null,"Instances:\t[world.contents.len]")
-
-			if(master_controller)
-				stat(null,"MasterController-[last_tick_duration] ([master_controller.processing?"On":"Off"]-[controller_iteration])")
-				stat(null,"Air-[master_controller.air_cost]\tSun-[master_controller.sun_cost]")
-				stat(null,"Mob-[master_controller.mobs_cost]\t#[mob_list.len]")
-				stat(null,"Dis-[master_controller.diseases_cost]\t#[active_diseases.len]")
-				stat(null,"Mch-[master_controller.machines_cost]\t#[machines.len]")
-				stat(null,"Obj-[master_controller.objects_cost]\t#[processing_objects.len]")
-				stat(null,"Net-[master_controller.networks_cost]\tPnet-[master_controller.powernets_cost]")
-				stat(null,"NanoUI-[master_controller.nano_cost]\t#[nanomanager.processing_uis.len]")
-				stat(null,"Events-[master_controller.events_cost]\t#[event_manager.active_events.len]")
-				stat(null,"Tick-[master_controller.ticker_cost]\tALL-[master_controller.total_cost]")
-			else
-				stat(null,"MasterController-ERROR")
+		if(statpanel("MC") && master_controller)
+			stat(null,"MasterController-[last_tick_duration] ([master_controller.processing?"On":"Off"]-[controller_iteration])")
+			stat(null,"Air-[master_controller.air_cost]\tSun-[master_controller.sun_cost]")
+			stat(null,"Mob-[master_controller.mobs_cost]\t#[mob_list.len]")
+			stat(null,"Dis-[master_controller.diseases_cost]\t#[active_diseases.len]")
+			stat(null,"Mch-[master_controller.machines_cost]\t#[machines.len]")
+			stat(null,"Obj-[master_controller.objects_cost]\t#[processing_objects.len]")
+			stat(null,"Net-[master_controller.networks_cost]\tPnet-[master_controller.powernets_cost]")
+			stat(null,"NanoUI-[master_controller.nano_cost]\t#[nanomanager.processing_uis.len]")
+			stat(null,"Event-[master_controller.events_cost]\t#[event_manager.active_events.len]")
+			alarm_manager.stat_entry()
+			stat(null,"Tick-[master_controller.ticker_cost]\tALL-[master_controller.total_cost]")
+		else
+			stat(null,"MasterController-ERROR")
 
 	if(listed_turf && client)
 		if(!TurfAdjacent(listed_turf))

code/modules/mob/mob_helpers.dm

@@ -559,3 +559,16 @@ proc/is_blind(A)
 			say_dead_direct("The ghost of <span class='name'>[name]</span> now [pick("skulks","lurks","prowls","creeps","stalks")] among the dead. [message]")
 		else
 			say_dead_direct("<span class='name'>[name]</span> no longer [pick("skulks","lurks","prowls","creeps","stalks")] in the realm of the dead. [message]")
+
+/mob/proc/switch_to_camera(var/obj/machinery/camera/C)
+	if (!C.can_use() || stat || (get_dist(C, src) > 1 || machine != src || blinded || !canmove))
+		return 0
+	check_eye(src)
+	return 1
+
+/mob/living/silicon/ai/switch_to_camera(var/obj/machinery/camera/C)
+	if(!C.can_use() || !is_in_chassis())
+		return 0
+
+	eyeobj.setLoc(C)
+	return 1

code/modules/nano/modules/alarm_monitor.dm

@@ -0,0 +1,83 @@
+/obj/nano_module/alarm_monitor
+	name = "Alarm monitor"
+	var/list_cameras = 0						// Whether or not to list camera references. A future goal would be to merge this with the enginering/security camera console. Currently really only for AI-use.
+	var/list/datum/alarm_handler/alarm_handlers // The particular list of alarm handlers this alarm monitor should present to the user.
+
+/obj/nano_module/alarm_monitor/ai
+	list_cameras = 1
+
+/obj/nano_module/alarm_monitor/ai/New()
+	..()
+	alarm_handlers = alarm_manager.all_handlers
+
+/obj/nano_module/alarm_monitor/borg/New()
+	..()
+	alarm_handlers = alarm_manager.all_handlers
+
+/obj/nano_module/alarm_monitor/engineering/New()
+	..()
+	alarm_handlers = list(atmosphere_alarm, fire_alarm, power_alarm)
+
+/obj/nano_module/alarm_monitor/security/New()
+	..()
+	alarm_handlers = list(camera_alarm, motion_alarm)
+
+/obj/nano_module/alarm_monitor/proc/register(var/object, var/procName)
+	for(var/datum/alarm_handler/AH in alarm_handlers)
+		AH.register(object, procName)
+
+/obj/nano_module/alarm_monitor/proc/unregister(var/object)
+	for(var/datum/alarm_handler/AH in alarm_handlers)
+		AH.unregister(object)
+
+/obj/nano_module/alarm_monitor/proc/active_alarms()
+	var/list/all_alarms = new()
+	for(var/datum/alarm_handler/AH in alarm_handlers)
+		var/list/alarms = AH.alarms
+		all_alarms += alarms
+
+	return all_alarms
+
+/obj/nano_module/alarm_monitor/ai/Topic(ref, href_list)
+	if(..())
+		return 1
+	if(href_list["switchTo"])
+		var/obj/machinery/camera/C = locate(href_list["switchTo"]) in cameranet.cameras
+		if(!C)
+
+			return
+
+		usr.switch_to_camera(C)
+		return 1
+
+/obj/nano_module/alarm_monitor/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = 1)
+	var/data[0]
+
+	var/categories[0]
+	for(var/datum/alarm_handler/AH in alarm_handlers)
+		categories[++categories.len] = list("category" = AH.category, "alarms" = list())
+		for(var/datum/alarm/A in AH.major_alarms())
+			var/cameras[0]
+			var/lost_sources[0]
+
+			if(list_cameras)
+				for(var/obj/machinery/camera/C in A.cameras())
+					cameras[++cameras.len] = C.nano_structure()
+			for(var/datum/alarm_source/AS in A.sources)
+				if(!AS.source)
+					lost_sources[++lost_sources.len] = AS.source_name
+
+			categories[categories.len]["alarms"] += list(list(
+					"name" = sanitize(A.alarm_name()),
+					"origin_lost" = A.origin == null,
+					"has_cameras" = cameras.len,
+					"cameras" = cameras,
+					"lost_sources" = sanitize(english_list(lost_sources, nothing_text = "", and_text = ", "))))
+	data["categories"] = categories
+
+	ui = nanomanager.try_update_ui(user, src, ui_key, ui, data, force_open)
+	if (!ui)
+		ui = new(user, src, ui_key, "alarm_monitor.tmpl", "Alarm Monitoring Console", 800, 800)
+		ui.set_initial_data(data)
+		ui.open()
+		ui.set_auto_update(1)

code/modules/nano/modules/rcon.dm

@@ -1,5 +1,5 @@
 /obj/nano_module/rcon
-	name = "RCON interface"
+	name = "Power RCON"
 
 	var/list/known_SMESs = null
 	var/list/known_breakers = null

code/modules/organs/organ_alien.dm

@@ -48,7 +48,7 @@
 		H.death()
 
 	//This is a terrible hack and I should be ashamed.
-	var/datum/seed/diona = seed_types["diona"]
+	var/datum/seed/diona = plant_controller.seeds["diona"]
 	if(!diona)
 		del(src)
 

code/modules/organs/organ_external.dm

@@ -497,10 +497,11 @@ Note that amputating the affected organ does in fact remove the infection from t
 		H = owner
 
 	for(var/datum/wound/W in wounds)
-		if(W.damage_type == CUT || W.damage_type == BRUISE)
-			brute_dam += W.damage
-		else if(W.damage_type == BURN)
-			burn_dam += W.damage
+		if(!W.internal) //so IB doesn't count towards crit/paincrit
+			if(W.damage_type == CUT || W.damage_type == BRUISE)
+				brute_dam += W.damage
+			else if(W.damage_type == BURN)
+				burn_dam += W.damage
 
 		if(!(status & ORGAN_ROBOT) && W.bleeding() && (H && !(H.species.flags & NO_BLOOD)))
 			W.bleed_timer--

code/modules/paperwork/handlabeler.dm

@@ -6,12 +6,12 @@
 	var/label = null
 	var/labels_left = 30
 	var/mode = 0	//off or on.
-	
+
 /obj/item/weapon/hand_labeler/attack()
 	return
 
 /obj/item/weapon/hand_labeler/afterattack(atom/A, mob/user as mob, proximity)
-	if(!proximity) 
+	if(!proximity)
 		return
 	if(!mode)	//if it's off, give up.
 		return
@@ -39,6 +39,14 @@
 	if(istype(A, /obj/item/weapon/reagent_containers/glass))
 		user << "<span class='notice'>The label can't stick to the [A.name].  (Try using a pen)</span>"
 		return
+	if(istype(A, /obj/machinery/portable_atmospherics/hydroponics))
+		var/obj/machinery/portable_atmospherics/hydroponics/tray = A
+		if(!tray.mechanical)
+			user << "<span class='notice'>How are you going to label that?</span>"
+			return
+		tray.labelled = label
+		spawn(1)
+			tray.update_icon()
 
 	user.visible_message("<span class='notice'>[user] labels [A] as [label].</span>", \
 						 "<span class='notice'>You label [A] as [label].</span>")

code/modules/power/apc.dm

@@ -183,9 +183,6 @@
 	if(terminal)
 		disconnect_terminal()
 
-	//If there's no more APC then there shouldn't be a cause for alarm I guess
-	area.poweralert(1, src) //so that alarms don't go on forever
-
 	..()
 
 /obj/machinery/power/apc/proc/make_terminal()
@@ -725,7 +722,7 @@
 	src.interact(user)
 
 /obj/machinery/power/apc/attack_ghost(user as mob)
-	if(stat & (BROKEN|MAINT))	
+	if(stat & (BROKEN|MAINT))
 		return
 	return ui_interact(user)
 
@@ -1164,29 +1161,27 @@
 				lighting = autoset(lighting, 1)
 				environ = autoset(environ, 1)
 				autoflag = 3
-				area.poweralert(1, src)
-				if(cell.charge >= 4000)
-					area.poweralert(1, src)
+				power_alarm.clearAlarm(loc, src)
 		else if((cell.percent() <= 30) && (cell.percent() > 15) && longtermpower < 0)                       // <30%, turn off equipment
 			if(autoflag != 2)
 				equipment = autoset(equipment, 2)
 				lighting = autoset(lighting, 1)
 				environ = autoset(environ, 1)
-				area.poweralert(0, src)
+				power_alarm.triggerAlarm(loc, src)
 				autoflag = 2
 		else if(cell.percent() <= 15)        // <15%, turn off lighting & equipment
 			if((autoflag > 1 && longtermpower < 0) || (autoflag > 1 && longtermpower >= 0))
 				equipment = autoset(equipment, 2)
 				lighting = autoset(lighting, 2)
 				environ = autoset(environ, 1)
-				area.poweralert(0, src)
+				power_alarm.triggerAlarm(loc, src)
 				autoflag = 1
 		else                                   // zero charge, turn all off
 			if(autoflag != 0)
 				equipment = autoset(equipment, 0)
 				lighting = autoset(lighting, 0)
 				environ = autoset(environ, 0)
-				area.poweralert(0, src)
+				power_alarm.triggerAlarm(loc, src)
 				autoflag = 0
 
 		// now trickle-charge the cell
@@ -1233,7 +1228,7 @@
 		equipment = autoset(equipment, 0)
 		lighting = autoset(lighting, 0)
 		environ = autoset(environ, 0)
-		area.poweralert(0, src)
+		power_alarm.triggerAlarm(loc, src)
 		autoflag = 0
 
 	// update icon & area power if anything changed

code/modules/power/singularity/investigate.dm

@@ -1,4 +1,4 @@
-/area/engineering/poweralert(var/state, var/source)
-	if (state != poweralm)
+/area/engineering/power_alert(var/alarming)
+	if (alarming)
 		investigate_log("has a power alarm!","singulo")
 	..()

code/modules/projectiles/guns/energy.dm

@@ -76,7 +76,13 @@
 /obj/item/weapon/gun/energy/update_icon()
 	if(charge_meter)
 		var/ratio = power_supply.charge / power_supply.maxcharge
-		ratio = round(ratio, 0.25) * 100
+		
+		//make sure that rounding down will not give us the empty state even if we have charge for a shot left.
+		if(power_supply.charge < charge_cost)
+			ratio = 0
+		else
+			ratio = max(round(ratio, 0.25) * 100, 25)
+		
 		if(modifystate)
 			icon_state = "[modifystate][ratio]"
 		else

code/modules/projectiles/guns/energy/special.dm

@@ -2,9 +2,10 @@
 	name = "ion rifle"
 	desc = "A man portable anti-armor weapon designed to disable mechanical threats"
 	icon_state = "ionrifle"
+	item_state = "ionrifle"
 	fire_sound = 'sound/weapons/Laser.ogg'
 	origin_tech = "combat=2;magnets=4"
-	w_class = 4.0
+	w_class = 4
 	force = 10
 	flags =  CONDUCT
 	slot_flags = SLOT_BACK
@@ -16,6 +17,13 @@
 		return //so it doesn't EMP itself, I guess
 	..()
 
+/obj/item/weapon/gun/energy/ionrifle/update_icon()
+	..()
+	if(power_supply.charge < charge_cost)
+		item_state = "ionrifle-empty"
+	else
+		item_state = initial(item_state)
+
 /obj/item/weapon/gun/energy/decloner
 	name = "biological demolecularisor"
 	desc = "A gun that discharges high amounts of controlled radiation to slowly break a target into component elements."

code/modules/projectiles/guns/projectile/sniper.dm

@@ -1,6 +1,6 @@
 /obj/item/weapon/gun/projectile/heavysniper
 	name = "\improper PTRS-7 rifle"
-	desc = "A portable anti-armour rifle fitted with a scope. Originally designed to used against armoured exosuits, it is capable of punching through non-reinforced walls with ease. Fires armor piercing 14.5mm shells."
+	desc = "A portable anti-armour rifle fitted with a scope. Originally designed to used against armoured exosuits, it is capable of punching through windows and non-reinforced walls with ease. Fires armor piercing 14.5mm shells."
 	icon_state = "heavysniper"
 	item_state = "shotgun"
 	w_class = 4

code/modules/projectiles/projectile/bullets.dm

@@ -43,10 +43,10 @@
 	var/chance = 0
 	if(istype(A, /turf/simulated/wall))
 		var/turf/simulated/wall/W = A
-		chance = round(damage/W.damage_cap*180)
+		chance = round(damage/W.damage_cap*250)
 	else if(istype(A, /obj/machinery/door))
 		var/obj/machinery/door/D = A
-		chance = round(damage/D.maxhealth*100)
+		chance = round(damage/D.maxhealth*150)
 	else if(istype(A, /obj/structure/girder) || istype(A, /obj/structure/cultgirder))
 		chance = 100
 	else if(istype(A, /obj/machinery) || istype(A, /obj/structure))
@@ -141,13 +141,13 @@
 	penetrating = 1
 
 /obj/item/projectile/bullet/rifle/a145
-	damage = 80
+	damage = 60
 	stun = 3
 	weaken = 3
 	penetrating = 5
 
 /obj/item/projectile/bullet/rifle/a556
-	damage = 50
+	damage = 40
 	penetrating = 1
 
 /* Miscellaneous */

code/modules/random_map/setpiece.dm

@@ -1,125 +0,0 @@
-/datum/setpiece
-	var/descriptor
-	var/base_x
-	var/base_y
-	var/origin_x
-	var/origin_y
-	var/origin_z
-	var/x_bound
-	var/y_bound
-	var/list/map
-	var/min_x = 32
-	var/min_y = 32
-
-/datum/setpiece/New(var/x, var/y, var/x_size, var/y_size)
-
-	// Get operating paramaters.
-	if(x_size)
-		x_bound = x_size
-	else
-		x_bound = base_x
-	if(y_size)
-		y_bound = y_size
-	else
-		y_bound = base_y
-
-	origin_x = x
-	origin_y = y
-
-	// Initialize map.
-	map = list()
-	map.len = x_bound * y_bound
-
-	// Build.
-	if(is_buildable())
-		generate()
-		apply_to_map()
-		return 1
-	return 0
-
-/datum/setpiece/proc/is_buildable()
-	return 1
-
-/datum/setpiece/proc/apply_to_map()
-	return 1
-
-/datum/setpiece/proc/generate()
-	return 1
-
-/datum/setpiece/asteroid_secret
-	descriptor = "secret room"
-	base_x = 5
-	base_y = 5
-	min_x = 5
-	min_y = 5
-
-/datum/setpiece/asteroid_secret/is_buildable()
-
-	var/valid = 0
-	var/turf/T = null
-	var/sanity = 0
-	var/list/room = null
-	var/list/turfs = null
-
-	turfs = get_area_turfs(/area/mine/unexplored)
-
-	if(!turfs.len)
-		return 0
-
-	while(!valid)
-		valid = 1
-		sanity++
-		if(sanity > 100)
-			return 0
-
-		T=pick(turfs)
-		if(!T)
-			return 0
-
-		var/list/surroundings = list()
-
-		surroundings += range(7, locate(T.x,T.y,T.z))
-		surroundings += range(7, locate(T.x+size,T.y,T.z))
-		surroundings += range(7, locate(T.x,T.y+size,T.z))
-		surroundings += range(7, locate(T.x+size,T.y+size,T.z))
-
-		if(locate(/area/mine/explored) in surroundings)			// +5s are for view range
-			valid = 0
-			continue
-
-		if(locate(/turf/space) in surroundings)
-			valid = 0
-			continue
-
-		if(locate(/area/asteroid/artifactroom) in surroundings)
-			valid = 0
-			continue
-
-		if(locate(/turf/simulated/floor/plating/airless/asteroid) in surroundings)
-			valid = 0
-			continue
-
-	if(!T)
-		return 0
-
-	room = spawn_room(T,size,size,,,1)
-
-	if(room)
-		T = pick(room["floors"])
-		if(T)
-			var/surprise = null
-			valid = 0
-			while(!valid)
-				surprise = pickweight(space_surprises)
-				if(surprise in spawned_surprises)
-					if(prob(20))
-						valid++
-					else
-						continue
-				else
-					valid++
-
-			spawned_surprises.Add(surprise)
-			new surprise(T)
-
-	return 1

code/modules/reagents/Chemistry-Machinery.dm

@@ -3,8 +3,8 @@
 #define GAS 3
 
 #define CHEM_DISPENSER_ENERGY_COST	0.1	//How many energy points do we use per unit of chemical?
-
 #define BOTTLE_SPRITES list("bottle-1", "bottle-2", "bottle-3", "bottle-4") //list of available bottle sprites
+#define REAGENTS_PER_SHEET 20
 
 /obj/machinery/chem_dispenser
 	name = "chem dispenser"
@@ -647,7 +647,7 @@
 				if(type in diseases) // Make sure this is a disease
 					D = new type(0, null)
 			var/list/data = list("viruses"=list(D))
-			var/name = sanitize(copytext(input(usr,"Name:","Name the culture",D.name), 1, MAX_NAME_LEN))
+			var/name = sanitize(input(usr,"Name:","Name the culture",D.name))
 			if(!name || name == " ") name = D.name
 			B.name = "[name] culture bottle"
 			B.desc = "A small bottle. Contains [D.agent] culture in synthblood medium."
@@ -826,57 +826,15 @@
 	var/inuse = 0
 	var/obj/item/weapon/reagent_containers/beaker = null
 	var/limit = 10
-	var/list/blend_items = list (
-
-		//Sheets
-		/obj/item/stack/sheet/mineral/phoron = list("phoron" = 20),
-		/obj/item/stack/sheet/mineral/uranium = list("uranium" = 20),
-		/obj/item/stack/sheet/mineral/silver = list("silver" = 20),
-		/obj/item/stack/sheet/mineral/gold = list("gold" = 20),
-		/obj/item/weapon/grown/nettle/death = list("pacid" = 0),
-		/obj/item/weapon/grown/nettle = list("sacid" = 0),
-
-		//Blender Stuff
-		/obj/item/weapon/reagent_containers/food/snacks/grown/soybeans = list("soymilk" = 0),
-		/obj/item/weapon/reagent_containers/food/snacks/grown/tomato = list("ketchup" = 0),
-		/obj/item/weapon/reagent_containers/food/snacks/grown/corn = list("cornoil" = 0),
-		///obj/item/weapon/reagent_containers/food/snacks/grown/wheat = list("flour" = -5),
-		/obj/item/weapon/reagent_containers/food/snacks/grown/ricestalk = list("rice" = -5),
-		/obj/item/weapon/reagent_containers/food/snacks/grown/cherries = list("cherryjelly" = 0),
-		/obj/item/weapon/reagent_containers/food/snacks/grown/plastellium = list("plasticide" = 5),
-
-
-		//archaeology!
-		/obj/item/weapon/rocksliver = list("ground_rock" = 50),
-
-
-
-		//All types that you can put into the grinder to transfer the reagents to the beaker. !Put all recipes above this.!
-		/obj/item/weapon/reagent_containers/pill = list(),
-		/obj/item/weapon/reagent_containers/food = list(),
-
-		//Crayons
-		/obj/item/toy/crayon = list()
-	)
-
-	var/list/juice_items = list (
-
-		//Juicer Stuff
-		/obj/item/weapon/reagent_containers/food/snacks/grown/tomato = list("tomatojuice" = 0),
-		/obj/item/weapon/reagent_containers/food/snacks/grown/carrot = list("carrotjuice" = 0),
-		/obj/item/weapon/reagent_containers/food/snacks/grown/berries = list("berryjuice" = 0),
-		/obj/item/weapon/reagent_containers/food/snacks/grown/banana = list("banana" = 0),
-		/obj/item/weapon/reagent_containers/food/snacks/grown/potato = list("potato" = 0),
-		/obj/item/weapon/reagent_containers/food/snacks/grown/lemon = list("lemonjuice" = 0),
-		/obj/item/weapon/reagent_containers/food/snacks/grown/orange = list("orangejuice" = 0),
-		/obj/item/weapon/reagent_containers/food/snacks/grown/lime = list("limejuice" = 0),
-		/obj/item/weapon/reagent_containers/food/snacks/watermelonslice = list("watermelonjuice" = 0),
-		/obj/item/weapon/reagent_containers/food/snacks/grown/grapes = list("grapejuice" = 0),
-		/obj/item/weapon/reagent_containers/food/snacks/grown/poisonberries = list("poisonberryjuice" = 0),
-	)
-
-
 	var/list/holdingitems = list()
+	var/list/sheet_reagents = list(
+		/obj/item/stack/sheet/mineral/iron = "iron",
+		/obj/item/stack/sheet/mineral/uranium = "uranium",
+		/obj/item/stack/sheet/mineral/phoron = "phoron",
+		/obj/item/stack/sheet/mineral/gold = "gold",
+		/obj/item/stack/sheet/mineral/silver = "silver",
+		/obj/item/stack/sheet/mineral/mhydrogen = "hydrogen"
+		)
 
 /obj/machinery/reagentgrinder/New()
 	..()
@@ -887,10 +845,8 @@
 	icon_state = "juicer"+num2text(!isnull(beaker))
 	return
 
-
 /obj/machinery/reagentgrinder/attackby(var/obj/item/O as obj, var/mob/user as mob)
 
-
 	if (istype(O,/obj/item/weapon/reagent_containers/glass) || \
 		istype(O,/obj/item/weapon/reagent_containers/food/drinks/drinkingglass) || \
 		istype(O,/obj/item/weapon/reagent_containers/food/drinks/shaker))
@@ -909,25 +865,35 @@
 		usr << "The machine cannot hold anymore items."
 		return 1
 
-	//Fill machine with the plantbag!
-	if(istype(O, /obj/item/weapon/storage/bag/plants))
+	if(!istype(O))
+		return
 
-		for (var/obj/item/weapon/reagent_containers/food/snacks/grown/G in O.contents)
+	if(istype(O,/obj/item/weapon/storage/bag/plants))
+		var/failed = 1
+		for (var/obj/item/G in O.contents)
+			if(!O.reagents || !O.reagents.total_volume)
+				continue
+			failed = 0
 			O.contents -= G
 			G.loc = src
 			holdingitems += G
-			if(holdingitems && holdingitems.len >= limit) //Sanity checking so the blender doesn't overfill
-				user << "You fill the All-In-One grinder to the brim."
+			if(holdingitems && holdingitems.len >= limit)
 				break
 
+		if(failed)
+			user << "Nothing in the plant bag is usable."
+			return 1
+
 		if(!O.contents.len)
-			user << "You empty the plant bag into the All-In-One grinder."
+			user << "You fill \the [src]."
+		else
+			user << "You fill \the [src]. Some of the things in the plant bag aren't suitable."
 
 		src.updateUsrDialog()
 		return 0
 
-	if (!is_type_in_list(O, blend_items) && !is_type_in_list(O, juice_items))
-		user << "Cannot refine into a reagent."
+	if(!sheet_reagents[O.type] && (!O.reagents || !O.reagents.total_volume))
+		user << "\The [O] is not suitable for blending."
 		return 1
 
 	user.before_take_item(O)
@@ -976,8 +942,7 @@
 	[beaker_contents]<hr>
 	"}
 		if (is_beaker_ready && !is_chamber_empty && !(stat & (NOPOWER|BROKEN)))
-			dat += "<A href='?src=\ref[src];action=grind'>Grind the reagents</a><BR>"
-			dat += "<A href='?src=\ref[src];action=juice'>Juice the reagents</a><BR><BR>"
+			dat += "<A href='?src=\ref[src];action=grind'>Process the reagents</a><BR>"
 		if(holdingitems && holdingitems.len > 0)
 			dat += "<A href='?src=\ref[src];action=eject'>Eject the reagents</a><BR>"
 		if (beaker)
@@ -996,8 +961,6 @@
 	switch(href_list["action"])
 		if ("grind")
 			grind()
-		if("juice")
-			juice()
 		if("eject")
 			eject()
 		if ("detach")
@@ -1027,190 +990,49 @@
 		holdingitems -= O
 	holdingitems = list()
 
-/obj/machinery/reagentgrinder/proc/is_allowed(var/obj/item/weapon/reagent_containers/O)
-	for (var/i in blend_items)
-		if(istype(O, i))
-			return 1
-	return 0
-
-/obj/machinery/reagentgrinder/proc/get_allowed_by_id(var/obj/item/weapon/grown/O)
-	for (var/i in blend_items)
-		if (istype(O, i))
-			return blend_items[i]
-
-/obj/machinery/reagentgrinder/proc/get_allowed_snack_by_id(var/obj/item/weapon/reagent_containers/food/snacks/O)
-	for(var/i in blend_items)
-		if(istype(O, i))
-			return blend_items[i]
-
-/obj/machinery/reagentgrinder/proc/get_allowed_juice_by_id(var/obj/item/weapon/reagent_containers/food/snacks/O)
-	for(var/i in juice_items)
-		if(istype(O, i))
-			return juice_items[i]
-
-/obj/machinery/reagentgrinder/proc/get_grownweapon_amount(var/obj/item/weapon/grown/O)
-	if (!istype(O))
-		return 5
-	else if (O.potency == -1)
-		return 5
-	else
-		return round(O.potency)
-
-/obj/machinery/reagentgrinder/proc/get_juice_amount(var/obj/item/weapon/reagent_containers/food/snacks/grown/O)
-	if (!istype(O))
-		return 5
-	else if (O.potency == -1)
-		return 5
-	else
-		return round(5*sqrt(O.potency))
-
 /obj/machinery/reagentgrinder/proc/remove_object(var/obj/item/O)
 	holdingitems -= O
 	del(O)
 
-/obj/machinery/reagentgrinder/proc/juice()
-	power_change()
-	if(stat & (NOPOWER|BROKEN))
-		return
-	if (!beaker || (beaker && beaker.reagents.total_volume >= beaker.reagents.maximum_volume))
-		return
-	playsound(src.loc, 'sound/machines/juicer.ogg', 20, 1)
-	inuse = 1
-	spawn(50)
-		inuse = 0
-		interact(usr)
-	//Snacks
-	for (var/obj/item/weapon/reagent_containers/food/snacks/O in holdingitems)
-		if (beaker.reagents.total_volume >= beaker.reagents.maximum_volume)
-			break
-
-		var/allowed = get_allowed_juice_by_id(O)
-		if(isnull(allowed))
-			break
-
-		for (var/r_id in allowed)
-
-			var/space = beaker.reagents.maximum_volume - beaker.reagents.total_volume
-			var/amount = get_juice_amount(O)
-
-			beaker.reagents.add_reagent(r_id, min(amount, space))
-
-			if (beaker.reagents.total_volume >= beaker.reagents.maximum_volume)
-				break
-
-		remove_object(O)
-
 /obj/machinery/reagentgrinder/proc/grind()
 
 	power_change()
 	if(stat & (NOPOWER|BROKEN))
 		return
+
+	// Sanity check.
 	if (!beaker || (beaker && beaker.reagents.total_volume >= beaker.reagents.maximum_volume))
 		return
+
 	playsound(src.loc, 'sound/machines/blender.ogg', 50, 1)
 	inuse = 1
+
+	// Reset the machine.
 	spawn(60)
 		inuse = 0
 		interact(usr)
-	//Snacks and Plants
-	for (var/obj/item/weapon/reagent_containers/food/snacks/O in holdingitems)
-		if (beaker.reagents.total_volume >= beaker.reagents.maximum_volume)
-			break
 
-		var/allowed = get_allowed_snack_by_id(O)
-		if(isnull(allowed))
-			break
+	// Process.
+	for (var/obj/item/O in holdingitems)
 
-		for (var/r_id in allowed)
+		if(!O || !istype(O))
+			holdingitems -= null
+			continue
 
-			var/space = beaker.reagents.maximum_volume - beaker.reagents.total_volume
-			var/amount = allowed[r_id]
-			if(amount <= 0)
-				if(amount == 0)
-					if (O.reagents != null && O.reagents.has_reagent("nutriment"))
-						beaker.reagents.add_reagent(r_id, min(O.reagents.get_reagent_amount("nutriment"), space))
-						O.reagents.remove_reagent("nutriment", min(O.reagents.get_reagent_amount("nutriment"), space))
-				else
-					if (O.reagents != null && O.reagents.has_reagent("nutriment"))
-						beaker.reagents.add_reagent(r_id, min(round(O.reagents.get_reagent_amount("nutriment")*abs(amount)), space))
-						O.reagents.remove_reagent("nutriment", min(O.reagents.get_reagent_amount("nutriment"), space))
+		var/remaining_volume = beaker.reagents.maximum_volume - beaker.reagents.total_volume
+		if(sheet_reagents[O.type])
+			var/obj/item/stack/stack = O
+			if(istype(stack))
+				var/amount_to_take = max(0,min(stack.amount,round(remaining_volume/REAGENTS_PER_SHEET)))
+				if(amount_to_take)
+					stack.use(amount_to_take)
+					beaker.reagents.add_reagent(sheet_reagents[stack.type], (amount_to_take*REAGENTS_PER_SHEET))
+					continue
 
-			else
-				O.reagents.trans_id_to(beaker, r_id, min(amount, space))
-
-			if (beaker.reagents.total_volume >= beaker.reagents.maximum_volume)
-				break
-
-		if(O.reagents.reagent_list.len == 0)
+		O.reagents.trans_to(beaker, min(O.reagents.total_volume, remaining_volume))
+		if(O.reagents.total_volume == 0)
 			remove_object(O)
-
-	//Sheets
-	for (var/obj/item/stack/sheet/O in holdingitems)
-		var/allowed = get_allowed_by_id(O)
 		if (beaker.reagents.total_volume >= beaker.reagents.maximum_volume)
 			break
-		for(var/i = 1; i <= round(O.amount, 1); i++)
-			for (var/r_id in allowed)
-				var/space = beaker.reagents.maximum_volume - beaker.reagents.total_volume
-				var/amount = allowed[r_id]
-				beaker.reagents.add_reagent(r_id,min(amount, space))
-				if (space < amount)
-					break
-			if (i == round(O.amount, 1))
-				remove_object(O)
-				break
-	//Plants
-	for (var/obj/item/weapon/grown/O in holdingitems)
-		if (beaker.reagents.total_volume >= beaker.reagents.maximum_volume)
-			break
-		var/allowed = get_allowed_by_id(O)
-		for (var/r_id in allowed)
-			var/space = beaker.reagents.maximum_volume - beaker.reagents.total_volume
-			var/amount = allowed[r_id]
-			if (amount == 0)
-				if (O.reagents != null && O.reagents.has_reagent(r_id))
-					beaker.reagents.add_reagent(r_id,min(O.reagents.get_reagent_amount(r_id), space))
-			else
-				beaker.reagents.add_reagent(r_id,min(amount, space))
 
-			if (beaker.reagents.total_volume >= beaker.reagents.maximum_volume)
-				break
-		remove_object(O)
-
-	//xenoarch
-	for(var/obj/item/weapon/rocksliver/O in holdingitems)
-		if (beaker.reagents.total_volume >= beaker.reagents.maximum_volume)
-			break
-		var/allowed = get_allowed_by_id(O)
-		for (var/r_id in allowed)
-			var/space = beaker.reagents.maximum_volume - beaker.reagents.total_volume
-			var/amount = allowed[r_id]
-			beaker.reagents.add_reagent(r_id,min(amount, space), O.geological_data)
-
-			if (beaker.reagents.total_volume >= beaker.reagents.maximum_volume)
-				break
-		remove_object(O)
-
-	//crayons
-	for (var/obj/item/toy/crayon/O in holdingitems)
-		if (beaker.reagents.total_volume >= beaker.reagents.maximum_volume)
-			break
-		var/amount = round(O.uses/3) //full crayon gives 10 juice
-		var/dustcolour = "red"
-		if (O.colourName == "mime")
-			dustcolour = "grey" //black+white
-		else if (O.colourName == "rainbow")
-			dustcolour = "brown" //mix of all colours
-		else if (!isnull(O.colourName)) //all other defined colours
-			dustcolour = O.colourName
-		beaker.reagents.add_reagent("crayon_dust_[dustcolour]",amount)
-		remove_object(O)
-
-	//Everything else - Transfers reagents from it into beaker
-	for (var/obj/item/weapon/reagent_containers/O in holdingitems)
-		if (beaker.reagents.total_volume >= beaker.reagents.maximum_volume)
-			break
-		var/amount = O.reagents.total_volume
-		O.reagents.trans_to(beaker, amount)
-		if(!O.reagents.total_volume)
-			remove_object(O)
+#undef REAGENTS_PER_SHEET

code/modules/reagents/Chemistry-Reagents.dm

@@ -192,6 +192,13 @@ datum
 					M.resistances += self.data
 				return
 
+		woodpulp
+			name = "Wood Pulp"
+			id = "woodpulp"
+			description = "A mass of wood fibers."
+			reagent_state = LIQUID
+			color = "#B97A57"
+
 		#define WATER_LATENT_HEAT 19000 // How much heat is removed when applied to a hot turf, in J/unit (19000 makes 120 u of water roughly equivalent to 4L)
 		water
 			name = "Water"
@@ -260,13 +267,13 @@ datum
 
 			reaction_mob(var/mob/living/M, var/method=TOUCH, var/volume)
 				if (istype(M, /mob/living/carbon/slime))
-					var/mob/living/carbon/slime/S = M
+					var/mob/living/carbon/slime/S = M
 					S.apply_water(volume)
 				if(method == TOUCH && isliving(M))
 					M.adjust_fire_stacks(-(volume / 10))
 					if(M.fire_stacks <= 0)
 						M.ExtinguishMob()
-					return
+					return
 
 		water/holywater
 			name = "Holy Water"
@@ -1848,10 +1855,12 @@ datum
 					var/obj/effect/alien/weeds/alien_weeds = O
 					alien_weeds.health -= rand(15,35) // Kills alien weeds pretty fast
 					alien_weeds.healthcheck()
-				else if(istype(O,/obj/effect/glowshroom)) //even a small amount is enough to kill it
+				else if(istype(O,/obj/effect/plant)) //even a small amount is enough to kill it
 					del(O)
-				else if(istype(O,/obj/effect/plantsegment))
-					if(prob(50)) del(O) //Kills kudzu too.
+				else if(istype(O,/obj/effect/plant))
+					if(prob(50))
+						var/obj/effect/plant/plant = O
+						plant.die_off()
 				else if(istype(O,/obj/machinery/portable_atmospherics/hydroponics))
 					var/obj/machinery/portable_atmospherics/hydroponics/tray = O
 
@@ -2080,7 +2089,7 @@ datum
 						M.take_organ_damage(min(6*toxpwr, volume * toxpwr))
 
 			reaction_obj(var/obj/O, var/volume)
-				if((istype(O,/obj/item) || istype(O,/obj/effect/glowshroom)) && prob(meltprob * 3))
+				if((istype(O,/obj/item) || istype(O,/obj/effect/plant)) && prob(meltprob * 3))
 					if(!O.unacidable)
 						var/obj/effect/decal/cleanable/molten_item/I = new/obj/effect/decal/cleanable/molten_item(O.loc)
 						I.desc = "Looks like this was \an [O] some time ago."
@@ -2126,6 +2135,17 @@ datum
 					M.nutrition -= nutriment_factor
 				..()
 
+		nutriment/egg // Also bad for skrell. Not a child of protein because it might mess up, not sure.
+			name = "egg yolk"
+			id = "egg"
+			color = "#FFFFAA"
+
+			on_mob_life(var/mob/living/M, var/alien)
+				if(alien && alien == IS_SKRELL)
+					M.adjustToxLoss(0.5)
+					M.nutrition -= nutriment_factor
+				..()
+
 		lipozine
 			name = "Lipozine" // The anti-nutriment.
 			id = "lipozine"
@@ -2511,7 +2531,6 @@ datum
 				..()
 				return
 
-/* We're back to flour bags
 		flour
 			name = "flour"
 			id = "flour"
@@ -2529,7 +2548,6 @@ datum
 				src = null
 				if(!istype(T, /turf/space))
 					new /obj/effect/decal/cleanable/flour(T)
-*/
 
 		rice
 			name = "Rice"

code/modules/reagents/Chemistry-Recipes.dm

@@ -586,6 +586,14 @@ datum
 			required_reagents = list("capsaicin" = 2)
 			required_catalysts = list("phoron" = 5)
 			result_amount = 1
+
+		ketchup
+			name = "Ketchup"
+			id = "ketchup"
+			result = "ketchup"
+			required_reagents = list("tomatojuice" = 2, "water" = 1, "sugar" = 1)
+			result_amount = 4
+
 ///////////////////////////////////////////////////////////////////////////////////
 
 // foam and foam precursor
@@ -1604,6 +1612,26 @@ datum
 				new /obj/item/weapon/reagent_containers/food/snacks/sliceable/cheesewheel(location)
 				return
 
+		meatball
+			name = "Meatball"
+			id = "meatball"
+			result = null
+			required_reagents = list("protein" = 3, "flour" = 5)
+			result_amount = 3
+			on_reaction(var/datum/reagents/holder, var/created_volume)
+				new /obj/item/weapon/reagent_containers/food/snacks/meatball(get_turf(holder.my_atom))
+				return
+
+		dough
+			name = "Dough"
+			id = "dough"
+			result = null
+			required_reagents = list("egg" = 3, "flour" = 10)
+			result_amount = 1
+			on_reaction(var/datum/reagents/holder, var/created_volume)
+				new /obj/item/weapon/reagent_containers/food/snacks/dough(get_turf(holder.my_atom))
+				return
+
 		syntiflesh
 			name = "Syntiflesh"
 			id = "syntiflesh"

code/modules/reagents/reagent_containers.dm

@@ -28,8 +28,8 @@
 	return
 
 /obj/item/weapon/reagent_containers/attack(mob/M as mob, mob/user as mob, def_zone)
-	if (can_operate(M))        //Checks if mob is lying down on table for surgery
-		if (do_surgery(M,user,src))
+	if(can_operate(M))        //Checks if mob is lying down on table for surgery
+		if(do_surgery(M,user,src))
 			return
 
 // this prevented pills, food, and other things from being picked up by bags.

code/modules/reagents/reagent_containers/food/drinks.dm

@@ -173,20 +173,6 @@
 		..()
 		reagents.add_reagent("milk", 50)
 
-/* Flour is no longer a reagent
-/obj/item/weapon/reagent_containers/food/drinks/flour
-	name = "flour sack"
-	desc = "A big bag of flour. Good for baking!"
-	icon = 'icons/obj/food.dmi'
-	icon_state = "flour"
-	item_state = "flour"
-	New()
-		..()
-		reagents.add_reagent("flour", 30)
-		src.pixel_x = rand(-10.0, 10)
-		src.pixel_y = rand(-10.0, 10)
-*/
-
 /obj/item/weapon/reagent_containers/food/drinks/soymilk
 	name = "SoyMilk"
 	desc = "It's soy milk. White and nutritious goodness!"

code/modules/reagents/reagent_containers/food/snacks.dm

@@ -34,9 +34,10 @@
 	return
 
 /obj/item/weapon/reagent_containers/food/snacks/attack(mob/M as mob, mob/user as mob, def_zone)
-	if(!reagents.total_volume)						//Shouldn't be needed but it checks to see if it has anything left in it.
-		user << "\red None of [src] left, oh no!"
-		M.drop_from_inventory(src)	//so icons update :[
+
+	if(!reagents.total_volume)
+		user << "<span class='danger'>None of [src] left!</span>"
+		user.drop_from_inventory(src)
 		del(src)
 		return 0
 
@@ -108,9 +109,6 @@
 
 	return 0
 
-/obj/item/weapon/reagent_containers/food/snacks/afterattack(obj/target, mob/user, proximity)
-	return ..()
-
 /obj/item/weapon/reagent_containers/food/snacks/examine(mob/user)
 	if(!..(user, 1))
 		return
@@ -209,7 +207,7 @@
 /obj/item/weapon/reagent_containers/food/snacks/attack_generic(var/mob/living/user)
 	if(!isanimal(user) && !isalien(user))
 		return
-	user.visible_message("<b>[user]</b> nibbles away at the [src].","You nibble away at the [src].")
+	user.visible_message("<b>[user]</b> nibbles away at \the [src].","You nibble away at \the [src].")
 	bitecount++
 	if(reagents && user.reagents)
 		reagents.trans_to_ingest(user, bitesize)
@@ -469,31 +467,41 @@
 	icon_state = "egg"
 	filling_color = "#FDFFD1"
 
-	New()
+/obj/item/weapon/reagent_containers/food/snacks/egg/New()
+	..()
+	reagents.add_reagent("egg", 3)
+
+/obj/item/weapon/reagent_containers/food/snacks/egg/afterattack(obj/O as obj, mob/user as mob, proximity)
+	if(istype(O,/obj/machinery/microwave))
+		return ..()
+	if(!(proximity && O.is_open_container()))
+		return
+	user << "You crack \the [src] into \the [O]."
+	reagents.trans_to(O, reagents.total_volume)
+	user.drop_from_inventory(src)
+	del(src)
+
+/obj/item/weapon/reagent_containers/food/snacks/throw_impact(atom/hit_atom)
+	..()
+	new/obj/effect/decal/cleanable/egg_smudge(src.loc)
+	src.reagents.reaction(hit_atom, TOUCH)
+	src.visible_message("\red [src.name] has been squashed.","\red You hear a smack.")
+	del(src)
+
+/obj/item/weapon/reagent_containers/food/snacks/attackby(obj/item/weapon/W as obj, mob/user as mob)
+	if(istype( W, /obj/item/toy/crayon ))
+		var/obj/item/toy/crayon/C = W
+		var/clr = C.colourName
+
+		if(!(clr in list("blue","green","mime","orange","purple","rainbow","red","yellow")))
+			usr << "\blue The egg refuses to take on this color!"
+			return
+
+		usr << "\blue You color \the [src] [clr]"
+		icon_state = "egg-[clr]"
+		item_color = clr
+	else
 		..()
-		reagents.add_reagent("protein", 2)
-
-	throw_impact(atom/hit_atom)
-		..()
-		new/obj/effect/decal/cleanable/egg_smudge(src.loc)
-		src.reagents.reaction(hit_atom, TOUCH)
-		src.visible_message("\red [src.name] has been squashed.","\red You hear a smack.")
-		del(src)
-
-	attackby(obj/item/weapon/W as obj, mob/user as mob)
-		if(istype( W, /obj/item/toy/crayon ))
-			var/obj/item/toy/crayon/C = W
-			var/clr = C.colourName
-
-			if(!(clr in list("blue","green","mime","orange","purple","rainbow","red","yellow")))
-				usr << "\blue The egg refuses to take on this color!"
-				return
-
-			usr << "\blue You color \the [src] [clr]"
-			icon_state = "egg-[clr]"
-			item_color = clr
-		else
-			..()
 
 /obj/item/weapon/reagent_containers/food/snacks/egg/blue
 	icon_state = "egg-blue"
@@ -551,15 +559,18 @@
 		reagents.add_reagent("protein", 2)
 
 /obj/item/weapon/reagent_containers/food/snacks/flour
-	name = "flour"
-	desc = "A small bag filled with some flour."
+	name = "flour sack"
+	desc = "A big bag of flour. Good for baking!"
+	icon = 'icons/obj/food.dmi'
 	icon_state = "flour"
+	item_state = "flour"
 	New()
 		..()
-		reagents.add_reagent("nutriment", 1)
+		reagents.add_reagent("flour", 30)
+		src.pixel_x = rand(-10.0, 10)
+		src.pixel_y = rand(-10.0, 10)
 
 /obj/item/weapon/reagent_containers/food/snacks/organ
-
 	name = "organ"
 	desc = "It's good for you."
 	icon = 'icons/obj/surgery.dmi'
@@ -2807,23 +2818,6 @@
 ///////////////////////////////////////////
 // new old food stuff from bs12
 ///////////////////////////////////////////
-
-// Flour + egg = dough
-/obj/item/weapon/reagent_containers/food/snacks/flour/attackby(obj/item/weapon/W as obj, mob/user as mob)
-	if(istype(W,/obj/item/weapon/reagent_containers/food/snacks/egg))
-		new /obj/item/weapon/reagent_containers/food/snacks/dough(src)
-		user << "You make some dough."
-		del(W)
-		del(src)
-
-// Egg + flour = dough
-/obj/item/weapon/reagent_containers/food/snacks/egg/attackby(obj/item/weapon/W as obj, mob/user as mob)
-	if(istype(W,/obj/item/weapon/reagent_containers/food/snacks/flour))
-		new /obj/item/weapon/reagent_containers/food/snacks/dough(src)
-		user << "You make some dough."
-		del(W)
-		del(src)
-
 /obj/item/weapon/reagent_containers/food/snacks/dough
 	name = "dough"
 	desc = "A piece of dough."
@@ -2860,6 +2854,8 @@
 	desc = "A building block of an impressive dish."
 	icon = 'icons/obj/food_ingredients.dmi'
 	icon_state = "doughslice"
+	slice_path = /obj/item/weapon/reagent_containers/food/snacks/spagetti
+	slices_num = 1
 	bitesize = 2
 	New()
 		..()
@@ -3031,4 +3027,4 @@
 	New()
 		..()
 		reagents.add_reagent("nutriment", 10)
-		bitesize = 3
+		bitesize = 3

code/modules/reagents/reagent_containers/food/snacks/grown.dm

@@ -1,644 +0,0 @@
-
-
-// ***********************************************************
-// Foods that are produced from hydroponics ~~~~~~~~~~
-// Data from the seeds carry over to these grown foods
-// ***********************************************************
-
-//Grown foods
-//Subclass so we can pass on values
-/obj/item/weapon/reagent_containers/food/snacks/grown/
-	var/plantname
-	var/potency = -1
-	icon = 'icons/obj/harvest.dmi'
-	New(newloc,newpotency)
-		if (!isnull(newpotency))
-			potency = newpotency
-		..()
-		src.pixel_x = rand(-5.0, 5)
-		src.pixel_y = rand(-5.0, 5)
-	dried_type = -1
-
-/obj/item/weapon/reagent_containers/food/snacks/grown/New()
-	..()
-
-	if (dried_type == -1)
-		dried_type = src.type
-
-	//Handle some post-spawn var stuff.
-	spawn(1)
-		// Fill the object up with the appropriate reagents.
-		if(!isnull(plantname))
-			var/datum/seed/S = seed_types[plantname]
-			if(!S || !S.chems)
-				return
-
-			potency = S.potency
-
-			for(var/rid in S.chems)
-				var/list/reagent_data = S.chems[rid]
-				var/rtotal = reagent_data[1]
-				if(reagent_data.len > 1 && potency > 0)
-					rtotal += round(potency/reagent_data[2])
-				reagents.add_reagent(rid,max(1,rtotal))
-
-		if(reagents.total_volume > 0)
-			bitesize = 1+round(reagents.total_volume / 2, 1)
-
-/obj/item/weapon/reagent_containers/food/snacks/grown/corn
-	name = "ear of corn"
-	desc = "Needs some butter!"
-	plantname = "corn"
-	icon_state = "corn"
-	potency = 40
-	filling_color = "#FFEE00"
-	trash = /obj/item/weapon/corncob
-
-/obj/item/weapon/reagent_containers/food/snacks/grown/cherries
-	name = "cherries"
-	desc = "Great for toppings!"
-	icon_state = "cherry"
-	filling_color = "#FF0000"
-	gender = PLURAL
-	plantname = "cherry"
-
-/obj/item/weapon/reagent_containers/food/snacks/grown/poppy
-	name = "poppy"
-	desc = "Long-used as a symbol of rest, peace, and death."
-	icon_state = "poppy"
-	potency = 30
-	filling_color = "#CC6464"
-	plantname = "poppies"
-
-/obj/item/weapon/reagent_containers/food/snacks/grown/harebell
-	name = "harebell"
-	desc = "\"I'll sweeten thy sad grave: thou shalt not lack the flower that's like thy face, pale primrose, nor the azured hare-bell, like thy veins; no, nor the leaf of eglantine, whom not to slander, out-sweeten<65>d not thy breath.\""
-	icon_state = "harebell"
-	potency = 1
-	filling_color = "#D4B2C9"
-	plantname = "harebells"
-
-/obj/item/weapon/reagent_containers/food/snacks/grown/potato
-	name = "potato"
-	desc = "Boil 'em! Mash 'em! Stick 'em in a stew!"
-	icon_state = "potato"
-	potency = 25
-	filling_color = "#E6E8DA"
-	plantname = "potato"
-
-/obj/item/weapon/reagent_containers/food/snacks/grown/potato/attackby(obj/item/weapon/W as obj, mob/user as mob)
-	..()
-	if(istype(W, /obj/item/stack/cable_coil))
-		var/obj/item/stack/cable_coil/C = W
-		if(C.use(5))
-			user << "<span class='notice'>You add some cable to the potato and slide it inside the battery encasing.</span>"
-			var/obj/item/weapon/cell/potato/pocell = new /obj/item/weapon/cell/potato(user.loc)
-			pocell.maxcharge = src.potency * 10
-			pocell.charge = pocell.maxcharge
-			del(src)
-			return
-
-/obj/item/weapon/reagent_containers/food/snacks/grown/grapes
-	name = "bunch of grapes"
-	desc = "Nutritious!"
-	icon_state = "grapes"
-	filling_color = "#A332AD"
-	plantname = "grapes"
-
-/obj/item/weapon/reagent_containers/food/snacks/grown/greengrapes
-	name = "bunch of green grapes"
-	desc = "Nutritious!"
-	icon_state = "greengrapes"
-	potency = 25
-	filling_color = "#A6FFA3"
-	plantname = "greengrapes"
-
-/obj/item/weapon/reagent_containers/food/snacks/grown/peanut
-	name = "peanut"
-	desc = "Nuts!"
-	icon_state = "peanut"
-	filling_color = "857e27"
-	potency = 25
-	plantname = "peanut"
-
-/obj/item/weapon/reagent_containers/food/snacks/grown/cabbage
-	name = "cabbage"
-	desc = "Ewwwwwwwwww. Cabbage."
-	icon_state = "cabbage"
-	potency = 25
-	filling_color = "#A2B5A1"
-	plantname = "cabbage"
-
-/obj/item/weapon/reagent_containers/food/snacks/grown/berries
-	name = "bunch of berries"
-	desc = "Nutritious!"
-	icon_state = "berrypile"
-	filling_color = "#C2C9FF"
-	plantname = "berries"
-
-/obj/item/weapon/reagent_containers/food/snacks/grown/plastellium
-	name = "clump of plastellium"
-	desc = "Hmm, needs some processing"
-	icon_state = "plastellium"
-	filling_color = "#C4C4C4"
-	plantname = "plastic"
-
-/obj/item/weapon/reagent_containers/food/snacks/grown/shand
-	name = "S'rendarr's Hand leaf"
-	desc = "A leaf sample from a lowland thicket shrub. Smells strongly like wax."
-	icon_state = "shand"
-	filling_color = "#70C470"
-	plantname = "shand"
-
-/obj/item/weapon/reagent_containers/food/snacks/grown/mtear
-	name = "sprig of Messa's Tear"
-	desc = "A mountain climate herb with a soft, cold blue flower, known to contain an abundance of healing chemicals."
-	icon_state = "mtear"
-	filling_color = "#70C470"
-	plantname = "mtear"
-
-/obj/item/weapon/reagent_containers/food/snacks/grown/mtear/attack_self(mob/user as mob)
-	if(istype(user.loc,/turf/space))
-		return
-	var/obj/item/stack/medical/ointment/tajaran/poultice = new /obj/item/stack/medical/ointment/tajaran(user.loc)
-
-	poultice.heal_burn = potency
-	del(src)
-
-	user << "<span class='notice'>You mash the petals into a poultice.</span>"
-
-/obj/item/weapon/reagent_containers/food/snacks/grown/shand/attack_self(mob/user as mob)
-	if(istype(user.loc,/turf/space))
-		return
-	var/obj/item/stack/medical/bruise_pack/tajaran/poultice = new /obj/item/stack/medical/bruise_pack/tajaran(user.loc)
-
-	poultice.heal_brute = potency
-	del(src)
-
-	user << "<span class='notice'>You mash the leaves into a poultice.</span>"
-
-/obj/item/weapon/reagent_containers/food/snacks/grown/glowberries
-	name = "bunch of glow-berries"
-	desc = "Nutritious!"
-	var/light_on = 1
-	var/brightness_on = 2 //luminosity when on
-	filling_color = "#D3FF9E"
-	icon_state = "glowberrypile"
-	plantname = "glowberries"
-
-/obj/item/weapon/reagent_containers/food/snacks/grown/glowberries/Del()
-	if(istype(loc,/mob))
-		loc.SetLuminosity(round(loc.luminosity - potency/5,1))
-	..()
-
-/obj/item/weapon/reagent_containers/food/snacks/grown/glowberries/pickup(mob/user)
-	src.SetLuminosity(0)
-	user.SetLuminosity(round(user.luminosity + (potency/5),1))
-
-/obj/item/weapon/reagent_containers/food/snacks/grown/glowberries/dropped(mob/user)
-	user.SetLuminosity(round(user.luminosity - (potency/5),1))
-	src.SetLuminosity(round(potency/5,1))
-
-/obj/item/weapon/reagent_containers/food/snacks/grown/cocoapod
-	name = "cocoa pod"
-	desc = "Can be ground into cocoa powder."
-	icon_state = "cocoapod"
-	potency = 50
-	filling_color = "#9C8E54"
-	plantname = "cocoa"
-
-/obj/item/weapon/reagent_containers/food/snacks/grown/sugarcane
-	name = "sugarcane"
-	desc = "Sickly sweet."
-	icon_state = "sugarcane"
-	potency = 50
-	filling_color = "#C0C9AD"
-	plantname = "sugarcane"
-
-/obj/item/weapon/reagent_containers/food/snacks/grown/poisonberries
-	name = "bunch of poison-berries"
-	desc = "Taste so good, you could die!"
-	icon_state = "poisonberrypile"
-	gender = PLURAL
-	potency = 15
-	filling_color = "#B422C7"
-	plantname = "poisonberries"
-
-/obj/item/weapon/reagent_containers/food/snacks/grown/deathberries
-	name = "bunch of death-berries"
-	desc = "Taste so good, you could die!"
-	icon_state = "deathberrypile"
-	gender = PLURAL
-	potency = 50
-	filling_color = "#4E0957"
-	plantname = "deathberries"
-
-/obj/item/weapon/reagent_containers/food/snacks/grown/ambrosiavulgaris
-	name = "ambrosia vulgaris branch"
-	desc = "This is a plant containing various healing chemicals."
-	icon_state = "ambrosiavulgaris"
-	potency = 10
-	filling_color = "#125709"
-	plantname = "ambrosia"
-
-/obj/item/weapon/reagent_containers/food/snacks/grown/ambrosiadeus
-	name = "ambrosia deus branch"
-	desc = "Eating this makes you feel immortal!"
-	icon_state = "ambrosiadeus"
-	potency = 10
-	filling_color = "#229E11"
-	plantname = "ambrosiadeus"
-
-/obj/item/weapon/reagent_containers/food/snacks/grown/apple
-	name = "apple"
-	desc = "It's a little piece of Eden."
-	icon_state = "apple"
-	potency = 15
-	filling_color = "#DFE88B"
-	plantname = "apple"
-
-/obj/item/weapon/reagent_containers/food/snacks/grown/apple/poisoned
-	name = "apple"
-	desc = "It's a little piece of Eden."
-	icon_state = "apple"
-	potency = 15
-	filling_color = "#B3BD5E"
-	plantname = "poisonapple"
-
-/obj/item/weapon/reagent_containers/food/snacks/grown/goldapple
-	name = "golden apple"
-	desc = "Emblazoned upon the apple is the word 'Kallisti'."
-	icon_state = "goldapple"
-	potency = 15
-	filling_color = "#F5CB42"
-	plantname = "goldapple"
-
-/obj/item/weapon/reagent_containers/food/snacks/grown/watermelon
-	name = "watermelon"
-	desc = "It's full of watery goodness."
-	icon_state = "watermelon"
-	potency = 10
-	filling_color = "#FA2863"
-	slice_path = /obj/item/weapon/reagent_containers/food/snacks/watermelonslice
-	slices_num = 5
-	plantname = "watermelon"
-
-/obj/item/weapon/reagent_containers/food/snacks/grown/pumpkin
-	name = "pumpkin"
-	desc = "It's large and scary."
-	icon_state = "pumpkin"
-	potency = 10
-	filling_color = "#FAB728"
-	plantname = "pumpkin"
-
-/obj/item/weapon/reagent_containers/food/snacks/grown/pumpkin/attackby(obj/item/weapon/W as obj, mob/user as mob)
-	..()
-	if(istype(W, /obj/item/weapon/circular_saw) || istype(W, /obj/item/weapon/hatchet) || istype(W, /obj/item/weapon/twohanded/fireaxe) || istype(W, /obj/item/weapon/kitchen/utensil/knife) || istype(W, /obj/item/weapon/kitchenknife) || istype(W, /obj/item/weapon/melee/energy))
-		user.show_message("<span class='notice'>You carve a face into [src]!</span>", 1)
-		new /obj/item/clothing/head/pumpkinhead (user.loc)
-		del(src)
-		return
-
-/obj/item/weapon/reagent_containers/food/snacks/grown/lime
-	name = "lime"
-	desc = "It's so sour, your face will twist."
-	icon_state = "lime"
-	potency = 20
-	filling_color = "#28FA59"
-	plantname = "lime"
-
-/obj/item/weapon/reagent_containers/food/snacks/grown/lemon
-	name = "lemon"
-	desc = "When life gives you lemons, be grateful they aren't limes."
-	icon_state = "lemon"
-	potency = 20
-	filling_color = "#FAF328"
-	plantname = "lemon"
-
-/obj/item/weapon/reagent_containers/food/snacks/grown/orange
-	name = "orange"
-	desc = "It's a tangy fruit."
-	icon_state = "orange"
-	potency = 20
-	filling_color = "#FAAD28"
-	plantname = "orange"
-
-/obj/item/weapon/reagent_containers/food/snacks/grown/whitebeet
-	name = "white-beet"
-	desc = "You can't beat white-beet."
-	icon_state = "whitebeet"
-	potency = 15
-	filling_color = "#FFFCCC"
-	plantname = "whitebeet"
-
-/obj/item/weapon/reagent_containers/food/snacks/grown/banana
-	name = "banana"
-	desc = "It's an excellent prop for a comedy."
-	icon = 'icons/obj/items.dmi'
-	icon_state = "banana"
-	item_state = "banana"
-	slot_flags = SLOT_HOLSTER
-	filling_color = "#FCF695"
-	trash = /obj/item/weapon/bananapeel
-	plantname = "banana"
-
-/obj/item/weapon/reagent_containers/food/snacks/grown/chili
-	name = "chili"
-	desc = "It's spicy! Wait... IT'S BURNING ME!!"
-	icon_state = "chilipepper"
-	filling_color = "#FF0000"
-	plantname = "chili"
-
-/obj/item/weapon/reagent_containers/food/snacks/grown/eggplant
-	name = "eggplant"
-	desc = "Maybe there's a chicken inside?"
-	icon_state = "eggplant"
-	filling_color = "#550F5C"
-	plantname = "eggplant"
-
-/obj/item/weapon/reagent_containers/food/snacks/grown/soybeans
-	name = "soybeans"
-	desc = "It's pretty bland, but oh the possibilities..."
-	gender = PLURAL
-	filling_color = "#E6E8B7"
-	icon_state = "soybeans"
-	plantname = "soybean"
-
-/obj/item/weapon/reagent_containers/food/snacks/grown/tomato
-	name = "tomato"
-	desc = "I say to-mah-to, you say tom-mae-to."
-	icon_state = "tomato"
-	filling_color = "#FF0000"
-	potency = 10
-	plantname = "tomato"
-
-/obj/item/weapon/reagent_containers/food/snacks/grown/tomato/throw_impact(atom/hit_atom)
-	..()
-	new/obj/effect/decal/cleanable/tomato_smudge(src.loc)
-	src.visible_message("<span class='notice'>The [src.name] has been squashed.</span>","<span class='moderate'>You hear a smack.</span>")
-	del(src)
-	return
-
-/obj/item/weapon/reagent_containers/food/snacks/grown/killertomato
-	name = "killer-tomato"
-	desc = "I say to-mah-to, you say tom-mae-to... OH GOD IT'S EATING MY LEGS!!"
-	icon_state = "killertomato"
-	potency = 10
-	filling_color = "#FF0000"
-	potency = 30
-	plantname = "killertomato"
-
-/obj/item/weapon/reagent_containers/food/snacks/grown/killertomato/attack_self(mob/user as mob)
-	if(istype(user.loc,/turf/space))
-		return
-	new /mob/living/simple_animal/tomato(user.loc)
-	del(src)
-
-	user << "<span class='notice'>You plant the killer-tomato.</span>"
-
-/obj/item/weapon/reagent_containers/food/snacks/grown/bloodtomato
-	name = "blood-tomato"
-	desc = "So bloody...so...very...bloody....AHHHH!!!!"
-	icon_state = "bloodtomato"
-	potency = 10
-	filling_color = "#FF0000"
-	plantname = "bloodtomato"
-
-/obj/item/weapon/reagent_containers/food/snacks/grown/bloodtomato/throw_impact(atom/hit_atom)
-	..()
-	new/obj/effect/decal/cleanable/blood/splatter(src.loc)
-	src.visible_message("<span class='notice'>The [src.name] has been squashed.</span>","<span class='moderate'>You hear a smack.</span>")
-	src.reagents.reaction(get_turf(hit_atom))
-	for(var/atom/A in get_turf(hit_atom))
-		src.reagents.reaction(A)
-	del(src)
-	return
-
-/obj/item/weapon/reagent_containers/food/snacks/grown/bluetomato
-	name = "blue-tomato"
-	desc = "I say blue-mah-to, you say blue-mae-to."
-	icon_state = "bluetomato"
-	potency = 10
-	filling_color = "#586CFC"
-	plantname = "bluetomato"
-
-/obj/item/weapon/reagent_containers/food/snacks/grown/bluetomato/throw_impact(atom/hit_atom)
-	..()
-	new/obj/effect/decal/cleanable/blood/oil(src.loc)
-	src.visible_message("<span class='notice'>The [src.name] has been squashed.</span>","<span class='moderate'>You hear a smack.</span>")
-	src.reagents.reaction(get_turf(hit_atom))
-	for(var/atom/A in get_turf(hit_atom))
-		src.reagents.reaction(A)
-	del(src)
-	return
-
-/obj/item/weapon/reagent_containers/food/snacks/grown/bluetomato/Crossed(AM as mob|obj)
-	if (istype(AM, /mob/living))
-		var/mob/living/M = AM
-		M.slip("the [src]!")
-
-/obj/item/weapon/reagent_containers/food/snacks/grown/wheat
-	name = "wheat"
-	desc = "Sigh... wheat... a-grain?"
-	gender = PLURAL
-	icon_state = "wheat"
-	filling_color = "#F7E186"
-	plantname = "wheat"
-
-/obj/item/weapon/reagent_containers/food/snacks/grown/ricestalk
-	name = "rice stalk"
-	desc = "Rice to see you."
-	gender = PLURAL
-	icon_state = "rice"
-	filling_color = "#FFF8DB"
-	plantname = "rice"
-
-/obj/item/weapon/reagent_containers/food/snacks/grown/kudzupod
-	name = "kudzu pod"
-	desc = "<I>Pueraria Virallis</I>: An invasive species with vines that rapidly creep and wrap around whatever they contact."
-	icon_state = "kudzupod"
-	filling_color = "#59691B"
-	plantname = "kudzu"
-
-/obj/item/weapon/reagent_containers/food/snacks/grown/tobacco
-	name = "tobacco leaf"
-	desc = "Contains nicotine."
-	icon_state = "tobacco"
-	filling_color = "#009900"
-	plantname = "tobacco"
-
-/obj/item/weapon/reagent_containers/food/snacks/grown/icepepper
-	name = "ice-pepper"
-	desc = "It's a mutant strain of chili"
-	icon_state = "icepepper"
-	potency = 20
-	filling_color = "#66CEED"
-	plantname = "icechili"
-
-/obj/item/weapon/reagent_containers/food/snacks/grown/carrot
-	name = "carrot"
-	desc = "It's good for the eyes!"
-	icon_state = "carrot"
-	potency = 10
-	filling_color = "#FFC400"
-	plantname = "carrot"
-
-/obj/item/weapon/reagent_containers/food/snacks/grown/mushroom/reishi
-	name = "reishi"
-	desc = "<I>Ganoderma lucidum</I>: A special fungus believed to help relieve stress."
-	icon_state = "reishi"
-	potency = 10
-	filling_color = "#FF4800"
-	plantname = "reishi"
-
-/obj/item/weapon/reagent_containers/food/snacks/grown/mushroom/amanita
-	name = "fly amanita"
-	desc = "<I>Amanita Muscaria</I>: Learn poisonous mushrooms by heart. Only pick mushrooms you know."
-	icon_state = "amanita"
-	potency = 10
-	filling_color = "#FF0000"
-	plantname = "amanita"
-
-/obj/item/weapon/reagent_containers/food/snacks/grown/mushroom/angel
-	name = "destroying angel"
-	desc = "<I>Amanita Virosa</I>: Deadly poisonous basidiomycete fungus filled with alpha amatoxins."
-	icon_state = "angel"
-	potency = 35
-	filling_color = "#FFDEDE"
-	plantname = "destroyingangel"
-
-/obj/item/weapon/reagent_containers/food/snacks/grown/mushroom/libertycap
-	name = "liberty-cap"
-	desc = "<I>Psilocybe Semilanceata</I>: Liberate yourself!"
-	icon_state = "libertycap"
-	potency = 15
-	filling_color = "#F714BE"
-	plantname = "libertycap"
-
-/obj/item/weapon/reagent_containers/food/snacks/grown/mushroom/plumphelmet
-	name = "plump-helmet"
-	desc = "<I>Plumus Hellmus</I>: Plump, soft and s-so inviting~"
-	icon_state = "plumphelmet"
-	filling_color = "#F714BE"
-	plantname = "plumphelmet"
-
-/obj/item/weapon/reagent_containers/food/snacks/grown/mushroom/walkingmushroom
-	name = "walking mushroom"
-	desc = "<I>Plumus Locomotus</I>: The beginning of the great walk."
-	icon_state = "walkingmushroom"
-	filling_color = "#FFBFEF"
-	potency = 30
-	plantname = "walkingmushroom"
-
-/obj/item/weapon/reagent_containers/food/snacks/grown/mushroom/walkingmushroom/attack_self(mob/user as mob)
-	if(istype(user.loc,/turf/space))
-		return
-	new /mob/living/simple_animal/mushroom(user.loc)
-	del(src)
-
-	user << "<span class='notice'>You plant the walking mushroom.</span>"
-
-/obj/item/weapon/reagent_containers/food/snacks/grown/mushroom/chanterelle
-	name = "chanterelle cluster"
-	desc = "<I>Cantharellus Cibarius</I>: These jolly yellow little shrooms sure look tasty!"
-	icon_state = "chanterelle"
-	filling_color = "#FFE991"
-	plantname = "mushrooms"
-
-/obj/item/weapon/reagent_containers/food/snacks/grown/mushroom/glowshroom
-	name = "glowshroom cluster"
-	desc = "<I>Mycena Bregprox</I>: This species of mushroom glows in the dark. Or does it?"
-	icon_state = "glowshroom"
-	filling_color = "#DAFF91"
-	potency = 30
-	plantname = "glowshroom"
-
-/obj/item/weapon/reagent_containers/food/snacks/grown/mushroom/glowshroom/attack_self(mob/user as mob)
-	if(istype(user.loc,/turf/space))
-		return
-	var/obj/effect/glowshroom/planted = new /obj/effect/glowshroom(user.loc)
-
-	planted.delay = 50
-	planted.endurance = 100
-	planted.potency = potency
-	del(src)
-
-	user << "<span class='notice'>You plant the glowshroom.</span>"
-
-/obj/item/weapon/reagent_containers/food/snacks/grown/mushroom/glowshroom/Del()
-	if(istype(loc,/mob))
-		loc.SetLuminosity(round(loc.luminosity - potency/10,1))
-	..()
-
-/obj/item/weapon/reagent_containers/food/snacks/grown/mushroom/glowshroom/pickup(mob/user)
-	SetLuminosity(0)
-	user.SetLuminosity(round(user.luminosity + (potency/10),1))
-
-/obj/item/weapon/reagent_containers/food/snacks/grown/mushroom/glowshroom/dropped(mob/user)
-	user.SetLuminosity(round(user.luminosity - (potency/10),1))
-	SetLuminosity(round(potency/10,1))
-
-
-// *************************************
-// Complex Grown Object Defines -
-// Putting these at the bottom so they don't clutter the list up. -Cheridan
-// *************************************
-
-/obj/item/weapon/reagent_containers/food/snacks/grown/bluespacetomato
-	name = "blue-space tomato"
-	desc = "So lubricated, you might slip through space-time."
-	icon_state = "bluespacetomato"
-	potency = 20
-	origin_tech = "bluespace=3"
-	filling_color = "#91F8FF"
-	plantname = "bluespacetomato"
-
-/obj/item/weapon/reagent_containers/food/snacks/grown/bluespacetomato/throw_impact(atom/hit_atom)
-	..()
-	var/mob/M = usr
-	var/outer_teleport_radius = potency/10 //Plant potency determines radius of teleport.
-	var/inner_teleport_radius = potency/15
-	var/list/turfs = new/list()
-	var/datum/effect/effect/system/spark_spread/s = new /datum/effect/effect/system/spark_spread
-	if(inner_teleport_radius < 1) //Wasn't potent enough, it just splats.
-		new/obj/effect/decal/cleanable/blood/oil(src.loc)
-		src.visible_message("<span class='notice'>The [src.name] has been squashed.</span>","<span class='moderate'>You hear a smack.</span>")
-		del(src)
-		return
-	for(var/turf/T in orange(M,outer_teleport_radius))
-		if(T in orange(M,inner_teleport_radius)) continue
-		if(istype(T,/turf/space)) continue
-		if(T.density) continue
-		if(T.x>world.maxx-outer_teleport_radius || T.x<outer_teleport_radius)	continue
-		if(T.y>world.maxy-outer_teleport_radius || T.y<outer_teleport_radius)	continue
-		turfs += T
-	if(!turfs.len)
-		var/list/turfs_to_pick_from = list()
-		for(var/turf/T in orange(M,outer_teleport_radius))
-			if(!(T in orange(M,inner_teleport_radius)))
-				turfs_to_pick_from += T
-		turfs += pick(/turf in turfs_to_pick_from)
-	var/turf/picked = pick(turfs)
-	if(!isturf(picked)) return
-	switch(rand(1,2))//Decides randomly to teleport the thrower or the throwee.
-		if(1) // Teleports the person who threw the tomato.
-			s.set_up(3, 1, M)
-			s.start()
-			new/obj/effect/decal/cleanable/molten_item(M.loc) //Leaves a pile of goo behind for dramatic effect.
-			M.loc = picked //
-			sleep(1)
-			s.set_up(3, 1, M)
-			s.start() //Two set of sparks, one before the teleport and one after.
-		if(2) //Teleports mob the tomato hit instead.
-			for(var/mob/A in get_turf(hit_atom))//For the mobs in the tile that was hit...
-				s.set_up(3, 1, A)
-				s.start()
-				new/obj/effect/decal/cleanable/molten_item(A.loc) //Leave a pile of goo behind for dramatic effect...
-				A.loc = picked//And teleport them to the chosen location.
-				sleep(1)
-				s.set_up(3, 1, A)
-				s.start()
-	new/obj/effect/decal/cleanable/blood/oil(src.loc)
-	src.visible_message("<span class='notice'>The [src.name] has been squashed, causing a distortion in space-time.</span>","<span class='moderate'>You hear a splat and a crackle.</span>")
-	del(src)
-	return

code/modules/reagents/reagent_containers/food/snacks/meat.dm

@@ -6,7 +6,7 @@
 	filling_color = "#FF1C1C"
 	New()
 		..()
-		reagents.add_reagent("nutriment", 3)
+		reagents.add_reagent("protein", 9)
 		src.bitesize = 3
 
 /obj/item/weapon/reagent_containers/food/snacks/meat/attackby(obj/item/weapon/W as obj, mob/user as mob)

code/modules/reagents/reagent_containers/glass.dm

@@ -253,12 +253,6 @@
 		reagents.add_reagent("sacid", 60)
 		update_icon()
 
-/obj/item/weapon/reagent_containers/glass/beaker/slime
-	New()
-		..()
-		reagents.add_reagent("slimejelly", 60)
-		update_icon()
-
 /obj/item/weapon/reagent_containers/glass/bucket
 	desc = "It's a bucket."
 	name = "bucket"

code/modules/reagents/reagent_containers/spray.dm

@@ -170,7 +170,7 @@
 /obj/item/weapon/reagent_containers/spray/waterflower
 	name = "water flower"
 	desc = "A seemingly innocent sunflower...with a twist."
-	icon = 'icons/obj/harvest.dmi'
+	icon = 'icons/obj/device.dmi'
 	icon_state = "sunflower"
 	item_state = "sunflower"
 	amount_per_transfer_from_this = 1
@@ -237,7 +237,7 @@
 /obj/item/weapon/reagent_containers/spray/plantbgone // -- Skie
 	name = "Plant-B-Gone"
 	desc = "Kills those pesky weeds!"
-	icon = 'icons/obj/hydroponics.dmi'
+	icon = 'icons/obj/hydroponics_machines.dmi'
 	icon_state = "plantbgone"
 	item_state = "plantbgone"
 	volume = 100

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

@@ -1,81 +0,0 @@
-/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."
-	icon = 'icons/obj/xenoarchaeology.dmi'
-	icon_state = "telriisclump"
-	New(var/loc, var/potency)
-		..()
-		reagents.add_reagent("pwine", potency * 5)
-		reagents.add_reagent("nutriment", potency)
-		bitesize = 1+round(reagents.total_volume / 2, 1)
-
-/obj/item/weapon/reagent_containers/food/snacks/grown/thaadrabloom
-	name = "thaa'dra bloom"
-	desc = "Looks chewy, might be good to eat."
-	icon = 'icons/obj/xenoarchaeology.dmi'
-	icon_state = "thaadrabloom"
-	New(var/loc, var/potency)
-		..()
-		reagents.add_reagent("frostoil", potency * 1.5 + 5)
-		reagents.add_reagent("nutriment", potency)
-		bitesize = 1+round(reagents.total_volume / 2, 1)
-
-/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."
-	icon = 'icons/obj/xenoarchaeology.dmi'
-	icon_state = "jurlmahpod"
-	New(var/loc, var/potency)
-		..()
-		reagents.add_reagent("serotrotium", potency)
-		reagents.add_reagent("nutriment", potency)
-		bitesize = 1+round(reagents.total_volume / 2, 1)
-
-/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."
-	icon = 'icons/obj/xenoarchaeology.dmi'
-	icon_state = "amaurifruit"
-	New(var/loc, var/potency)
-		..()
-		reagents.add_reagent("zombiepowder", potency * 10)
-		reagents.add_reagent("condensedcapsaicin", potency * 5)
-		reagents.add_reagent("nutriment", potency)
-		bitesize = 1+round(reagents.total_volume / 2, 1)
-
-/obj/item/weapon/reagent_containers/food/snacks/grown/gelthi
-	name = "gelthi berries"
-	desc = "They feel fluffy and slightly warm to the touch."
-	icon = 'icons/obj/xenoarchaeology.dmi'
-	icon_state = "gelthiberries"
-	New(var/loc, var/potency)
-		..()
-		//this may prove a little strong
-		reagents.add_reagent("stoxin", (potency * potency) / 5)
-		reagents.add_reagent("capsaicin", (potency * potency) / 5)
-		reagents.add_reagent("nutriment", potency)
-		bitesize = 1+round(reagents.total_volume / 2, 1)
-
-/obj/item/weapon/reagent_containers/food/snacks/grown/vale
-	name = "vale leaves"
-	desc = "Small, curly leaves covered in a soft pale fur."
-	icon = 'icons/obj/xenoarchaeology.dmi'
-	icon_state = "valeleaves"
-	New(var/loc, var/potency)
-		..()
-		reagents.add_reagent("paracetamol", potency * 5)
-		reagents.add_reagent("dexalin", potency * 2)
-		reagents.add_reagent("nutriment", potency)
-		bitesize = 1+round(reagents.total_volume / 2, 1)
-
-/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."
-	icon = 'icons/obj/xenoarchaeology.dmi'
-	icon_state = "surikfruit"
-	New(var/loc, var/potency)
-		..()
-		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)

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

@@ -1,139 +0,0 @@
-/datum/seed/telriis
-
-	name = "telriis"
-	seed_name = "telriis"
-	display_name = "telriis grass"
-	products = list(/obj/item/weapon/reagent_containers/food/snacks/grown/telriis_clump)
-	packet_icon = "seed-alien1"
-	plant_icon = "telriis"
-
-	lifespan = 50
-	endurance = 50
-	maturation = 5
-	production = 5
-	yield = 4
-	potency = 5
-	growth_stages = 4
-
-/datum/seed/thaadra
-
-	name = "thaadra"
-	seed_name = "thaa'dra"
-	display_name = "thaa'dra lichen"
-	products = list(/obj/item/weapon/reagent_containers/food/snacks/grown/thaadrabloom)
-	packet_icon = "seed-alien3"
-	plant_icon = "thaadra"
-
-	lifespan = 20
-	endurance = 10
-	maturation = 5
-	production = 9
-	yield = 2
-	potency = 5
-	growth_stages = 4
-
-/datum/seed/jurlmah
-
-	name = "jurlmah"
-	seed_name = "jurl'mah"
-	display_name = "jurl'mah reeds"
-	products = list(/obj/item/weapon/reagent_containers/food/snacks/grown/jurlmah)
-	packet_icon = "seed-alien3"
-	plant_icon = "jurlmah"
-
-	lifespan = 20
-	endurance = 12
-	maturation = 8
-	production = 9
-	yield = 3
-	potency = 10
-	growth_stages = 5
-
-/datum/seed/amauri
-
-	name = "amauri"
-	seed_name = "amauri"
-	display_name = "amauri plant"
-	products = list(/obj/item/weapon/reagent_containers/food/snacks/grown/amauri)
-	packet_icon = "seed-alien3"
-	plant_icon = "amauri"
-
-	lifespan = 30
-	endurance = 10
-	maturation = 8
-	production = 9
-	yield = 4
-	potency = 10
-	growth_stages = 3
-
-/datum/seed/gelthi
-
-	name = "gelthi"
-	seed_name = "gelthi"
-	display_name = "gelthi plant"
-	products = list(/obj/item/weapon/reagent_containers/food/snacks/grown/gelthi)
-	packet_icon = "seed-alien2"
-	plant_icon = "gelthi"
-
-	lifespan = 20
-	endurance = 15
-	maturation = 6
-	production = 6
-	yield = 2
-	potency = 1
-	growth_stages = 3
-
-/datum/seed/vale
-
-	name = "vale"
-	seed_name = "vale"
-	display_name = "vale bush"
-	products = list(/obj/item/weapon/reagent_containers/food/snacks/grown/vale)
-	packet_icon = "seed-alien2"
-	plant_icon = "vale"
-
-	lifespan = 25
-	endurance = 15
-	maturation = 8
-	production = 10
-	yield = 3
-	potency = 3
-	growth_stages = 4
-
-/datum/seed/surik
-
-	name = "surik"
-	seed_name = "surik"
-	display_name = "surik vine"
-	products = list(/obj/item/weapon/reagent_containers/food/snacks/grown/surik)
-	packet_icon = "seed-alien3"
-	plant_icon = "surik"
-
-	lifespan = 30
-	endurance = 18
-	maturation = 7
-	production = 7
-	yield = 3
-	potency = 3
-	growth_stages = 4
-
-/obj/item/seeds/jurlmah
-	seed_type = "jurlmah"
-
-/obj/item/seeds/amauri
-	seed_type = "amauri"
-
-/obj/item/seeds/gelthi
-	seed_type = "gelthi"
-
-/obj/item/seeds/vale
-	seed_type = "vale"
-
-/obj/item/seeds/surik
-	seed_type = "surik"
-
-/obj/item/seeds/telriis
-	seed_type = "telriis"
-
-/obj/item/seeds/thaadra
-	seed_type = "thaadra"

code/modules/research/xenoarchaeology/geosample.dm

@@ -29,6 +29,8 @@
 	icon_state = "sliver[rand(1,3)]"
 	pixel_x = rand(0,16)-8
 	pixel_y = rand(0,8)-8
+	create_reagents(50)
+	reagents.add_reagent("ground_rock",50)
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 // Geosample datum