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

Gardener QOL changes #5514

Merged
merged 9 commits into from
Feb 1, 2024
Merged

Gardener QOL changes #5514

merged 9 commits into from
Feb 1, 2024

Conversation

Red-byte3D
Copy link
Contributor

@Red-byte3D Red-byte3D commented Jan 21, 2024

About the pull request

Gives bigger fruit eaten/destroyed/picked texts as its currently too small to be seen in chat because is usually always moving and being spammed.
Makes it so you can put fruits next to eachother, but not ontop of eachother.
Lets the player know you can use resin surge to speed up the growth of the fruits.
eaten fruits now delete faster so you can replace them faster, the old 3 seconds made it so if you ate a fruit and instantly replaced it at max fruits, it'd rather delete another one because the eaten fruit still exited for a whole 3 seconds.

Explain why it's good for the game

QOL changes good

Testing Photographs and Procedure

Screenshots & Videos

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

Changelog

🆑
qol: Bigger text when a gardener's fruit gets picked/destroyed/consumed
qol: Gardeners can now put their fruits next to eachother.
grammar: Adds new information to the strain buy text
code: The fruits now get deleted 1 second after they get eaten, instead of 3 seconds.
balance: Gardener can now transfer plasma
fix: Properly gives the corresponding message when you eat a fruit from the ground, now "consumed" instead of "destroyed"
/:cl:

@github-actions github-actions bot added Quality of Life Make the game harder to play Code Improvement Make the code longer labels Jan 21, 2024
@Birdtalon Birdtalon added Balance You need to be a professional veteran game maintainer to comprehend what is being done here. Grammar and Formatting Fixes the codebase's tpyos and grammatical's errors and removed Quality of Life Make the game harder to play Code Improvement Make the code longer labels Jan 22, 2024
Copy link
Contributor

@Drulikar Drulikar left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Everything else looks fine.

code/modules/cm_aliens/structures/fruit.dm Show resolved Hide resolved
@Drulikar Drulikar added the Balance Approved This PR has had its balance and gameplay-affecting aspects approved. Cry to the Head-maint about it. label Jan 31, 2024
@Drulikar Drulikar marked this pull request as draft February 1, 2024 00:02
@Red-byte3D Red-byte3D marked this pull request as ready for review February 1, 2024 13:17
@Drulikar Drulikar added this pull request to the merge queue Feb 1, 2024
Merged via the queue into cmss13-devs:master with commit cd90318 Feb 1, 2024
27 checks passed
github-merge-queue bot pushed a commit that referenced this pull request Feb 10, 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
<details>
<summary>Screenshots & Videos</summary>


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

</details>


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

---------

Co-authored-by: Birdtalon <[email protected]>
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]>
@Red-byte3D Red-byte3D deleted the gardenerqols branch April 19, 2024 10:20
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Balance Approved This PR has had its balance and gameplay-affecting aspects approved. Cry to the Head-maint about it. Balance You need to be a professional veteran game maintainer to comprehend what is being done here. Grammar and Formatting Fixes the codebase's tpyos and grammatical's errors
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants