From 0aeab2dca9196eec5230dc14412c156cf7d6eca0 Mon Sep 17 00:00:00 2001 From: Duck- Date: Sat, 13 Sep 2014 16:24:04 -0400 Subject: [PATCH] Botany changes Poisonous plants you'll now eat in a single bite. Because poisoning. Poisoned cyanide death apples enabled in mutations. They look just like normal apples! Be careful. Death nettles buffed significantly, considering it's a tri-department effort to even get them, and that's excluding potency growth. --- code/game/machinery/hydroponics.dm | 6 +++++- code/game/objects/items/weapons/hydroponics.dm | 2 +- .../reagents/reagent_containers/food/snacks/grown.dm | 6 +++--- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/code/game/machinery/hydroponics.dm b/code/game/machinery/hydroponics.dm index ecd16e68..188af968 100644 --- a/code/game/machinery/hydroponics.dm +++ b/code/game/machinery/hydroponics.dm @@ -341,7 +341,11 @@ obj/machinery/hydroponics/proc/mutatespecie() // Mutagent produced a new plant! else if ( istype(myseed, /obj/item/seeds/appleseed )) del(myseed) - myseed = new /obj/item/seeds/goldappleseed + switch(rand(1,100)) + if(1 to 50) + myseed = new /obj/item/seeds/goldappleseed + if(51 to 100) + myseed = new /obj/item/seeds/poisonedappleseed else if ( istype(myseed, /obj/item/seeds/berryseed )) del(myseed) diff --git a/code/game/objects/items/weapons/hydroponics.dm b/code/game/objects/items/weapons/hydroponics.dm index 91f8e0ca..85872fd6 100644 --- a/code/game/objects/items/weapons/hydroponics.dm +++ b/code/game/objects/items/weapons/hydroponics.dm @@ -203,7 +203,7 @@ /obj/item/weapon/grown/deathnettle/changePotency(newValue) //-QualityVan potency = newValue - force = round((5+potency/2.5), 1) + force = round((5+potency), 1) ///2.5. deadly nettles because you have earned it. /* diff --git a/code/modules/reagents/reagent_containers/food/snacks/grown.dm b/code/modules/reagents/reagent_containers/food/snacks/grown.dm index acbb5810..6a04ea7f 100644 --- a/code/modules/reagents/reagent_containers/food/snacks/grown.dm +++ b/code/modules/reagents/reagent_containers/food/snacks/grown.dm @@ -382,7 +382,7 @@ reagents.add_reagent("nutriment", 1) reagents.add_reagent("toxin", 3+round(potency / 3, 1)) reagents.add_reagent("lexorin", 1+round(potency / 5, 1)) - bitesize = 1+round(reagents.total_volume / 2, 1) + bitesize = reagents.total_volume /obj/item/weapon/reagent_containers/food/snacks/grown/ambrosiavulgaris seed = "/obj/item/seeds/ambrosiavulgaris" @@ -833,7 +833,7 @@ reagents.add_reagent("nutriment", 1) reagents.add_reagent("amatoxin", 3+round(potency / 3, 1)) reagents.add_reagent("psilocybin", 1+round(potency / 25, 1)) - bitesize = 1+round(reagents.total_volume / 2, 1) + bitesize = reagents.total_volume /obj/item/weapon/reagent_containers/food/snacks/grown/mushroom/amanita/attackby(var/obj/item/O as obj, var/mob/user as mob) . = ..() @@ -854,7 +854,7 @@ reagents.add_reagent("nutriment", 1+round((potency / 50), 1)) reagents.add_reagent("amatoxin", 13+round(potency / 3, 1)) reagents.add_reagent("psilocybin", 1+round(potency / 25, 1)) - bitesize = 1+round(reagents.total_volume / 2, 1) + bitesize = reagents.total_volume /obj/item/weapon/reagent_containers/food/snacks/grown/mushroom/angel/attackby(var/obj/item/O as obj, var/mob/user as mob) . = ..()