<!-- Write **BELOW** The Headers and **ABOVE** The comments else it may
not be viewable. -->
<!-- You can view Contributing.MD for a detailed description of the pull
request process. -->

## About The Pull Request

Introduces the glorious rockfruit, a delish little fruit which just
happens to grow literal granite around it.
<!-- Describe The Pull Request. Please be sure every change is
documented or this can delay review and even discourage maintainers from
merging your PR! -->


![image](https://github.com/Bubberstation/Bubberstation/assets/49160555/4bb9512a-2f8c-455a-b16a-c4011dd544b6)

![image](https://github.com/Bubberstation/Bubberstation/assets/49160555/ecaa4a5a-34b9-4446-99df-0db723e46d70)


I'm not the greatest spriter but I think these look good enough. It is
honestly hard to work with a desaturated, rocky palette when floors use
the same

<!-- Please make sure to actually test your PRs. If you have not tested
your PR mention it. -->

## Why It's Good For The Game

More interesting food is good, plus this fits nicely into adding stone
type food later (Very soon)

<!-- Argue for the merits of your changes and how they benefit the game,
especially if they are controversial and/or far reaching. If you can't
actually explain WHY what you are doing will improve the game, then it
probably isn't good for the game in the first place. -->

## Changelog

<!-- If your PR modifies aspects of the game that can be concretely
observed by players or admins you should add a changelog. If your change
does NOT meet this description, remove this section. Be sure to properly
mark your PRs to prevent unnecessary GBP loss. You can read up on GBP
and it's effects on PRs in the tgstation guides for contributors. Please
note that maintainers freely reserve the right to remove and add tags
should they deem it appropriate. You can attempt to finagle the system
all you want, but it's best to shoot for clear communication right off
the bat. -->

🆑
add: Rockfruit, the new awesome fruit that's literally just a plant
growing a granite shell

image: Rockfruit seeds, plant, fruit, and rocks
/🆑

<!-- Both 🆑's are required for the changelog to work! You can put
your name to the right of the first 🆑 if you want to overwrite your
GitHub username as author ingame. -->
<!-- You can use multiple of the same prefix (they're only used for the
icon ingame) and delete the unneeded ones. Despite some of the tags,
changelogs should generally represent how a player might be affected by
the changes rather than a summary of the PR's contents. -->

---------

Co-authored-by: Cyprex <35031555+Cyprex@users.noreply.github.com>
Co-authored-by: The Sharkening <95130227+StrangeWeirdKitten@users.noreply.github.com>
This commit is contained in:
Waterpig
2023-11-22 21:41:39 -07:00
committed by GitHub
co-authored by Cyprex The Sharkening
parent 4f088d4ba5
commit a643dc10eb
7 changed files with 101 additions and 0 deletions
Binary file not shown.

After

Width:  |  Height:  |  Size: 970 B

@@ -0,0 +1,93 @@
/obj/item/seeds/rockfruit
name = "pack of rockfruit seedlings"
desc = "Small seedlings of the golem rockfruit plant. There's a warning label on its packaging: \n\
\"Remember: Legally speaking, rocking is more legal than stoning. \n \
We are not liable for any injury, death, or complete body evaporation caused by using or growing these plants\""
icon = 'modular_zubbers/code/modules/hydroponics/icons/seeds.dmi'
icon_state = "seed-rockfruit"
species = "rock"
plantname = "Rockfruits"
product = /obj/item/grown/rockfruit
lifespan = 20
endurance = 45
potency = 15
maturation = 8
production = 4
yield = 2
instability = 0 // Rocks are very stable
growthstages = 2
growing_icon = 'modular_zubbers/code/modules/hydroponics/icons/growing_fruits.dmi'
genes = list(/datum/plant_gene/trait/plant_type/weed_hardy,
/datum/plant_gene/trait/fire_resistance,
/datum/plant_gene/trait/stable_stats, // It's a rock
/datum/plant_gene/trait/preserved)
reagents_add = list(/datum/reagent/consumable/nutriment/vitamin = 0.01,
/datum/reagent/consumable/nutriment = 0.01,
)
/obj/item/grown/rockfruit
seed = /obj/item/seeds/rockfruit
name = "Rockfruit"
desc = "Piece of rockfruit, commonly enjoyed by golem folk. The inside seems to be fruity, with the outside being a rocky shell."
force = 5 // Comparatively shit considering a nettle is 15
throwforce = 10 // Less shit but hey, it is a rock
icon = 'modular_zubbers/code/modules/hydroponics/icons/harvest.dmi'
icon_state = "rockfruit"
var/product = /obj/item/food/grown/rockfruit
/obj/item/grown/rockfruit/attack_self(mob/user, modifiers)
user.show_message(span_notice("You begin peeling the rocky exterior..."))
if(!(do_after(user, 2 SECONDS)))
return
user.show_message(span_notice("You peel off the rocky shell of the rockfruit, revealing the fruity goodness inside!"))
balloon_alert(user, "peeled")
// The fruit inside
var/obj/item/food/grown/peel_prod
peel_prod = new product(user.loc, new_seed = seed) // I stole this from seed code and am physically crying and shaking
// The rocky shell
new /obj/item/food/golem_food/rocks(user.loc)
qdel(src)
user.put_in_hands(peel_prod)
/obj/item/food/grown/rockfruit
seed = /obj/item/seeds/rockfruit
name = "Rockfruit core"
desc = "The fruity insides of a rockfruit! Not too sugary, but still tasty. Golem folk use this to complement their rock foods. \
Curiously enough, they don't like to eat this on its own"
foodtypes = FRUIT
icon = 'modular_zubbers/code/modules/hydroponics/icons/harvest.dmi'
icon_state = "rockfruit-peeled"
tastes = list("mountains" = 1)
/obj/item/food/golem_food/rocks
name = "Peeled rockfruit shell"
desc = "The peeled shell of a rockfruit, or as you may call it, \"Literal pile of rocks\". \
Probably not edible, but a golem will try to prove you otherwise"
icon = 'modular_zubbers/code/modules/food_and_drinks/icons/rocks.dmi'
icon_state = "rocks"
foodtypes = STONE
food_reagents = list(/datum/reagent/consumable/nutriment/mineral = 5)
tastes = list("rocks and stones" = 1)
/datum/reagent/consumable/nutriment/mineral
taste_description = "rocks and stones"
Binary file not shown.

After

Width:  |  Height:  |  Size: 1.0 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1001 B

@@ -0,0 +1,6 @@
/obj/machinery/vending/hydroseeds/Initialize(mapload)
for(var/category in product_categories)
if(category["name"] == "Fruits")
category["products"] += list(/obj/item/seeds/rockfruit = 3)
return ..()
+2
View File
@@ -8087,6 +8087,7 @@
#include "modular_zubbers\code\modules\ghostcafe\hilbertshotel_silicon.dm"
#include "modular_zubbers\code\modules\hydroponics\gene_modder.dm"
#include "modular_zubbers\code\modules\hydroponics\plant_genes.dm"
#include "modular_zubbers\code\modules\hydroponics\grown\rocks.dm"
#include "modular_zubbers\code\modules\jobs\job_types\blacksmith.dm"
#include "modular_zubbers\code\modules\jobs\job_types\blueshield.dm"
#include "modular_zubbers\code\modules\jobs\job_types\cargo_technician.dm"
@@ -8157,6 +8158,7 @@
#include "modular_zubbers\code\modules\synths\code\designs\exofab_designs.dm"
#include "modular_zubbers\code\modules\traitor\goal_overrides.dm"
#include "modular_zubbers\code\modules\vending\halloween_chocolate.dm"
#include "modular_zubbers\code\modules\vending\megaseed.dm"
#include "modular_zubbers\code\modules\vending\wardrobe.dm"
#include "modular_zubbers\maps\biodome\area.dm"
#include "modular_zubbers\maps\biodome\beach.dm"