Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Resin Fruits now contain enough fruit resin to be scanned. Alacrit now contains catecholamine plasma #4425

Merged
merged 2 commits into from
Oct 2, 2023
Merged

Resin Fruits now contain enough fruit resin to be scanned. Alacrit now contains catecholamine plasma #4425

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e987967
fixes all of my woes
private-tristan Sep 17, 2023
ff96b56
Merge branch 'master' into morefruitresin
private-tristan Sep 28, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 10 additions & 10 deletions code/modules/cm_aliens/structures/fruit.dm
View file
Open in desktop
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)