Merge pull request #6471 from Citadel-Station-13/upstream-merge-36270

[MIRROR] [READY] A few additions, tweaks, and fixes for integrated circuits

code/modules/hydroponics/hydroponics.dm

@@ -853,7 +853,8 @@
 	if(issilicon(user)) //How does AI know what plant is?
 		return
 	if(harvest)
-		myseed.harvest(user)
+		return myseed.harvest(user)
+
 	else if(dead)
 		dead = 0
 		to_chat(user, "<span class='notice'>You remove the dead plant from [src].</span>")
@@ -861,9 +862,10 @@
 		myseed = null
 		update_icon()
 	else
-		examine(user)
+		if(user)
+			examine(user)
 
-/obj/machinery/hydroponics/proc/update_tray(mob/user = usr)
+/obj/machinery/hydroponics/proc/update_tray(mob/user)
 	harvest = 0
 	lastproduce = age
 	if(istype(myseed, /obj/item/seeds/replicapod))