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

Nightmare Survivor Hostility Indicator #4628

Merged
merged 3 commits into from
Nov 6, 2023

Conversation

realforest2001
Copy link
Member

@realforest2001 realforest2001 commented Oct 11, 2023

About the pull request

Adds a big bold message for Nightmare survivors to know if they're hostile to marines or not.
This does not apply to natural map-specific survivors, only those in nightmare inserts.

Explain why it's good for the game

Makes it clearer for nightmare inserts to indicate if survivors are hostile. Good example of this is UPP on trijent are non hostile but this isn't always clear.

Testing Photographs and Procedure

Screenshots & Videos

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

Changelog

🆑
add: Added a big line to Nightmare survivor spawns that indicates hostility.
/:cl:

@github-actions github-actions bot added the Feature Feature coder badge label Oct 11, 2023
Copy link
Contributor

@Zonespace27 Zonespace27 left a comment

Choose a reason for hiding this comment

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

this doesn't seem to actually show a message?

@Zonespace27 Zonespace27 marked this pull request as draft October 11, 2023 15:18
@realforest2001 realforest2001 marked this pull request as ready for review October 11, 2023 18:20
if(hostile)
to_chat(survivor, SPAN_HIGHDANGER("You are HOSTILE to the USCM!"))
else
to_chat(survivor, SPAN_XENOHIGHDANGER("You are NON-HOSTILE to the USCM!"))
for(var/line in intro_text)
Copy link
Contributor

Choose a reason for hiding this comment

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

With how much junk the survs get told here, put the you are hostile/nonhostile below this

@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 Oct 23, 2023
@realforest2001 realforest2001 removed the Stale beg a maintainer to review your PR label Oct 28, 2023
Copy link
Contributor

github-actions bot commented Nov 5, 2023

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 Nov 5, 2023
@harryob harryob added this pull request to the merge queue Nov 6, 2023
Merged via the queue into cmss13-devs:master with commit b5123f5 Nov 6, 2023
25 checks passed
cm13-github added a commit that referenced this pull request Nov 6, 2023
github-merge-queue bot pushed a commit that referenced this pull request Feb 27, 2024
# About the pull request

Followup to #4628. That PR added the message telling CLF survivors that
they are hostile, but it is based on the hostility of the entire
survivor job, which is only toggled by the nightmare landmarks that make
all the survivors hostile. It repeatedly gets CLF survivors in regular
rounds confused when they get the nonhostile version - thus, a fix with
an added reminder that they should not be shooting the resident
guard/director/whomever.

# Explain why it's good for the game

Is fix.

# Changelog

:cl:
fix: CLF survivors no longer incorrectly get told that they are not
hostile to marines.
/:cl:
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Feature Feature coder badge Stale beg a maintainer to review your PR
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants