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.

Sign up for GitHub

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

Jump to bottom

[pull] dev from Baystation12:dev #24

Merged
merged 23 commits into from
Dec 31, 2023
Merged

[pull] dev from Baystation12:dev #24

merged 23 commits into from
Dec 31, 2023

Commits on Dec 26, 2023

  1. Automatic changelog generation [ci skip]

    @Bay12Bot
    Bay12Bot committed Dec 26, 2023
    Configuration menu
    Copy the full SHA
    8e6030c View commit details
    Browse the repository at this point in the history

  2. attackby /machinery/a to use_tool

    @emmanuelbassil
    emmanuelbassil committed Dec 26, 2023
    Configuration menu
    Copy the full SHA
    2b4874f View commit details
    Browse the repository at this point in the history

  3. attackby /machinery/b-c to use_tool 

    Fixes
    @emmanuelbassil
    emmanuelbassil committed Dec 26, 2023
    Configuration menu
    Copy the full SHA
    898666f View commit details
    Browse the repository at this point in the history

  4. attackby /machinery/d-f to use_tool

    @emmanuelbassil
    emmanuelbassil committed Dec 26, 2023
    Configuration menu
    Copy the full SHA
    969779d View commit details
    Browse the repository at this point in the history

  5. attackby /machinery/g-o

    @emmanuelbassil
    emmanuelbassil committed Dec 26, 2023
    Configuration menu
    Copy the full SHA
    53acde6 View commit details
    Browse the repository at this point in the history

  6. attackby /machinery/p

    @emmanuelbassil
    emmanuelbassil committed Dec 26, 2023
    Configuration menu
    Copy the full SHA
    3c0f293 View commit details
    Browse the repository at this point in the history

  7. attackby /machinery q-z

    @emmanuelbassil
    emmanuelbassil committed Dec 26, 2023
    Configuration menu
    Copy the full SHA
    52badbf View commit details
    Browse the repository at this point in the history

  8. Check-paths 

    Checkpaths

Auto stash before rebase of "refs/heads/AssortedQI"

Fixes

Auto stash before rebase of "refs/heads/Wrapping"

Auto stash before rebase of "refs/heads/Attackby"

Auto stash before rebase of "refs/heads/Attackby"
    @emmanuelbassil
    emmanuelbassil committed Dec 26, 2023
    Configuration menu
    Copy the full SHA
    c59fa8b View commit details
    Browse the repository at this point in the history

  9. Merge pull request #34305 from emmanuelbassil/Attackby 

    Change all machinery/attackby to use_tool
    @SierraKomodo
    SierraKomodo authored Dec 26, 2023
    Configuration menu
    Copy the full SHA
    b79bfab View commit details
    Browse the repository at this point in the history

  10. Automatic changelog generation for PR #34305 [ci skip]

    @Bay12Bot
    Bay12Bot committed Dec 26, 2023
    Configuration menu
    Copy the full SHA
    06abeee View commit details
    Browse the repository at this point in the history

  11. Automatic changelog generation [ci skip]

    @Bay12Bot
    Bay12Bot committed Dec 26, 2023
    Configuration menu
    Copy the full SHA
    1ff8913 View commit details
    Browse the repository at this point in the history

Commits on Dec 28, 2023

  1. Generalize chameleon extension setup

    @PsiOmegaDelta
    PsiOmegaDelta committed Dec 28, 2023
    Configuration menu
    Copy the full SHA
    da20b8f View commit details
    Browse the repository at this point in the history

  2. Refactor poster code 

    No longer relies on Torch-type references in main code
    @PsiOmegaDelta
    PsiOmegaDelta committed Dec 28, 2023
    Configuration menu
    Copy the full SHA
    6be3a3f View commit details
    Browse the repository at this point in the history

Commits on Dec 29, 2023

  1. fix organ printer not taking steel

    @MuckerMayhem
    MuckerMayhem committed Dec 29, 2023
    Configuration menu
    Copy the full SHA
    5f1d6bd View commit details
    Browse the repository at this point in the history

  2. Merge pull request #34416 from PsiOmegaDelta/231227-HiddenPurpose 

    Generalize chameleon extension setup
    @MuckerMayhem
    MuckerMayhem authored Dec 29, 2023
    Configuration menu
    Copy the full SHA
    90a1f59 View commit details
    Browse the repository at this point in the history

  3. disallow summoning nar-sie on shuttles or offship

    @MuckerMayhem
    MuckerMayhem committed Dec 29, 2023
    Configuration menu
    Copy the full SHA
    63b9204 View commit details
    Browse the repository at this point in the history

  4. Merge pull request #34419 from MuckerMayhem/cult-summon-nerf 

    Prevent Cultists from summoning nar-sie on shuttles or off-ship.
    @Spookerton
    Spookerton authored Dec 29, 2023
    Configuration menu
    Copy the full SHA
    77d67aa View commit details
    Browse the repository at this point in the history

  5. Automatic changelog generation for PR #34419 [ci skip]

    @Bay12Bot
    Bay12Bot committed Dec 29, 2023
    Configuration menu
    Copy the full SHA
    e852f99 View commit details
    Browse the repository at this point in the history

  6. Merge pull request #34418 from MuckerMayhem/organ-printer-fix 

    fix organ printer not taking steel
    @Spookerton
    Spookerton authored Dec 29, 2023
    Configuration menu
    Copy the full SHA
    44c69ef View commit details
    Browse the repository at this point in the history

  7. Automatic changelog generation for PR #34418 [ci skip]

    @Bay12Bot
    Bay12Bot committed Dec 29, 2023
    Configuration menu
    Copy the full SHA
    cf633f7 View commit details
    Browse the repository at this point in the history

  8. Merge pull request #34415 from PsiOmegaDelta/231129-OpenClosed 

    Refactor poster code
    @MuckerMayhem
    MuckerMayhem authored Dec 29, 2023
    Configuration menu
    Copy the full SHA
    38a2bbc View commit details
    Browse the repository at this point in the history

Commits on Dec 30, 2023

  1. Automatic changelog generation [ci skip]

    @Bay12Bot
    Bay12Bot committed Dec 30, 2023
    Configuration menu
    Copy the full SHA
    2a9ca65 View commit details
    Browse the repository at this point in the history

Commits on Dec 31, 2023

  1. Automatic changelog generation [ci skip]

    @Bay12Bot
    Bay12Bot committed Dec 31, 2023
    Configuration menu
    Copy the full SHA
    c78554d View commit details
    Browse the repository at this point in the history