Fix merge conflict

code/modules/hydroponics/biogenerator.dm

@@ -5,7 +5,7 @@
 	icon_state = "biogen-empty"
 	density = 1
 	anchored = 1
-	use_power = 1
+	use_power = IDLE_POWER_USE
 	idle_power_usage = 40
 	var/processing = 0
 	var/obj/item/reagent_containers/glass/beaker = null

code/modules/hydroponics/grown/beans.dm

@@ -15,7 +15,7 @@
 	icon_dead = "soybean-dead"
 	genes = list(/datum/plant_gene/trait/repeated_harvest)
 	mutatelist = list(/obj/item/seeds/soya/koi)
-	reagents_add = list("vitamin" = 0.04, "plantmatter" = 0.05)
+	reagents_add = list("soybeanoil" = 0.2, "vitamin" = 0.04, "plantmatter" = 0.05)
 
 /obj/item/reagent_containers/food/snacks/grown/soybeans
 	seed = /obj/item/seeds/soya

code/modules/hydroponics/hydroponics.dm

@@ -1008,7 +1008,7 @@
 	icon = 'icons/obj/hydroponics/equipment.dmi'
 	icon_state = "soil"
 	density = 0
-	use_power = 0
+	use_power = NO_POWER_USE
 	wrenchable = 0
 
 /obj/machinery/hydroponics/soil/update_icon_hoses()