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

Cargo Overhaul #349

Merged
merged 105 commits into from
Dec 16, 2023
Merged

Cargo Overhaul #349

merged 105 commits into from
Dec 16, 2023

Conversation

RimiNosha
Copy link
Contributor

@RimiNosha RimiNosha commented Oct 29, 2023 •
edited
Loading

About The Pull Request

#336 can wait, I need to get this show on the road, and traders are entirely half-baked right now.

Let's get them into an acceptable state, and let's get ourselves some publicity.

Leaving here so I can write the changelog as I go, cause writing the CL for #348 was god awful.

Ports:

The deets (unchecked are planned, and may cause more entries, checks are ones that have been done):

  • Yeet bounties.
  • Yeet a missed var from trader reputation, which fixes an obscure bug where they'd silently lock you out of trades.
  • Fix the trading and overmap subsystem init order. Apparently I didn't offset the numbers correctly, which caused the guaranteed station spawn to sometimes not contain their specialist shop.
  • Yeet trader bought and sold goods.
  • Sort supply packs and exports.
    • Also reassign supply pack categories, so traders can be easily made aware of what they can and can't buy/sell.
  • Rewire the normal imports and exports to be handled by traders instead.
  • Replace the old consoles with a limited selection of "galactic imports" on the trade console. These are special orders that are notably more expensive than traders, but allow for being able to get a hold of more "essential" items, should traders be out of stock, or non existent.
  • Rewire the shuttle to:
    • Take a little longer selling than buying, as buying is pre-arranged.
    • Simulate time taken to visit each trade hub on the shopping list.
    • Spawn all deliveries with wrapping.
  • Yeet the supply and express console.
  • Yeet the trade telepad.
  • Entirely overhaul the trader UI.
    • The UX is not quite right still, and it could stand to be condensed into hubs+traders, the trader itself, galactic imports, and the shopping list as tabs.
  • Add some lore stuff. TBD in a later PR
    • Manufacturer labels.
    • Trader names.
    • Trader messages for synth crewmembers to reflect their lore.
    • (Optional) Add one or two technophobic traders.

How Does This Help Gameplay?

Crew are now encouraged to do things via the fact traders are nearly their sole source of income, aside from raiding/mining and selling the loot they get.

Also no more magic centcom shuttle.

How Does This Help Roleplay?

Better anchoring inside the setting!

Proof of Testing

See testmerge.

Changelog

🆑
del: Civilian bounties and their consoles.
fix: You can now print trader console boards at cargo lathes.
del: The last of the trader reputation system. Apparently I missed a var, which could cause you to be silently locked out from trading.
fix: The scrapper trade hub should now always have their scrapper shop.
del: The supply and express supply console have both been replaced by trader consoles.
code: The trade console has been entirely overhauled, featuring shuttle integration and a much wider selection of goodies.
del: Almost all of the old cargo system.
add: Banking modular computer/PDA app. Check your cashflow with ease!
fix: Some minor UI style changes, most notably the button font colour being a lot better.
add: All deliveries on the shuttle are now wrapped, and will forego crates entirely where access isn't required.
balance: Departments no longer receive free money. You're entirely on your own to make money now.
qol: Trader bounties and delivery runs now pay directly to department accounts. The reward for crew? Getting a paycheck at all.
add: All heads now have their departmental budget cards, try not to lose them!
/:cl:

@github-actions github-actions bot added the Removal "What is soul? Are you a cult?" label Oct 29, 2023
@github-actions github-actions bot added Mapping Something something someone placed three reinforced window spawners in one place. Tools Oh great, another thing with external dependencies that'll break in the next six months. Fix Cleans up someone else's code from 5 years ago. labels Oct 29, 2023
@github-actions github-actions bot added the UI Also known as "I like lagspikes, so I added TGUI to your TGUI". label Nov 2, 2023
@RimiNosha
More changes
9bafc96
@RimiNosha
NT Pay app. Money send on distance, transaction log! (#70108)
62acd00 
* base

* reasons

* GetToken proc, with a many remarks

* Add a way to change reason in transfer_money proc. Add a reasons.

* Reason to use the app. Commission. Standard application.

* Apply suggestions from code review - Tralezab

Co-authored-by: tralezab <[email protected]>

* Tralezab & jlsnow301 advices. New format(everywhere)

* Nanotrasen

* Refactor TGUI(not me:( ). Fix useless capitalize

* Update code/modules/economy/account.dm

* Trans transforms in transaction

* coMmission. little autodoc mistalke. Translation != Transaction

* oops

* Merge Conflict

* ...

* back feats

* mistakes bye!

* ну да

Co-authored-by: tralezab <[email protected]>
# Conflicts:
#	code/datums/components/pricetag.dm
#	code/game/objects/items/crab17.dm
#	code/modules/economy/account.dm
#	code/modules/modular_computers/hardware/hard_drive.dm
#	code/modules/vending/_vending.dm
@RimiNosha
Make it work
a70f2fd
@RimiNosha
Reverts undocumented 5 credit tax on withdrawing money from your bank…
d693dc0 
… account. (#70363)
@RimiNosha
Standardizes NtosPay with other NTos apps (#72356)
116bdf3 
## About The Pull Request

Ntos apps are generally split between 'app' and 'appContent' in their
TGUI interfaces. This is done to add the ability to use the app's UI
both with and without NtOS, or two NtOS apps sharing the same UI; though
that's a rarer case (example: Newscaster, R&D console, Atmos alarm), so
it's important to keep this standardized.

## Why It's Good For The Game

Consistency with other NtOS apps, makes the app more accessible for
coders and makes the UI not break if used anywhere outside of the NtOS
environment.

## Changelog

No player-facing changes.
@RimiNosha
Fix grammar/typo in NTPay (#72670)
8bbbeac 
## About The Pull Request

Fix small typo/grammar in NTPay

## Why It's Good For The Game

Less typos is good

## Changelog

:cl:
spellcheck: fixed grammar/typo in Nanotrasen Pay System add
/:cl:
@RimiNosha
I don't want wireless transfers, sorry. The ship is small enough for …
952ce82 
…your lazy ass to walk over.
@RimiNosha
Oops
74b0632
@RimiNosha
Stuff so far. Yes, the trade console is fucked, I know.
06ab641 
Also yes, the sell code is fucked, cause if you put 50 pens inside, it'll take fucking forever. Probably going to do a reverse exponential or something, or whatever the fuck the fancy math name for that is.
@RimiNosha
Clean up some code
2c6299a
@RimiNosha RimiNosha removed the Merge Conflict Uh oh, a maint merged a PR that edits the same stuff as yours! label Dec 13, 2023
@github-actions github-actions bot added Balance Also known as "I died to this, let's make it bad". Quality of Life Also known as "I deleted a ton of other things and made one particular thing the only way". labels Dec 13, 2023
@RimiNosha RimiNosha changed the title [WIP] Cargo Overhaul Cargo Overhaul Dec 13, 2023
@RimiNosha
Copy link
Contributor Author

I've done basically all the features I'm willing to cram into a PR, this kinda spiraled a little, and I need to cut it now.

@RimiNosha RimiNosha marked this pull request as ready for review December 13, 2023 16:02
@RimiNosha
Copy link
Contributor Author

Don't look at the diff

@RimiNosha RimiNosha merged commit 632057f into Artea-Station:master Dec 16, 2023
17 checks passed
@RimiNosha RimiNosha deleted the cargo_overhaul branch December 16, 2023 20:15
Artea-Station-Bot added a commit that referenced this pull request Dec 16, 2023
@Artea-Station-Bot
Automatic changelog for PR #349 [ci skip]
5886fbc
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
Balance Also known as "I died to this, let's make it bad". Feature How I broke the server in one easy step! Fix Cleans up someone else's code from 5 years ago. Mapping Something something someone placed three reinforced window spawners in one place. Quality of Life Also known as "I deleted a ton of other things and made one particular thing the only way". Removal "What is soul? Are you a cult?" Sprites I like pretty things. Tools Oh great, another thing with external dependencies that'll break in the next six months. UI Also known as "I like lagspikes, so I added TGUI to your TGUI".
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
1 participant
@RimiNosha