Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac

code/modules/hydroponics/grown.dm

@@ -185,13 +185,17 @@
 				pocell.charge = pocell.maxcharge
 				qdel(src)
 				return
-		else if(W.sharp)
+	
+		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)
 				qdel(src)
 				return
-			else if(seed.chems)
+
+			if(seed.chems)
+
 				if(W.sharp && W.edge && !isnull(seed.chems["woodpulp"]))
 					user.show_message("<span class='notice'>You make planks out of \the [src]!</span>", 1)
 					playsound(src, 'sound/effects/woodcutting.ogg', 50, 1)
@@ -209,36 +213,49 @@
 						to_chat(user, "You add the newly-formed wood to the stack. It now contains [NG.get_amount()] planks.")
 					qdel(src)
 					return
-				else if(!isnull(seed.chems["potato"]))
+				
+				if(seed.kitchen_tag == "sunflower")
+					new /obj/item/weapon/reagent_containers/food/snacks/rawsunflower(get_turf(src))
+					to_chat(user, SPAN_NOTICE("You remove the seeds from the flower, slightly damaging them."))
+					qdel(src)
+					return
+
+				if(seed.kitchen_tag == "potato" || !isnull(seed.chems["potato"]))
 					to_chat(user, "You slice \the [src] into sticks.")
 					new /obj/item/weapon/reagent_containers/food/snacks/rawsticks(get_turf(src))
 					qdel(src)
 					return
-				else if(!isnull(seed.chems["carrotjuice"]))
+				
+				if(!isnull(seed.chems["carrotjuice"]))
 					to_chat(user, "You slice \the [src] into sticks.")
 					new /obj/item/weapon/reagent_containers/food/snacks/carrotfries(get_turf(src))
 					qdel(src)
 					return
-				else if(!isnull(seed.chems["pineapplejuice"]))
+				
+				if(!isnull(seed.chems["pineapplejuice"]))
 					to_chat(user, "You slice \the [src] into rings.")
 					new /obj/item/weapon/reagent_containers/food/snacks/pineapple_ring(get_turf(src))
 					qdel(src)
 					return
-				else if(!isnull(seed.chems["soymilk"]))
+				
+				if(!isnull(seed.chems["soymilk"]))
 					to_chat(user, "You roughly chop up \the [src].")
 					new /obj/item/weapon/reagent_containers/food/snacks/soydope(get_turf(src))
 					qdel(src)
 					return
-				else if(seed.get_trait(TRAIT_FLESH_COLOUR))
+				
+				if(seed.get_trait(TRAIT_FLESH_COLOUR))
 					to_chat(user, "You slice up \the [src].")
 					var/slices = rand(3,5)
 					var/reagents_to_transfer = round(reagents.total_volume/slices)
 					for(var/i=1; i<=slices; i++)
 						var/obj/item/weapon/reagent_containers/food/snacks/fruit_slice/F = new(get_turf(src),seed)
-						if(reagents_to_transfer) reagents.trans_to_obj(F,reagents_to_transfer)
+						if(reagents_to_transfer)
+							reagents.trans_to_obj(F,reagents_to_transfer)
 					qdel(src)
 					return
-	..()
+
+	. = ..()
 
 /obj/item/weapon/reagent_containers/food/snacks/grown/apply_hit_effect(mob/living/target, mob/living/user, var/hit_zone)
 	. = ..()

code/modules/hydroponics/grown_predefined.dm

@@ -3,6 +3,3 @@
 
 /obj/item/weapon/reagent_containers/food/snacks/grown/ambrosiadeus
 	plantname = "ambrosiadeus"
-
-/obj/item/weapon/reagent_containers/food/snacks/grown/sifpod
-	plantname = "sifbulb"

code/modules/hydroponics/grown_sif.dm

@@ -0,0 +1,39 @@
+/obj/item/weapon/reagent_containers/food/snacks/grown/sif
+	var/seeds = 0
+
+/obj/item/weapon/reagent_containers/food/snacks/grown/sif/Initialize(mapload, planttype) // Wild Sifplants have some seeds you can extract with a knife.
+	. = ..()
+	seeds = rand(1, 2)
+
+/obj/item/weapon/reagent_containers/food/snacks/grown/sif/examine(mob/user)
+	. = ..()
+	if(seeds)
+		to_chat(user, SPAN_NOTICE("You can see [seeds] seed\s in \the [src]. You might be able to extract them with a sharp object."))
+
+/obj/item/weapon/reagent_containers/food/snacks/grown/sif/attackby(var/obj/item/weapon/W, var/mob/living/user)
+	if(seed && W.sharp && seeds > 0)
+		var/take_seeds = min(seeds, rand(1,2))
+		seeds -= take_seeds
+		to_chat(user, SPAN_NOTICE("You stick \the [W] into \the [src] and lever out [take_seeds] seed\s."))
+		for(var/i = 1 to take_seeds)
+			new /obj/item/seeds(get_turf(src), seed.name)
+		return
+	. = ..()
+
+/obj/item/weapon/reagent_containers/food/snacks/grown/sif/sifpod
+	plantname = "sifbulb"
+
+/obj/item/weapon/reagent_containers/food/snacks/grown/sif/wabback
+	plantname = "wabback"
+
+/obj/item/weapon/reagent_containers/food/snacks/grown/sif/blackwabback
+	plantname = "blackwabback"
+
+/obj/item/weapon/reagent_containers/food/snacks/grown/sif/wildwabback
+	plantname = "wildwabback"
+
+/obj/item/weapon/reagent_containers/food/snacks/grown/sif/eyebulbs
+	plantname = "eyebulbs"
+
+/obj/item/weapon/reagent_containers/food/snacks/grown/sif/cavebulbs
+	plantname = "cavebulbs"

code/modules/hydroponics/seed_packets.dm

@@ -13,7 +13,9 @@ GLOBAL_LIST_BOILERPLATE(all_seed_packs, /obj/item/seeds)
 	var/datum/seed/seed
 	var/modified = 0
 
-/obj/item/seeds/Initialize()
+/obj/item/seeds/Initialize(var/ml, var/_seed_type)
+	if(_seed_type in SSplants.seeds)
+		seed_type = _seed_type
 	update_seed()
 	. = ..()
 

code/modules/hydroponics/seedtypes/apples.dm

@@ -43,7 +43,7 @@
 
 /datum/seed/apple/sif
 	name = "sifbulb"
-	seed_name = "sivian tree"
+	seed_name = "sivian pod"
 	display_name = "sivian pod"
 	kitchen_tag = "apple"
 	chems = list("nutriment" = list(1,5),"sifsap" = list(10,20))

code/modules/hydroponics/trays/tray_soil.dm

@@ -32,6 +32,16 @@
 /obj/machinery/portable_atmospherics/hydroponics/soil/CanPass()
 	return 1
 
+/obj/machinery/portable_atmospherics/hydroponics/soil/attackby(obj/item/O, mob/user)
+	if(istype(O, /obj/item/weapon/shovel) && user.a_intent == I_HURT)
+		user.visible_message(SPAN_NOTICE("\The [user] begins filling in \the [src]."))
+		if(do_after(user, 3 SECONDS) && !QDELETED(src))
+			user.visible_message(SPAN_NOTICE("\The [user] fills in \the [src]."))
+			qdel(src)
+		return
+	. = ..()
+	
+
 // Holder for vine plants.
 // Icons for plants are generated as overlays, so setting it to invisible wouldn't work.
 // Hence using a blank icon.