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

Merge upstream [30.07.2024] #469

Merged
merged 6 commits into from
Jul 30, 2024
Merged

Merge upstream [30.07.2024] #469

merged 6 commits into from
Jul 30, 2024

Conversation

Gaxeer
Copy link
Collaborator

@Gaxeer Gaxeer commented Jul 30, 2024

About The Pull Request

Merge upstream [30.07.2024]

rroqc and others added 6 commits July 29, 2024 23:19
…85329)

## About The Pull Request

fixes tgstation#83852

Rewrites the code responsible for the pollination reagent selection
logic making it more readable and self contained, fixes a bug where
plants would repeatedly select reagents they already have for
pollination
## Why It's Good For The Game

Better code, fixes a bug that would cause reagent cross pollination to
take forever in plants with many reagents.
## Changelog
:cl:
fix: plants no longer select reagent genes they already have while cross
pollinating
code: improves reagent cross pollination code
:cl:

---------

Co-authored-by: RafRoq <[email protected]>
Co-authored-by: Rafael <[email protected]>
Co-authored-by: Ghom <[email protected]>
## About The Pull Request

Here's the new spritework


![image](https://github.com/user-attachments/assets/ec9af04c-9d07-4960-a0f9-c043d0d81a0d)

Sprites taken, kitbashed and edited from
Baystation12/Baystation12#30468, authored by
AzlanonPC

## Why It's Good For The Game

Current sprites are very dated and fugly.

## Changelog
:cl:
image: All implants have received a fresh coat of paint
/:cl:
@github-actions github-actions bot added 🖌️ Спрайты Вы заработали свою миска-рис и кошко-жена. Партия гордится вами! 🙏 Слияние с восходящим потоком О великий восходящий поток, спасибо что приносишь нам свои дары контента и багфиксов labels Jul 30, 2024
@Gaxeer Gaxeer merged commit 8da65af into master Jul 30, 2024
21 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
🖌️ Спрайты Вы заработали свою миска-рис и кошко-жена. Партия гордится вами! 🙏 Слияние с восходящим потоком О великий восходящий поток, спасибо что приносишь нам свои дары контента и багфиксов
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants