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.

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

Refactors cargo to reside in the codebase #20030

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

Conversation

nauticall
Copy link
Contributor

@nauticall nauticall commented Oct 11, 2024

NOTE TO SYSADMINS: This PR makes the Cargo SQL file(s) stored online redundant. They should be removed.

Moves the data containing cargo items (i.e. the ones you order from ops and get in the cargo shuttle) from the online database to the codebase. Everything from suppliers to categories to individual items is now code-side and editable by developers/contributors.

Refactors cargo items to use singletons instead of datums for cargo_supplier, cargo_category, and cargo_item. Multiple-instnace things like cargo_orders, etc. still use datums.

Fixed a bunch of strange discrepancies in categories, suppliers, and pricing for various cargo items. I did a little bit, but it's exhausting to go through all of it right now.

Clicking the 'Details' button on the Cargo Order app now actually gives you details instead of bluescreening. Also added some UI elements to the Cargo Order app - Cargo Control and Delivery remain untouched.

Overhauled the Cargo Order console TGUI window. It now has tabs on the left, displays restricted access, supplier information, and boasts search functionality.

This PR has a lot of moving parts, and would probably be best suited for a testmerge to iron out any possible hiccups.

image
image
image

@github-actions github-actions bot added the TGUI label Oct 11, 2024
@nauticall nauticall added Test Merge Candidate The PR is eligible for test merging. Database The PR or issue affects the database. Update Config The PR changes something that needs to be reflected in the server's configuration files. and removed TGUI Database The PR or issue affects the database. labels Oct 11, 2024
@nauticall
Copy link
Contributor Author

!review

@github-actions github-actions bot added the TGUI label Oct 11, 2024
code/modules/cargo/cargo_categories.dm Outdated Show resolved Hide resolved
code/modules/cargo/items/cargo_items.dm Outdated Show resolved Hide resolved
code/controllers/subsystems/cargo.dm Outdated Show resolved Hide resolved
code/controllers/subsystems/cargo.dm Outdated Show resolved Hide resolved
code/controllers/subsystems/cargo.dm Outdated Show resolved Hide resolved
code/controllers/subsystems/cargo.dm Outdated Show resolved Hide resolved
code/controllers/subsystems/cargo.dm Outdated Show resolved Hide resolved
code/controllers/subsystems/cargo.dm Outdated Show resolved Hide resolved
code/modules/cargo/cargo_suppliers.dm Outdated Show resolved Hide resolved
code/modules/cargo/items/cargo_items.dm Outdated Show resolved Hide resolved
@nauticall nauticall marked this pull request as draft October 13, 2024 09:18
@nauticall nauticall marked this pull request as ready for review October 13, 2024 13:18
Copy link
Contributor

@FluffyGhoster FluffyGhoster left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It looks good enough for a testmerge to me

@Arrow768 Arrow768 added the ⛔ Maintainer Discussion The PR will be discussed by the maintainers. label Oct 19, 2024
@Arrow768
Copy link
Member

MD to determine if we should deviate from the established position that cargo data is stored in the db

Copy link
Contributor

@Geevies Geevies left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

thank u sammy!! i support this change

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Awaiting Merge ⛔ Maintainer Discussion The PR will be discussed by the maintainers. Refactor Test Merge Candidate The PR is eligible for test merging. TGUI Update Config The PR changes something that needs to be reflected in the server's configuration files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants