From c362edae4bddc4f43825ebfbd7983500521653e4 Mon Sep 17 00:00:00 2001 From: private-tristan <54422837+private-tristan@users.noreply.github.com> Date: Sun, 1 Oct 2023 22:55:32 -0400 Subject: [PATCH] Resin Fruits now contain enough fruit resin to be scanned. Alacrit now contains catecholamine plasma (#4425) # About the pull request all resin fruits, including lesser fruits, now contain 30u fruit resin along with 30u of their secondary reagent (in the case of special gardener fruits). alacrit nw contains catheo plasma due to it being a speed up. greater resin fruits will have 60u of fruit resin due to having no other secondary chemical within. # Explain why it's good for the game currently, to get fruit resin as a researcher you need: a gardener/healer drone have them plant a fruit have marines push xenos past that fruit without it having been eaten have a marine uproot the fruit instead of clearing weeds (NOBODY DOES THIS) take the fruit and NOT eat it bring it all the way to fob up to research and then you get to tell them that you need 2-10 more of the same fruit for researchers to be able to SCAN fruit resin. you are more likely to get ROYAL PLASMA than this chemical. alternatively you'd need a marine to find and kill a gardener drone, not have the body gibbed, dragged back to someone with fulton, and brought to you. this cuts out at least the final part, allowing all fruits to be scannable if uneaten, along with its' secondary chemical. # Testing Photographs and Procedure
Screenshots & Videos Put screenshots and videos here with an empty line between the screenshots and the `
` tags.
# Changelog :cl: Private Tristan balance: all resin fruits now contain 30u of fruit resin along with their secondary reagents. balance: Alacrit fruits now contain catecholamine plasma instead of pheromone plasma. /:cl: --- code/modules/cm_aliens/structures/fruit.dm | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/code/modules/cm_aliens/structures/fruit.dm b/code/modules/cm_aliens/structures/fruit.dm index e54cb9417d7c..318bc6ba6cf2 100644 --- a/code/modules/cm_aliens/structures/fruit.dm +++ b/code/modules/cm_aliens/structures/fruit.dm @@ -438,7 +438,7 @@ return XENO_NONCOMBAT_ACTION /obj/item/reagent_container/food/snacks/resin_fruit/proc/add_juice() - reagents.add_reagent("fruit_resin", 8) + reagents.add_reagent("fruit_resin", 30) /obj/effect/alien/resin/fruit/MouseDrop(atom/over_object) var/mob/living/carbon/xenomorph/X = over_object @@ -491,7 +491,7 @@ fruit_type = /obj/effect/alien/resin/fruit/greater /obj/item/reagent_container/food/snacks/resin_fruit/greater/add_juice() - reagents.add_reagent("fruit_resin", 16) + reagents.add_reagent("fruit_resin", 60) /obj/item/reagent_container/food/snacks/resin_fruit/unstable name = XENO_FRUIT_UNSTABLE @@ -501,8 +501,8 @@ fruit_type = /obj/effect/alien/resin/fruit/unstable /obj/item/reagent_container/food/snacks/resin_fruit/unstable/add_juice() - reagents.add_reagent("fruit_resin", 4) - reagents.add_reagent(PLASMA_CHITIN, 12) + reagents.add_reagent("fruit_resin", 30) + reagents.add_reagent(PLASMA_CHITIN, 30) /obj/item/reagent_container/food/snacks/resin_fruit/spore name = XENO_FRUIT_SPORE @@ -511,8 +511,8 @@ fruit_type = /obj/effect/alien/resin/fruit/spore /obj/item/reagent_container/food/snacks/resin_fruit/spore/add_juice() - reagents.add_reagent("fruit_resin", 4) - reagents.add_reagent(PLASMA_PHEROMONE, 12) + reagents.add_reagent("fruit_resin", 30) + reagents.add_reagent(PLASMA_PHEROMONE, 30) /obj/item/reagent_container/food/snacks/resin_fruit/speed name = XENO_FRUIT_SPEED @@ -521,8 +521,8 @@ fruit_type = /obj/effect/alien/resin/fruit/speed /obj/item/reagent_container/food/snacks/resin_fruit/speed/add_juice() - reagents.add_reagent("fruit_resin", 4) - reagents.add_reagent(PLASMA_PHEROMONE, 12) + reagents.add_reagent("fruit_resin", 30) + reagents.add_reagent(PLASMA_CATECHOLAMINE, 30) /obj/item/reagent_container/food/snacks/resin_fruit/plasma name = XENO_FRUIT_PLASMA @@ -530,5 +530,5 @@ fruit_type = /obj/effect/alien/resin/fruit/plasma /obj/item/reagent_container/food/snacks/resin_fruit/plasma/add_juice() - reagents.add_reagent("fruit_resin", 4) - reagents.add_reagent(PLASMA_PURPLE, 12) + reagents.add_reagent("fruit_resin", 30) + reagents.add_reagent(PLASMA_PURPLE, 30)