Merge resolution.

code/modules/hydroponics/grown.dm

@@ -29,7 +29,7 @@
 		sleep(250) // ugly hack, should mean roundstart plants are fine.
 	if(!plant_controller)
 		world << "<span class='danger'>Plant controller does not exist and [src] requires it. Aborting.</span>"
-		del(src)
+		qdel(src)
 		return
 
 	seed = plant_controller.seeds[plantname]
@@ -65,7 +65,7 @@
 		sleep(250) // ugly hack, should mean roundstart plants are fine.
 	if(!plant_controller)
 		world << "<span class='danger'>Plant controller does not exist and [src] requires it. Aborting.</span>"
-		del(src)
+		qdel(src)
 		return
 
 	if(plant_controller.product_descs["[seed.uid]"])
@@ -163,7 +163,7 @@
 			M.Weaken(5)
 			seed.thrown_at(src,M)
 			sleep(-1)
-			if(src) del(src)
+			if(src) qdel(src)
 			return
 
 /obj/item/weapon/reagent_containers/food/snacks/grown/throw_impact(atom/hit_atom)
@@ -183,13 +183,13 @@
 					user.put_in_hands(pocell)
 				pocell.maxcharge = src.potency * 10
 				pocell.charge = pocell.maxcharge
-				del(src)
+				qdel(src)
 				return
 		else if(W.sharp)
 			if(seed.kitchen_tag == "pumpkin") // Ugggh these checks are awful.
 				user.show_message("<span class='notice'>You carve a face into [src]!</span>", 1)
 				new /obj/item/clothing/head/pumpkinhead (user.loc)
-				del(src)
+				qdel(src)
 				return
 			else if(seed.chems)
 				if(istype(W,/obj/item/weapon/hatchet) && !isnull(seed.chems["woodpulp"]))
@@ -204,22 +204,22 @@
 								continue
 							G.attackby(NG, user)
 						user << "You add the newly-formed wood to the stack. It now contains [NG.amount] planks."
-					del(src)
+					qdel(src)
 					return
 				else if(!isnull(seed.chems["potato"]))
 					user << "You slice \the [src] into sticks."
 					new /obj/item/weapon/reagent_containers/food/snacks/rawsticks(get_turf(src))
-					del(src)
+					qdel(src)
 					return
 				else if(!isnull(seed.chems["carrotjuice"]))
 					user << "You slice \the [src] into sticks."
 					new /obj/item/weapon/reagent_containers/food/snacks/carrotfries(get_turf(src))
-					del(src)
+					qdel(src)
 					return
 				else if(!isnull(seed.chems["soymilk"]))
 					user << "You roughly chop up \the [src]."
 					new /obj/item/weapon/reagent_containers/food/snacks/soydope(get_turf(src))
-					del(src)
+					qdel(src)
 					return
 	..()
 
@@ -276,7 +276,7 @@
 				if(user)
 					user << "<span class='danger'>\The [src] has fallen to bits.</span>"
 					user.drop_from_inventory(src)
-				del(src)
+				qdel(src)
 
 		add_fingerprint(user)
 		return 1
@@ -296,7 +296,7 @@
 		user.visible_message("<span class='danger'>\The [user] squashes \the [src]!</span>")
 		seed.thrown_at(src,user)
 		sleep(-1)
-		if(src) del(src)
+		if(src) qdel(src)
 		return
 
 	if(seed.kitchen_tag == "grass")
@@ -311,13 +311,13 @@
 					continue
 				NG.attackby(G, user)
 			user << "You add the newly-formed grass to the stack. It now contains [G.amount] tiles."
-		del(src)
+		qdel(src)
 		return
 
 	if(seed.get_trait(TRAIT_SPREAD) > 0)
 		user << "<span class='notice'>You plant the [src.name].</span>"
 		new /obj/machinery/portable_atmospherics/hydroponics/soil/invisible(get_turf(user),src.seed)
-		del(src)
+		qdel(src)
 		return
 
 	/*
@@ -327,13 +327,13 @@
 				var/obj/item/stack/medical/bruise_pack/tajaran/poultice = new /obj/item/stack/medical/bruise_pack/tajaran(user.loc)
 				poultice.heal_brute = potency
 				user << "<span class='notice'>You mash the leaves into a poultice.</span>"
-				del(src)
+				qdel(src)
 				return
 			if("mtear")
 				var/obj/item/stack/medical/ointment/tajaran/poultice = new /obj/item/stack/medical/ointment/tajaran(user.loc)
 				poultice.heal_burn = potency
 				user << "<span class='notice'>You mash the petals into a poultice.</span>"
-				del(src)
+				qdel(src)
 				return
 	*/
 

code/modules/hydroponics/grown_inedible.dm

@@ -48,7 +48,7 @@
 	if(istype(W, /obj/item/weapon/circular_saw) || istype(W, /obj/item/weapon/hatchet) || istype(W, /obj/item/weapon/kitchen/utensil/knife) || istype(W, /obj/item/weapon/kitchenknife) || istype(W, /obj/item/weapon/kitchenknife/ritual))
 		user << "<span class='notice'>You use [W] to fashion a pipe out of the corn cob!</span>"
 		new /obj/item/clothing/mask/smokable/pipe/cobpipe (user.loc)
-		del(src)
+		qdel(src)
 		return
 
 /obj/item/weapon/bananapeel

code/modules/hydroponics/seed.dm

@@ -102,10 +102,10 @@
 	if(!istype(target))
 		if(istype(target, /mob/living/simple_animal/mouse))
 			new /obj/effect/decal/remains/mouse(get_turf(target))
-			del(target)
+			qdel(target)
 		else if(istype(target, /mob/living/simple_animal/lizard))
 			new /obj/effect/decal/remains/lizard(get_turf(target))
-			del(target)
+			qdel(target)
 		return
 
 
@@ -229,7 +229,7 @@
 				apply_special_effect(M)
 			splatter(T,thrown)
 		origin_turf.visible_message("<span class='danger'>The [thrown.name] explodes!</span>")
-		del(thrown)
+		qdel(thrown)
 		return
 
 	if(istype(target,/mob/living))
@@ -242,7 +242,7 @@
 	if(get_trait(TRAIT_JUICY) && splatted)
 		splatter(origin_turf,thrown)
 		origin_turf.visible_message("<span class='danger'>The [thrown.name] splatters against [target]!</span>")
-		del(thrown)
+		qdel(thrown)
 
 /datum/seed/proc/handle_environment(var/turf/current_turf, var/datum/gas_mixture/environment, var/light_supplied, var/check_only)
 

code/modules/hydroponics/seed_controller.dm

@@ -37,7 +37,7 @@ var/global/datum/controller/plants/plant_controller // Set in New().
 /datum/controller/plants/New()
 	if(plant_controller && plant_controller != src)
 		log_debug("Rebuilding plant controller.")
-		del(plant_controller)
+		qdel(plant_controller)
 	plant_controller = src
 	setup()
 	process()

code/modules/hydroponics/seed_machines.dm

@@ -224,7 +224,7 @@
 			genetics = seed.seed
 			degradation = 0
 
-		del(seed)
+		qdel(seed)
 		seed = null
 
 	if(href_list["get_gene"])

code/modules/hydroponics/seed_storage.dm

@@ -188,16 +188,16 @@
 					N.seeds -= O
 					if (N.amount <= 0 || N.seeds.len <= 0)
 						piles -= N
-						del(N)
+						qdel(N)
 					O.loc = src.loc
 				else
 					piles -= N
-					del(N)
+					qdel(N)
 			else if (task == "purge")
 				for (var/obj/O in N.seeds)
-					del(O)
+					qdel(O)
 					piles -= N
-					del(N)
+					qdel(N)
 			break
 	updateUsrDialog()
 
@@ -231,12 +231,15 @@
 		S.remove_from_storage(O, src)
 
 	O.loc = src
+	var/newID = 0
 
 	for (var/datum/seed_pile/N in piles)
 		if (N.matches(O))
 			++N.amount
 			N.seeds += (O)
 			return
+		else if(N.ID >= newID)
+			newID = N.ID + 1
 
-	piles += new /datum/seed_pile(O, piles.len)
+	piles += new /datum/seed_pile(O, newID)
 	return

code/modules/hydroponics/spreading/spreading.dm

@@ -26,13 +26,13 @@
 	color = DEAD_PLANT_COLOUR
 
 /obj/effect/dead_plant/attack_hand()
-	del(src)
+	qdel(src)
 
 /obj/effect/dead_plant/attackby()
 	..()
 	for(var/obj/effect/plant/neighbor in range(1))
 		neighbor.update_neighbors()
-	del(src)
+	qdel(src)
 
 /obj/effect/plant
 	name = "plant"
@@ -60,7 +60,7 @@
 	var/last_tick = 0
 	var/obj/machinery/portable_atmospherics/hydroponics/soil/invisible/plant
 
-/obj/effect/plant/Del()
+/obj/effect/plant/Destroy()
 	if(plant_controller)
 		plant_controller.remove_plant(src)
 	for(var/obj/effect/plant/neighbor in range(1,src))
@@ -81,14 +81,14 @@
 		sleep(250) // ugly hack, should mean roundstart plants are fine.
 	if(!plant_controller)
 		world << "<span class='danger'>Plant controller does not exist and [src] requires it. Aborting.</span>"
-		del(src)
+		qdel(src)
 		return
 
 	if(!istype(newseed))
 		newseed = plant_controller.seeds[DEFAULT_SEED]
 	seed = newseed
 	if(!seed)
-		del(src)
+		qdel(src)
 		return
 
 	name = seed.display_name

code/modules/hydroponics/spreading/spreading_growth.dm

@@ -99,6 +99,6 @@
 		for(var/obj/effect/plant/neighbor in check_turf.contents)
 			neighbor.neighbors |= check_turf
 			plant_controller.add_plant(neighbor)
-	spawn(1) if(src) del(src)
+	spawn(1) if(src) qdel(src)
 
 #undef NEIGHBOR_REFRESH_TIME

code/modules/hydroponics/trays/tray.dm

@@ -457,7 +457,7 @@
 
 			if(!S.seed)
 				user << "The packet seems to be empty. You throw it away."
-				del(O)
+				qdel(O)
 				return
 
 			user << "You plant the [S.seed.seed_name] [S.seed.seed_noun]."
@@ -468,7 +468,7 @@
 			health = (istype(S, /obj/item/seeds/cutting) ? round(seed.get_trait(TRAIT_ENDURANCE)/rand(2,5)) : seed.get_trait(TRAIT_ENDURANCE))
 			lastcycle = world.time
 
-			del(O)
+			qdel(O)
 
 			check_health()
 
@@ -503,7 +503,7 @@
 		weedlevel -= spray.weed_kill_str
 		user << "You spray [src] with [O]."
 		playsound(loc, 'sound/effects/spray3.ogg', 50, 1, -6)
-		del(O)
+		qdel(O)
 		check_health()
 
 	else if(mechanical && istype(O, /obj/item/weapon/wrench))
@@ -522,13 +522,13 @@
 			user << "<span class='danger'>[src] is already occupied!</span>"
 		else
 			user.drop_item()
-			del(O)
+			qdel(O)
 
 			var/obj/machinery/apiary/A = new(src.loc)
 			A.icon = src.icon
 			A.icon_state = src.icon_state
 			A.hydrotray_type = src.type
-			del(src)
+			qdel(src)
 	else if(O.force && seed)
 		user.visible_message("<span class='danger'>\The [seed.display_name] has been attacked by [user] with \the [O]!</span>")
 		if(!dead)

code/modules/hydroponics/trays/tray_apiary.dm

@@ -51,7 +51,7 @@
 			health = 10
 			nutrilevel += 10
 			user.drop_item()
-			del(O)
+			qdel(O)
 			user << "\blue You carefully insert the queen into [src], she gets busy making a hive."
 			bees_in_hive = 0
 	else if(istype(O, /obj/item/beezeez))
@@ -62,7 +62,7 @@
 			user << "\blue You insert [O] into [src]. A relaxed humming appears to pick up."
 		else
 			user << "\blue You insert [O] into [src]. Now it just needs some bees."
-		del(O)
+		qdel(O)
 	else if(istype(O, /obj/item/weapon/minihoe))
 		if(health > 0)
 			user << "\red <b>You begin to dislodge the apiary from the tray, the bees don't like that.</b>"
@@ -73,7 +73,7 @@
 			new hydrotray_type(src.loc)
 			new /obj/item/apiary(src.loc)
 			user << "\red You dislodge the apiary from the tray."
-			del(src)
+			qdel(src)
 	else if(istype(O, /obj/item/weapon/bee_net))
 		var/obj/item/weapon/bee_net/N = O
 		if(N.caught_bees > 0)
@@ -115,11 +115,11 @@
 		if(swarming <= 0)
 			for(var/mob/living/simple_animal/bee/B in src.loc)
 				bees_in_hive += B.strength
-				del(B)
+				qdel(B)
 	else if(bees_in_hive < 10)
 		for(var/mob/living/simple_animal/bee/B in src.loc)
 			bees_in_hive += B.strength
-			del(B)
+			qdel(B)
 
 	if(world.time > (lastcycle + cycledelay))
 		lastcycle = world.time
@@ -199,7 +199,7 @@
 		B.target_turf = get_turf(src)
 		B.strength -= 1
 		if(B.strength <= 0)
-			del(B)
+			qdel(B)
 		else if(B.strength <= 5)
 			B.icon_state = "bees[B.strength]"
 	bees_in_hive = 0

code/modules/hydroponics/trays/tray_soil.dm

@@ -41,25 +41,25 @@
 
 /obj/machinery/portable_atmospherics/hydroponics/soil/invisible/remove_dead()
 	..()
-	del(src)
+	qdel(src)
 
 /obj/machinery/portable_atmospherics/hydroponics/soil/invisible/harvest()
 	..()
 	if(!seed) // Repeat harvests are a thing.
-		del(src)
+		qdel(src)
 
 /obj/machinery/portable_atmospherics/hydroponics/soil/invisible/die()
-	del(src)
+	qdel(src)
 
 /obj/machinery/portable_atmospherics/hydroponics/soil/invisible/process()
 	if(!seed)
-		del(src)
+		qdel(src)
 		return
 	else if(name=="plant")
 		name = seed.display_name
 	..()
 
-/obj/machinery/portable_atmospherics/hydroponics/soil/invisible/Del()
+/obj/machinery/portable_atmospherics/hydroponics/soil/invisible/Destroy()
 	// Check if we're masking a decal that needs to be visible again.
 	for(var/obj/effect/plant/plant in get_turf(src))
 		if(plant.invisibility == INVISIBILITY_MAXIMUM)

code/modules/hydroponics/trays/tray_tools.dm

@@ -277,4 +277,4 @@
 		for(var/obj/effect/plant/B in orange(A,1))
 			if(prob(80))
 				B.die_off(1)
-		del A
+		qdel(A)