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

ports some tg botany code to fix novaflowers #3063

Merged
merged 12 commits into from
Sep 9, 2024

Conversation

FalloutFalcon
Copy link
Member

@FalloutFalcon FalloutFalcon commented Jun 2, 2024

About The Pull Request

novaflowers werent applying firestacks so i ported a ton of botany code.
novaflowers and nettles now use genes for there pickup and attack stuff
clothing traits that only botany gloves use rn

tgstation/tgstation#59107
tgstation/tgstation#56233

Why It's Good For The Game

better code c:

Changelog

🆑 FalloutFalcon, MrMelbert, Coiax
code: ported alot tg botany code along with gene desc and icons to be used more soon
refactor: moves most plant effects into genetics stuff
/:cl:

@github-actions github-actions bot added DME Edit Code change Watch something violently break. labels Jun 2, 2024
@Sun-Soaked
Copy link
Member

remember to link related prs and attribute in changelog (smiles smimfully)

@FalloutFalcon
Copy link
Member Author

remember to link related prs and attribute in changelog (smiles smimfully)

i didnt go by prs.. let me go find some..

@FalloutFalcon FalloutFalcon marked this pull request as draft June 4, 2024 03:23
@FalloutFalcon FalloutFalcon marked this pull request as draft June 4, 2024 03:23
@FalloutFalcon FalloutFalcon marked this pull request as ready for review June 4, 2024 04:46
@rye-rice
Copy link
Member

Linters

@github-actions github-actions bot added the Merge Conflict Use Git Hooks, you're welcome. label Jul 30, 2024
Copy link
Contributor

This pull request has conflicts, please resolve those before we can evaluate the pull request.

@github-actions github-actions bot removed the Merge Conflict Use Git Hooks, you're welcome. label Aug 10, 2024
@rye-rice rye-rice added this pull request to the merge queue Sep 9, 2024
Merged via the queue into shiptest-ss13:master with commit fcb0fbb Sep 9, 2024
14 checks passed
MysticalFaceLesS pushed a commit to CeladonSS13/Shiptest that referenced this pull request Sep 11, 2024
<!-- 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. -->
novaflowers werent applying firestacks so i ported a ton of botany code.
novaflowers and nettles now use genes for there pickup and attack stuff
clothing traits that only botany gloves use rn

tgstation/tgstation#59107
tgstation/tgstation#56233
<!-- Describe The Pull Request. Please be sure every change is
documented or this can delay review and even discourage maintainers from
merging your PR! -->
better code c:
<!-- Please add a short description of why you think these changes would
benefit the game. If you can't justify it in words, it might not be
worth adding. -->

:cl: FalloutFalcon, MrMelbert, Coiax
code: ported alot tg botany code along with gene desc and icons to be
used more soon
refactor: moves most plant effects into genetics stuff
/:cl:

<!-- Both :cl:'s are required for the changelog to work! You can put
your name to the right of the first :cl: 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: Sun-Soaked <[email protected]>
MrCat15352 pushed a commit to MrCat15352/MrCat that referenced this pull request Dec 24, 2024
<!-- 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. -->
novaflowers werent applying firestacks so i ported a ton of botany code.
novaflowers and nettles now use genes for there pickup and attack stuff
clothing traits that only botany gloves use rn

tgstation/tgstation#59107
tgstation/tgstation#56233
<!-- Describe The Pull Request. Please be sure every change is
documented or this can delay review and even discourage maintainers from
merging your PR! -->
better code c:
<!-- Please add a short description of why you think these changes would
benefit the game. If you can't justify it in words, it might not be
worth adding. -->

:cl: FalloutFalcon, MrMelbert, Coiax
code: ported alot tg botany code along with gene desc and icons to be
used more soon
refactor: moves most plant effects into genetics stuff
/:cl:

<!-- Both :cl:'s are required for the changelog to work! You can put
your name to the right of the first :cl: 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: Sun-Soaked <[email protected]>
@FalloutFalcon FalloutFalcon deleted the novaflowers-broke branch January 7, 2025 04:02
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Code change Watch something violently break. DME Edit
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants