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

[MDB IGNORE] Converts storage to a datum (sorry) #3716

Merged
merged 29 commits into from
Apr 17, 2024
Merged

[MDB IGNORE] Converts storage to a datum (sorry) #3716

merged 29 commits into from
Apr 17, 2024

Conversation

MistakeNot4892
Copy link
Contributor

@MistakeNot4892 MistakeNot4892 commented Feb 23, 2024 •
edited
Loading

DNM, opening for CI.

Description of changes

  • Merges behavior from /obj/item/suit/storage /obj/item/storage /obj/structure/mirror into /datum/extension/storage.
  • Removes/repaths storage types globally.
  • Replaces typechecks etc. with extension checks.
  • Adds a new contents getter, /atom/proc/get_stored_inventory(), which defaults to get_contained_external_atoms().

TODO

  • Coarse conversion.
  • Repaths to remove redundant types.
  • Test basic storage functionality.
  • Test pockets functionality on suits.
  • Allow objects to be removed from structure inventory.
  • Work out how to separate mirror interface and storage interactions.
  • Test structure functionality on mirrors.
  • Test pneumatic cannon functionality (or rewrite)
  • Consider get_contained_external_atoms() in storage contents helper?
  • Test post-conversion to datum.
  • Test recycler.
  • Fix holders not closing UI on move away from mob (throwing your backpack)
  • Fix storage not updating UI on qdel of item (recycler).

Why and what will this PR improve

Less redundant storage code, more flexible storage functionality, shorter typepaths generally. Lays the groundwork for some clothing and accessory stuff I want to do down the track.

Authorship

Myself.

Changelog

Nothing player-facing.

@MistakeNot4892 MistakeNot4892 added the work in progress This PR is under development and shouldn't be merged. label Feb 23, 2024
@MistakeNot4892 MistakeNot4892 force-pushed the rework/storage branch 6 times, most recently from 366b980 to d52dac0 Compare February 25, 2024 03:36
@MistakeNot4892 MistakeNot4892 force-pushed the rework/storage branch 2 times, most recently from f4508d4 to 65cb3b0 Compare March 13, 2024 02:51
@MistakeNot4892 MistakeNot4892 added ready for review This PR is ready for review and merge. and removed work in progress This PR is under development and shouldn't be merged. labels Mar 13, 2024
@MistakeNot4892 MistakeNot4892 mentioned this pull request Mar 17, 2024
Merged
@MistakeNot4892 MistakeNot4892 changed the title [MDB IGNORE] Converts storage to an extension (sorry) [MDB IGNORE] Converts storage to a datum (sorry) Mar 18, 2024
@MistakeNot4892 MistakeNot4892 added work in progress This PR is under development and shouldn't be merged. and removed ready for review This PR is ready for review and merge. labels Mar 18, 2024
@MistakeNot4892 MistakeNot4892 force-pushed the rework/storage branch 9 times, most recently from 9e9204b to a32a30d Compare March 23, 2024 00:03
@MistakeNot4892 MistakeNot4892 force-pushed the rework/storage branch 2 times, most recently from b210be5 to 3391fc2 Compare April 2, 2024 13:15
@MistakeNot4892
Repathing med pouches off storage.
60633f0
@MistakeNot4892
Repathing wallets off storage.
fe473f4
@MistakeNot4892
Repathing MREs off storage.
f9d6578
@MistakeNot4892
Repathing toolboxes off storage.
0772b8b
@MistakeNot4892
Repathing first aid kits off storage.
a81e579
@MistakeNot4892
Repaths lunchboxes off storage.
0889c94
@MistakeNot4892
Repathing cigpapers off storage.
2c49471
@MistakeNot4892
Repathing secure storage items to their own type.
fe7e211
@MistakeNot4892
Repathing belts off storage.
3d2147f
@MistakeNot4892
Repathing several misc remaining storage items off storage.
06a7c73
@MistakeNot4892
More misc item repaths off storage.
fdd5bb4
@MistakeNot4892
Merging tray subtypes.
d65aed9
@MistakeNot4892
Removes remaining /obj/item/storage uses.
5fa49eb
@MistakeNot4892
Repaths suit/storage to suit.
0cccdc8
@MistakeNot4892
Updating/refining storage rework.
b11a45f
@MistakeNot4892
Repaths storage accessories to webbing.
31cc7b6
@MistakeNot4892
Post-update compile fixes.
f84e62e
@MistakeNot4892
Converting storage extension to a storage datum.
e3eb771
@MistakeNot4892
Post-rebase updates.
805afb1
@MistakeNot4892
Updating storage unit test.
8b21f5b
@MistakeNot4892
Fixes storage UI not updating on item Destroy().
ba81ff8
@MistakeNot4892
Post-post-rebase update.
fc0a1a0
@MistakeNot4892
Post-post-post rebase update.
c1ead71
@MistakeNot4892 MistakeNot4892 force-pushed the rework/storage branch 2 times, most recently from b0efafd to 1076012 Compare April 16, 2024 04:44
@out-of-phaze out-of-phaze merged commit 37324f8 into NebulaSS13:dev Apr 17, 2024
12 checks passed
@MistakeNot4892 MistakeNot4892 deleted the rework/storage branch May 23, 2024 02:44
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@out-of-phaze out-of-phaze out-of-phaze approved these changes

Assignees
No one assigned
Labels
ready for review This PR is ready for review and merge.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@MistakeNot4892 @out-of-phaze