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 Biohazard Lockdown #4067

Merged
merged 41 commits into from
Aug 24, 2023
Merged

Research Biohazard Lockdown #4067

merged 41 commits into from
Aug 24, 2023

Commits on Jul 25, 2023

  1. USCM & WY (start)

    @realforest2001
    realforest2001 committed Jul 25, 2023
    Configuration menu
    Copy the full SHA
    5741197 View commit details
    Browse the repository at this point in the history

  2. Almayer Lower Deck

    @realforest2001
    realforest2001 committed Jul 25, 2023
    Configuration menu
    Copy the full SHA
    d94b293 View commit details
    Browse the repository at this point in the history

  3. Top deck and pipes 

    cmo
    @realforest2001
    realforest2001 committed Jul 25, 2023
    Configuration menu
    Copy the full SHA
    9f14195 View commit details
    Browse the repository at this point in the history

  4. More lists and Ultrazine 

    x
    @realforest2001
    realforest2001 committed Jul 25, 2023
    Configuration menu
    Copy the full SHA
    a5c2588 View commit details
    Browse the repository at this point in the history

  5. More WY and Corpses

    @realforest2001
    realforest2001 committed Jul 25, 2023
    Configuration menu
    Copy the full SHA
    0842c20 View commit details
    Browse the repository at this point in the history

  6. UPP and Yautja defines

    @realforest2001
    realforest2001 committed Jul 25, 2023
    Configuration menu
    Copy the full SHA
    fb954f4 View commit details
    Browse the repository at this point in the history

  7. CLF and TWE defines

    @realforest2001
    realforest2001 committed Jul 25, 2023
    Configuration menu
    Copy the full SHA
    3bf80e9 View commit details
    Browse the repository at this point in the history

Commits on Jul 28, 2023

  1. Merge remote-tracking branch 'cmss13-devs/master' into project/factio… 

    …naccess
    @realforest2001
    realforest2001 committed Jul 28, 2023
    Configuration menu
    Copy the full SHA
    e91c641 View commit details
    Browse the repository at this point in the history

  2. research pipes and walls

    @realforest2001
    realforest2001 committed Jul 28, 2023
    Configuration menu
    Copy the full SHA
    8491e21 View commit details
    Browse the repository at this point in the history

  3. Generic UPP/CLF & WY Goons specific

    @realforest2001
    realforest2001 committed Jul 28, 2023
    Configuration menu
    Copy the full SHA
    eb665f1 View commit details
    Browse the repository at this point in the history

  4. Goodbye get_all_main_access

    @realforest2001
    realforest2001 committed Jul 28, 2023
    Configuration menu
    Copy the full SHA
    d122a6b View commit details
    Browse the repository at this point in the history

  5. alignment fix

    @realforest2001
    realforest2001 committed Jul 28, 2023
    Configuration menu
    Copy the full SHA
    992edc9 View commit details
    Browse the repository at this point in the history

Commits on Jul 30, 2023

  1. fixes press door

    @realforest2001
    realforest2001 committed Jul 30, 2023
    Configuration menu
    Copy the full SHA
    d38f142 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'forest/pressfix' into project/factionaccess

    @realforest2001
    realforest2001 committed Jul 30, 2023
    Configuration menu
    Copy the full SHA
    3c9be16 View commit details
    Browse the repository at this point in the history

Commits on Jul 31, 2023

  1. woop woop biohazard

    @realforest2001
    realforest2001 committed Jul 31, 2023
    Configuration menu
    Copy the full SHA
    6e263a8 View commit details
    Browse the repository at this point in the history

Commits on Aug 2, 2023

  1. no breaking

    @realforest2001
    realforest2001 committed Aug 2, 2023
    Configuration menu
    Copy the full SHA
    9020224 View commit details
    Browse the repository at this point in the history

Commits on Aug 4, 2023

  1. Merge remote-tracking branch 'cmss13-devs/master' into project/factio… 

    …naccess
    @realforest2001
    realforest2001 committed Aug 4, 2023
    Configuration menu
    Copy the full SHA
    593a384 View commit details
    Browse the repository at this point in the history

  2. conflict resolution

    @realforest2001
    realforest2001 committed Aug 4, 2023
    Configuration menu
    Copy the full SHA
    e8235fc View commit details
    Browse the repository at this point in the history

  3. aso prep

    @realforest2001
    realforest2001 committed Aug 4, 2023
    Configuration menu
    Copy the full SHA
    f92fcfc View commit details
    Browse the repository at this point in the history

Commits on Aug 5, 2023

  1. Apply suggestions from code review 

    Co-authored-by: harryob <[email protected]>
    @realforest2001 @harryob
    realforest2001 and harryob authored Aug 5, 2023
    Configuration menu
    Copy the full SHA
    b39487c View commit details
    Browse the repository at this point in the history

Commits on Aug 6, 2023

  1. less spammable & sound change

    @realforest2001
    realforest2001 committed Aug 6, 2023
    Configuration menu
    Copy the full SHA
    a3c9ada View commit details
    Browse the repository at this point in the history

Commits on Aug 8, 2023

  1. Merge remote-tracking branch 'cmss13-devs/master' into project/factio… 

    …naccess
    @realforest2001
    realforest2001 committed Aug 8, 2023
    Configuration menu
    Copy the full SHA
    86cc623 View commit details
    Browse the repository at this point in the history

  2. aux

    @realforest2001
    realforest2001 committed Aug 8, 2023
    Configuration menu
    Copy the full SHA
    81de223 View commit details
    Browse the repository at this point in the history

  3. Merge remote-tracking branch 'cmss13-devs/master' into project/factio… 

    …naccess
    @realforest2001
    realforest2001 committed Aug 8, 2023
    Configuration menu
    Copy the full SHA
    f3001d5 View commit details
    Browse the repository at this point in the history

  4. mapfix

    @realforest2001
    realforest2001 committed Aug 8, 2023
    Configuration menu
    Copy the full SHA
    b6d13d7 View commit details
    Browse the repository at this point in the history

  5. chaplain prep

    @realforest2001
    realforest2001 committed Aug 8, 2023
    Configuration menu
    Copy the full SHA
    e77998b View commit details
    Browse the repository at this point in the history

Commits on Aug 11, 2023

  1. PMC/Goon/CLF access sets. 

    Also removes duplicate access code, and a duplicate entry for CLF commander.
    @realforest2001
    realforest2001 committed Aug 11, 2023
    Configuration menu
    Copy the full SHA
    29896c3 View commit details
    Browse the repository at this point in the history

Commits on Aug 17, 2023

  1. indentation

    @realforest2001
    realforest2001 committed Aug 17, 2023
    Configuration menu
    Copy the full SHA
    134ded0 View commit details
    Browse the repository at this point in the history

  2. Merge remote-tracking branch 'cmss13-devs/master' into project/factio… 

    …naccess
    @realforest2001
    realforest2001 committed Aug 17, 2023
    Configuration menu
    Copy the full SHA
    5965980 View commit details
    Browse the repository at this point in the history

Commits on Aug 18, 2023

  1. Merge remote-tracking branch 'cmss13-devs/master' into project/factio… 

    …naccess
    @realforest2001
    realforest2001 committed Aug 18, 2023
    Configuration menu
    Copy the full SHA
    59b8745 View commit details
    Browse the repository at this point in the history

  2. Merge remote-tracking branch 'cmss13-devs/master' into project/ares/b… 

    …iohazard
    @realforest2001
    realforest2001 committed Aug 18, 2023
    Configuration menu
    Copy the full SHA
    8e9f1b6 View commit details
    Browse the repository at this point in the history

  3. merge conflicts

    @realforest2001
    realforest2001 committed Aug 18, 2023
    Configuration menu
    Copy the full SHA
    5d3d06e View commit details
    Browse the repository at this point in the history

Commits on Aug 20, 2023

  1. global fix

    @realforest2001
    realforest2001 committed Aug 20, 2023
    Configuration menu
    Copy the full SHA
    dc0dcef View commit details
    Browse the repository at this point in the history

Commits on Aug 21, 2023

  1. Merge remote-tracking branch 'cmss13-devs/master' into project/ares/b… 

    …iohazard
    @realforest2001
    realforest2001 committed Aug 21, 2023
    Configuration menu
    Copy the full SHA
    0ad4e7e View commit details
    Browse the repository at this point in the history

  2. Merge branch 'project/factionaccess' into project/ares/biohazard

    @realforest2001
    realforest2001 committed Aug 21, 2023
    Configuration menu
    Copy the full SHA
    a410884 View commit details
    Browse the repository at this point in the history

  3. merge conflict

    @realforest2001
    realforest2001 committed Aug 21, 2023
    Configuration menu
    Copy the full SHA
    3f3ab30 View commit details
    Browse the repository at this point in the history

Commits on Aug 22, 2023

  1. ARES log

    @realforest2001
    realforest2001 committed Aug 22, 2023
    Configuration menu
    Copy the full SHA
    a84ded3 View commit details
    Browse the repository at this point in the history

  2. ares log message

    @realforest2001
    realforest2001 committed Aug 22, 2023
    Configuration menu
    Copy the full SHA
    bf0aaa8 View commit details
    Browse the repository at this point in the history

  3. Merge remote-tracking branch 'cmss13-devs/master' into project/ares/b… 

    …iohazard
    @realforest2001
    realforest2001 committed Aug 22, 2023
    Configuration menu
    Copy the full SHA
    3197ff3 View commit details
    Browse the repository at this point in the history

  4. white directionals

    @realforest2001
    realforest2001 committed Aug 22, 2023
    Configuration menu
    Copy the full SHA
    44d5839 View commit details
    Browse the repository at this point in the history

  5. implementation

    @realforest2001
    realforest2001 committed Aug 22, 2023
    Configuration menu
    Copy the full SHA
    a71df91 View commit details
    Browse the repository at this point in the history