Merge branch 'master' into donoritemmodularization

code/modules/hydroponics/biogenerator.dm

@@ -53,7 +53,7 @@
 	productivity = P
 	max_items = max_storage
 
-/obj/machinery/biogenerator/on_reagent_change()			//When the reagents change, change the icon as well.
+/obj/machinery/biogenerator/on_reagent_change(changetype)			//When the reagents change, change the icon as well.
 	update_icon()
 
 /obj/machinery/biogenerator/update_icon()
@@ -294,7 +294,7 @@
 
 /obj/machinery/biogenerator/proc/detach()
 	if(beaker)
-		beaker.loc = src.loc
+		beaker.forceMove(drop_location())
 		beaker = null
 		update_icon()
 

code/modules/hydroponics/seeds.dm

@@ -150,7 +150,7 @@
 		t_amount++
 		product_name = t_prod.name
 	if(getYield() >= 1)
-		SSblackbox.add_details("food_harvested","[product_name]|[getYield()]")
+		SSblackbox.record_feedback("tally", "food_harvested", getYield(), product_name)
 	parent.update_tray()
 
 	return result