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 Optics Update #4549

Merged
merged 11 commits into from
Oct 4, 2023
Merged

Conversation

morrowwolf
Copy link
Member

@morrowwolf morrowwolf commented Sep 29, 2023

About the pull request

This PR:

Adds NVG optics

Removes functional tube NVGs from gameplay

Adds a hotkey to cycle optics

Refactors a bunch of backend optic stuff to make it less redundant

Stops helmet destruction, or somehow visors in helmets destruction ???, from forcing a HUD or effect to stay on

Adds special marine raider optic which gives night vision, medical readouts, and USCM HUD.

Adds examine text for visors

Adds research publication to advanced medical optic

Explain why it's good for the game

Optics are awesome!

Better code is good (at least I hope it's better)

Testing Photographs and Procedure

Screenshots & Videos

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

Changelog

🆑 Morrow
add: Added NVG optics
add: Added a hotkey to cycle optics
add: Added special marine raider optic
add: Added examine text for optics
add: Added research publication to advanced medical optic
del: Removed functional tube NVGs from gameplay
refactor: Moved some optics code around to make it less redundant
fix: Fixed a bug with duplicate optic actions
fix: Fixed a reported bug where HUDs would stay on forever with destruction of a helmet
/:cl:

@github-actions github-actions bot added Sprites Remove the soul from the game. Mapping did you remember to save in tgm format? Feature Feature coder badge Removal snap Refactor Make the code harder to read Fix Fix one bug, make ten more labels Sep 29, 2023
@morrowwolf morrowwolf removed the Sprites Remove the soul from the game. label Sep 29, 2023
@morrowwolf
Copy link
Member Author

No real sprite changes, just renaming.

@morrowwolf
Copy link
Member Author

Also I hate how the recharger works and I'm gonna refactor it into something else at some point just don't yell at me for how cursed it is right now bless

@morrowwolf morrowwolf changed the title NVG Optics and optics bug fixes/refactor Helmet Optics Update Sep 29, 2023
@morrowwolf morrowwolf added the Sprites Remove the soul from the game. label Oct 2, 2023
@morrowwolf
Copy link
Member Author

Alright so now we do actually have sprites

Copy link
Contributor

@sleepynecrons sleepynecrons left a comment

Choose a reason for hiding this comment

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

cool sprites

@sleepynecrons sleepynecrons added the Sprites Approved confirmed no stray pixels label Oct 2, 2023
@cm13-github cm13-github added the Merge Conflict PR can't be merged because it touched too much code label Oct 3, 2023
@cm13-github
Copy link
Contributor

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

@cm13-github
Copy link
Contributor

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

@cm13-github cm13-github removed the Merge Conflict PR can't be merged because it touched too much code label Oct 3, 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 Oct 4, 2023
Merged via the queue into cmss13-devs:master with commit 766b4ab Oct 4, 2023
25 checks passed
cm13-github added a commit that referenced this pull request Oct 4, 2023
github-merge-queue bot pushed a commit that referenced this pull request Jan 23, 2024
# About the pull request
removes an outdated xeno tip about breaking NVG goggles (you couldn't as
of #4549)
removes a doublespace on a tip
adds a new tip about targeting marines based on what they're (not)
wearing
<!-- Remove this text and explain what the purpose of your PR is.

Mention if you have tested your changes. If you changed a map, make sure
you used the mapmerge tool.
If this is an Issue Correction, you can type "Fixes Issue #169420" to
link the PR to the corresponding Issue number #169420.

Remember: something that is self-evident to you might not be to others.
Explain your rationale fully, even if you feel it goes without saying.
-->

# Explain why it's good for the game
tips not being outdated... good??? new tips good I think.
# Testing Photographs and Procedure
<details>
<summary>Screenshots & Videos</summary>

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

</details>


# Changelog
:cl:
add: Added a new xeno tip about where to target.
spellcheck: changed a few tips' wording.
del: Removed an outdated xeno tip about slashing NVGs
/:cl:
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 Mapping did you remember to save in tgm format? Refactor Make the code harder to read Removal snap Sprites Approved confirmed no stray pixels Sprites Remove the soul from the game.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants