Added Captain's Combat Gas Mask #117
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
RSI Diff Bot; head commit 816a021 merging into 4568bb3 Resources/Textures/TheDen/Clothing/Mask/gascaptaincombat.rsi
|
added 2 commits
January 1, 2025 21:06
sleepyyapril
approved these changes
Jan 1, 2025
sleepyyapril
added a commit
that referenced
this pull request
Jan 1, 2025
VMSolidus
pushed a commit
to Simple-Station/Einstein-Engines
that referenced
this pull request
Jan 5, 2025
# Description **(Use a MERGE COMMIT, not squash if possible to ~~avoid~~ reduce merge conflicts for our downstream)** Cherry-picks some PRs from The Den: - TheDenSS14/TheDen#8 - TheDenSS14/TheDen#31 - TheDenSS14/TheDen#108 - TheDenSS14/TheDen#116 - TheDenSS14/TheDen#117 - TheDenSS14/TheDen#123 - TheDenSS14/TheDen#124 # Changelog <!-- You can add an author after the `:cl:` to change the name that appears in the changelog (ex: `:cl: Death`) Leaving it blank will default to your GitHub display name This includes all available types for the changelog --> :cl: The Den Contributors - fix: Put actual prescription lenses in the prescription medhuds and sechuds (by KyuPolaris) - add: Added the CMO turtleneck and head mirror to the CMO loadouts. (by sleepyyapril, KyuPolaris) - add: Added an armored trenchcoat for the Captain. Enjoy your swag! (by Rosycup) - fix: Fixed uneven pants leg on summer security uniforms. (by Rosycup) - add: Added the Captain's Combat Gas Mask, for those more fond of close encounters. (by Rosycup) - tweak: Added the Captain's Trenchcoat to the other captain locker variants. (by Rosycup) - fix: Fixed they/them pronouns being displayed for it/its characters in the character preview. (by Azzy) --------- Co-authored-by: flyingkarii <[email protected]> Co-authored-by: sleepyyapril <[email protected]>
sleepyyapril
added a commit
to sleepyyapril/TheDen
that referenced
this pull request
Jan 8, 2025
<!-- This is a semi-strict format, you can add/remove sections as needed but the order/format should be kept the same Remove these comments before submitting --> <!-- Explain this PR in as much detail as applicable Some example prompts to consider: How might this affect the game? The codebase? What might be some alternatives to this? How/Who does this benefit/hurt [the game/codebase]? --> Adds a gas mask variant for the captain intended for combat encounters. --- <!-- You can add an author after the `:cl:` to change the name that appears in the changelog (ex: `:cl: Death`) Leaving it blank will default to your GitHub display name This includes all available types for the changelog --> :cl: - add: Added the Captain's Combat Gas Mask, for those more fond of close encounters. - tweak: Added the Captain's Trenchcoat to the other captain locker variants.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description
Adds a gas mask variant for the captain intended for combat encounters.
Changelog
🆑