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

Fixes being unable to re-enter your body when you're unnested #3747

Merged
merged 1 commit into from
Jun 29, 2023

Conversation

TheGamerdk
Copy link
Contributor

@TheGamerdk TheGamerdk commented Jun 27, 2023

About the pull request

Turns out the parent call of unbuckle() calls afterbuckle() which deletes the nest and clears ghost_of_buckled_mob, which means it can't set your ghost to can_reenter_corpse = TRUE

Explain why it's good for the game

Bugs bad

Testing Photographs and Procedure

Screenshots & Videos

Put screenshots and videos here with an empty line between the screenshots and the <details> tags.

Changelog

🆑
fix: You can now re-enter your body when unnested, marine mains, rejoice!
/:cl:

@github-actions github-actions bot added the Fix Fix one bug, make ten more label Jun 27, 2023
Copy link
Contributor

@Drulikar Drulikar left a comment

Choose a reason for hiding this comment

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

Code works, though please also consider changing the ghost prompt in /mob/living/proc/do_ghost() when you remain in body for the first prompt. (As in get nested > remain > ghost)
It looks like this currently:
image
And if you changed it to say text_prompt += "\nSince you're nested, you will get a chance to reenter your body if freed." it would look like this:
image

@TheGamerdk
Copy link
Contributor Author

Code works, though please also consider changing the ghost prompt in /mob/living/proc/do_ghost() when you remain in body for the first prompt. (As in get nested > remain > ghost)
It looks like this currently:
image
And if you changed it to say text_prompt += "\nSince you're nested, you will get a chance to reenter your body if freed." it would look like this:
image

That’s a bug with the tgui prompt. It should scale according to contents. Out of scope

@Drulikar
Copy link
Contributor

You are altering the action of ghosting when nested. That is the prompt given to users when doing that action; so it is not out of scope.

Sure updating tgui_alert to adapt to the size isn't very related; but thats not what I requested. The message is needlessly wordy regardless.

@Drulikar Drulikar marked this pull request as draft June 28, 2023 12:11
@TheGamerdk
Copy link
Contributor Author

You are altering the action of ghosting when nested. That is the prompt given to users when doing that action; so it is not out of scope.

Sure updating tgui_alert to adapt to the size isn't very related; but thats not what I requested. The message is needlessly wordy regardless.

I’m not altering anything about ghosting. I’m only touching nest unbuckling

@TheGamerdk TheGamerdk marked this pull request as ready for review June 28, 2023 15:58
@Drulikar
Copy link
Contributor

I'll take the GBP for the requested change in a separate PR then.

@Drulikar Drulikar added this pull request to the merge queue Jun 29, 2023
Merged via the queue into cmss13-devs:master with commit 4b7aacd Jun 29, 2023
31 checks passed
cm13-github added a commit that referenced this pull request Jun 29, 2023
github-actions bot added a commit that referenced this pull request Jun 29, 2023
github-merge-queue bot pushed a commit that referenced this pull request Jun 30, 2023
# About the pull request

This PR is a followup to #3597 that was requested but refused in #3747
to improve the situation where there is too much text in a tgui_alert
when ghosting while nested.

# Explain why it's good for the game

Instead of:

![image](https://github.com/cmss13-devs/cmss13/assets/76988376/aee760ce-ed79-4cac-be06-b2d265bd69c6)
It is now:

![image](https://github.com/cmss13-devs/cmss13/assets/76988376/26859630-c185-4c2a-94e2-d275e85a620e)

# Testing Photographs and Procedure

1. Get nested
2. Remain in body for the first prompt
3. Ghost

# Changelog
:cl: Drathek
spellcheck: Tweaked message when ghosting while nested
/:cl:
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Fix Fix one bug, make ten more
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants