Merge branch 'master' of https://github.com/tgstation/tgstation into xpokee-test-upstream-sync

code/modules/hydroponics/grown/flowers.dm

@@ -19,6 +19,19 @@
 	mutatelist = list(/obj/item/seeds/poppy/geranium, /obj/item/seeds/poppy/lily)
 	reagents_add = list(/datum/reagent/medicine/c2/libital = 0.2, /datum/reagent/consumable/nutriment = 0.05)
 
+/obj/item/seeds/poppy/interact_with_atom(obj/item/I, mob/user, obj/machinery/hydroponics/tray)
+	if(I.sharpness && !src.extracted && tray.age >= 10 && tray.age <= 19)
+		src.extracted = TRUE
+		var/seed_yield = tray.myseed?.potency
+		new /obj/item/food/drug/opium/raw(get_turf(src), seed_yield)
+		playsound(src, 'sound/effects/bubbles/bubbles.ogg', 30, TRUE)
+		playsound(loc, 'sound/items/weapons/bladeslice.ogg', 30, TRUE)
+		user.visible_message(
+			span_notice("You carefully slice the poppy's pod, collecting the fragrant, alluring sap.")
+		)
+		return ITEM_INTERACT_SUCCESS
+	return NONE
+
 /obj/item/food/grown/poppy
 	seed = /obj/item/seeds/poppy
 	name = "poppy"

code/modules/hydroponics/hydroponics.dm

@@ -938,6 +938,12 @@
 			to_chat(user, span_warning("This plot is completely devoid of weeds! It doesn't need uprooting."))
 			return
 
+	else if(O.sharpness) // Allows for the extraction (for opium or sap) interaction if a seed has it.
+		if(myseed && !myseed.extracted)
+			myseed.interact_with_atom(O, user, src)
+		else
+			return ..()
+
 	else if(istype(O, /obj/item/secateurs))
 		if(!myseed)
 			to_chat(user, span_notice("This plot is empty."))

code/modules/hydroponics/seeds.dm

@@ -63,6 +63,8 @@
 	var/graft_gene
 	///Determines if the plant should be allowed to mutate early at 30+ instability.
 	var/seed_flags = MUTATE_EARLY
+	///Determines if the plant has been sliced with a sharp tool to extract substances like saps.
+	var/extracted = 0
 
 /obj/item/seeds/Initialize(mapload, nogenes = FALSE)
 	. = ..()