Skip to content

Makes it easier to poke and annoy your colleagues than ever before. Also makes it so that hugging or shaking someone's hand requires you to grab them first. #4868

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

Merged
merged 4 commits into from
Jun 3, 2025

Conversation

zimon9
Copy link
Contributor

@zimon9 zimon9 commented May 22, 2025

About The Pull Request

This PR changes hugging so that it requires that one grabs the person they wish to hug first. If one clicks on another character without grabbing someone, they end up poking them instead. This PR also makes it so that you need to grab someone in order to shake their hand. Otherwise, you just pat the person on the shoulder instead. This PR also fixes a bug where shaking someone up from a lying down position would call both text for shaking them up, as well as text for a specific body region.

Before:
image

After:
image

Why It's Good For The Game

I've always found it a little silly that one could accidentally click on another character and hug them that way. This change should make it so that the more realistic scenario of tapping or poking someone happens instead. It also ensures that if someone wants to hug someone else, there is proper intent behind it. This also ties into bear hugs, which require an aggressive grab to function, so this would end up making hugs follow a logical sequence of intent.

It also makes sense to have to grab someone before shaking their hand, I think, for a similar reason, in that it signals intent better.

Changelog

🆑
balance: hugs now require grabbing the person to be hugged -- not doing so pokes that person instead. The same is true for shaking one's hand.
fix: fixes shaking someone up also poking them or patting them at the same time
/:cl:

zimon9 added 2 commits May 22, 2025 15:53
…s clicking on someone while targetting the chest poke them instead
@zimon9 zimon9 requested a review from a team as a code owner May 22, 2025 20:01
@github-actions github-actions bot added the Code change Watch something violently break. label May 22, 2025
@zimon9 zimon9 changed the title Makes it easier to poke and annoy your colleagues than ever before. Also makes it so that hugging requires you to grab someone first. Makes it easier to poke and annoy your colleagues than ever before. Also makes it so that hugging or shaking someone's hand requires you to grab them first. May 22, 2025
@FalloutFalcon FalloutFalcon added the Test Merge Candidate You do it for free. label May 26, 2025
@FalloutFalcon FalloutFalcon removed the Test Merge Candidate You do it for free. label Jun 3, 2025
@FalloutFalcon FalloutFalcon added this pull request to the merge queue Jun 3, 2025
github-merge-queue bot pushed a commit that referenced this pull request Jun 3, 2025
…lso makes it so that hugging or shaking someone's hand requires you to grab them first. (#4868)

<!-- Write **BELOW** The Headers and **ABOVE** The comments else it may
not be viewable. -->
<!-- You can view Contributing.MD for a detailed description of the pull
request process. -->

## About The Pull Request

This PR changes hugging so that it requires that one grabs the person
they wish to hug first. If one clicks on another character without
grabbing someone, they end up poking them instead. This PR also makes it
so that you need to grab someone in order to shake their hand.
Otherwise, you just pat the person on the shoulder instead. This PR also
fixes a bug where shaking someone up from a lying down position would
call both text for shaking them up, as well as text for a specific body
region.

Before:

![image](https://github.com/user-attachments/assets/6243bd6d-a107-4a31-9ed0-d882068d9510)

After:

![image](https://github.com/user-attachments/assets/e84425eb-b8f4-4309-8cb3-599076718b85)


## Why It's Good For The Game

I've always found it a little silly that one could accidentally click on
another character and hug them that way. This change should make it so
that the more realistic scenario of tapping or poking someone happens
instead. It also ensures that if someone wants to hug someone else,
there is proper intent behind it. This also ties into bear hugs, which
require an aggressive grab to function, so this would end up making hugs
follow a logical sequence of intent.

It also makes sense to have to grab someone before shaking their hand, I
think, for a similar reason, in that it signals intent better.

## Changelog

:cl:
balance: hugs now require grabbing the person to be hugged -- not doing
so pokes that person instead. The same is true for shaking one's hand.
fix: fixes shaking someone up also poking them or patting them at the
same time
/:cl:

<!-- Both :cl:'s are required for the changelog to work! You can put
your name to the right of the first :cl: if you want to overwrite your
GitHub username as author ingame. -->
<!-- You can use multiple of the same prefix (they're only used for the
icon ingame) and delete the unneeded ones. Despite some of the tags,
changelogs should generally represent how a player might be affected by
the changes rather than a summary of the PR's contents. -->
Merged via the queue into shiptest-ss13:master with commit 9c60ebb Jun 3, 2025
16 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Code change Watch something violently break.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants