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

More Xeno Alliances Tweaks #4053

Merged
merged 3 commits into from
Aug 12, 2023

Conversation

ihatethisengine
Copy link
Contributor

@ihatethisengine ihatethisengine commented Jul 30, 2023

About the pull request

  1. xeno_message no longer sends the message to allied hives.

  2. All hive's alliances break on Queen's death (instead of essentially just ceasing to function).

  3. If another hive breaks alliance with you, you break alliance with them automatically.

  4. Some code improvements.

Explain why it's good for the game

  1. Less confusing. I meant to add a "notify_allies" var to the proc, but I haven't found a single message that should be sent to allies.

  2. Less confusing. Essentially all alliances already don't function if queen is dead, so this way it's just more clear for everyone.

  3. You don't have to keep hive alliance status open all the time in case allied queen decides to betray you. Simply a QoL.

  4. Just good

Testing Photographs and Procedure

Screenshots & Videos

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

Changelog

🆑 ihatethisengine
add: All hive's alliances break on Queen's death.
qol: If a hive breaks an alliance with another, the second hive also breaks the alliance.
fix: xeno_message no longer sends the message to allied hives
/:cl:

@github-actions github-actions bot added Feature Feature coder badge Quality of Life Make the game harder to play Fix Fix one bug, make ten more labels Jul 30, 2023
Copy link
Member

@harryob harryob left a comment

Choose a reason for hiding this comment

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

string nitpick

code/modules/mob/living/carbon/xenomorph/xeno_defines.dm Outdated Show resolved Hide resolved
@harryob harryob marked this pull request as draft August 4, 2023 04:59
@ihatethisengine ihatethisengine marked this pull request as ready for review August 4, 2023 06:36
@github-actions
Copy link
Contributor

This PR has been inactive for long enough to be automatically marked as stale. This means it is at risk of being auto closed in ~ 7 days, please address any outstanding review items and ensure your PR is finished, if these are all true and you are auto-staled anyway, you need to actively ask maintainers if your PR will be merged. Once you have done any of the previous actions then you should request a maintainer remove the stale label on your PR, to reset the stale timer. If you feel no maintainer will respond in that time, you may wish to close this PR youself, while you seek maintainer comment, as you will then be able to reopen the PR yourself

@github-actions github-actions bot added the Stale beg a maintainer to review your PR label Aug 12, 2023
Copy link
Contributor

@BeagleGaming1 BeagleGaming1 left a comment

Choose a reason for hiding this comment

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

Code seems good

@BeagleGaming1 BeagleGaming1 added this pull request to the merge queue Aug 12, 2023
Merged via the queue into cmss13-devs:master with commit 87f2e5a Aug 12, 2023
26 checks passed
cm13-github added a commit that referenced this pull request Aug 12, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Feature Feature coder badge Fix Fix one bug, make ten more Quality of Life Make the game harder to play Stale beg a maintainer to review your PR
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants