Merge branch 'master' into upstream-merge-37476

# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.

code/modules/hydroponics/biogenerator.dm

@@ -262,8 +262,7 @@
 		if(!check_cost(D.materials, amount))
 			return FALSE
 
-		var/obj/item/stack/product = new D.build_path(loc)
-		product.amount = amount
+		new D.build_path(drop_location(), amount)
 		for(var/R in D.make_reagents)
 			beaker.reagents.add_reagent(R, D.make_reagents[R]*amount)
 	else

code/modules/hydroponics/gene_modder.dm

@@ -85,14 +85,15 @@
 			interact(user)
 		return
 	else if(istype(I, /obj/item/disk/plantgene))
-		if(disk)
-			to_chat(user, "<span class='warning'>A data disk is already loaded into the machine!</span>")
-		else
-			if(!user.transferItemToLoc(I, src))
-				return
-			disk = I
-			to_chat(user, "<span class='notice'>You add [I] to the machine.</span>")
-			interact(user)
+		if (operation)
+			to_chat(user, "<span class='notice'>Please complete current operation.</span>")
+			return
+		eject_disk()
+		if(!user.transferItemToLoc(I, src))
+			return
+		disk = I
+		to_chat(user, "<span class='notice'>You add [I] to the machine.</span>")
+		interact(user)
 	else
 		..()
 
@@ -266,18 +267,13 @@
 				to_chat(usr, "<span class='notice'>You add [I] to the machine.</span>")
 		update_icon()
 	else if(href_list["eject_disk"] && !operation)
-		if (disk)
-			disk.forceMove(drop_location())
-			disk.verb_pickup()
-			disk = null
-			update_genes()
-		else
-			var/obj/item/I = usr.get_active_held_item()
-			if(istype(I, /obj/item/disk/plantgene))
-				if(!usr.transferItemToLoc(I, src))
-					return
-				disk = I
-				to_chat(usr, "<span class='notice'>You add [I] to the machine.</span>")
+		var/obj/item/I = usr.get_active_held_item()
+		eject_disk()
+		if(istype(I, /obj/item/disk/plantgene))
+			if(!usr.transferItemToLoc(I, src))
+				return
+			disk = I
+			to_chat(usr, "<span class='notice'>You add [I] to the machine.</span>")
 	else if(href_list["op"] == "insert" && disk && disk.gene && seed)
 		if(!operation) // Wait for confirmation
 			operation = "insert"
@@ -365,6 +361,16 @@
 	update_genes()
 	update_icon()
 
+/obj/machinery/plantgenes/proc/eject_disk()
+	if (disk && !operation)
+		if(Adjacent(usr) && !issilicon(usr))
+			if (!usr.put_in_hands(disk))
+				disk.forceMove(drop_location())
+		else
+			disk.forceMove(drop_location())
+		disk = null
+		update_genes()
+
 /obj/machinery/plantgenes/proc/update_genes()
 	core_genes = list()
 	reagent_genes = list()

code/modules/hydroponics/grown/grass_carpet.dm

@@ -36,19 +36,8 @@
 			continue
 		grassAmt += 1 + round(G.seed.potency * tile_coefficient)
 		qdel(G)
-	var/obj/item/stack/tile/GT = new stacktype(user.loc)
-	while(grassAmt > GT.max_amount)
-		GT.amount = GT.max_amount
-		grassAmt -= GT.max_amount
-		GT = new stacktype(user.loc)
-	GT.amount = grassAmt
-	for(var/obj/item/stack/tile/T in user.loc)
-		if((T.type == stacktype) && (T.amount < T.max_amount))
-			GT.merge(T)
-			if(GT.amount <= 0)
-				break
+	new stacktype(user.drop_location(), grassAmt)
 	qdel(src)
-	return
 
 // Carpet
 /obj/item/seeds/grass/carpet

code/modules/hydroponics/grown/replicapod.dm

@@ -22,7 +22,7 @@
 	var/blood_type = null
 	var/list/features = null
 	var/factions = null
-	var/list/traits = null
+	var/list/quirks = null
 	var/contains_sample = 0
 
 /obj/item/seeds/replicapod/Initialize()
@@ -42,7 +42,7 @@
 				blood_type = B.data["blood_type"]
 				features = B.data["features"]
 				factions = B.data["factions"]
-				factions = B.data["traits"]
+				factions = B.data["quirks"]
 				contains_sample = TRUE
 				visible_message("<span class='notice'>The [src] is injected with a fresh blood sample.</span>")
 			else
@@ -114,7 +114,7 @@
 		podman.faction |= factions
 		if(!features["mcolor"])
 			features["mcolor"] = "#59CE00"
-		for(var/V in traits)
+		for(var/V in quirks)
 			new V(podman)
 		podman.hardset_dna(null,null,podman.real_name,blood_type, new /datum/species/pod,features)//Discard SE's and UI's, podman cloning is inaccurate, and always make them a podman
 		podman.set_cloned_appearance()