Plant port

Ported Sapbeans and Hardlight seeds (not the mobs) Dragonshark has made Ported Tea plant, matcha recipes and tea recipes still not finished Ported Meatwheat, Milkdew, Sweet breeze, Solarflower and Voltato Ported self falling poisonous apple Wont port mutation system changes, already chances in new code for random reagents, decided to wait with decision making plants randomly produce reagents or not, might have specific plants and/or random ones do it.
2025-12-10 18:22:39 +00:00 · 2020-02-24 17:47:35 +01:00
parent 1ed5de2ec7
commit 8cf7d72641
8 changed files with 244 additions and 3 deletions
--- a/code/modules/food/food/snacks_ch.dm
+++ b/code/modules/food/food/snacks_ch.dm
@@ -88,4 +88,47 @@

 /obj/item/weapon/reagent_containers/food/snacks/garlicbread/New()
 	..()
-	bitesize = 4
+	bitesize = 4
+
+/obj/item/weapon/reagent_containers/food/snacks/steamtealeaf
+	name = "Steamed tea leaf"
+	desc = "A freshly picked tea leaf steamed to inhibit oxidation. Needs rolling."
+	icon = 'icons/obj/food.dmi'
+	icon_state = "tealeafsteam"
+	nutriment_amt = 0
+	nutriment_desc = list("nothing" = 1)
+
+/obj/item/weapon/reagent_containers/food/snacks/steamtealeaf/New()
+	..()
+	bitesize = 1
+
+/obj/item/weapon/reagent_containers/food/snacks/steamtealeaf/attackby(obj/item/weapon/W as obj, mob/user as mob)
+	if(istype(W,/obj/item/weapon/material/kitchen/rollingpin))
+		new /obj/item/weapon/reagent_containers/food/snacks/steamrolltealeaf(src)
+		user << "You roll the steamed tea leaf."
+		qdel(src)
+
+/obj/item/weapon/reagent_containers/food/snacks/steamrolltealeaf
+	name = "Rolled steamed tea leaf"
+	desc = "A steamed tea leaf ready for drying."
+	icon = 'icons/obj/food.dmi'
+	icon_state = "tealeafsteamroll"
+	nutriment_amt = 0
+	nutriment_desc = list("nothing" = 1)
+
+/obj/item/weapon/reagent_containers/food/snacks/steamrolltealeaf/New()
+	..()
+	bitesize = 1
+
+/obj/item/weapon/reagent_containers/food/snacks/greentealeaf
+	name = "Green tea leaf"
+	desc = "Green tea! Just grind and mix with hot water."
+	icon = 'icons/obj/food.dmi'
+	icon_state = "greentealeaf"
+	nutriment_amt = 0
+	nutriment_desc = list("nothing" = 1)
+
+/obj/item/weapon/reagent_containers/food/snacks/greentealeaf/New()
+	..()
+	reagents.add_reagent("tealeavesgreen", 6)
+	bitesize = 1
--- a/code/modules/food/recipes_microwave_ch.dm
+++ b/code/modules/food/recipes_microwave_ch.dm
@@ -67,4 +67,16 @@
 		/obj/item/weapon/reagent_containers/food/snacks/slice/bread,
 		/obj/item/weapon/reagent_containers/food/snacks/slice/bread
 	)
-	result = /obj/item/weapon/reagent_containers/food/snacks/garlicbread
+	result = /obj/item/weapon/reagent_containers/food/snacks/garlicbread
+	
+/datum/recipe/steamtealeaf
+	reagents = list("water" = 5)
+	fruit = list("tea" = 1)
+
+	result = /obj/item/weapon/reagent_containers/food/snacks/steamtealeaf
+
+/datum/recipe/greentealeaf //TODO: Figure out how to make this recipe with a drying rack.
+	items = list(
+		/obj/item/weapon/reagent_containers/food/snacks/steamrolltealeaf
+	)
+	result = /obj/item/weapon/reagent_containers/food/snacks/greentealeaf
--- a/code/modules/hydroponics/seed_datums.dm
+++ b/code/modules/hydroponics/seed_datums.dm
@@ -256,7 +256,7 @@
 	seed_name = "apple"
 	display_name = "apple tree"
 	kitchen_tag = "apple"
-	mutants = list("poisonapple","goldapple")
+	mutants = list("poisonapple","goldapple","fallingapple")	//CHOMPEDIT: adding fall apple to list
 	chems = list("nutriment" = list(1,10),"applejuice" = list(10,20))

 /datum/seed/apple/New()
@@ -588,6 +588,7 @@
 	name = "sunflowers"
 	seed_name = "sunflower"
 	display_name = "sunflowers"
+	mutants = list("solarflower") //CHOMPEDIT A sunflower well suited for planting as a natural lamp
 	kitchen_tag = "sunflower"

 /datum/seed/flower/sunflower/New()
@@ -604,6 +605,7 @@
 	name = "lavender"
 	seed_name = "lavender"
 	display_name = "lavender"
+	mutants = list("milkdew") //CHOMPEDIT: leads to milk plant and lavender that makes a tier 2 source for some medical chems
 	kitchen_tag = "lavender"
 	chems = list("nutriment" = list(1,20), "bicaridine" = list(1,10))

@@ -888,6 +890,7 @@
 	name = "potato"
 	seed_name = "potato"
 	display_name = "potatoes"
+	mutants = list("voltato") //CHOMPEDIT: Adding a better potato battery and viable source for V200
 	kitchen_tag = "potato"
 	chems = list("nutriment" = list(1,10), "potatojuice" = list(10,10))

@@ -925,6 +928,7 @@
 	name = "soybean"
 	seed_name = "soybean"
 	display_name = "soybeans"
+	mutants = list("orangesapbean","purplesapbean","bluesapbean") //CHOMPEDIT: Adding sappy beanies to mutation
 	kitchen_tag = "soybeans"
 	chems = list("nutriment" = list(1,20), "soymilk" = list(10,20))

@@ -943,6 +947,7 @@
 	name = "wheat"
 	seed_name = "wheat"
 	display_name = "wheat stalks"
+	mutants = list("meatwheat")	//CHOMPEDIT: Meat wheat, the solution for vegetarian carnivores
 	kitchen_tag = "wheat"
 	chems = list("nutriment" = list(1,25), "flour" = list(10,30))

--- a/code/modules/hydroponics/seed_datums_ch.dm
+++ b/code/modules/hydroponics/seed_datums_ch.dm
@@ -0,0 +1,174 @@
+//////CHOMP PLANTS//////
+
+/datum/seed/soybean/sapbean
+	name = "sapbean"
+	seed_name = "sapbean"
+	display_name = "sapbeans"
+	chems = list()
+
+/datum/seed/soybean/sapbean/orange
+	name = "orangesapbean"
+	mutants = list("Purplesapbean","bluesapbean","blacksapbean")
+	chems = list("orangesap" = list(0,10))
+
+/datum/seed/soybean/sapbean/purple
+	name = "purplesapbean"
+	mutants = list("Orangesapbean","bluesapbean","blacksapbean")
+	chems = list("purplesap" = list(0,10))
+
+/datum/seed/soybean/sapbean/blue
+	name = "bluesapbean"
+	mutants = list("orangesapbean","purplesapbean","blacksapbean")
+	chems = list("bluesap" = list(0,10))
+
+/datum/seed/soybean/sapbean/black //A bean with all the power but in so little quanitity
+	name = "blacksapbean"
+	chems = list("bluesap" = list(1,2),"orangesap" = list(1,2),"purplesap" = list(1,2))
+
+/datum/seed/soybean/sapbean/orange/New()
+	..()
+	set_trait(TRAIT_PRODUCT_COLOUR,"#FF8700")
+	set_trait(TRAIT_PLANT_COLOUR,"#FF8700")
+/datum/seed/soybean/sapbean/purple/New()
+	..()
+	set_trait(TRAIT_PRODUCT_COLOUR,"#FF00FF")
+	set_trait(TRAIT_PLANT_COLOUR,"#FF00FF")
+/datum/seed/soybean/sapbean/blue/New()
+	..()
+	set_trait(TRAIT_PRODUCT_COLOUR,"#0000FF")
+	set_trait(TRAIT_PLANT_COLOUR,"#0000FF")
+
+/datum/seed/soybean/sapbean/black/New() //the only real positive is that its 1 plant to care for rather than 3
+	..()
+	set_trait(TRAIT_PRODUCT_ICON,"treefruit")
+	set_trait(TRAIT_PRODUCT_COLOUR,"#333333")
+	set_trait(TRAIT_PLANT_COLOUR,"#333333")
+	set_trait(TRAIT_PRODUCTION,3)
+	set_trait(TRAIT_MATURATION,8)
+	set_trait(TRAIT_POTENCY,10)
+	set_trait(TRAIT_YIELD,2)
+
+//Adding self harvesting apples which contain poison and can mutate into poisonapples
+/datum/seed/apple/falling
+	name = "fallingapple"
+	mutants = list("poisonapple")
+	can_self_harvest = 1
+	chems = list("nutriment" = list(1,5),"applejuice" = list(5,10),"cyanide" = list(1,3))
+
+/datum/seed/wheat/meatwheat
+	name = "meatwheat"
+	seed_name = "meatwheat"
+	display_name = "meatwheat stalks"
+	mutants = null
+	chems = list("nutriment" = list(1,25), "protein" = list(4,10))
+
+/datum/seed/wheat/meatwheat/New()
+	..()
+	set_trait(TRAIT_PRODUCT_COLOUR,"#440000")
+
+/datum/seed/potato/voltato
+	name = "voltato"
+	seed_name = "voltato"
+	display_name = "voltatos"
+	chems = list("nutriment" = list(1,10), "shockchem" = list(0,10))
+	mutants = null
+
+/datum/seed/potato/voltato/New()
+	..()
+	set_trait(TRAIT_PRODUCT_COLOUR,"#E4EC2F")
+	set_trait(TRAIT_POTENCY,30)
+	set_trait(TRAIT_MATURATION,12)
+	set_trait(TRAIT_PRODUCTION,3)
+	set_trait(TRAIT_YIELD,3)
+
+/datum/seed/flower/sunflower/solarflower
+	name = "solarflower"
+	seed_name = "solarflower"
+	display_name = "solarflowers"
+	mutants = null
+
+/datum/seed/flower/sunflower/solarflower/New()
+	..()
+	set_trait(TRAIT_PRODUCT_COLOUR,"#4466b3")
+	set_trait(TRAIT_BIOLUM,1)
+	set_trait(TRAIT_BIOLUM_COLOUR,"#4e74cc")
+	set_trait(TRAIT_POTENCY,25)
+	set_trait(TRAIT_MATURATION,10)
+	set_trait(TRAIT_YIELD,1)
+	set_trait(TRAIT_SPREAD,1)
+
+/datum/seed/flower/lavender/milkdew
+	name = "milkdew"
+	seed_name = "milk dew"
+	display_name = "milk dew"
+	chems = list("nutriment" = list(1,10), "milk" = list(4,5))
+	mutants = list("sweetbreeze")
+
+/datum/seed/flower/lavender/milkdew/New()
+	..()
+	set_trait(TRAIT_PRODUCT_COLOUR,"#DFDFDF")
+	set_trait(TRAIT_POTENCY,5)
+	set_trait(TRAIT_YIELD,3)
+
+/datum/seed/flower/lavender/sweetbreeze
+	name = "sweetbreeze"
+	seed_name = "sweet breeze"
+	display_name = "sweet breeze"
+	chems = list("nutriment" = list(1,10), "serazine" = list(1,10))
+	mutants = null
+
+/datum/seed/flower/lavender/sweetbreeze/New()
+	..()
+	set_trait(TRAIT_PRODUCT_COLOUR,"#df9898")
+	set_trait(TRAIT_POTENCY,10)
+	set_trait(TRAIT_MATURATION,20)
+	set_trait(TRAIT_PRODUCTION,7)
+	set_trait(TRAIT_YIELD,3)
+
+// Tea plants/variants.
+/datum/seed/tea
+	name = "tea"
+	seed_name = "tea"
+	display_name = "tea plant"
+	chems = list("teamush" = list(3,10))
+	mutants = null
+	kitchen_tag = "tea"
+
+/datum/seed/tea/New()
+	..()
+	set_trait(TRAIT_HARVEST_REPEAT,1)
+	set_trait(TRAIT_MATURATION,5)
+	set_trait(TRAIT_PRODUCTION,5)
+	set_trait(TRAIT_YIELD,6)
+	set_trait(TRAIT_POTENCY,20)
+	set_trait(TRAIT_PRODUCT_ICON,"tea")
+	set_trait(TRAIT_PRODUCT_COLOUR,"#b7e496")
+	set_trait(TRAIT_PLANT_COLOUR,"#b7e496")
+	set_trait(TRAIT_PLANT_ICON,"bush4")
+	set_trait(TRAIT_IDEAL_HEAT, 298)
+	set_trait(TRAIT_IDEAL_LIGHT, 7)
+	set_trait(TRAIT_WATER_CONSUMPTION, 6)
+	set_trait(TRAIT_NUTRIENT_CONSUMPTION, 0.25)
+
+/datum/seed/hardlightseed    //WIP: havent ported the mob and such yet, best someone more keen on these mobs does it - Jack
+	name = "Type NULL Hardlight Generator"
+	seed_name = "Biomechanical Hardlight generator seed"
+	display_name = "Biomechanical Hardlight stem"
+	mutants = null
+	can_self_harvest = 1
+	has_mob_product = null
+
+/datum/seed/hardlightseed/New()
+	..()
+	set_trait(TRAIT_IMMUTABLE,1) //Normal genetics wont be able to do much with the mechanical parts, its more a machine than a real plant
+	set_trait(TRAIT_MATURATION,1)
+	set_trait(TRAIT_PRODUCTION,1)
+	set_trait(TRAIT_YIELD,1)
+	set_trait(TRAIT_POTENCY,1)
+	set_trait(TRAIT_PRODUCT_ICON,"alien4")
+	set_trait(TRAIT_PRODUCT_COLOUR,"#00FFFF")
+	set_trait(TRAIT_PLANT_COLOUR,"#00FFFF")
+	set_trait(TRAIT_PLANT_ICON,"alien4") //spooky pods
+	set_trait(TRAIT_IDEAL_HEAT, 283)
+	set_trait(TRAIT_NUTRIENT_CONSUMPTION, 0)
+	set_trait(TRAIT_WATER_CONSUMPTION, 0)
--- a/code/modules/hydroponics/seed_packets_ch.dm
+++ b/code/modules/hydroponics/seed_packets_ch.dm
@@ -0,0 +1,3 @@
+
+/obj/item/seeds/teaseed
+	seed_type = "tea"
--- a/code/modules/hydroponics/seed_storage_vr.dm
+++ b/code/modules/hydroponics/seed_storage_vr.dm
@@ -36,6 +36,7 @@
 		/obj/item/seeds/sugarcaneseed = 3,
 		/obj/item/seeds/sunflowerseed = 3,
 		/obj/item/seeds/shandseed = 2,
+		/obj/item/seeds/teaseed = 3, //CHOMPEDIT
 		/obj/item/seeds/tobaccoseed = 3,
 		/obj/item/seeds/tomatoseed = 3,
 		/obj/item/seeds/towermycelium = 3,
@@ -93,6 +94,7 @@
 		/obj/item/seeds/sugarcaneseed = 3,
 		/obj/item/seeds/sunflowerseed = 3,
 		/obj/item/seeds/shandseed = 2,
+		/obj/item/seeds/teaseed = 3, //CHOMPEDIT
 		/obj/item/seeds/tobaccoseed = 3,
 		/obj/item/seeds/tomatoseed = 3,
 		/obj/item/seeds/towermycelium = 3,
--- a/icons/obj/hydroponics_products.dmi
+++ b/icons/obj/hydroponics_products.dmi
--- a/vorestation.dme
+++ b/vorestation.dme
@@ -2122,12 +2122,14 @@
 #include "code\modules\hydroponics\seed.dm"
 #include "code\modules\hydroponics\seed_controller.dm"
 #include "code\modules\hydroponics\seed_datums.dm"
+#include "code\modules\hydroponics\seed_datums_ch.dm"
 #include "code\modules\hydroponics\seed_datums_vr.dm"
 #include "code\modules\hydroponics\seed_datums_yw.dm"
 #include "code\modules\hydroponics\seed_gene_mut.dm"
 #include "code\modules\hydroponics\seed_machines.dm"
 #include "code\modules\hydroponics\seed_mobs.dm"
 #include "code\modules\hydroponics\seed_packets.dm"
+#include "code\modules\hydroponics\seed_packets_ch.dm"
 #include "code\modules\hydroponics\seed_packets_vr.dm"
 #include "code\modules\hydroponics\seed_packets_yw.dm"
 #include "code\modules\hydroponics\seed_storage.dm"