diff --git a/code/modules/hydroponics/grown.dm b/code/modules/hydroponics/grown.dm index 62b29c3acee..db6f8b8fedc 100644 --- a/code/modules/hydroponics/grown.dm +++ b/code/modules/hydroponics/grown.dm @@ -528,6 +528,18 @@ reagents.add_reagent("nutriment", 1+round((potency / 20), 1)) bitesize = 1+round(reagents.total_volume / 2, 1) +/obj/item/weapon/reagent_containers/food/snacks/grown/koibeans + seed = "/obj/item/seeds/koiseed" + name = "koibean" + desc = "Something about these seems fishy." + icon_state = "koibeans" + New() + ..() + spawn(5) //So potency can be set in the proc that creates these crops + reagents.add_reagent("nutriment", 1+round((potency / 30), 1)) + reagents.add_reagent("carpotoxin", 1+round((potency / 20), 1)) + bitesize = 1+round(reagents.total_volume / 2, 1) + /obj/item/weapon/reagent_containers/food/snacks/grown/moonflower seed = "/obj/item/seeds/moonflowerseed" name = "moonflower" diff --git a/code/modules/hydroponics/seeds.dm b/code/modules/hydroponics/seeds.dm index f463816e7d3..f2af1a69446 100644 --- a/code/modules/hydroponics/seeds.dm +++ b/code/modules/hydroponics/seeds.dm @@ -374,11 +374,28 @@ yield = 3 potency = 5 plant_type = 0 - growthstages = 6 + growthstages = 4 + mutatelist = list(/obj/item/seeds/koiseed) + +/obj/item/seeds/koiseed + name = "pack of koibean seeds" + desc = "These seeds grow into koibean plants." + icon_state = "seed-koibean" + species = "soybean" + plantname = "Koibean Plants" + product = /obj/item/weapon/reagent_containers/food/snacks/grown/koibeans + lifespan = 25 + endurance = 15 + maturation = 4 + production = 4 + yield = 3 + potency = 10 + plant_type = 0 + growthstages = 4 /obj/item/seeds/wheatseed name = "pack of wheat seeds" - desc = "These may, or may not, grow into weed." + desc = "These may, or may not, grow into wheat." icon_state = "seed-wheat" species = "wheat" plantname = "Wheat Stalks" @@ -849,7 +866,6 @@ plant_type = 0 growthstages = 3 - /obj/item/seeds/limeseed name = "pack of lime seeds" desc = "These are very sour seeds." @@ -966,10 +982,10 @@ /obj/item/seeds/cocoapodseed name = "pack of cocoa pod seeds" - desc = "These seeds grow into cacao trees. They look fattening." //SIC: cocoa is the seeds. The tress ARE spelled cacao. + desc = "These seeds grow into cacao trees. They look fattening." //SIC: cocoa is the seeds. The trees are spelled cacao. icon_state = "seed-cocoapod" species = "cocoapod" - plantname = "Cocao Tree" //SIC: see above + plantname = "Cocao Tree" product = /obj/item/weapon/reagent_containers/food/snacks/grown/cocoapod lifespan = 20 endurance = 15 diff --git a/code/modules/reagents/Chemistry-Reagents.dm b/code/modules/reagents/Chemistry-Reagents.dm index c66e0f92bcb..6e74de42a5e 100644 --- a/code/modules/reagents/Chemistry-Reagents.dm +++ b/code/modules/reagents/Chemistry-Reagents.dm @@ -1190,6 +1190,33 @@ datum ..() return + rezadone + name = "Rezadone" + id = "rezadone" + description = "A powder derived from fish toxin, this substance can effectively treat genetic damage in humanoids, though excessive consumption has side effects." + reagent_state = SOLID + color = "#669900" // rgb: 102, 153, 0 + + on_mob_life(var/mob/living/M as mob) + if(!M) M = holder.my_atom + if(!data) data = 1 + data++ + switch(data) + if(1 to 15) + M.adjustCloneLoss(-1) + M.heal_organ_damage(1,1) + if(15 to 35) + M.adjustCloneLoss(-2) + M.heal_organ_damage(2,1) + M.status_flags &= ~DISFIGURED + if(35 to INFINITY) + M.adjustToxLoss(1) + M.make_dizzy(5) + M.make_jittery(5) + + ..() + return + spaceacillin name = "Spaceacillin" id = "spaceacillin" diff --git a/code/modules/reagents/Chemistry-Recipes.dm b/code/modules/reagents/Chemistry-Recipes.dm index 9e7f735cfb9..3c8a95566ad 100644 --- a/code/modules/reagents/Chemistry-Recipes.dm +++ b/code/modules/reagents/Chemistry-Recipes.dm @@ -424,6 +424,13 @@ datum required_reagents = list("carpotoxin" = 5, "stoxin" = 5, "copper" = 5) result_amount = 2 + rezadone + name = "Rezadone" + id = "rezadone" + result = "rezadone" + required_reagents = list("carpotoxin" = 1, "cryptobiolin" = 1, "copper" = 1) + result_amount = 3 + mindbreaker name = "Mindbreaker Toxin" id = "mindbreaker" diff --git a/icons/obj/harvest.dmi b/icons/obj/harvest.dmi index 9840e0a363c..55946eb018e 100644 Binary files a/icons/obj/harvest.dmi and b/icons/obj/harvest.dmi differ diff --git a/icons/obj/hydroponics.dmi b/icons/obj/hydroponics.dmi index 6026a7ddfe3..1f9e2e52c15 100644 Binary files a/icons/obj/hydroponics.dmi and b/icons/obj/hydroponics.dmi differ diff --git a/icons/obj/seeds.dmi b/icons/obj/seeds.dmi index d9f36352faa..50528f91cfb 100644 Binary files a/icons/obj/seeds.dmi and b/icons/obj/seeds.dmi differ