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

Cyborg Inventory Refactor #27788

Merged
merged 15 commits into from
Feb 12, 2025
Merged

Conversation

BiancaWilkson
Copy link
Contributor

@BiancaWilkson BiancaWilkson commented Jan 1, 2025

What Does This PR Do

This PR refactors most of how the three main cyborg inventory slots are handled. Previously, the screens and the 3 modules were each hardcoded in seperately. This changes them to use a list. There's also now support for items that need a signal for when they are activated or unactivated, like ore bags needing a target to listen to. Fixes #27733

Why It's Good For The Game

Bugs are bad, decade old code being rewritten is good.

Testing

Spawned in as a cyborg:
Selected each of my inventory slots
Cycled through each of my inventory slots
Put items into each of my inventory slots
Replaced glass floors with metal
Tried picking up ore automatically as a cyborg and as a human


Declaration

  • I confirm that I either do not require pre-approval for this PR, or I have obtained such approval and have included a screenshot to demonstrate this below.

Changelog

🆑
fix: Cyborg ore bags work properly now
tweak: Swapping, cycling, and selecting modules functions slightly different than before, it'll take some muscle memory adjusting.
/:cl:

@ParadiseSS13-Bot ParadiseSS13-Bot added -Status: Awaiting type assignment This PR is waiting for its type to be assigned internally -Status: Awaiting review This PR is awaiting review from the review team and removed -Status: Awaiting type assignment This PR is waiting for its type to be assigned internally labels Jan 1, 2025
Copy link
Contributor

@Drsmail Drsmail left a comment

Choose a reason for hiding this comment

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

A few small things

code/__DEFINES/dcs/item_signals.dm Outdated Show resolved Hide resolved
code/_onclick/hud/robot_hud.dm Show resolved Hide resolved
code/modules/mob/living/silicon/robot/robot_inventory.dm Outdated Show resolved Hide resolved
code/modules/mob/living/silicon/robot/robot_inventory.dm Outdated Show resolved Hide resolved
code/modules/mob/living/silicon/robot/robot_inventory.dm Outdated Show resolved Hide resolved
code/modules/mob/living/silicon/robot/robot_inventory.dm Outdated Show resolved Hide resolved
code/modules/mob/living/silicon/robot/robot_mob.dm Outdated Show resolved Hide resolved
@Burzah Burzah added Refactor This PR will clean up the code but have the same ingame outcome Tweak This PR tweaks something ingame Fix This PR will fix an issue in the game labels Jan 3, 2025
Copy link
Contributor

@lewcc lewcc left a comment

Choose a reason for hiding this comment

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

Please make sure to test with aobserve! Otherwise, looks good, and thanks for doing this. Very good change

code/_onclick/hud/robot_hud.dm Outdated Show resolved Hide resolved
code/modules/mob/living/silicon/robot/robot_inventory.dm Outdated Show resolved Hide resolved
BiancaWilkson and others added 4 commits January 8, 2025 22:23
Dr and Lewc reviews

Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
Co-authored-by: Drsmail <60036448+Drsmail@users.noreply.github.com>
Signed-off-by: BiancaWilkson <42818125+BiancaWilkson@users.noreply.github.com>
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
Signed-off-by: BiancaWilkson <42818125+BiancaWilkson@users.noreply.github.com>
@github-actions github-actions bot added the Merge Conflict This PR is merge conflicted label Jan 10, 2025
@github-actions github-actions bot removed the Merge Conflict This PR is merge conflicted label Jan 16, 2025
@Burzah Burzah requested review from lewcc and Drsmail January 17, 2025 01:59
BiancaWilkson and others added 2 commits February 6, 2025 17:41
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
Signed-off-by: BiancaWilkson <42818125+BiancaWilkson@users.noreply.github.com>
Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>
Signed-off-by: BiancaWilkson <42818125+BiancaWilkson@users.noreply.github.com>
@ParadiseSS13-Bot ParadiseSS13-Bot added -Status: Awaiting merge This PR is ready for merge and removed -Status: Awaiting review This PR is awaiting review from the review team labels Feb 7, 2025
@Burzah Burzah requested a review from lewcc February 11, 2025 06:01
@lewcc lewcc added this pull request to the merge queue Feb 12, 2025
Merged via the queue into ParadiseSS13:master with commit 4fdc79c Feb 12, 2025
17 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
-Status: Awaiting merge This PR is ready for merge Fix This PR will fix an issue in the game Refactor This PR will clean up the code but have the same ingame outcome Tweak This PR tweaks something ingame
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Cyborg Mining Satchel not picking up ores automatically
5 participants