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

Helmet Visors/Optics and built-in HUDs #4156

Merged
merged 20 commits into from
Aug 25, 2023
Merged

Conversation

morrowwolf
Copy link
Member

@morrowwolf morrowwolf commented Aug 10, 2023

About the pull request

This PR adds various helmet visors and optics that you can cycle through for HUDs without goofy eyewear.

Video demonstration: https://cdn.discordapp.com/attachments/495285245877157906/1139189768597540905/2023-08-10_09-26-38.mp4

On the code side this PR allows for separate sources for HUDs that can be doubled up without one overriding the other. I'm certain this will require some testing and jank reduction and frankly my skill with associated lists and the HUD system is so-so. We'll see if I need to completely overhaul this.

Explain why it's good for the game

Movielike

Testing Photographs and Procedure

Screenshots & Videos

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

Changelog

🆑 Morrow, Frans_Feiffer (beautiful sprites)
add: Added in built HUDs to various helmets
add: Sensormates used by squads without medical skills have been converted to buyable helmet optics
/:cl:

@github-actions github-actions bot added Sprites Remove the soul from the game. Feature Feature coder badge labels Aug 10, 2023
@morrowwolf morrowwolf added the Work in Progress Will never be finished label Aug 10, 2023
@morrowwolf morrowwolf removed the Work in Progress Will never be finished label Aug 11, 2023
@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 21, 2023
@cm13-github
Copy link
Contributor

This pull request has conflicts, please resolve those before we can evaluate the pull request.

@cm13-github cm13-github added the Merge Conflict PR can't be merged because it touched too much code label Aug 22, 2023
@cm13-github cm13-github removed the Merge Conflict PR can't be merged because it touched too much code label Aug 22, 2023
@cm13-github
Copy link
Contributor

Conflicts have been resolved. A maintainer will review the pull request shortly.

@github-actions github-actions bot removed the Stale beg a maintainer to review your PR label Aug 23, 2023
@harryob harryob added this pull request to the merge queue Aug 25, 2023
Merged via the queue into cmss13-devs:master with commit d0b549f Aug 25, 2023
25 checks passed
cm13-github added a commit that referenced this pull request Aug 25, 2023
@morrowwolf morrowwolf deleted the visor branch August 25, 2023 15:06
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Feature Feature coder badge Sprites Remove the soul from the game.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants