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 [31.07.2024] #473

Merged
merged 14 commits into from
Jul 31, 2024
Merged

Merge upstream [31.07.2024] #473

merged 14 commits into from
Jul 31, 2024

Commits on Jul 30, 2024

  1. Fixes temperature getting stuck in offset equalibrium causing lizards…

    … to die if wearing thermal insulation (tgstation#85401)
    
    ## About The Pull Request
    
    When returning to thermal equilibrium, the core temperature and body
    temperature seem to get stuck in a feedback loop, causing them to
    sometimes get stuck below or above safe limits and kill the player
    unless they remove their armor. This fixes that.
    
    Here's a pic of slowly returning to safe temperature after being shot a
    bunch by watcher, whereas originally this would kill you if you had too
    much thermal insulation.
    
    ![image](https://github.com/user-attachments/assets/72236ff6-2444-4872-a19c-92d8788f660d)
    (Ignore the duplicate var prints, one should be core_skin_change, but
    messed it up)
    ## Why It's Good For The Game
    You don't have to remove your armor to stop from being permanently
    frozen/hot.
    ## Changelog
    :cl:
    fix: Fixes getting permanently hot or cold if wearing thermal insulation
    as a lizard
    /:cl:
    thegrb93 authored Jul 30, 2024
    Configuration menu
    Copy the full SHA
    2defe5d View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    30d6886 View commit details
    Browse the repository at this point in the history
  3. [No GBP] Fixes Bad Botany Bug (tgstation#85400)

    ## About The Pull Request
    
    fixes a really bad bug i introduced with my previous PR, no proper
    instantiation of gene objects
    tgstation#85329
    
    would be nice to get this merged fast
    rroqc authored Jul 30, 2024
    Configuration menu
    Copy the full SHA
    cf44be6 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    b95d2da View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    bd70477 View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    d5b4348 View commit details
    Browse the repository at this point in the history

Commits on Jul 31, 2024

  1. Configuration menu
    Copy the full SHA
    c28c0dc View commit details
    Browse the repository at this point in the history
  2. Subtype vendor no longer requries an ID (tgstation#85383)

    ## About The Pull Request
    
    Closes tgstation#85378
    
    ## Changelog
    :cl:
    admin: Subtype vendor no longer requries an ID
    /:cl:
    SmArtKar authored Jul 31, 2024
    Configuration menu
    Copy the full SHA
    908618b View commit details
    Browse the repository at this point in the history
  3. [NO GBP] Fixed advanced pods showing up as cultist pods (tgstation#85393

    )
    
    ## About The Pull Request
    
    Closes tgstation#85385
    
    ## Changelog
    :cl:
    fix: Fixed advanced pods showing up as cultist pods
    /:cl:
    SmArtKar authored Jul 31, 2024
    Configuration menu
    Copy the full SHA
    eda2af2 View commit details
    Browse the repository at this point in the history
  4. Fixed spray can face spraying logic (tgstation#85375)

    ## About The Pull Request
    It was only checking for eye protection, since light-sensitives can have
    0 or less eye protection even with sunglasses on, this doesn't make
    sense.
    There is now more redundancy, the same check for blind carbons and
    another check for `is_eyes_covered` which takes in account if your eyes
    are covered by eyewear or masks.
    ## Changelog
    :cl:
    fix: spray can face spraying will no longer work on light-sensitives
    with eyewear and people wearing eye covering masks
    /:cl:
    Sadboysuss authored Jul 31, 2024
    Configuration menu
    Copy the full SHA
    6734bcf View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    c75f2b2 View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    9551f44 View commit details
    Browse the repository at this point in the history
  7. Configuration menu
    Copy the full SHA
    a8cc7bb View commit details
    Browse the repository at this point in the history
  8. Configuration menu
    Copy the full SHA
    7d2209b View commit details
    Browse the repository at this point in the history