Skip to content

Commit

Permalink
Resin Fruits now contain enough fruit resin to be scanned. Alacrit no…
Browse files Browse the repository at this point in the history
…w 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
<details>
<summary>Screenshots & Videos</summary>

Put screenshots and videos here with an empty line between the
screenshots and the `<details>` tags.

</details>


# 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:
  • Loading branch information
private-tristan committed Oct 2, 2023
1 parent 65ab3f5 commit c362eda
Showing 1 changed file with 10 additions and 10 deletions.
20 changes: 10 additions & 10 deletions code/modules/cm_aliens/structures/fruit.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -521,14 +521,14 @@
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
icon_state = "fruit_plasma_item"
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)

0 comments on commit c362eda

Please sign in to comment.