diff --git a/code/modules/hydroponics/grown.dm b/code/modules/hydroponics/grown.dm
index 056edc02d6f..3bff511538b 100644
--- a/code/modules/hydroponics/grown.dm
+++ b/code/modules/hydroponics/grown.dm
@@ -374,9 +374,6 @@
 	..()
 	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)
@@ -385,10 +382,4 @@
 			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 && seed.get_trait(TRAIT_BIOLUM))
-		user.SetLuminosity(user.luminosity - seed.get_trait(TRAIT_BIOLUM))
-		SetLuminosity(seed.get_trait(TRAIT_BIOLUM))
+		seed.do_sting(H,src,pick("r_hand","l_hand"))
\ No newline at end of file
diff --git a/code/modules/hydroponics/seed.dm b/code/modules/hydroponics/seed.dm
index abb67db4615..28486a254d4 100644
--- a/code/modules/hydroponics/seed.dm
+++ b/code/modules/hydroponics/seed.dm
@@ -162,10 +162,11 @@
 		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")]"
+			var/clr
 			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))
+					clr = get_trait(TRAIT_BIOLUM_COLOUR)
+				splat.set_light(get_trait(TRAIT_BIOLUM), l_color = clr)
 			if(get_trait(TRAIT_PRODUCT_COLOUR))
 				splat.color = get_trait(TRAIT_PRODUCT_COLOUR)
 
@@ -278,12 +279,12 @@
 
 	// 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
+		var/atom/movable/lighting_overlay/L = locate(/atom/movable/lighting_overlay) in current_turf
+		if(L)
+			light_supplied = max(0,min(10,L.lum_r + L.lum_g + L.lum_b)-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
@@ -698,9 +699,10 @@
 				product.desc += " On second thought, something about this one looks strange."
 
 			if(get_trait(TRAIT_BIOLUM))
+				var/clr
 				if(get_trait(TRAIT_BIOLUM_COLOUR))
-					product.l_color = get_trait(TRAIT_BIOLUM_COLOUR)
-				product.SetLuminosity(get_trait(TRAIT_BIOLUM))
+					clr = get_trait(TRAIT_BIOLUM_COLOUR)
+				product.set_light(get_trait(TRAIT_BIOLUM), l_color = clr)
 
 			//Handle spawning in living, mobile products (like dionaea).
 			if(istype(product,/mob/living))
diff --git a/code/modules/hydroponics/spreading/spreading.dm b/code/modules/hydroponics/spreading/spreading.dm
index d4bd00c9c05..dbfcdddcb36 100644
--- a/code/modules/hydroponics/spreading/spreading.dm
+++ b/code/modules/hydroponics/spreading/spreading.dm
@@ -6,10 +6,9 @@
 		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
+			for(var/turf/simulated/floor/F in A.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)
@@ -149,14 +148,13 @@
 		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))
+		var/clr
 		if(seed.get_trait(TRAIT_BIOLUM_COLOUR))
-			l_color = seed.get_trait(TRAIT_BIOLUM_COLOUR)
-		else
-			l_color = null
+			clr = seed.get_trait(TRAIT_BIOLUM_COLOUR)
+		set_light(1+round(seed.get_trait(TRAIT_POTENCY)/20), l_color = clr)
 		return
 	else
-		SetLuminosity(0)
+		set_light(0)
 
 /obj/effect/plant/proc/refresh_icon()
 	var/growth = min(max_growth,round(health/growth_threshold))
diff --git a/code/modules/hydroponics/trays/tray.dm b/code/modules/hydroponics/trays/tray.dm
index d09a4674294..112b503fec1 100644
--- a/code/modules/hydroponics/trays/tray.dm
+++ b/code/modules/hydroponics/trays/tray.dm
@@ -488,7 +488,7 @@
 		usr << "There is no label to remove."
 	return
 
-/obj/machinery/portable_atmospherics/hydroponics/verb/set_light()
+/obj/machinery/portable_atmospherics/hydroponics/verb/setlight()
 	set name = "Set Light"
 	set category = "Object"
 	set src in view(1)
diff --git a/code/modules/hydroponics/trays/tray_soil.dm b/code/modules/hydroponics/trays/tray_soil.dm
index ff8e3e23df0..bea2a8e82ed 100644
--- a/code/modules/hydroponics/trays/tray_soil.dm
+++ b/code/modules/hydroponics/trays/tray_soil.dm
@@ -16,7 +16,7 @@
 	..()
 	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
+	verbs -= /obj/machinery/portable_atmospherics/hydroponics/verb/setlight
 
 /obj/machinery/portable_atmospherics/hydroponics/soil/CanPass()
 	return 1
diff --git a/code/modules/hydroponics/trays/tray_update_icons.dm b/code/modules/hydroponics/trays/tray_update_icons.dm
index 61e19632ea1..45454c0d286 100644
--- a/code/modules/hydroponics/trays/tray_update_icons.dm
+++ b/code/modules/hydroponics/trays/tray_update_icons.dm
@@ -73,12 +73,11 @@
 	// Update bioluminescence.
 	if(seed)
 		if(seed.get_trait(TRAIT_BIOLUM))
-			SetLuminosity(round(seed.get_trait(TRAIT_POTENCY)/10))
+			var/clr
 			if(seed.get_trait(TRAIT_BIOLUM_COLOUR))
-				l_color = seed.get_trait(TRAIT_BIOLUM_COLOUR)
-			else
-				l_color = null
+				clr = seed.get_trait(TRAIT_BIOLUM_COLOUR)
+			set_light(round(seed.get_trait(TRAIT_POTENCY)/10), l_color = clr)
 			return
 
-	SetLuminosity(0)
+	set_light(0)
 	return
\ No newline at end of file
diff --git a/paradise.dme b/paradise.dme
index 883255595e1..9dd56fe5829 100644
--- a/paradise.dme
+++ b/paradise.dme
@@ -279,7 +279,6 @@
 #include "code\game\gamemodes\events\black_hole.dm"
 #include "code\game\gamemodes\events\clang.dm"
 #include "code\game\gamemodes\events\power_failure.dm"
-#include "code\game\gamemodes\events\spacevines.dm"
 #include "code\game\gamemodes\events\wormholes.dm"
 #include "code\game\gamemodes\events\holidays\Christmas.dm"
 #include "code\game\gamemodes\events\holidays\Holidays.dm"
@@ -353,7 +352,6 @@
 #include "code\game\machinery\atmo_control.dm"
 #include "code\game\machinery\autolathe.dm"
 #include "code\game\machinery\Beacon.dm"
-#include "code\game\machinery\bees_apiary.dm"
 #include "code\game\machinery\bees_items.dm"
 #include "code\game\machinery\biogenerator.dm"
 #include "code\game\machinery\buttons.dm"
@@ -1083,10 +1081,27 @@
 #include "code\modules\food\recipes_microwave.dm"
 #include "code\modules\food\recipes_oven.dm"
 #include "code\modules\genetics\side_effects.dm"
+#include "code\modules\hydroponics\_hydro_setup.dm"
+#include "code\modules\hydroponics\grown.dm"
 #include "code\modules\hydroponics\grown_inedible.dm"
+#include "code\modules\hydroponics\grown_predefined.dm"
+#include "code\modules\hydroponics\seed.dm"
+#include "code\modules\hydroponics\seed_controller.dm"
 #include "code\modules\hydroponics\seed_datums.dm"
 #include "code\modules\hydroponics\seed_machines.dm"
 #include "code\modules\hydroponics\seed_mobs.dm"
+#include "code\modules\hydroponics\seed_packets.dm"
+#include "code\modules\hydroponics\seed_storage.dm"
+#include "code\modules\hydroponics\spreading\spreading.dm"
+#include "code\modules\hydroponics\spreading\spreading_growth.dm"
+#include "code\modules\hydroponics\spreading\spreading_response.dm"
+#include "code\modules\hydroponics\trays\tray.dm"
+#include "code\modules\hydroponics\trays\tray_apiary.dm"
+#include "code\modules\hydroponics\trays\tray_process.dm"
+#include "code\modules\hydroponics\trays\tray_reagents.dm"
+#include "code\modules\hydroponics\trays\tray_soil.dm"
+#include "code\modules\hydroponics\trays\tray_tools.dm"
+#include "code\modules\hydroponics\trays\tray_update_icons.dm"
 #include "code\modules\jungle\falsewall.dm"
 #include "code\modules\jungle\jungle.dm"
 #include "code\modules\jungle\jungle_animals.dm"
@@ -1538,7 +1553,6 @@
 #include "code\modules\reagents\reagent_containers\food\drinks\jar.dm"
 #include "code\modules\reagents\reagent_containers\food\drinks\bottle\robot.dm"
 #include "code\modules\reagents\reagent_containers\food\snacks\candy.dm"
-#include "code\modules\reagents\reagent_containers\food\snacks\grown.dm"
 #include "code\modules\reagents\reagent_containers\food\snacks\meat.dm"
 #include "code\modules\reagents\reagent_containers\glass\bottle.dm"
 #include "code\modules\reagents\reagent_containers\glass\bottle\robot.dm"
@@ -1612,8 +1626,6 @@
 #include "code\modules\research\xenoarchaeology\finds\finds_special.dm"
 #include "code\modules\research\xenoarchaeology\finds\finds_talkingitem.dm"
 #include "code\modules\research\xenoarchaeology\genetics\prehistoric_animals.dm"
-#include "code\modules\research\xenoarchaeology\genetics\prehistoric_plants.dm"
-#include "code\modules\research\xenoarchaeology\genetics\prehistoric_seeds.dm"
 #include "code\modules\research\xenoarchaeology\genetics\reconstitutor.dm"
 #include "code\modules\research\xenoarchaeology\machinery\artifact_analyser.dm"
 #include "code\modules\research\xenoarchaeology\machinery\artifact_harvester.dm"