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

LessLethalVend #527

Merged
merged 14 commits into from
Nov 7, 2023
Merged

LessLethalVend #527

merged 14 commits into from
Nov 7, 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 committed Oct 26, 2023
    Configuration menu
    Copy the full SHA
    8f0d548 View commit details
    Browse the repository at this point in the history

Commits on Nov 1, 2023

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

    …station-14 into Ammovend-v2

# Conflicts:
#	Resources/Textures/_NF/Structures/Machines/shredder.rsi/meta.json
#	Resources/Textures/_NF/Structures/Machines/shredder.rsi/normal.png
#	Resources/Textures/_NF/Structures/Machines/syndicate_shredder.rsi/meta.json
    @IData-RedactedI
    IData-RedactedI committed Nov 1, 2023
    Configuration menu
    Copy the full SHA
    b69c274 View commit details
    Browse the repository at this point in the history

Commits on Nov 2, 2023

  1. Added the LessLethalVending Machine

    @IData-RedactedI
    IData-RedactedI committed Nov 2, 2023
    Configuration menu
    Copy the full SHA
    a72a2a0 View commit details
    Browse the repository at this point in the history

Commits on Nov 3, 2023

  1. Update 

    It works
    @IData-RedactedI
    IData-RedactedI committed Nov 3, 2023
    Configuration menu
    Copy the full SHA
    49bc29c View commit details
    Browse the repository at this point in the history

  2. Fix

    @IData-RedactedI
    IData-RedactedI committed Nov 3, 2023
    Configuration menu
    Copy the full SHA
    c92c542 View commit details
    Browse the repository at this point in the history

  3. Added restock to the vender

    @IData-RedactedI
    IData-RedactedI committed Nov 3, 2023
    Configuration menu
    Copy the full SHA
    33b9a91 View commit details
    Browse the repository at this point in the history

Commits on Nov 6, 2023

  1. More ammo types and some fun weapons 

    -Added
*Beanbag and Mosin rubbers
*Darts to the contraband inventory (I think its funny)
*Practice shotgun shells to emag

*Added a flare gun as a alternative to the double barrel
     -May need to tweak the prices of weapons in the vend, flare, pisol, and disabler at $5000 currently
    @IData-RedactedI
    IData-RedactedI committed Nov 6, 2023
    Configuration menu
    Copy the full SHA
    1ba36bf View commit details
    Browse the repository at this point in the history

  2. Updated Costs and added RubberMosin

    @IData-RedactedI
    IData-RedactedI committed Nov 6, 2023
    Configuration menu
    Copy the full SHA
    d4e3c97 View commit details
    Browse the repository at this point in the history

  3. Fix

    @IData-RedactedI
    IData-RedactedI committed Nov 6, 2023
    Configuration menu
    Copy the full SHA
    88ca024 View commit details
    Browse the repository at this point in the history