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

Commits on Jul 29, 2024

  1. Botany reagent cross pollination code improvement and fix (tgstation#…

    …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]>
    4 people committed Jul 29, 2024
    Configuration menu
    Copy the full SHA
    460a2d8 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    5277b6e View commit details
    Browse the repository at this point in the history

Commits on Jul 30, 2024

  1. Configuration menu
    Copy the full SHA
    97ba539 View commit details
    Browse the repository at this point in the history
  2. Updated implant sprites (tgstation#85368)

    ## 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:
    SmArtKar committed Jul 30, 2024
    Configuration menu
    Copy the full SHA
    f33b33b View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    54ef5d9 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    d7663ba View commit details
    Browse the repository at this point in the history