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

Fix fruit counting and refactor out delete_fruit #5686

Merged
merged 2 commits into from
Feb 10, 2024

Conversation

Drulikar
Copy link
Contributor

@Drulikar Drulikar commented Feb 9, 2024

About the pull request

This PR is a follow up to #5514 where we set picked true to have more accurate messages sent, however this was also checked to skip updating the fruit count in the bound_xeno's action. This PR also refactors out delete_fruit since it just effectively was Destroy anyways.

Explain why it's good for the game

Fixes #5666

Testing Photographs and Procedure

Screenshots & Videos
Fruit.mp4

Changelog

🆑 Drathek
fix: Fix gardener fruit count not always updating
/:cl:

@github-actions github-actions bot added the Fix Fix one bug, make ten more label Feb 9, 2024
@Birdtalon Birdtalon added this pull request to the merge queue Feb 10, 2024
@Birdtalon Birdtalon removed this pull request from the merge queue due to a manual request Feb 10, 2024
@Birdtalon Birdtalon added this pull request to the merge queue Feb 10, 2024
Merged via the queue into cmss13-devs:master with commit 31d7f57 Feb 10, 2024
26 checks passed
cm13-github added a commit that referenced this pull request Feb 10, 2024
Guidesu pushed a commit to Guidesu/cmss13 that referenced this pull request Feb 10, 2024
This PR is a follow up to cmss13-devs#5514 where we set picked true to have more
accurate messages sent, however this was also checked to skip updating
the fruit count in the bound_xeno's action. This PR also refactors out
delete_fruit since it just effectively was Destroy anyways.

Fixes cmss13-devs#5666

<details>
<summary>Screenshots & Videos</summary>

https://github.com/cmss13-devs/cmss13/assets/76988376/4020e86d-df91-4d44-aaf5-0a338584cbc2

</details>

:cl: Drathek
fix: Fix gardener fruit count not always updating
/:cl:

---------

Co-authored-by: Birdtalon <[email protected]>
@Drulikar Drulikar deleted the Fix_Fruit_Count branch February 12, 2024 00:36
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Fix Fix one bug, make ten more
Projects
None yet
Development

Successfully merging this pull request may close these issues.

gardener fruit icons dont update upon consume
2 participants