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

Merges the Hug Module With the Cyborg Gripper #26007

Merged
merged 21 commits into from
Aug 7, 2024

Conversation

Fordoxia
Copy link
Contributor

@Fordoxia Fordoxia commented Jun 22, 2024

What Does This PR Do

Removes the cyborg gripper from the medical module.

Functions have been transferred to the cyborg gripper, allowing any borg with a gripper to give hugs and boops!

It has been adjusted in the following ways:

  • The shock mode has been removed. It's all hugs all the time.
  • Hug strength is now based on intent rather than attack_self() (as the gripper already has attack_self() interactions). Help for regular hugs, harm for awkward/emagged hugs. Targeting the head to apply normal/awkward baps instead of hugging remains unchanged.
  • Specific dialog for hugging yourself.
  • When emagged, in addition to being able to use crush mode, targeting the head will allow you to punch people in the face. It does the same amount of damage, but it will be concentrated in the face.
  • The inherent help-up mechanic has not been given to any borg types that do not already possess it, due to balance concerns.

Why It's Good For The Game

This removes an item from the mediborg's inventory. Streamlining it is good due to the large amount of items that have to be kept track of.

All gripper-equipped borgs can now display appreciation/malice with the application of hugs and baps.

The damage output of the hug module's emagged mode shouldn't have too much effect on balance, as emagged borgs already have access to quite powerful equipment and/or items that do the same or more damage.

Testing

Hugged a skrell.
Playfully bapped a skrell.
Hugged a skrell, but in an awkward way.
Bapped a skrell.
Crushed a skrell.
Punched a skrell in the face.

Applied many headpats to Ian.

Hugged myself.
Hugged myself harder.
Punched myself.

Changelog

🆑
del: Removed the Hug Module from the medical borg.
tweak: Tweaked all grippers to have modified Hug Module functionality.
/:cl:

@ParadiseSS13-Bot ParadiseSS13-Bot added the -Status: Awaiting type assignment This PR is waiting for its type to be assigned internally label Jun 22, 2024
@FunnyMan3595 FunnyMan3595 added the Requires Wiki Update Useful for Wiki Contributers to search for things that need updating label Jun 26, 2024
@ParadiseSS13-Bot ParadiseSS13-Bot added -Status: Awaiting approval This PR is waiting for approval internally and removed -Status: Awaiting type assignment This PR is waiting for its type to be assigned internally labels Jun 27, 2024
@BiancaWilkson BiancaWilkson added the Tweak This PR tweaks something ingame label Jun 27, 2024
@chuga-git
Copy link
Member

Gripper equipped borgs can now all help people to their feet. This is probably fine, they get to be nice and help people.
Objecting for balance concern over this mechanic specifically. Borgs being able to sprint around at the same speed as a human while spamming stamcrit people up to their feet has so many things wrong with it. I am fine with the rest of the PR.

@Fordoxia
Copy link
Contributor Author

Fordoxia commented Jul 7, 2024

Gripper equipped borgs can now all help people to their feet. This is probably fine, they get to be nice and help people.
Objecting for balance concern over this mechanic specifically. Borgs being able to sprint around at the same speed as a human while spamming stamcrit people up to their feet has so many things wrong with it. I am fine with the rest of the PR.

I honestly don't see this being a big deal at all, but I have removed the functionality from all the borgs that don't already have it.

@github-actions github-actions bot added the Merge Conflict This PR is merge conflicted label Jul 9, 2024
@github-actions github-actions bot removed the Merge Conflict This PR is merge conflicted label Jul 10, 2024
@S34NW
Copy link
Member

S34NW commented Jul 30, 2024

This PR has unfortunately failed to pass the relevant team vote, with 0 for and 5 against.
Some of the reasons for objection include (anonymised):

  • "Déjà vu, I've just been in this time before. Higher on the beat and I know it's a place to go!" No to clownborgs, no to borgs being able to hug people, no to all borgs being able to help people up.
  • CRUNCH Cyborg PR - as [FIRST OBJECTION REASON AUTHOR] said.
  • I would be ok with this if they weren't able to help people up. You no longer have a way to catch up to borgs without a ranged weapon that can hurt them with the silicon movement rework. Objecting until (if) the helping up part is axed.
  • When it comes to CRUNCH PRs, I might be a fence sitter, as after seeing all the degenerate things they post in other discords has ruined my view on them and makes it difficult for me to take anything they do seriously.
  • objecting the helping people up part of the PR. [OTHER OBJECTOR'S] comment on PR sums it up perfectly

Please feel free to discuss this with the relevant team and see if you can rework it into something acceptable to them.

@S34NW S34NW closed this Jul 30, 2024
@Fordoxia
Copy link
Contributor Author

Fordoxia commented Jul 30, 2024

This PR has unfortunately failed to pass the relevant team vote, with 0 for and 5 against. Some of the reasons for objection include (anonymised):

  • "Déjà vu, I've just been in this time before. Higher on the beat and I know it's a place to go!" No to clownborgs, no to borgs being able to hug people, no to all borgs being able to help people up.
  • CRUNCH Cyborg PR - as [FIRST OBJECTION REASON AUTHOR] said.
  • I would be ok with this if they weren't able to help people up. You no longer have a way to catch up to borgs without a ranged weapon that can hurt them with the silicon movement rework. Objecting until (if) the helping up part is axed.
  • When it comes to CRUNCH PRs, I might be a fence sitter, as after seeing all the degenerate things they post in other discords has ruined my view on them and makes it difficult for me to take anything they do seriously.
  • objecting the helping people up part of the PR. [OTHER OBJECTOR'S] comment on PR sums it up perfectly

Please feel free to discuss this with the relevant team and see if you can rework it into something acceptable to them.

This PR didn't give any borgs the ability to help up that did not already possess it.

One of these reasons doesn't even have anything to do with the PR.

@DGamerL DGamerL reopened this Jul 31, 2024
@ParadiseSS13-Bot ParadiseSS13-Bot added -Status: Awaiting review This PR is awaiting review from the review team and removed -Status: Awaiting approval This PR is waiting for approval internally labels Aug 4, 2024
code/game/objects/items/robot/cyborg_gripper.dm Outdated Show resolved Hide resolved
code/game/objects/items/robot/cyborg_gripper.dm Outdated Show resolved Hide resolved
code/game/objects/items/robot/cyborg_gripper.dm Outdated Show resolved Hide resolved
code/game/objects/items/robot/cyborg_gripper.dm Outdated Show resolved Hide resolved
code/game/objects/items/robot/cyborg_gripper.dm Outdated Show resolved Hide resolved
code/modules/mob/living/silicon/robot/robot_modules.dm Outdated Show resolved Hide resolved
code/modules/mob/living/silicon/robot/robot_modules.dm Outdated Show resolved Hide resolved
code/modules/mob/living/silicon/robot/robot_modules.dm Outdated Show resolved Hide resolved
code/modules/mob/living/silicon/robot/robot_modules.dm Outdated Show resolved Hide resolved
code/modules/mob/living/silicon/robot/robot_modules.dm Outdated Show resolved Hide resolved
Co-authored-by: Burzah <[email protected]>
Signed-off-by: CRUNCH <[email protected]>
@Burzah
Copy link
Member

Burzah commented Aug 5, 2024

librewolf_jgSeVPCojV
Moused again. Amazing.
Rerunning CI.

@Burzah Burzah self-requested a review August 5, 2024 08:45
Copy link
Member

@Burzah Burzah left a comment

Choose a reason for hiding this comment

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

Tentative approval. I would like another reviewer to check out the attack chain logic.

code/game/objects/items/robot/cyborg_gripper.dm Outdated Show resolved Hide resolved
@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 Aug 6, 2024
@github-actions github-actions bot added the Merge Conflict This PR is merge conflicted label Aug 7, 2024
@github-actions github-actions bot removed the Merge Conflict This PR is merge conflicted label Aug 7, 2024
@S34NW S34NW added this pull request to the merge queue Aug 7, 2024
Merged via the queue into ParadiseSS13:master with commit 2c1fcbd Aug 7, 2024
11 checks passed
@Fordoxia Fordoxia deleted the hug-module branch September 11, 2024 23:21
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 Requires Wiki Update Useful for Wiki Contributers to search for things that need updating Tweak This PR tweaks something ingame
Projects
None yet
Development

Successfully merging this pull request may close these issues.

10 participants