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

Nebula civilian hub test #6659

Open
wants to merge 66 commits into
base: master
Choose a base branch
from
Open

Nebula civilian hub test #6659

wants to merge 66 commits into from

Commits on Jul 6, 2024

  1. Add 2 new shuttle / Makes the Nebula pad bigger

    @DeltaDav
    DeltaDav committed Jul 6, 2024
    Configuration menu
    Copy the full SHA
    e05aa1b View commit details
    Browse the repository at this point in the history

  2. Update tradeport_192.dmm

    @DeltaDav
    DeltaDav committed Jul 6, 2024
    Configuration menu
    Copy the full SHA
    dbf665c View commit details
    Browse the repository at this point in the history

Commits on Jul 11, 2024

  1. Merge remote-tracking branch 'upstream/master' into nebula-shuttle

    @DeltaDav
    DeltaDav committed Jul 11, 2024
    Configuration menu
    Copy the full SHA
    c427cc0 View commit details
    Browse the repository at this point in the history

  2. Update tradeport_192.dmm

    @DeltaDav
    DeltaDav committed Jul 11, 2024
    Configuration menu
    Copy the full SHA
    4003085 View commit details
    Browse the repository at this point in the history

  3. Update shuttles.dm

    @DeltaDav
    DeltaDav committed Jul 11, 2024
    Configuration menu
    Copy the full SHA
    3d03403 View commit details
    Browse the repository at this point in the history

Commits on Jul 13, 2024

  1. Update tradeport_192.dmm

    @DeltaDav
    DeltaDav committed Jul 13, 2024
    Configuration menu
    Copy the full SHA
    3e5f998 View commit details
    Browse the repository at this point in the history

  2. Update tradeport_192.dmm

    @DeltaDav
    DeltaDav committed Jul 13, 2024
    Configuration menu
    Copy the full SHA
    6f88269 View commit details
    Browse the repository at this point in the history

Commits on Jul 17, 2024

  1. Update tradeport_192.dmm

    @DeltaDav
    DeltaDav committed Jul 17, 2024
    Configuration menu
    Copy the full SHA
    420dca9 View commit details
    Browse the repository at this point in the history

Commits on Jul 19, 2024

  1. Update shuttles.dm

    @DeltaDav
    DeltaDav committed Jul 19, 2024
    Configuration menu
    Copy the full SHA
    f6451d3 View commit details
    Browse the repository at this point in the history

  2. shuttle landmark

    @DeltaDav
    DeltaDav committed Jul 19, 2024
    Configuration menu
    Copy the full SHA
    f6406d6 View commit details
    Browse the repository at this point in the history

  3. Update shuttles.dm

    @DeltaDav
    DeltaDav committed Jul 19, 2024
    Configuration menu
    Copy the full SHA
    edd986d View commit details
    Browse the repository at this point in the history

Commits on Jul 21, 2024

  1. fix attempt

    @DeltaDav
    DeltaDav committed Jul 21, 2024
    Configuration menu
    Copy the full SHA
    8ed38f1 View commit details
    Browse the repository at this point in the history

  2. Update shuttles.dm

    @DeltaDav
    DeltaDav committed Jul 21, 2024
    Configuration menu
    Copy the full SHA
    d1120f5 View commit details
    Browse the repository at this point in the history

  3. Revert "fix attempt" 

    This reverts commit 8ed38f1.
    @DeltaDav
    DeltaDav committed Jul 21, 2024
    Configuration menu
    Copy the full SHA
    1b74000 View commit details
    Browse the repository at this point in the history

  4. attempt to fix 2

    @DeltaDav
    DeltaDav committed Jul 21, 2024
    Configuration menu
    Copy the full SHA
    1c849c7 View commit details
    Browse the repository at this point in the history

Commits on Jul 22, 2024

  1. Update trade_station.dm

    @DeltaDav
    DeltaDav committed Jul 22, 2024
    Configuration menu
    Copy the full SHA
    8a57b1e View commit details
    Browse the repository at this point in the history

  2. Update tradeport_192.dmm

    @DeltaDav
    DeltaDav committed Jul 22, 2024
    Configuration menu
    Copy the full SHA
    849722d View commit details
    Browse the repository at this point in the history

  3. Update tradeport_192.dmm

    @DeltaDav
    DeltaDav committed Jul 22, 2024
    Configuration menu
    Copy the full SHA
    45c9768 View commit details
    Browse the repository at this point in the history

Commits on Jul 23, 2024

  1. attempt to fix

    @DeltaDav
    DeltaDav committed Jul 23, 2024
    Configuration menu
    Copy the full SHA
    d642056 View commit details
    Browse the repository at this point in the history

  2. Update triumph_shuttle_landmarks.dm

    @DeltaDav
    DeltaDav committed Jul 23, 2024
    Configuration menu
    Copy the full SHA
    c9c2b41 View commit details
    Browse the repository at this point in the history

  3. map fixes

    @DeltaDav
    DeltaDav committed Jul 23, 2024
    Configuration menu
    Copy the full SHA
    a243573 View commit details
    Browse the repository at this point in the history

  4. map fix attempt + color change

    @DeltaDav
    DeltaDav committed Jul 23, 2024
    Configuration menu
    Copy the full SHA
    eebc1b1 View commit details
    Browse the repository at this point in the history

  5. docks for Triumph/Atlas stations

    @DeltaDav
    DeltaDav committed Jul 23, 2024
    Configuration menu
    Copy the full SHA
    8739097 View commit details
    Browse the repository at this point in the history

Commits on Jul 24, 2024

  1. Update rift-06-surface3.dmm

    @DeltaDav
    DeltaDav committed Jul 24, 2024
    Configuration menu
    Copy the full SHA
    8614009 View commit details
    Browse the repository at this point in the history

  2. Update rift-06-surface3.dmm

    @DeltaDav
    DeltaDav committed Jul 24, 2024
    Configuration menu
    Copy the full SHA
    6cba07f View commit details
    Browse the repository at this point in the history

  3. map changes

    @DeltaDav
    DeltaDav committed Jul 24, 2024
    Configuration menu
    Copy the full SHA
    c3fcf71 View commit details
    Browse the repository at this point in the history

Commits on Jul 26, 2024

  1. change of color / triumph docks

    @DeltaDav
    DeltaDav committed Jul 26, 2024
    Configuration menu
    Copy the full SHA
    0cbaa1f View commit details
    Browse the repository at this point in the history

  2. Merge remote-tracking branch 'upstream/master' into nebula-shuttle

    @DeltaDav
    DeltaDav committed Jul 26, 2024
    Configuration menu
    Copy the full SHA
    ec51c78 View commit details
    Browse the repository at this point in the history

Commits on Aug 1, 2024

  1. Fixing the phoron cycle issue

    @DeltaDav
    DeltaDav committed Aug 1, 2024
    Configuration menu
    Copy the full SHA
    68229fa View commit details
    Browse the repository at this point in the history

  2. Merge remote-tracking branch 'upstream/master' into Nebula-civilian-h… 

    …ub-test
    @DeltaDav
    DeltaDav committed Aug 1, 2024
    Configuration menu
    Copy the full SHA
    d798cf7 View commit details
    Browse the repository at this point in the history

Commits on Aug 2, 2024

  1. Merge remote-tracking branch 'upstream/master' into Nebula-civilian-h… 

    …ub-test
    @DeltaDav
    DeltaDav committed Aug 2, 2024
    Configuration menu
    Copy the full SHA
    4a8d1d0 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'nebula-shuttle' into Nebula-civilian-hub-test

    @DeltaDav
    DeltaDav committed Aug 2, 2024
    Configuration menu
    Copy the full SHA
    6846824 View commit details
    Browse the repository at this point in the history

Commits on Aug 6, 2024

  1. Merge remote-tracking branch 'upstream/master' into Nebula-civilian-h… 

    …ub-test
    @DeltaDav
    DeltaDav committed Aug 6, 2024
    Configuration menu
    Copy the full SHA
    9a79773 View commit details
    Browse the repository at this point in the history

  2. Fix The Docking bay of both Scoophead and Udang

    @DeltaDav
    DeltaDav committed Aug 6, 2024
    Configuration menu
    Copy the full SHA
    a2f31c9 View commit details
    Browse the repository at this point in the history

Commits on Aug 11, 2024

  1. Merge remote-tracking branch 'upstream/master' into Nebula-civilian-h… 

    …ub-test
    @DeltaDav
    DeltaDav committed Aug 11, 2024
    Configuration menu
    Copy the full SHA
    c36c7f4 View commit details
    Browse the repository at this point in the history

Commits on Aug 13, 2024

  1. NEbula Map, And Shuttle , and vending machines , and 2 template shuttle

    @DeltaDav
    DeltaDav committed Aug 13, 2024
    Configuration menu
    Copy the full SHA
    214224a View commit details
    Browse the repository at this point in the history

  2. Merge branch 'nebula-shuttle' into Nebula-civilian-hub-test

    @DeltaDav
    DeltaDav committed Aug 13, 2024
    Configuration menu
    Copy the full SHA
    225bf7c View commit details
    Browse the repository at this point in the history

  3. Update trade_station.dm

    @DeltaDav
    DeltaDav committed Aug 13, 2024
    Configuration menu
    Copy the full SHA
    e5475fc View commit details
    Browse the repository at this point in the history

Commits on Aug 19, 2024

  1. Merge remote-tracking branch 'upstream/master' into Nebula-civilian-h… 

    …ub-test
    @DeltaDav
    DeltaDav committed Aug 19, 2024
    Configuration menu
    Copy the full SHA
    0d41b7b View commit details
    Browse the repository at this point in the history

Commits on Aug 21, 2024

  1. Attempt to fix the shuttles

    @DeltaDav
    DeltaDav committed Aug 21, 2024
    Configuration menu
    Copy the full SHA
    d35a879 View commit details
    Browse the repository at this point in the history

Commits on Aug 23, 2024

  1. map fix attempt

    @DeltaDav
    DeltaDav committed Aug 23, 2024
    Configuration menu
    Copy the full SHA
    1c7d2a8 View commit details
    Browse the repository at this point in the history

  2. Update tradeport_192.dmm

    @DeltaDav
    DeltaDav committed Aug 23, 2024
    Configuration menu
    Copy the full SHA
    6b2b156 View commit details
    Browse the repository at this point in the history

Commits on Aug 25, 2024

  1. Update tradeport_192.dmm

    @DeltaDav
    DeltaDav committed Aug 25, 2024
    Configuration menu
    Copy the full SHA
    4229ef4 View commit details
    Browse the repository at this point in the history

Commits on Aug 27, 2024

  1. Merge remote-tracking branch 'upstream/master' into Nebula-civilian-h… 

    …ub-test
    @DeltaDav
    DeltaDav committed Aug 27, 2024
    Configuration menu
    Copy the full SHA
    01aa541 View commit details
    Browse the repository at this point in the history

  2. Merge remote-tracking branch 'upstream/master' into Nebula-civilian-h… 

    …ub-test
    @DeltaDav
    DeltaDav committed Aug 27, 2024
    Configuration menu
    Copy the full SHA
    d264c8a View commit details
    Browse the repository at this point in the history

Commits on Aug 29, 2024

  1. attempt to fix with area

    @DeltaDav
    DeltaDav committed Aug 29, 2024
    Configuration menu
    Copy the full SHA
    ca7ece7 View commit details
    Browse the repository at this point in the history

  2. Update shuttles.dm

    @DeltaDav
    DeltaDav committed Aug 29, 2024
    Configuration menu
    Copy the full SHA
    1ed8966 View commit details
    Browse the repository at this point in the history

  3. Update shuttles.dm

    @DeltaDav
    DeltaDav committed Aug 29, 2024
    Configuration menu
    Copy the full SHA
    e7684b6 View commit details
    Browse the repository at this point in the history

Commits on Aug 30, 2024

  1. Update tradeport_192.dmm

    @DeltaDav
    DeltaDav committed Aug 30, 2024
    Configuration menu
    Copy the full SHA
    726c606 View commit details
    Browse the repository at this point in the history

Commits on Aug 31, 2024

  1. Update access.dm

    @DeltaDav
    DeltaDav committed Aug 31, 2024
    Configuration menu
    Copy the full SHA
    e75b991 View commit details
    Browse the repository at this point in the history

  2. fix the shuttles

    @DeltaDav
    DeltaDav committed Aug 31, 2024
    Configuration menu
    Copy the full SHA
    4c4b279 View commit details
    Browse the repository at this point in the history

Commits on Sep 2, 2024

  1. biggerpads

    @DeltaDav
    DeltaDav committed Sep 2, 2024
    Configuration menu
    Copy the full SHA
    6a078da View commit details
    Browse the repository at this point in the history

Commits on Sep 5, 2024

  1. Merge remote-tracking branch 'upstream/master' into Nebula-civilian-h… 

    …ub-test
    @DeltaDav
    DeltaDav committed Sep 5, 2024
    Configuration menu
    Copy the full SHA
    d6a8634 View commit details
    Browse the repository at this point in the history

Commits on Sep 6, 2024

  1. biggerpads + small adjustements

    @DeltaDav
    DeltaDav committed Sep 6, 2024
    Configuration menu
    Copy the full SHA
    ad44d76 View commit details
    Browse the repository at this point in the history

Commits on Sep 8, 2024

  1. Merge remote-tracking branch 'upstream/master' into Nebula-civilian-h… 

    …ub-test
    @DeltaDav
    DeltaDav committed Sep 8, 2024
    Configuration menu
    Copy the full SHA
    231c273 View commit details
    Browse the repository at this point in the history

Commits on Sep 18, 2024

  1. Merge remote-tracking branch 'upstream/master' into Nebula-civilian-h… 

    …ub-test
    @DeltaDav
    DeltaDav committed Sep 18, 2024
    Configuration menu
    Copy the full SHA
    6702b74 View commit details
    Browse the repository at this point in the history

Commits on Sep 19, 2024

  1. Update access.dm

    @DeltaDav
    DeltaDav committed Sep 19, 2024
    Configuration menu
    Copy the full SHA
    273d6cf View commit details
    Browse the repository at this point in the history

Commits on Sep 25, 2024

  1. Update access.dm

    @DeltaDav
    DeltaDav committed Sep 25, 2024
    Configuration menu
    Copy the full SHA
    160dc0d View commit details
    Browse the repository at this point in the history

  2. Update access.dm

    @DeltaDav
    DeltaDav committed Sep 25, 2024
    Configuration menu
    Copy the full SHA
    0404ddb View commit details
    Browse the repository at this point in the history

  3. acces change

    @DeltaDav
    DeltaDav committed Sep 25, 2024
    Configuration menu
    Copy the full SHA
    2172831 View commit details
    Browse the repository at this point in the history

  4. Merge remote-tracking branch 'upstream/master' into Nebula-civilian-h… 

    …ub-test
    @DeltaDav
    DeltaDav committed Sep 25, 2024
    Configuration menu
    Copy the full SHA
    f68f2ec View commit details
    Browse the repository at this point in the history

  5. Update access.dm

    @DeltaDav
    DeltaDav committed Sep 25, 2024
    Configuration menu
    Copy the full SHA
    b395114 View commit details
    Browse the repository at this point in the history

  6. removal of IDs and stuff (was bad idea)

    @DeltaDav
    DeltaDav committed Sep 25, 2024
    Configuration menu
    Copy the full SHA
    e51f12f View commit details
    Browse the repository at this point in the history

Commits on Nov 12, 2024

  1. Merge remote-tracking branch 'upstream/master' into Nebula-civilian-h… 

    …ub-test
    @DeltaDav
    DeltaDav committed Nov 12, 2024
    Configuration menu
    Copy the full SHA
    0a83887 View commit details
    Browse the repository at this point in the history

  2. Fixing mistake, Reverting vendor

    @DeltaDav
    DeltaDav committed Nov 12, 2024
    Configuration menu
    Copy the full SHA
    bafc4e4 View commit details
    Browse the repository at this point in the history

  3. Merge remote-tracking branch 'upstream/master' into Nebula-civilian-h… 

    …ub-test
    @DeltaDav
    DeltaDav committed Nov 12, 2024
    Configuration menu
    Copy the full SHA
    c9c6e1e View commit details
    Browse the repository at this point in the history