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 Borg Grippers a Bit More, Adds Mining Gripper. Borgs Drop Items in Storage Modules if Gibbed. #25511

Merged
merged 7 commits into from
Jun 12, 2024

Conversation

Fordoxia
Copy link
Contributor

@Fordoxia Fordoxia commented May 18, 2024

What Does This PR Do

Refactors the borg gripper, mostly the afterattack chain, it's nicer now.

Borgs with storage-capable items such as the trash bag or mining satchel will now dump the contents of those items on the floor when gibbed (in line with how the service borg tray is handled already).

Adds the mining gripper. It can hold 3 things:

  • Goliath Plates: To allow the borg to armour itself without assistance (because even if the miners ignore the borg, the fauna won't.)
  • Bluespace Shelter Capsule: Allows the borg to deploy shelters for other miners, perhaps just in the nick of time to save one from an untimely death. As mining borgs are already immune to ash storms, they don't get much personal benefit from this, but it helps them help the mining crew.
  • Pickaxe: Because it's funny to let the borg slave away with an actual pickaxe.

This also fixes #25512 (and fixes #25648, which is a duplicate issue).

Why It's Good For The Game

Nicer code is good.

Considering that when carbons are gibbed, they drop the stuff they're carrying, it makes sense to extend this to the non-module/component items a borg might have too.

Mining borgs have it rough, they aren't ignored by fauna, and are also locked out of the lavaland combat rewards entirely. This throws them a little bone to gnaw on.
Bug bad, oops.

Testing

It compiled.
Made one of every borg with every variant of storage-capable item. Filled them up, gibbed them, the items all dropped.
Became mining borg. Was able to grab a pickaxe and mine. Was able to make shelter. Was able to grab goliath plating and armour myself with it. Tested and verified the armour actually worked.
Became Service, Medical, and Enginering borg. Verified that all their gripper functions still worked as before.

Changelog

🆑
add: Adds a mining gripper for the mining borg. It can hold and use goliath plates (for self armouring), shelter capsules (for shelter), and pickaxes (for old fashioned mining).
/:cl:

@ParadiseSS13-Bot ParadiseSS13-Bot added the -Status: Awaiting type assignment This PR is waiting for its type to be assigned internally label May 18, 2024
Co-authored-by: Deniz <66401072+Oyu07@users.noreply.github.com>
Signed-off-by: CRUNCH <143041327+Fordoxia@users.noreply.github.com>
@ParadiseSS13-Bot ParadiseSS13-Bot added -Status: Awaiting approval This PR is waiting for approval 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 -Status: Awaiting approval This PR is waiting for approval internally labels May 18, 2024
@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 May 30, 2024
@github-actions github-actions bot added the Merge Conflict This PR is merge conflicted label May 31, 2024
Signed-off-by: CRUNCH <143041327+Fordoxia@users.noreply.github.com>
@github-actions github-actions bot removed the Merge Conflict This PR is merge conflicted label May 31, 2024
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.

One quick thing.

code/game/objects/items/robot/cyborg_gripper.dm Outdated Show resolved Hide resolved
@Fordoxia Fordoxia requested a review from lewcc June 9, 2024 22:19
@lewcc lewcc added the Feature This PR is a new addition to the game label Jun 12, 2024
@lewcc lewcc added this pull request to the merge queue Jun 12, 2024
Merged via the queue into ParadiseSS13:master with commit 77d83ef Jun 12, 2024
11 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 Feature This PR is a new addition to the game
Projects
None yet
5 participants