Merge branch 'master' into plumb

code/modules/hydroponics/biogenerator.dm

@@ -10,13 +10,13 @@
 	var/processing = FALSE
 	var/obj/item/reagent_containers/glass/beaker = null
 	var/points = 0
-	var/menustat = "menu"
 	var/efficiency = 0
 	var/productivity = 0
 	var/max_items = 40
 	var/datum/techweb/stored_research
 	var/list/show_categories = list("Food", "Botany Chemicals", "Organic Materials")
-	var/list/timesFiveCategories = list("Food", "Botany Chemicals")
+	/// Currently selected category in the UI
+	var/selected_cat
 
 /obj/machinery/biogenerator/Initialize()
 	. = ..()
@@ -37,22 +37,20 @@
 	if(A == beaker)
 		beaker = null
 		update_icon()
-		updateUsrDialog()
 
 /obj/machinery/biogenerator/RefreshParts()
-	var/E = 0.5
-	var/P = 0.5
-	var/max_storage = 20
+	var/E = 0
+	var/P = 0
+	var/max_storage = 40
 	for(var/obj/item/stock_parts/matter_bin/B in component_parts)
-		P += B.rating * 0.5
-		max_storage = max(20 * B.rating, max_storage)
+		P += B.rating
+		max_storage = 40 * B.rating
 	for(var/obj/item/stock_parts/manipulator/M in component_parts)
-		E += M.rating * 0.5
+		E += M.rating
 	efficiency = E
 	productivity = P
 	max_items = max_storage
 
-
 /obj/machinery/biogenerator/examine(mob/user)
 	. = ..()
 	if(in_range(user, src) || isobserver(user))
@@ -70,7 +68,6 @@
 		icon_state = "biogen-stand"
 	else
 		icon_state = "biogen-work"
-	return
 
 /obj/machinery/biogenerator/attackby(obj/item/O, mob/user, params)
 	if(user.a_intent == INTENT_HARM)
@@ -102,7 +99,6 @@
 				beaker = O
 				to_chat(user, "<span class='notice'>You add the container to the machine.</span>")
 				update_icon()
-				updateUsrDialog()
 		else
 			to_chat(user, "<span class='warning'>Close the maintenance panel first.</span>")
 		return
@@ -139,9 +135,9 @@
 				to_chat(user, "<span class='info'>You put [O.name] in [src.name]</span>")
 		return TRUE //no afterattack
 	else if (istype(O, /obj/item/disk/design_disk))
-		user.visible_message("[user] begins to load \the [O] in \the [src]...",
-			"You begin to load a design from \the [O]...",
-			"You hear the chatter of a floppy drive.")
+		user.visible_message("<span class='notice'>[user] begins to load \the [O] in \the [src]...</span>",
+			"<span class='notice'>You begin to load a design from \the [O]...</span>",
+			"<span class='hear'>You hear the chatter of a floppy drive.</span>")
 		processing = TRUE
 		var/obj/item/disk/design_disk/D = O
 		if(do_after(user, 10, target = src))
@@ -153,106 +149,53 @@
 	else
 		to_chat(user, "<span class='warning'>You cannot put this in [src.name]!</span>")
 
-/obj/machinery/biogenerator/ui_interact(mob/user)
-	if(stat & BROKEN || panel_open)
-		return
-	. = ..()
-	var/dat
-	if(processing)
-		dat += "<div class='statusDisplay'>Biogenerator is processing! Please wait...</div><BR>"
-	else
-		switch(menustat)
-			if("nopoints")
-				dat += "<div class='statusDisplay'>You do not have enough biomass to create products.<BR>Please, put growns into reactor and activate it.</div>"
-				menustat = "menu"
-			if("complete")
-				dat += "<div class='statusDisplay'>Operation complete.</div>"
-				menustat = "menu"
-			if("void")
-				dat += "<div class='statusDisplay'>Error: No growns inside.<BR>Please, put growns into reactor.</div>"
-				menustat = "menu"
-			if("nobeakerspace")
-				dat += "<div class='statusDisplay'>Not enough space left in container. Unable to create product.</div>"
-				menustat = "menu"
-		if(beaker)
-			var/categories = show_categories.Copy()
-			for(var/V in categories)
-				categories[V] = list()
-			for(var/V in stored_research.researched_designs)
-				var/datum/design/D = SSresearch.techweb_design_by_id(V)
-				for(var/C in categories)
-					if(C in D.category)
-						categories[C] += D
-
-			dat += "<div class='statusDisplay'>Biomass: [points] units.</div><BR>"
-			dat += "<A href='?src=[REF(src)];activate=1'>Activate</A><A href='?src=[REF(src)];detach=1'>Detach Container</A>"
-			for(var/cat in categories)
-				dat += "<h3>[cat]:</h3>"
-				dat += "<div class='statusDisplay'>"
-				for(var/V in categories[cat])
-					var/datum/design/D = V
-					dat += "[D.name]: <A href='?src=[REF(src)];create=[D.id];amount=1'>Make</A>"
-					if(cat in timesFiveCategories)
-						dat += "<A href='?src=[REF(src)];create=[D.id];amount=5'>x5</A>"
-					if(ispath(D.build_path, /obj/item/stack))
-						dat += "<A href='?src=[REF(src)];create=[D.id];amount=10'>x10</A>"
-					dat += "([CEILING(D.materials[SSmaterials.GetMaterialRef(/datum/material/biomass)]/efficiency, 1)])<br>"
-				dat += "</div>"
-		else
-			dat += "<div class='statusDisplay'>No container inside, please insert container.</div>"
-
-	var/datum/browser/popup = new(user, "biogen", name, 350, 520)
-	popup.set_content(dat)
-	popup.open()
-
 /obj/machinery/biogenerator/AltClick(mob/living/user)
 	. = ..()
-	if(istype(user) && user.canUseTopic(src, BE_CLOSE, FALSE, NO_TK))
+	if(user.canUseTopic(src, BE_CLOSE, FALSE, NO_TK) && can_interact(user))
 		detach(user)
 
-/obj/machinery/biogenerator/proc/activate()
-	if (usr.stat != CONSCIOUS)
+/**
+  * activate: Activates biomass processing and converts all inserted grown products into biomass
+  *
+  * Arguments:
+  * * user The mob starting the biomass processing
+  */
+/obj/machinery/biogenerator/proc/activate(mob/user)
+	if(user.stat != CONSCIOUS)
 		return
-	if (src.stat != NONE) //NOPOWER etc
+	if(stat != NONE)
 		return
 	if(processing)
-		to_chat(usr, "<span class='warning'>The biogenerator is in the process of working.</span>")
+		to_chat(user, "<span class='warning'>The biogenerator is in the process of working.</span>")
 		return
 	var/S = 0
-	var/total = 0
 	for(var/obj/item/reagent_containers/food/snacks/grown/I in contents)
 		S += 5
-		var/nutri_amount = I.reagents.get_reagent_amount(/datum/reagent/consumable/nutriment)
-		if(nutri_amount < 0.1)
-			total += 1*productivity
+		if(I.reagents.get_reagent_amount(/datum/reagent/consumable/nutriment) < 0.1)
+			points += 1 * productivity
 		else
-			total += nutri_amount*10*productivity
+			points += I.reagents.get_reagent_amount(/datum/reagent/consumable/nutriment) * 10 * productivity
 		qdel(I)
-	points += round(total)
 	if(S)
 		processing = TRUE
 		update_icon()
-		updateUsrDialog()
-		playsound(src.loc, 'sound/machines/blender.ogg', 50, 1)
-		use_power(S*30)
-		sleep(S+15/productivity)
+		playsound(loc, 'sound/machines/blender.ogg', 50, TRUE)
+		use_power(S * 30)
+		sleep(S + 15 / productivity)
+		if(QDELETED(src)) //let's not.
+			return
 		processing = FALSE
 		update_icon()
-	else
-		menustat = "void"
 
 /obj/machinery/biogenerator/proc/check_cost(list/materials, multiplier = 1, remove_points = TRUE)
 	if(materials.len != 1 || materials[1] != SSmaterials.GetMaterialRef(/datum/material/biomass))
 		return FALSE
-	var/cost = CEILING(materials[SSmaterials.GetMaterialRef(/datum/material/biomass)]*multiplier/efficiency, 1)
-	if (cost > points)
-		menustat = "nopoints"
+	if (materials[SSmaterials.GetMaterialRef(/datum/material/biomass)]*multiplier/efficiency > points)
 		return FALSE
 	else
 		if(remove_points)
-			points -= cost
+			points -= materials[SSmaterials.GetMaterialRef(/datum/material/biomass)]*multiplier/efficiency
 		update_icon()
-		updateUsrDialog()
 		return TRUE
 
 /obj/machinery/biogenerator/proc/check_container_volume(list/reagents, multiplier = 1)
@@ -262,7 +205,6 @@
 	sum_reagents *= multiplier
 
 	if(beaker.reagents.total_volume + sum_reagents > beaker.reagents.maximum_volume)
-		menustat = "nobeakerspace"
 		return FALSE
 
 	return TRUE
@@ -284,6 +226,7 @@
 		var/i = amount
 		while(i > 0)
 			if(!check_container_volume(D.make_reagents))
+				say("Warning: Attached container does not have enough free capacity!")
 				return .
 			if(!check_cost(D.materials))
 				return .
@@ -293,51 +236,100 @@
 				beaker.reagents.add_reagent(R, D.make_reagents[R])
 			. = 1
 			--i
-
-	menustat = "complete"
 	update_icon()
 	return .
 
 /obj/machinery/biogenerator/proc/detach(mob/living/user)
 	if(beaker)
-		user.put_in_hands(beaker)
+		if(can_interact(user))
+			user.put_in_hands(beaker)
+		else
+			beaker.drop_location(get_turf(src))
 		beaker = null
 		update_icon()
 
-/obj/machinery/biogenerator/Topic(href, href_list)
-	if(..() || panel_open)
+/obj/machinery/biogenerator/ui_status(mob/user)
+	if(stat & BROKEN || panel_open)
+		return UI_CLOSE
+	return ..()
+
+/obj/machinery/biogenerator/ui_assets(mob/user)
+	return list(
+		get_asset_datum(/datum/asset/spritesheet/research_designs),
+	)
+
+/obj/machinery/biogenerator/ui_interact(mob/user, datum/tgui/ui)
+	ui = SStgui.try_update_ui(user, src, ui)
+	if(!ui)
+		ui = new(user, src, "Biogenerator", name)
+		ui.open()
+
+/obj/machinery/biogenerator/ui_data(mob/user)
+	var/list/data = list()
+	data["beaker"] = beaker ? TRUE : FALSE
+	data["biomass"] = points
+	data["processing"] = processing
+	if(locate(/obj/item/reagent_containers/food/snacks/grown) in contents)
+		data["can_process"] = TRUE
+	else
+		data["can_process"] = FALSE
+	return data
+
+/obj/machinery/biogenerator/ui_static_data(mob/user)
+	var/list/data = list()
+	data["categories"] = list()
+
+	var/categories = show_categories.Copy()
+	for(var/V in categories)
+		categories[V] = list()
+	for(var/V in stored_research.researched_designs)
+		var/datum/design/D = SSresearch.techweb_design_by_id(V)
+		for(var/C in categories)
+			if(C in D.category)
+				categories[C] += D
+
+	for(var/category in categories)
+		var/list/cat = list(
+			"name" = category,
+			"items" = (category == selected_cat ? list() : null))
+		for(var/item in categories[category])
+			var/datum/design/D = item
+			cat["items"] += list(list(
+				"id" = D.id,
+				"name" = D.name,
+				"cost" = D.materials[SSmaterials.GetMaterialRef(/datum/material/biomass)]/efficiency,
+			))
+		data["categories"] += list(cat)
+
+	return data
+
+/obj/machinery/biogenerator/ui_act(action, list/params)
+	if(..())
 		return
 
-	usr.set_machine(src)
-
-	if(href_list["activate"])
-		activate()
-		updateUsrDialog()
-
-	else if(href_list["detach"])
-		detach(usr)
-		updateUsrDialog()
-
-	else if(href_list["create"])
-		var/amount = (text2num(href_list["amount"]))
-		//Can't be outside these (if you change this keep a sane limit)
-		amount = clamp(amount, 1, 50)
-		var/id = href_list["create"]
-		if(!stored_research.researched_designs.Find(id))
-			//naughty naughty
-			stack_trace("ID did not map to a researched datum [id]")
-			return
-
-		//Get design by id (or may return error design)
-		var/datum/design/D = SSresearch.techweb_design_by_id(id)
-		//Valid design datum, amount and the datum is not the error design, lets proceed
-		if(D && amount && !istype(D, /datum/design/error_design))
-			create_product(D, amount)
-		//This shouldnt happen normally but href forgery is real
-		else
-			stack_trace("ID could not be turned into a valid techweb design datum [id]")
-		updateUsrDialog()
-
-	else if(href_list["menu"])
-		menustat = "menu"
-		updateUsrDialog()
+	switch(action)
+		if("activate")
+			activate(usr)
+			return TRUE
+		if("detach")
+			detach(usr)
+			return TRUE
+		if("create")
+			var/amount = text2num(params["amount"])
+			amount = clamp(amount, 1, 10)
+			if(!amount)
+				return
+			var/id = params["id"]
+			if(!stored_research.researched_designs.Find(id))
+				stack_trace("ID did not map to a researched datum [id]")
+				return
+			var/datum/design/D = SSresearch.techweb_design_by_id(id)
+			if(D && !istype(D, /datum/design/error_design))
+				create_product(D, amount)
+			else
+				stack_trace("ID could not be turned into a valid techweb design datum [id]")
+				return
+			return TRUE
+		if("select")
+			selected_cat = params["category"]
+			return TRUE

code/modules/hydroponics/fermenting_barrel.dm

@@ -56,7 +56,7 @@
 	else
 		return ..()
 
-/obj/structure/fermenting_barrel/attack_hand(mob/user, act_intent = user.a_intent, unarmed_attack_flags)
+/obj/structure/fermenting_barrel/on_attack_hand(mob/user, act_intent = user.a_intent, unarmed_attack_flags)
 	open = !open
 	if(open)
 		DISABLE_BITFIELD(reagents.reagents_holder_flags, DRAINABLE)

code/modules/hydroponics/grown/banana.dm

@@ -27,6 +27,12 @@
 	juice_results = list(/datum/reagent/consumable/banana = 0)
 	distill_reagent = /datum/reagent/consumable/ethanol/bananahonk
 
+/obj/item/reagent_containers/food/snacks/grown/banana/generate_trash(atom/location)
+	. = ..()
+	var/obj/item/grown/bananapeel/peel = .
+	if(istype(peel))
+		peel.grind_results = list(/datum/reagent/consumable/banana_peel = seed.potency * 0.2)
+
 /obj/item/reagent_containers/food/snacks/grown/banana/suicide_act(mob/user)
 	user.visible_message("<span class='suicide'>[user] is aiming [src] at [user.p_them()]self! It looks like [user.p_theyre()] trying to commit suicide!</span>")
 	playsound(loc, 'sound/items/bikehorn.ogg', 50, 1, -1)

code/modules/hydroponics/grown/chili.dm

@@ -80,11 +80,9 @@
 	foodtype = FRUIT
 	wine_power = 50
 
-/obj/item/reagent_containers/food/snacks/grown/ghost_chili/attack_hand(mob/user, act_intent = user.a_intent, unarmed_attack_flags)
+/obj/item/reagent_containers/food/snacks/grown/ghost_chili/on_attack_hand(mob/user, act_intent = user.a_intent, unarmed_attack_flags)
 	. = ..()
-	if(.)
-		return
-	if( ismob(loc) )
+	if(ishuman(loc))
 		held_mob = loc
 		START_PROCESSING(SSobj, src)
 

code/modules/hydroponics/grown/nettle.dm

@@ -90,6 +90,7 @@
 	icon_state = "deathnettle"
 	force = 30
 	throwforce = 15
+	wound_bonus = CANT_WOUND
 
 /obj/item/reagent_containers/food/snacks/grown/nettle/death/add_juice()
 	..()

code/modules/hydroponics/grown/replicapod.dm

@@ -29,6 +29,28 @@
 
 	create_reagents(volume, INJECTABLE | DRAWABLE)
 
+/obj/item/seeds/replicapod/pre_attack(obj/machinery/hydroponics/I)
+	if(istype(I, /obj/machinery/hydroponics))
+		if(!I.myseed)
+			START_PROCESSING(SSobj, src)
+	return ..()
+
+/obj/item/seeds/replicapod/proc/check_mind_orbiting(atom/A)
+	for(var/mob/M in A.orbiters?.orbiters)
+		if(mind && M.mind && ckey(M.mind.key) == ckey(mind.key) && M.ckey && M.client && M.stat == DEAD && !M.suiciding && isobserver(M))
+			return TRUE
+	return FALSE
+
+/obj/item/seeds/replicapod/process()
+	var/obj/machinery/hydroponics/parent = loc
+	if(parent.harvest != 1)
+		return
+	if (check_mind_orbiting(parent))
+		icon_harvest = "replicapod-orbit"
+	else
+		icon_harvest = "replicapod-harvest"
+	parent.update_icon_plant()
+
 /obj/item/seeds/replicapod/on_reagent_change(changetype)
 	if(changetype == ADD_REAGENT)
 		var/datum/reagent/blood/B = reagents.has_reagent(/datum/reagent/blood)
@@ -59,8 +81,11 @@
 
 /obj/item/seeds/replicapod/get_analyzer_text()
 	var/text = ..()
+	var/obj/machinery/hydroponics/parent = loc
 	if(contains_sample)
 		text += "\n It contains a blood sample!"
+	if (parent && istype(parent) && check_mind_orbiting(parent))
+		text += "\n The soul is ready to enter the body."
 	return text
 
 
@@ -115,7 +140,7 @@
 			features["mcolor"] = "#59CE00"
 		for(var/V in quirks)
 			new V(podman)
-		podman.hardset_dna(null,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.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()
 
 	else //else, one packet of seeds. maybe two

code/modules/hydroponics/grown/towercap.dm

@@ -207,10 +207,7 @@
 			return ..()
 
 
-/obj/structure/bonfire/attack_hand(mob/user, act_intent = user.a_intent, unarmed_attack_flags)
-	. = ..()
-	if(.)
-		return
+/obj/structure/bonfire/on_attack_hand(mob/user, act_intent = user.a_intent, unarmed_attack_flags)
 	if(burning)
 		to_chat(user, "<span class='warning'>You need to extinguish [src] before removing the logs!</span>")
 		return

code/modules/hydroponics/hydroitemdefines.dm

@@ -82,7 +82,7 @@
 	custom_materials = list(/datum/material/iron = 15000)
 	attack_verb = list("chopped", "torn", "cut")
 	hitsound = 'sound/weapons/bladeslice.ogg'
-	sharpness = IS_SHARP
+	sharpness = SHARP_EDGED
 
 /obj/item/hatchet/Initialize()
 	. = ..()

code/modules/hydroponics/hydroponics.dm

@@ -889,10 +889,7 @@
 
 	return ..()
 
-/obj/machinery/hydroponics/attack_hand(mob/user, act_intent = user.a_intent, unarmed_attack_flags)
-	. = ..()
-	if(.)
-		return
+/obj/machinery/hydroponics/on_attack_hand(mob/user, act_intent = user.a_intent, unarmed_attack_flags)
 	if(issilicon(user)) //How does AI know what plant is?
 		return
 	if(harvest)

code/modules/hydroponics/seed_extractor.dm

@@ -1,3 +1,18 @@
+/**
+  * Finds and extracts seeds from an object
+  *
+  * Checks if the object is such that creates a seed when extracted.  Used by seed
+  * extractors or posably anything that would create seeds in some way.  The seeds
+  * are dropped either at the extractor, if it exists, or where the original object
+  * was and it qdel's the object
+  *
+  * Arguments:
+  * * O - Object containing the seed, can be the loc of the dumping of seeds
+  * * t_max - Amount of seed copies to dump, -1 is ranomized
+  * * extractor - Seed Extractor, used as the dumping loc for the seeds and seed multiplier
+  * * user - checks if we can remove the object from the inventory
+  * *
+  */
 /proc/seedify(obj/item/O, t_max, obj/machinery/seed_extractor/extractor, mob/living/user)
 	var/t_amount = 0
 	var/list/seeds = list()
@@ -46,20 +61,22 @@
 	icon_state = "sextractor"
 	density = TRUE
 	circuit = /obj/item/circuitboard/machine/seed_extractor
-	var/piles = list()
+	/// Associated list of seeds, they are all weak refs.  We check the len to see how many refs we have for each
+	// seed
+	var/list/piles = list()
 	var/max_seeds = 1000
 	var/seed_multiplier = 1
 
 /obj/machinery/seed_extractor/RefreshParts()
 	for(var/obj/item/stock_parts/matter_bin/B in component_parts)
-		max_seeds = 1000 * B.rating
+		max_seeds = initial(max_seeds) * B.rating
 	for(var/obj/item/stock_parts/manipulator/M in component_parts)
-		seed_multiplier = M.rating
+		seed_multiplier = initial(seed_multiplier) * M.rating
 
 /obj/machinery/seed_extractor/examine(mob/user)
 	. = ..()
 	if(in_range(user, src) || isobserver(user))
-		. += "<span class='notice'>The status display reads: Extracting <b>[seed_multiplier]</b> seed(s) per piece of produce.<br>Machine can store up to <b>[max_seeds]</b> seeds.</span>"
+		. += "<span class='notice'>The status display reads: Extracting <b>[seed_multiplier]</b> seed(s) per piece of produce.<br>Machine can store up to <b>[max_seeds]%</b> seeds.</span>"
 
 /obj/machinery/seed_extractor/attackby(obj/item/O, mob/user, params)
 
@@ -102,78 +119,26 @@
 	else
 		return ..()
 
-/datum/seed_pile
-	var/name = ""
-	var/lifespan = 0	//Saved stats
-	var/endurance = 0
-	var/maturation = 0
-	var/production = 0
-	var/yield = 0
-	var/potency = 0
-	var/amount = 0
+/**
+  * Generate seed string
+  *
+  * Creates a string based of the traits of a seed.  We use this string as a bucket for all
+  * seeds that match as well as the key the ui uses to get the seed.  We also use the key
+  * for the data shown in the ui.  Javascript parses this string to display
+  *
+  * Arguments:
+  * * O - seed to generate the string from
+  */
+/obj/machinery/seed_extractor/proc/generate_seed_string(obj/item/seeds/O)
+	return "name=[O.name];lifespan=[O.lifespan];endurance=[O.endurance];maturation=[O.maturation];production=[O.production];yield=[O.yield];potency=[O.potency];instability=0"
 
-/datum/seed_pile/New(var/name, var/life, var/endur, var/matur, var/prod, var/yie, var/poten, var/am = 1)
-	src.name = name
-	src.lifespan = life
-	src.endurance = endur
-	src.maturation = matur
-	src.production = prod
-	src.yield = yie
-	src.potency = poten
-	src.amount = am
-
-/obj/machinery/seed_extractor/ui_interact(mob/user)
-	. = ..()
-	if (stat)
-		return FALSE
-
-	var/dat = "<b>Stored seeds:</b><br>"
-
-	if (contents.len == 0)
-		dat += "<font color='red'>No seeds</font>"
-	else
-		dat += "<table cellpadding='3' style='text-align:center;'><tr><td>Name</td><td>Lifespan</td><td>Endurance</td><td>Maturation</td><td>Production</td><td>Yield</td><td>Potency</td><td>Stock</td></tr>"
-		for (var/datum/seed_pile/O in piles)
-			dat += "<tr><td>[O.name]</td><td>[O.lifespan]</td><td>[O.endurance]</td><td>[O.maturation]</td>"
-			dat += "<td>[O.production]</td><td>[O.yield]</td><td>[O.potency]</td><td>"
-			dat += "<a href='byond://?src=[REF(src)];name=[O.name];li=[O.lifespan];en=[O.endurance];ma=[O.maturation];pr=[O.production];yi=[O.yield];pot=[O.potency]'>Vend</a> ([O.amount] left)</td></tr>"
-		dat += "</table>"
-	var/datum/browser/popup = new(user, "seed_ext", name, 700, 400)
-	popup.set_content(dat)
-	popup.open()
-	return
-
-/obj/machinery/seed_extractor/Topic(var/href, var/list/href_list)
-	if(..())
-		return
-	usr.set_machine(src)
-
-	href_list["li"] = text2num(href_list["li"])
-	href_list["en"] = text2num(href_list["en"])
-	href_list["ma"] = text2num(href_list["ma"])
-	href_list["pr"] = text2num(href_list["pr"])
-	href_list["yi"] = text2num(href_list["yi"])
-	href_list["pot"] = text2num(href_list["pot"])
-
-	for (var/datum/seed_pile/N in piles)//Find the pile we need to reduce...
-		if (href_list["name"] == N.name && href_list["li"] == N.lifespan && href_list["en"] == N.endurance && href_list["ma"] == N.maturation && href_list["pr"] == N.production && href_list["yi"] == N.yield && href_list["pot"] == N.potency)
-			if(N.amount <= 0)
-				return
-			N.amount = max(N.amount - 1, 0)
-			if (N.amount <= 0)
-				piles -= N
-				qdel(N)
-			break
-
-	for (var/obj/T in contents)//Now we find the seed we need to vend
-		var/obj/item/seeds/O = T
-		if (O.plantname == href_list["name"] && O.lifespan == href_list["li"] && O.endurance == href_list["en"] && O.maturation == href_list["ma"] && O.production == href_list["pr"] && O.yield == href_list["yi"] && O.potency == href_list["pot"])
-			O.forceMove(drop_location())
-			break
-
-	src.updateUsrDialog()
-	return
 
+/** Add Seeds Proc.
+  *
+  * Adds the seeds to the contents and to an associated list that pregenerates the data
+  * needed to go to the ui handler
+  *
+ **/
 /obj/machinery/seed_extractor/proc/add_seed(obj/item/seeds/O)
 	if(contents.len >= 999)
 		to_chat(usr, "<span class='notice'>\The [src] is full.</span>")
@@ -188,10 +153,47 @@
 		if(!M.transferItemToLoc(O, src))
 			return FALSE
 
-	. = TRUE
-	for (var/datum/seed_pile/N in piles)
-		if (O.plantname == N.name && O.lifespan == N.lifespan && O.endurance == N.endurance && O.maturation == N.maturation && O.production == N.production && O.yield == N.yield && O.potency == N.potency)
-			++N.amount
-			return
+	var/seed_string = generate_seed_string(O)
+	if(piles[seed_string])
+		piles[seed_string] += WEAKREF(O)
+	else
+		piles[seed_string] = list(WEAKREF(O))
+
+	. = TRUE
+
+/obj/machinery/seed_extractor/ui_state(mob/user)
+	return GLOB.notcontained_state
+
+/obj/machinery/seed_extractor/ui_interact(mob/user, datum/tgui/ui)
+	ui = SStgui.try_update_ui(user, src, ui)
+	if(!ui)
+		ui = new(user, src, "SeedExtractor", name)
+		ui.open()
+
+/obj/machinery/seed_extractor/ui_data()
+	var/list/V = list()
+	for(var/key in piles)
+		if(piles[key])
+			var/len = length(piles[key])
+			if(len)
+				V[key] = len
+
+	. = list()
+	.["seeds"] = V
+
+/obj/machinery/seed_extractor/ui_act(action, params)
+	if(..())
+		return
+
+	switch(action)
+		if("select")
+			var/item = params["item"]
+			if(piles[item] && length(piles[item]) > 0)
+				var/datum/weakref/WO = piles[item][1]
+				var/obj/item/seeds/O = WO.resolve()
+				if(O)
+					piles[item] -= WO
+					O.forceMove(drop_location())
+					. = TRUE
+					//to_chat(usr, "<span class='notice'>[src] clanks to life briefly before vending [prize.equipment_name]!</span>")
 
-	piles += new /datum/seed_pile(O.plantname, O.lifespan, O.endurance, O.maturation, O.production, O.yield, O.potency)