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

alcohol v2 electric boogaloo #1662

Merged
merged 27 commits into from
Sep 16, 2024
Merged

alcohol v2 electric boogaloo #1662

merged 27 commits into from
Sep 16, 2024

Commits on Jul 12, 2024

  1. i think i fixed my shit

    @ray-boop
    ray-boop committed Jul 12, 2024
    Configuration menu
    Copy the full SHA
    387208b View commit details
    Browse the repository at this point in the history

  2. changed reagent into ethanol

    @ray-boop
    ray-boop committed Jul 12, 2024
    Configuration menu
    Copy the full SHA
    79f6129 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'master' into enhanced_alcoholism_v2

    @ray-boop
    ray-boop authored Jul 12, 2024
    Configuration menu
    Copy the full SHA
    a1ac2b2 View commit details
    Browse the repository at this point in the history

Commits on Jul 14, 2024

  1. Welcome to the Junglegit add --all

    @ray-boop
    ray-boop committed Jul 14, 2024
    Configuration menu
    Copy the full SHA
    39a0d9b View commit details
    Browse the repository at this point in the history

  2. t Merge branch 'enhanced_alcoholism_v2' of https://github.com/ray-boo… 

    …p/frontier-station-14 into enhanced_alcoholism_v2

moar drink
    @ray-boop
    ray-boop committed Jul 14, 2024
    Configuration menu
    Copy the full SHA
    e958fae View commit details
    Browse the repository at this point in the history

  3. Merge branch 'master' of https://github.com/new-frontiers-14/frontier… 

    …-station-14 into enhanced_alcoholism_v2
    @ray-boop
    ray-boop committed Jul 14, 2024
    Configuration menu
    Copy the full SHA
    85081fa View commit details
    Browse the repository at this point in the history

  4. Jungle Warfaregit add --all

    @ray-boop
    ray-boop committed Jul 14, 2024
    Configuration menu
    Copy the full SHA
    8255806 View commit details
    Browse the repository at this point in the history

  5. did an oopsie with the sprites and added an unwanted file

    @ray-boop
    ray-boop committed Jul 14, 2024
    Configuration menu
    Copy the full SHA
    25ee1d7 View commit details
    Browse the repository at this point in the history

Commits on Jul 15, 2024

  1. I wish for actual brewing but here we are making torpedo juice

    @ray-boop
    ray-boop committed Jul 15, 2024
    Configuration menu
    Copy the full SHA
    d95a42a View commit details
    Browse the repository at this point in the history

Commits on Jul 18, 2024

  1. bee kind to the buzzkeeper

    @ray-boop
    ray-boop committed Jul 18, 2024
    Configuration menu
    Copy the full SHA
    406bba3 View commit details
    Browse the repository at this point in the history

  2. threshold set wrong

    @ray-boop
    ray-boop committed Jul 18, 2024
    Configuration menu
    Copy the full SHA
    93d1e8d View commit details
    Browse the repository at this point in the history

  3. name edit

    @ray-boop
    ray-boop committed Jul 18, 2024
    Configuration menu
    Copy the full SHA
    374fc0c View commit details
    Browse the repository at this point in the history

Commits on Aug 6, 2024

  1. Merge branch 'master' into enhanced_alcoholism_v2

    @dvir001
    dvir001 authored Aug 6, 2024
    Configuration menu
    Copy the full SHA
    09c0e04 View commit details
    Browse the repository at this point in the history

Commits on Aug 18, 2024

  1. Merge branch 'new-frontiers-14:master' into enhanced_alcoholism_v2

    @ray-boop
    ray-boop authored Aug 18, 2024
    Configuration menu
    Copy the full SHA
    e05f942 View commit details
    Browse the repository at this point in the history

Commits on Sep 1, 2024

  1. Merge branch 'master' into enhanced_alcoholism_v2

    @ray-boop
    ray-boop authored Sep 1, 2024
    Configuration menu
    Copy the full SHA
    41aa7f8 View commit details
    Browse the repository at this point in the history

Commits on Sep 10, 2024

  1. Merge branch 'master' into enhanced_alcoholism_v2

    @ErhardSteinhauer
    ErhardSteinhauer authored Sep 10, 2024
    Configuration menu
    Copy the full SHA
    bdf5bdf View commit details
    Browse the repository at this point in the history

Commits on Sep 14, 2024

  1. Merge branch 'master' into enhanced_alcoholism_v2

    @ErhardSteinhauer
    ErhardSteinhauer authored Sep 14, 2024
    Configuration menu
    Copy the full SHA
    d9dc2b5 View commit details
    Browse the repository at this point in the history

  2. Update drinks.yml 

    fixing errors
    @ErhardSteinhauer
    ErhardSteinhauer authored Sep 14, 2024
    Configuration menu
    Copy the full SHA
    34febca View commit details
    Browse the repository at this point in the history

  3. Update drinks.yml 

    more fixes
    @ErhardSteinhauer
    ErhardSteinhauer authored Sep 14, 2024
    Configuration menu
    Copy the full SHA
    5080b54 View commit details
    Browse the repository at this point in the history

  4. stirring and shacking

    @ErhardSteinhauer
    ErhardSteinhauer authored Sep 14, 2024
    Configuration menu
    Copy the full SHA
    57af142 View commit details
    Browse the repository at this point in the history

  5. Merge branch 'master' into enhanced_alcoholism_v2

    @ErhardSteinhauer
    ErhardSteinhauer authored Sep 14, 2024
    Configuration menu
    Copy the full SHA
    df6fae3 View commit details
    Browse the repository at this point in the history

Commits on Sep 15, 2024

  1. Merge branch 'new-frontiers-14:master' into enhanced_alcoholism_v2

    @ray-boop
    ray-boop authored Sep 15, 2024
    Configuration menu
    Copy the full SHA
    f206337 View commit details
    Browse the repository at this point in the history

  2. sprites

    @ErhardSteinhauer
    ErhardSteinhauer committed Sep 15, 2024
    Configuration menu
    Copy the full SHA
    7ad5c70 View commit details
    Browse the repository at this point in the history

  3. Extra fill states, sprite cleanup, conserve mat%

    @whatston3
    whatston3 committed Sep 15, 2024
    Configuration menu
    Copy the full SHA
    f1aee2c View commit details
    Browse the repository at this point in the history

  4. sonik->sonic

    @whatston3
    whatston3 committed Sep 15, 2024
    Configuration menu
    Copy the full SHA
    4bcff53 View commit details
    Browse the repository at this point in the history

  5. Minor drink description rewrites

    @whatston3
    whatston3 committed Sep 15, 2024
    Configuration menu
    Copy the full SHA
    6601a0a View commit details
    Browse the repository at this point in the history

  6. Remove fart.ogg

    @whatston3
    whatston3 committed Sep 15, 2024
    Configuration menu
    Copy the full SHA
    5f858c4 View commit details
    Browse the repository at this point in the history