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

ArCargo: Adds the Galactic Materials Stock Market V1.2 (Free Market Edition) #78500

Merged
merged 30 commits into from
Sep 30, 2023
Merged

ArCargo: Adds the Galactic Materials Stock Market V1.2 (Free Market Edition) #78500

merged 30 commits into from
Sep 30, 2023

Commits on Sep 3, 2023

  1. First thing is remove static supply packs of things that I want to re… 

    …place with mineral market.
    @ArcaneMusic
    ArcaneMusic committed Sep 3, 2023
    Configuration menu
    Copy the full SHA
    e27e17c View commit details
    Browse the repository at this point in the history

  2. Man, I am I really this bad at ss13 associated lists?

    @ArcaneMusic
    ArcaneMusic committed Sep 3, 2023
    Configuration menu
    Copy the full SHA
    d5262ea View commit details
    Browse the repository at this point in the history

Commits on Sep 4, 2023

  1. Alright stopping so I can tweak mech mining across branches

    @ArcaneMusic
    ArcaneMusic committed Sep 4, 2023
    Configuration menu
    Copy the full SHA
    28d7d85 View commit details
    Browse the repository at this point in the history

  2. An actual work of art, guys, a space station 13 stock market that DOE… 

    …SN'T run on goofcode!
    @ArcaneMusic
    ArcaneMusic committed Sep 4, 2023
    Configuration menu
    Copy the full SHA
    867c6bb View commit details
    Browse the repository at this point in the history

  3. The version with quantity and all that

    @ArcaneMusic
    ArcaneMusic committed Sep 4, 2023
    Configuration menu
    Copy the full SHA
    b2be87b View commit details
    Browse the repository at this point in the history

Commits on Sep 5, 2023

  1. Alright, a very basic UI with no functionality. ARE YOU HAPPY GOD

    @ArcaneMusic
    ArcaneMusic committed Sep 5, 2023
    Configuration menu
    Copy the full SHA
    6550ea5 View commit details
    Browse the repository at this point in the history

  2. It looks good! Test's fairly well too.

    @ArcaneMusic
    ArcaneMusic committed Sep 5, 2023
    Configuration menu
    Copy the full SHA
    78d2094 View commit details
    Browse the repository at this point in the history

Commits on Sep 6, 2023

  1. Alright it's probably good enough now

    @ArcaneMusic
    ArcaneMusic committed Sep 6, 2023
    Configuration menu
    Copy the full SHA
    95e653a View commit details
    Browse the repository at this point in the history

  2. market fee text.

    @ArcaneMusic
    ArcaneMusic committed Sep 6, 2023
    Configuration menu
    Copy the full SHA
    483327a View commit details
    Browse the repository at this point in the history

  3. ha, I left in a define that I forgot to undef but moreso that I stole… 

    … from the mining PR
    @ArcaneMusic
    ArcaneMusic committed Sep 6, 2023
    Configuration menu
    Copy the full SHA
    e5e420b View commit details
    Browse the repository at this point in the history

Commits on Sep 7, 2023

  1. Apply suggestions from code review pt 1 

    Co-authored-by: Jeremiah <42397676+jlsnow301@users.noreply.github.com>
    @ArcaneMusic @jlsnow301
    ArcaneMusic and jlsnow301 committed Sep 7, 2023
    Configuration menu
    Copy the full SHA
    eed0162 View commit details
    Browse the repository at this point in the history

  2. Merge remote-tracking branch 'upstream/master' into arcargo-mineral-m… 

    …arket
    @ArcaneMusic
    ArcaneMusic committed Sep 7, 2023
    Configuration menu
    Copy the full SHA
    8fb5364 View commit details
    Browse the repository at this point in the history

  3. Some extra tweaks and tsx swap

    @ArcaneMusic
    ArcaneMusic committed Sep 7, 2023
    Configuration menu
    Copy the full SHA
    794ee6e View commit details
    Browse the repository at this point in the history

  4. more tweaks and I fixed stock blocks not updating the SubSys

    @ArcaneMusic
    ArcaneMusic committed Sep 7, 2023
    Configuration menu
    Copy the full SHA
    7463131 View commit details
    Browse the repository at this point in the history

  5. last little tweak before I sleep

    @ArcaneMusic
    ArcaneMusic committed Sep 7, 2023
    Configuration menu
    Copy the full SHA
    fe7c864 View commit details
    Browse the repository at this point in the history

  6. Little baby webedit to see if this fixes runtimes

    @ArcaneMusic
    ArcaneMusic committed Sep 7, 2023
    Configuration menu
    Copy the full SHA
    b834d4c View commit details
    Browse the repository at this point in the history

  7. Yeah this is doing it

    @ArcaneMusic
    ArcaneMusic committed Sep 7, 2023
    Configuration menu
    Copy the full SHA
    9a29859 View commit details
    Browse the repository at this point in the history

  8. This is a sin, I'm sinning rn fr fr

    @ArcaneMusic
    ArcaneMusic committed Sep 7, 2023
    Configuration menu
    Copy the full SHA
    c21d4eb View commit details
    Browse the repository at this point in the history

  9. Further sin

    @ArcaneMusic
    ArcaneMusic committed Sep 7, 2023
    Configuration menu
    Copy the full SHA
    c0f9721 View commit details
    Browse the repository at this point in the history

  10. Good lord in heaven am I done yet? Remind me to refactor this

    @ArcaneMusic
    ArcaneMusic committed Sep 7, 2023
    Configuration menu
    Copy the full SHA
    2f9abb3 View commit details
    Browse the repository at this point in the history

Commits on Sep 10, 2023

  1. adds pack merging and paying for crates as part of the price. Everyth… 

    …ing else is window dressing.
    @ArcaneMusic
    ArcaneMusic committed Sep 10, 2023
    Configuration menu
    Copy the full SHA
    50a3ff9 View commit details
    Browse the repository at this point in the history

  2. Market integration is basically complete

    @ArcaneMusic
    ArcaneMusic committed Sep 10, 2023
    Configuration menu
    Copy the full SHA
    55c553a View commit details
    Browse the repository at this point in the history

Commits on Sep 12, 2023

  1. Here we gooooo

    @ArcaneMusic
    ArcaneMusic committed Sep 12, 2023
    Configuration menu
    Copy the full SHA
    7089d93 View commit details
    Browse the repository at this point in the history

Commits on Sep 16, 2023

  1. Merge commit 'e27e17cd78365e0cd20ce8b707cae84a84779c7a' into arcargo-… 

    …mineral-market
    @ArcaneMusic
    ArcaneMusic committed Sep 16, 2023
    Configuration menu
    Copy the full SHA
    a5a9252 View commit details
    Browse the repository at this point in the history

  2. Merge commit '7089d9384afae447ba7f2f34bc09ab3ac3d83393' into arcargo-… 

    …mineral-market
    @ArcaneMusic
    ArcaneMusic committed Sep 16, 2023
    Configuration menu
    Copy the full SHA
    284fe9c View commit details
    Browse the repository at this point in the history

  3. Adds grape flavor stock blocks and a 0 credit tradeable minimum

    @ArcaneMusic
    ArcaneMusic committed Sep 16, 2023
    Configuration menu
    Copy the full SHA
    f46f714 View commit details
    Browse the repository at this point in the history

  4. Fixes the market so that it will actually fluxuate a bit harder and b… 

    …etter
    @ArcaneMusic
    ArcaneMusic committed Sep 16, 2023
    Configuration menu
    Copy the full SHA
    5de2d10 View commit details
    Browse the repository at this point in the history

Commits on Sep 22, 2023

  1. Fixes checks

    @ArcaneMusic
    ArcaneMusic committed Sep 22, 2023
    Configuration menu
    Copy the full SHA
    62612b6 View commit details
    Browse the repository at this point in the history

  2. Wrong parenthesis

    @ArcaneMusic
    ArcaneMusic committed Sep 22, 2023
    Configuration menu
    Copy the full SHA
    ce27cfa View commit details
    Browse the repository at this point in the history

Commits on Sep 25, 2023

  1. Merge branch 'master' into arcargo-mineral-market

    @ZephyrTFA
    ZephyrTFA committed Sep 25, 2023
    Configuration menu
    Copy the full SHA
    30a04ee View commit details
    Browse the repository at this point in the history