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

Lab items update #28892

Merged
merged 23 commits into from
Mar 27, 2019
Merged

Lab items update #28892

merged 23 commits into from
Mar 27, 2019

Commits on Mar 21, 2019

  1. add science tools 

    This is a general group. Later it would be good to have a chemistry/biology/physics/engineering distinction, but this will do for now.
    @I-am-Erk
    I-am-Erk authored Mar 21, 2019
    Configuration menu
    Copy the full SHA
    83f8e77 View commit details
    Browse the repository at this point in the history

  2. Reagents 

    General laboratory reagents and expendibles.  This list contains most conceivable chemicals in the game.  More specific lists for each type of lab would be reasonable eventually.
    @I-am-Erk
    I-am-Erk authored Mar 21, 2019
    Configuration menu
    Copy the full SHA
    720fc8f View commit details
    Browse the repository at this point in the history

  3. Vortex device

    @I-am-Erk
    I-am-Erk authored Mar 21, 2019
    Configuration menu
    Copy the full SHA
    a8a0683 View commit details
    Browse the repository at this point in the history

Commits on Mar 22, 2019

  1. Merge remote-tracking branch 'upstream/master' into lab-items-1

    @I-am-Erk
    I-am-Erk committed Mar 22, 2019
    Configuration menu
    Copy the full SHA
    04f710d View commit details
    Browse the repository at this point in the history

  2. Rework lab item spawns

    @I-am-Erk
    I-am-Erk committed Mar 22, 2019
    Configuration menu
    Copy the full SHA
    5f4f40c View commit details
    Browse the repository at this point in the history

  3. Switch up item groups on the rest of the lab

    @I-am-Erk
    I-am-Erk committed Mar 22, 2019
    Configuration menu
    Copy the full SHA
    787dd3c View commit details
    Browse the repository at this point in the history

  4. Lockers in basement spawn fix

    @I-am-Erk
    I-am-Erk committed Mar 22, 2019
    Configuration menu
    Copy the full SHA
    6ff2657 View commit details
    Browse the repository at this point in the history

  5. Add list of tools I'm about to program in

    @I-am-Erk
    I-am-Erk authored Mar 22, 2019
    Configuration menu
    Copy the full SHA
    c0a09c3 View commit details
    Browse the repository at this point in the history

  6. Start adding science tool definitions 

    Not done.
    @I-am-Erk
    I-am-Erk authored Mar 22, 2019
    Configuration menu
    Copy the full SHA
    6464f8a View commit details
    Browse the repository at this point in the history

  7. Continue adding stuff. Also added some things to dissection tools

    @I-am-Erk
    I-am-Erk committed Mar 22, 2019
    Configuration menu
    Copy the full SHA
    5f0b0bc View commit details
    Browse the repository at this point in the history

Commits on Mar 23, 2019

  1. ring stands and stuff

    @I-am-Erk
    I-am-Erk committed Mar 23, 2019
    Configuration menu
    Copy the full SHA
    5e1c294 View commit details
    Browse the repository at this point in the history

  2. add chemicals

    @I-am-Erk
    I-am-Erk committed Mar 23, 2019
    Configuration menu
    Copy the full SHA
    4ddc74d View commit details
    Browse the repository at this point in the history

  3. Add gaseous chemicals

    @I-am-Erk
    I-am-Erk committed Mar 23, 2019
    Configuration menu
    Copy the full SHA
    d35ec0d View commit details
    Browse the repository at this point in the history

  4. Start adding some deconstructions 

    salvage is great
    @I-am-Erk
    I-am-Erk committed Mar 23, 2019
    Configuration menu
    Copy the full SHA
    f2f2e27 View commit details
    Browse the repository at this point in the history

  5. Update tools.json

    @I-am-Erk
    I-am-Erk committed Mar 23, 2019
    Configuration menu
    Copy the full SHA
    656a77d View commit details
    Browse the repository at this point in the history

  6. some fixes and some new deconstructions

    @I-am-Erk
    I-am-Erk committed Mar 23, 2019
    Configuration menu
    Copy the full SHA
    89ca66d View commit details
    Browse the repository at this point in the history

  7. Add new items to some common item groups

    @I-am-Erk
    I-am-Erk committed Mar 23, 2019
    Configuration menu
    Copy the full SHA
    8b54ca7 View commit details
    Browse the repository at this point in the history

  8. catch errors in playtest

    @I-am-Erk
    I-am-Erk committed Mar 23, 2019
    Configuration menu
    Copy the full SHA
    e4bebc5 View commit details
    Browse the repository at this point in the history

  9. bump lab item spawns back up slightly

    @I-am-Erk
    I-am-Erk committed Mar 23, 2019
    Configuration menu
    Copy the full SHA
    3a0e210 View commit details
    Browse the repository at this point in the history

  10. double space period standard

    @I-am-Erk
    I-am-Erk committed Mar 23, 2019
    Configuration menu
    Copy the full SHA
    429c603 View commit details
    Browse the repository at this point in the history

  11. Update json_blacklist

    @I-am-Erk
    I-am-Erk committed Mar 23, 2019
    Configuration menu
    Copy the full SHA
    edcf7ce View commit details
    Browse the repository at this point in the history

  12. Update json_blacklist

    @I-am-Erk
    I-am-Erk committed Mar 23, 2019
    Configuration menu
    Copy the full SHA
    c4c2784 View commit details
    Browse the repository at this point in the history

Commits on Mar 27, 2019

  1. Merge branch 'master' into lab-items-1

    @ZhilkinSerg
    ZhilkinSerg authored Mar 27, 2019
    Configuration menu
    Copy the full SHA
    c56373b View commit details
    Browse the repository at this point in the history