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

Research bunker 2 #1161

Closed
wants to merge 19 commits into from
Closed

Research bunker 2 #1161

wants to merge 19 commits into from

Commits on Feb 11, 2024

  1. Is It fix??

    @VividPups
    VividPups committed Feb 11, 2024
    Configuration menu
    Copy the full SHA
    c04178b View commit details
    Browse the repository at this point in the history

Commits on Mar 21, 2024

  1. Merge branch 'master' of https://github.com/VividPups/frontier-statio… 

    …n-14
    @VividPups
    VividPups committed Mar 21, 2024
    Configuration menu
    Copy the full SHA
    936fafb View commit details
    Browse the repository at this point in the history

Commits on Mar 22, 2024

  1. New GUNS !

    @VividPups
    VividPups committed Mar 22, 2024
    Configuration menu
    Copy the full SHA
    06df043 View commit details
    Browse the repository at this point in the history

Commits on Mar 26, 2024

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

    @VividPups
    VividPups authored Mar 26, 2024
    Configuration menu
    Copy the full SHA
    4663a73 View commit details
    Browse the repository at this point in the history

Commits on Mar 28, 2024

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

    @VividPups
    VividPups authored Mar 28, 2024
    Configuration menu
    Copy the full SHA
    ef72794 View commit details
    Browse the repository at this point in the history

  2. I hope this shit will stiop breaking

    @VividPups
    VividPups committed Mar 28, 2024
    Configuration menu
    Copy the full SHA
    f005edc View commit details
    Browse the repository at this point in the history

Commits on Mar 29, 2024

  1. Delete Resources/Prototypes/Catalog/VendingMachines/Inventories/ammo.yml 

    Shouldnt be in this pr
    @VividPups
    VividPups authored Mar 29, 2024
    Configuration menu
    Copy the full SHA
    debeb1f View commit details
    Browse the repository at this point in the history

  2. Delete Resources/Prototypes/Catalog/VendingMachines/Inventories/janid… 

    …robe.yml

Shouldnt be in this PR
    @VividPups
    VividPups authored Mar 29, 2024
    Configuration menu
    Copy the full SHA
    f0843ec View commit details
    Browse the repository at this point in the history

  3. Delete Resources/Prototypes/Entities/Objects/Weapons/Guns/Snipers/sni… 

    …pers.yml

Shouldnt be in this PR
    @VividPups
    VividPups authored Mar 29, 2024
    Configuration menu
    Copy the full SHA
    05860af View commit details
    Browse the repository at this point in the history

  4. Delete Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/l… 

    …esslethalvend.yml

Shouldnt be in this PR
    @VividPups
    VividPups authored Mar 29, 2024
    Configuration menu
    Copy the full SHA
    760964b View commit details
    Browse the repository at this point in the history

  5. Delete Resources/Prototypes/_NF/Entities/Objects/Weapons/Ammunition/M… 

    …agazines/Rifles.yml

Shouldnt be in this PR
    @VividPups
    VividPups authored Mar 29, 2024
    Configuration menu
    Copy the full SHA
    f7c1e56 View commit details
    Browse the repository at this point in the history

  6. Delete Resources/Prototypes/_NF/Entities/Objects/Weapons/Ammunition/e… 

    …xplosives.yml

Shouldnt be in this PR
    @VividPups
    VividPups authored Mar 29, 2024
    Configuration menu
    Copy the full SHA
    03d608a View commit details
    Browse the repository at this point in the history

  7. Delete Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Guns/pi… 

    …stols.yml

Shouldnt be in this PR
    @VividPups
    VividPups authored Mar 29, 2024
    Configuration menu
    Copy the full SHA
    aa486a8 View commit details
    Browse the repository at this point in the history

  8. Delete Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Guns/re… 

    …volvers.yml

Shouldnt be in this PR
    @VividPups
    VividPups authored Mar 29, 2024
    Configuration menu
    Copy the full SHA
    bf4e782 View commit details
    Browse the repository at this point in the history

  9. Delete Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Guns/sn… 

    …ipers.yml

Shouldnt be in this PR
    @VividPups
    VividPups authored Mar 29, 2024
    Configuration menu
    Copy the full SHA
    0f3ede3 View commit details
    Browse the repository at this point in the history

  10. Delete Resources/Prototypes/_NF/Recipes/Cooking/meal_recipes.yml 

    Shouldnt be in this PR
    @VividPups
    VividPups authored Mar 29, 2024
    Configuration menu
    Copy the full SHA
    15cefb0 View commit details
    Browse the repository at this point in the history

  11. This shouldnt be in this PR

    @VividPups
    VividPups committed Mar 29, 2024
    Configuration menu
    Copy the full SHA
    cdbdf13 View commit details
    Browse the repository at this point in the history

  12. Merge branch 'Research-Bunker-2' of https://github.com/VividPups/fron… 

    …tier-station-14 into Research-Bunker-2
    @VividPups
    VividPups committed Mar 29, 2024
    Configuration menu
    Copy the full SHA
    f17beb1 View commit details
    Browse the repository at this point in the history

  13. Not post to be in this PR

    @VividPups
    VividPups committed Mar 29, 2024
    Configuration menu
    Copy the full SHA
    867654f View commit details
    Browse the repository at this point in the history