Code

Cargo Overhaul#349

Code

Merged

RimiNosha merged 105 commits intoArtea-Station:masterArtea-Station/Artea-Station-Server:masterfrom RimiNosha:cargo_overhaulRimiNosha/Nosha-Industries-Server:cargo_overhaulCopy head branch name to clipboardDec 16, 2023

+7,474-11,477

Commits

Commits on Oct 29, 2023

• Bye bounties. You will not be missed.

  RimiNosha

  committed
  811df07

  Copy full SHA for 811df07

• I was sure I removed the last of the reputation system. Oh well.

  RimiNosha

  committed
  2c530ee

  Copy full SHA for 2c530ee

• Fix compiling

  RimiNosha

  committed
  cfdce60

  Copy full SHA for cfdce60

Commits on Oct 30, 2023

• Haha, oops.

  RimiNosha

  committed
  d26ea4e

  Copy full SHA for d26ea4e

• Subsystem init order fix

  RimiNosha

  committed
  718527d

  Copy full SHA for 718527d

• Yeet sold goods in exchange for using exports.

  Show description for 8256423
  RimiNosha

  committed
  8256423

  Copy full SHA for 8256423

• Sort packs

  RimiNosha

  committed
  7bbc7d6

  Copy full SHA for 7bbc7d6

• Code tweaks

  RimiNosha

  committed
  d389c8d

  Copy full SHA for d389c8d

• Remove cargo requests, move strictly trade-related stuff to SStrading from SSshuttle

  RimiNosha

  committed
  480aaa8

  Copy full SHA for 480aaa8

Commits on Oct 31, 2023

• Uh, no.

  RimiNosha

  committed
  9375a1a

  Copy full SHA for 9375a1a

Commits on Nov 1, 2023

• Why

  RimiNosha

  committed
  cb50638

  Copy full SHA for cb50638

• Bye, you won't be missed

  RimiNosha

  committed
  27da608

  Copy full SHA for 27da608

• Update maps

  RimiNosha

  committed
  fea52d9

  Copy full SHA for fea52d9

Commits on Nov 2, 2023

• Woops

  RimiNosha

  committed
  18af818

  Copy full SHA for 18af818

• Work so far

  Show description for d7269e4
  RimiNosha

  committed
  d7269e4

  Copy full SHA for d7269e4

Commits on Nov 3, 2023

• More changes

  RimiNosha

  committed
  9bafc96

  Copy full SHA for 9bafc96

• NT Pay app. Money send on distance, transaction log! (#70108)

  Show description for 62acd00
  RimiNosha

  committed
  62acd00

  Copy full SHA for 62acd00

• Make it work

  RimiNosha

  committed
  a70f2fd

  Copy full SHA for a70f2fd

• Reverts undocumented 5 credit tax on withdrawing money from your bank account. (#70363)

  RimiNosha

  committed
  d693dc0

  Copy full SHA for d693dc0

• Standardizes NtosPay with other NTos apps (#72356)

  Show description for 116bdf3
  RimiNosha

  committed
  116bdf3

  Copy full SHA for 116bdf3

• Fix grammar/typo in NTPay (#72670)

  Show description for 8bbbeac
  RimiNosha

  committed
  8bbbeac

  Copy full SHA for 8bbbeac

• I don't want wireless transfers, sorry. The ship is small enough for your lazy ass to walk over.

  RimiNosha

  committed
  952ce82

  Copy full SHA for 952ce82

• Oops

  RimiNosha

  committed
  74b0632

  Copy full SHA for 74b0632

• Stuff so far. Yes, the trade console is fucked, I know.

  Show description for 06ab641
  RimiNosha

  committed
  06ab641

  Copy full SHA for 06ab641

• Clean up some code

  RimiNosha

  committed
  2c6299a

  Copy full SHA for 2c6299a

Commits on Nov 4, 2023

• Feature parity backend with old supply consoles.

  Show description for 5b8bd8f
  RimiNosha

  committed
  5b8bd8f

  Copy full SHA for 5b8bd8f

Commits on Nov 6, 2023

• Bye

  RimiNosha

  committed
  4b8c975

  Copy full SHA for 4b8c975

• Add optional default behavior for declining silicons/synths to traders.

  RimiNosha

  committed
  eadee18

  Copy full SHA for eadee18

• Haha, oops

  RimiNosha

  committed
  c2db0d3

  Copy full SHA for c2db0d3

• More oops

  RimiNosha

  committed
  acc8a87

  Copy full SHA for acc8a87

• Fix maps

  RimiNosha

  committed
  be6cf56

  Copy full SHA for be6cf56

• What the fuck Rimi

  RimiNosha

  committed
  6fdcc90

  Copy full SHA for 6fdcc90

Commits on Nov 8, 2023

• Why the FUCK did I think that would work??

  RimiNosha

  committed
  3d787c5

  Copy full SHA for 3d787c5

Commits on Nov 9, 2023

• This fixed a runtime????

  RimiNosha

  committed
  b5ff717

  Copy full SHA for b5ff717

Commits on Nov 10, 2023

• More runtime fix

  RimiNosha

  committed
  309107b

  Copy full SHA for 309107b

• Plaster patch. Forget about this, and the whole universe will know you lost the plot with cargo's dumb-ass datums.

  RimiNosha

  committed
  741bccb

  Copy full SHA for 741bccb

• Not nanotrasen

  RimiNosha

  committed
  0899eb1

  Copy full SHA for 0899eb1

• A ton of tweaks to the trader console. Probably doesn't work 100%.

  RimiNosha

  committed
  0e349b7

  Copy full SHA for 0e349b7

• Feexes

  RimiNosha

  committed
  09f228f

  Copy full SHA for 09f228f

• Fix inits, also let's not bother Azarak for a system they no longer develop.

  RimiNosha

  committed
  2866702

  Copy full SHA for 2866702

• Temporarily disable restock code, it's broken and I have no fucking clue why, cause nowhere else has this issue

  RimiNosha

  committed
  55f1201

  Copy full SHA for 55f1201

• Uhhh- manufacturers! Yay!

  RimiNosha

  committed
  e9e3a62

  Copy full SHA for e9e3a62

• Haha, gorup, also add tech disks back, add guaranteed_packs.

  RimiNosha

  committed
  925cc31

  Copy full SHA for 925cc31

• Actually, let's not do duplicates. Also make tech disks infinite.

  RimiNosha

  committed
  5c68a67

  Copy full SHA for 5c68a67

• Fix lints

  RimiNosha

  committed
  397169f

  Copy full SHA for 397169f

• Fix lint

  RimiNosha

  committed
  f4604f7

  Copy full SHA for f4604f7

• Add bearcat cargo ship

  RimiNosha

  committed
  544261b

  Copy full SHA for 544261b

Commits on Nov 11, 2023

• Update cargo shuttle and fix compile

  RimiNosha

  committed
  129c4be

  Copy full SHA for 129c4be

• Merge commit 'bf930182a91f70201aafbe95706f7c4b86569866' into cargo_overhaul

  RimiNosha

  committed
  0f4f847

  Copy full SHA for 0f4f847

• Fix cargo shuttle, fix docking port dwidth logic.

  RimiNosha

  committed
  2ee5b28

  Copy full SHA for 2ee5b28

• Fuck it, push these temp fixes so I can compile the server while I test

  RimiNosha

  committed
  8e83ae8

  Copy full SHA for 8e83ae8

• Simplify shuttle pathing even more, this is infinite-looping for SOME reason

  RimiNosha

  committed
  f461ee6

  Copy full SHA for f461ee6

• Get around funny atmos bug

  RimiNosha

  committed
  0b92454

  Copy full SHA for 0b92454

Commits on Nov 14, 2023

• Fix Artea-Station#359

  RimiNosha

  committed
  8ade8f9

  Copy full SHA for 8ade8f9

• Fix Artea-Station#357

  RimiNosha

  committed
  cef8f5e

  Copy full SHA for cef8f5e

• Fix Artea-Station#354

  RimiNosha

  committed
  7078106

  Copy full SHA for 7078106

Commits on Nov 19, 2023

• Fix Artea-Station#355

  RimiNosha

  committed
  68ecdb0

  Copy full SHA for 68ecdb0

• 10, sure, but not fucking 49

  RimiNosha

  committed
  5c14d4f

  Copy full SHA for 5c14d4f

• Remove defunct var

  RimiNosha

  committed
  e5b8c19

  Copy full SHA for e5b8c19

• Remove budget ordering program

  RimiNosha

  committed
  da87d38

  Copy full SHA for da87d38

Commits on Nov 20, 2023

• THIS CODE IS SHIT, BUT IT AT LEAST DOESN'T INFLOOP

  RimiNosha

  committed
  d2625e5

  Copy full SHA for d2625e5

• Make taking bounty rewards work (finishing them isn't, yet), add a system to add unremovable orders, overhaul the system for packaging orders (it's still shit)

  RimiNosha

  committed
  165bbd0

  Copy full SHA for 165bbd0

• Finish converting supply_packs to string IDs.

  RimiNosha

  committed
  f773894

  Copy full SHA for f773894

• Yeah, using a while here was a mistake, fuck this.

  RimiNosha

  committed
  1f8c767

  Copy full SHA for 1f8c767

• Haha, woops

  RimiNosha

  committed
  0b451d9

  Copy full SHA for 0b451d9

• How the fuck does this fix it? what?

  RimiNosha

  committed
  f363e2e

  Copy full SHA for f363e2e

• Overhaul package wrap, fix some spawn logic.

  RimiNosha

  committed
  f5a5305

  Copy full SHA for f5a5305

• Merge commit 'fa667f9a0e2a6e42f421886064af77eae65e445c' into cargo_overhaul

  Show description for e3bd7a4
  RimiNosha

  committed
  e3bd7a4

  Copy full SHA for e3bd7a4

Commits on Nov 21, 2023

• Update synth prefix, add proper documentation for trader speech.

  RimiNosha

  committed
  630952b

  Copy full SHA for 630952b

• Yeet access_view, instead use access/access_any for all access stuff.

  RimiNosha

  committed
  f0b934d

  Copy full SHA for f0b934d

Commits on Dec 2, 2023

• You idiot

  RimiNosha

  committed
  15a190d

  Copy full SHA for 15a190d

• Merge commit '957d6874a58eb71c64f7b1fe1a5023ee589b1138' into cargo_overhaul

  Show description for e19d567
  RimiNosha

  committed
  e19d567

  Copy full SHA for e19d567

• Yay, shitcode be causing issues

  RimiNosha

  committed
  995988a

  Copy full SHA for 995988a

Commits on Dec 7, 2023

• Merge commit 'fbe42e8de6225a3acbfd2ae4eb06720ad514eff8' into cargo_overhaul

  Show description for ea45f7b
  RimiNosha

  committed
  ea45f7b

  Copy full SHA for ea45f7b

• Naming consistency

  RimiNosha

  committed
  cf0e867

  Copy full SHA for cf0e867

• Fixes, also proper stock rotation

  RimiNosha

  committed
  d2aa795

  Copy full SHA for d2aa795

Commits on Dec 8, 2023

• Fix stock rotation

  RimiNosha

  committed
  ca0e4ae

  Copy full SHA for ca0e4ae

Commits on Dec 9, 2023

• Woops

  RimiNosha

  committed
  b55ce05

  Copy full SHA for b55ce05

• Fix delivery runs

  RimiNosha

  committed
  16414e6

  Copy full SHA for 16414e6

• Wait, why didn't I do it this way sooner?!

  RimiNosha

  committed
  2917345

  Copy full SHA for 2917345

• Fuck you delivery code, eat my ass

  RimiNosha

  committed
  32d2cb1

  Copy full SHA for 32d2cb1

Commits on Dec 12, 2023

• Okay, time to debug this garbage

  RimiNosha

  committed
  28d1463

  Copy full SHA for 28d1463

• Merge commit '3a7b583a693046c097e81d4a3328003ee9fcf470' into cargo_overhaul

  RimiNosha

  committed
  9db9f3f

  Copy full SHA for 9db9f3f

• :))))))))

  RimiNosha

  committed
  e9e58c7

  Copy full SHA for e9e58c7

Commits on Dec 13, 2023

• Fix claiming + make it only allow department cards

  RimiNosha

  committed
  6748f8f

  Copy full SHA for 6748f8f

• I think this all works. Maybe.

  RimiNosha

  committed
  6d08671

  Copy full SHA for 6d08671

• No more department handouts.

  RimiNosha

  committed
  68c7d0c

  Copy full SHA for 68c7d0c

• Delivery runs now pay each department

  RimiNosha

  committed
  cb4bea2

  Copy full SHA for cb4bea2

• Bounties too

  RimiNosha

  committed
  1b8863b

  Copy full SHA for 1b8863b

• Oops

  RimiNosha

  committed
  c08d4ec

  Copy full SHA for c08d4ec

• Cards

  RimiNosha

  committed
  44ac8d3

  Copy full SHA for 44ac8d3

• FUCKING SHIT PISS

  RimiNosha

  committed
  c8ce836

  Copy full SHA for c8ce836

• THAT WASN'T IT

  RimiNosha

  committed
  4651736

  Copy full SHA for 4651736

• Fucking shit cunt

  RimiNosha

  committed
  6cdd63e

  Copy full SHA for 6cdd63e

• Fuck

  RimiNosha

  committed
  af20913

  Copy full SHA for af20913

• Fuck

  RimiNosha

  committed
  209eddb

  Copy full SHA for 209eddb

• Mapping fixes

  RimiNosha

  committed
  b10889a

  Copy full SHA for b10889a

• Runtime fix for maps with no shuttle support

  RimiNosha

  committed
  7fe40d7

  Copy full SHA for 7fe40d7

• Merge commit '40eea9edff6978a7779d82a067ee8715363788ca' into cargo_overhaul

  RimiNosha

  committed
  59210c3

  Copy full SHA for 59210c3

• Merge branch 'master' into cargo_overhaul

  RimiNosha

  authored
  5f48eeb

  Copy full SHA for 5f48eeb

Commits on Dec 16, 2023

• 515 compat

  RimiNosha

  committed
  cda0277

  Copy full SHA for cda0277

• Remove bounties from gameplay, they need an entire overhaul, and I need to write a shitton of code to make it work.

  RimiNosha

  committed
  0138916

  Copy full SHA for 0138916

• Don't break cargo shuttle code plox

  RimiNosha

  committed
  91a258e

  Copy full SHA for 91a258e

• Yolo, TGUI is broken for me again

  RimiNosha

  committed
  a123cfe

  Copy full SHA for a123cfe

• Merge commit '4c911aa4f89f6976a81b969bbc049105b698f45f' into cargo_overhaul

  RimiNosha

  committed
  3e9e5b9

  Copy full SHA for 3e9e5b9