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

Shredders #499

Merged
merged 14 commits into from
Oct 29, 2023
Merged

Shredders #499

merged 14 commits into from
Oct 29, 2023

Commits on Oct 14, 2023

  1. Added Circuitvend Art 

    *Circuitvend Sprite

*Amended vending_machines.yml to show sprite
    @IData-RedactedI
    IData-RedactedI committed Oct 14, 2023
    Configuration menu
    Copy the full SHA
    8239c92 View commit details
    Browse the repository at this point in the history

Commits on Oct 23, 2023

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

    @IData-RedactedI
    IData-RedactedI committed Oct 23, 2023
    Configuration menu
    Copy the full SHA
    a4baed0 View commit details
    Browse the repository at this point in the history

  2. Shredding Sprites 

    Added nanotransen and syndicate shredder sprites
-Off
-Idle
-Shredding money
-not shredding anything
    @IData-RedactedI
    IData-RedactedI committed Oct 23, 2023
    Configuration menu
    Copy the full SHA
    4ecbd9b View commit details
    Browse the repository at this point in the history

Commits on Oct 24, 2023

  1. Merge branch 'master' of https://github.com/IData-RedactedI/frontier-… 

    …station-14
    @IData-RedactedI
    IData-RedactedI committed Oct 24, 2023
    Configuration menu
    Copy the full SHA
    1ab5b86 View commit details
    Browse the repository at this point in the history

  2. Shredder, 2! 

    Even better JSON
    @IData-RedactedI
    IData-RedactedI committed Oct 24, 2023
    Configuration menu
    Copy the full SHA
    32dc1a0 View commit details
    Browse the repository at this point in the history

Commits on Oct 26, 2023

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

    @IData-RedactedI
    IData-RedactedI authored Oct 26, 2023
    Configuration menu
    Copy the full SHA
    8f0d548 View commit details
    Browse the repository at this point in the history

  2. Added a non functional Shredder 

    It will gladly take your money, but nothing else
    @IData-RedactedI
    IData-RedactedI committed Oct 26, 2023
    Configuration menu
    Copy the full SHA
    e0a6aaf View commit details
    Browse the repository at this point in the history

Commits on Oct 27, 2023

  1. Added Shredder 

    Based off the lathe, the shredder is spawnable and interactable.
    @IData-RedactedI
    IData-RedactedI committed Oct 27, 2023
    Configuration menu
    Copy the full SHA
    2c4fc98 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'new-frontiers-14:master' into master

    @IData-RedactedI
    IData-RedactedI authored Oct 27, 2023
    Configuration menu
    Copy the full SHA
    faf12c0 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'master' of https://github.com/IData-RedactedI/frontier-… 

    …station-14 into Shredders
    @IData-RedactedI
    IData-RedactedI committed Oct 27, 2023
    Configuration menu
    Copy the full SHA
    b293ddf View commit details
    Browse the repository at this point in the history

Commits on Oct 29, 2023

  1. tests fix

    @Cheackraze
    Cheackraze committed Oct 29, 2023
    Configuration menu
    Copy the full SHA
    3e58e2a View commit details
    Browse the repository at this point in the history

  2. fix more

    @Cheackraze
    Cheackraze committed Oct 29, 2023
    Configuration menu
    Copy the full SHA
    9f3a19c View commit details
    Browse the repository at this point in the history

  3. more fix

    @Cheackraze
    Cheackraze committed Oct 29, 2023
    Configuration menu
    Copy the full SHA
    bf1440c View commit details
    Browse the repository at this point in the history

  4. more normal

    @Cheackraze
    Cheackraze committed Oct 29, 2023
    Configuration menu
    Copy the full SHA
    573da81 View commit details
    Browse the repository at this point in the history