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.

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

Pomegranate & Bombegranate #26407

Closed
wants to merge 277 commits into from

Conversation

drteaspoon420
Copy link
Contributor

@drteaspoon420 drteaspoon420 commented Mar 24, 2024

About the PR

  • Added Pomegranate & Bombegranate
  • Miscellaneous fixes/adjustments to make Bombegranate work

Why / Balance

Wanted to include something inspired by 'exploding' plants in nature that use violent explosion to send seeds in wider area. Usually the method is to store a lot of kinetic energy as it grows into strained shape or dries into one. Some plants have chemical reaction to produce some sort of propulsion.
Pomegranate was added just to provide pun for the mutation as the Bombegranate ,while inspired by Sandbox Tree Fruit, does not exist.

Technical details

Added prototypes for seeds & produce, localization strings and artwork for Pomegranate & Bombegranate
Bombegranate also has prototypes and artwork for seed projectiles.
Bombegranate's chemical contents are 9u (at potency 10) divided to Sulfur,Hydrogen and Ethanol. It Juices into Welding Fuel.

Bombegranate when thrown explode into ten (10) seed projectiles delivering all of the fruit's chemical contents evenly divided with the projectiles (0.9u per projectile).

For the Bombegranatet to work I had to:

  • ClusterGrenadeSystem.cs implemented AmmoShotEvent when using GrenadeType.Shoot to enable use of ChemicalAmmo component
  • ChemicalAmmoSystem.cs fixed issue with dividing Integer value instead of Float/FixedPoint value. More than 1 projectiles caused value to be zero.
  • SolutionInjectOnCollideSystem.cs fixed cases where trying to inject more than available space. While not issue in most cases

Media

grentree-grow.webm
grentree-throw.webm
Updated Bombegranate sprites:
bombegranate

  • I have added screenshots/videos to this PR showcasing its changes ingame, or this PR does not require an ingame showcase

Breaking changes

There should be no breaking changes.

Changelog

🆑 DrTeaSpoon

  • add: Pomegranate and its mutation Bombegranate

@github-actions github-actions bot added the Changes: Sprites Should be reviewed or fixed by people who are knowledgeable with spriting or visual design. label Mar 24, 2024
Copy link
Contributor

github-actions bot commented Mar 24, 2024

RSI Diff Bot; head commit 29e62ff merging into af6a2d7
This PR makes changes to 1 or more RSIs. Here is a summary of all changes:

Resources/Textures/Objects/Specific/Hydroponics/bombegranate.rsi

State Old New Status
dead Added
harvest Added
produce Added
seed Added
stage-1 Added
stage-2 Added
stage-3 Added
stage-4 Added
stage-5 Added
stage-6 Added

Resources/Textures/Objects/Specific/Hydroponics/pomegranate.rsi

State Old New Status
dead Added
harvest Added
produce Added
seed Added
stage-1 Added
stage-2 Added
stage-3 Added
stage-4 Added
stage-5 Added
stage-6 Added

Resources/Textures/Objects/Weapons/Guns/Projectiles/organic.rsi

State Old New Status
seed Added

Edit: diff updated after 29e62ff

@IProduceWidgets
Copy link
Contributor

"I swear officer, they're omnizine grenades!"

@Tayrtahn
Copy link
Member

Can we call them pomegrenades, or is that ripping off Barotrauma?

@drteaspoon420
Copy link
Contributor Author

drteaspoon420 commented Mar 24, 2024

I am cool with that. It's reasonable pun to make.
though 'granate' in pomegranate already means 'Grenade' in italian. so bit weird.
Maybe 'bombgranate' instead?

@Tayrtahn
Copy link
Member

Tayrtahn commented Mar 24, 2024

Maybe 'bombgranate' instead?

How about "bombegranate"?

@mirrorcult
Copy link
Contributor

100% bombegranate

@potato1234x
Copy link
Contributor

pvz reference

@drteaspoon420
Copy link
Contributor Author

Bombegranate it is.

EmoGarbage404 and others added 21 commits March 25, 2024 17:22
* Cleaner Grenade

Added Cleaner Grenade

* Sprite update

Draw issue moment

* Removed from jani closet | added box of cleanades
* Wearable Instrument Base + Changed harmonica base

Created the BaseWornInstrument base and updated the Harmonica to use it, being equipable in the neck slot.

* Update instruments_wind.yml

* compositions are cool and awesome
…e-wizards#26383)

* Fix mailing units turning into disposal units while recharging.

The states were hardcoded.

* Fix error handling

* Make default states constants
* Adds Church Bells

* I'm dumb.

* The bell is no longer haunted.

* forgot attributions

* change sounds so scary law no hunt

* One day I'll stop needing to make an immediate micro-commit. One day.

* God damn it.
* resprites labcoats again

* fix tests
* SS14-17313 Chat Censorship Systems

Adds some systems to manage chat censorship:

1. No-op: does nothing
2. SimpleCensor: a regex-free censor with a variety of rules to use
3. RegexCensor: a censor that uses regex.

This exposes a singleton backed by a builder pattern (ChatCensor) that
is set up, probably during the code init phase, and then globally available
for your censorship needs.

* Migrate to Shared

* Add a reset function to the builder.

* Resolve PJB's feedback; add unit tests
…s#26250)

* Make mind shield implants unable to be implanted more than once

* Default AllowMultipleImplants to false and update implanters.yml

* Use TryComp instead of TryGetComponent

* Deny multiple implants for fun implants too.

* Make comment more precise
* nerf ninja steal objective

* fubar
… containers (space-wizards#26430)

* Reduces size of smaller cartons

* Fix trash bottles/cartons

---------

Co-authored-by: Velcroboy <velcroboy333@hotmail.com>
* Fix atmos NAN error

* Remove redundant yaml entries
brainfood1183 and others added 18 commits April 4, 2024 17:29
* Adds the option for you to toggle your OOC Patron color visibility to yourself and others.

* Makes the button magically disappear if you arent a patron
…26658)

* Suit sensors now know the 'total health' of an entity

* Missed the constructor 😔
fix

Co-authored-by: GeneralGaws <limonmessi@mail.ru>
- Added Pomegranate & Grenade Fruit
- SolutionInjectOnCollideSystem fixed cases where trying to inject more than available space
- ChemicalAmmoSystem fixed issue with dividing Integer value instead of Float/FixedPoint value
- ClusterGrenadeSystem implemented AmmoShotEvent
fixed cargo price for seed crate
added ContainerContainer
@github-actions github-actions bot added Status: Needs Review This PR requires new reviews before it can be merged. Changes: Map Can be reviewed or fixed by people who are knowledgeable with mapping. Changes: UI Can be reviewed or fixed by people who are knowledgeable with UI design labels Apr 15, 2024
@beck-thompson
Copy link
Contributor

A classic mistake that I have also made 😆

@HandsomeTheEgg
Copy link

what happend? is it still worked on?

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Changes: Map Can be reviewed or fixed by people who are knowledgeable with mapping. Changes: Sprites Should be reviewed or fixed by people who are knowledgeable with spriting or visual design. Changes: UI Can be reviewed or fixed by people who are knowledgeable with UI design Merge Conflict This PR currently has conflicts that need to be addressed. Status: Needs Review This PR requires new reviews before it can be merged.
Projects
None yet
Development

Successfully merging this pull request may close these issues.