diff --git a/code/defines/obj/hydro.dm b/code/defines/obj/hydro.dm index bcfda71f782..4e38ed56e88 100644 --- a/code/defines/obj/hydro.dm +++ b/code/defines/obj/hydro.dm @@ -706,6 +706,23 @@ plant_type = 0 growthstages = 6 +/obj/item/seeds/poisonedappleseed + name = "pack of apple seeds" + desc = "These seeds grow into apple trees." + icon_state = "seed-apple" + mypath = "/obj/item/seeds/poisonedappleseed" + species = "apple" + plantname = "Apple Tree" + productname = "/obj/item/weapon/reagent_containers/food/snacks/grown/apple/poisoned" + lifespan = 55 + endurance = 35 + maturation = 6 + production = 6 + yield = 5 + potency = 10 + plant_type = 0 + growthstages = 6 + /obj/item/seeds/goldappleseed name = "pack of golden apple seeds" desc = "These seeds grow into golden apple trees. Good thing there are no firebirds in space." diff --git a/code/modules/reagents/reagent_containers/food/snacks/grown.dm b/code/modules/reagents/reagent_containers/food/snacks/grown.dm index 01820fb267b..a8eedf06bd5 100644 --- a/code/modules/reagents/reagent_containers/food/snacks/grown.dm +++ b/code/modules/reagents/reagent_containers/food/snacks/grown.dm @@ -333,8 +333,22 @@ New() ..() spawn(5) //So potency can be set in the proc that creates these crops + reagents.maximum_volume = 20 reagents.add_reagent("nutriment", 1+round((potency / 10), 1)) - bitesize = 1+round(reagents.total_volume / 2, 1) + bitesize = reagents.maximum_volume // Always eat the apple in one + +/obj/item/weapon/reagent_containers/food/snacks/grown/apple/poisoned + seed = "/obj/item/seeds/poisonedappleseed" + name = "apple" + desc = "It's a little piece of Eden." + icon_state = "apple" + potency = 15 + New() + ..() + spawn(5) //So potency can be set in the proc that creates these crops + reagents.maximum_volume = 20 + reagents.add_reagent("cyanide", 1+round((potency / 5), 1)) + bitesize = reagents.maximum_volume // Always eat the apple in one /obj/item/weapon/reagent_containers/food/snacks/grown/goldapple seed = "/obj/item/seeds/goldappleseed" diff --git a/code/modules/reagents/reagent_containers/spray.dm b/code/modules/reagents/reagent_containers/spray.dm index f934d5fffec..a430e605bc0 100644 --- a/code/modules/reagents/reagent_containers/spray.dm +++ b/code/modules/reagents/reagent_containers/spray.dm @@ -10,7 +10,7 @@ w_class = 2.0 throw_speed = 2 throw_range = 10 - amount_per_transfer_from_this = 5 + amount_per_transfer_from_this = 10 volume = 250 possible_transfer_amounts = null @@ -79,6 +79,16 @@ usr << "[round(R.volume)] units of [R.name] left." return +/obj/item/weapon/reagent_containers/spray/verb/empty() + + set name = "Empty Spray Bottle" + set category = "Object" + set src in usr + + if(isturf(usr.loc)) + usr << "You empty the [src] onto the floor." + reagents.reaction(usr.loc) + spawn(5) src.reagents.clear_reagents() //space cleaner /obj/item/weapon/reagent_containers/spray/cleaner diff --git a/html/changelog.html b/html/changelog.html index 9f5e8b63f28..008596ef3bb 100644 --- a/html/changelog.html +++ b/html/changelog.html @@ -59,6 +59,7 @@ should be listed in the changelog upon commit tho. Thanks. -->