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

Fix the first prompt to ghost when nested #3943

Merged
merged 2 commits into from
Jul 21, 2023

Conversation

Drulikar
Copy link
Contributor

@Drulikar Drulikar commented Jul 19, 2023

About the pull request

This PR fixes an oversight where the initial prompt to ghost when nested performed ghosting a different way than the ghost verb. Not only does it now use a TGUI prompt, but the larva queue time will be assigned to the time they ghosted so they aren't immediately a candidate (the get_xeno_candidates proc is checking reviveability, but they have no TOD yet so it skipped that check for nested).

An alternative implementation to this would be to have that proc account for nested, but I was more inclined to do this this way to update the prompt to tgui.

Explain why it's good for the game

More TGUI usage for user prompts, and nested marines should not get prioritized in the larva queue.

Testing Photographs and Procedure

Screenshots & Videos

https://youtu.be/FZTtlhTQPbE

Changelog

🆑 Drathek
fix: Fixed the prompt when nested to ghost: Now uses a TGUI prompt and sets larva queue time.
/:cl:

@github-actions github-actions bot added the Fix Fix one bug, make ten more label Jul 19, 2023
@harryob harryob added this pull request to the merge queue Jul 21, 2023
Merged via the queue into cmss13-devs:master with commit fa16ee3 Jul 21, 2023
cm13-github added a commit that referenced this pull request Jul 21, 2023
github-actions bot added a commit that referenced this pull request Jul 21, 2023
@Drulikar Drulikar deleted the Fix_Nesting_Ghost_Prompt branch July 21, 2023 20:57
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.

2 participants