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

Added Cap Trenchcoat #108

Merged
merged 5 commits into from
Dec 31, 2024
Merged

Conversation

Rosycup
Copy link
Contributor

@Rosycup Rosycup commented Dec 25, 2024

Description

Added a fashionable Captain's Armored Trenchcoat.


Changelog

🆑 Rosycup

  • add: Added an armored trenchcoat for the Captain. Enjoy your swag!

Copy link
Contributor

github-actions bot commented Dec 25, 2024

RSI Diff Bot; head commit d002bc6 merging into 34de3a7
This PR makes changes to 1 or more RSIs. Here is a summary of all changes:

Resources/Textures/TheDen/Clothing/OuterClothing/Coats/cap_trenchcoat.rsi

State Old New Status
equipped-OUTERCLOTHING Added
icon Added
inhand-left Added
inhand-right Added

Edit: diff updated after d002bc6

@sleepyyapril sleepyyapril merged commit f9174f9 into TheDenSS14:master Dec 31, 2024
4 checks passed
sleepyyapril added a commit that referenced this pull request Dec 31, 2024
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]?
-->

Added a fashionable Captain's Armored Trenchcoat.

---

<!--
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: Rosycup
- add: Added an armored trenchcoat for the Captain. Enjoy your swag!
@Rosycup Rosycup deleted the cap-trenchcoat branch January 12, 2025 00:47
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants