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

CMO Drip DLC #31

Merged
merged 3 commits into from
Nov 10, 2024
Merged

CMO Drip DLC #31

merged 3 commits into from
Nov 10, 2024

Conversation

sleepyyapril
Copy link
Contributor

Description

Adds drip.


Changelog

🆑

  • add: Added new medical clothes.

Hanzdegloker and others added 2 commits November 10, 2024 15:36
* All the stuff

yes yes

* THE GOD DAMN META

bruh

* New sprites and all that jazz

yay

* loadouts working?
@sleepyyapril sleepyyapril changed the title Cmo drip dlc CMO drip dlc Nov 10, 2024
@TheDen-Bot TheDen-Bot changed the title CMO drip dlc CMO Drip Dlc Nov 10, 2024
@sleepyyapril sleepyyapril changed the title CMO Drip Dlc CMO Drip DLC Nov 10, 2024
Copy link
Contributor

github-actions bot commented Nov 10, 2024

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

Resources/Textures/Clothing/Head/Misc/head_mirror.rsi

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

Resources/Textures/Clothing/Uniforms/Jumpskirt/cmo_turtle.rsi

State Old New Status
equipped-INNERCLOTHING-monkey Added
equipped-INNERCLOTHING Added
icon Added
inhand-left Added
inhand-right Added

Resources/Textures/Clothing/Uniforms/Jumpsuit/cmo_turtle.rsi

State Old New Status
equipped-INNERCLOTHING-monkey Added
equipped-INNERCLOTHING Added
icon Added
inhand-left Added
inhand-right Added

Edit: diff updated after fc2e88a

@sleepyyapril sleepyyapril merged commit 76909b7 into master Nov 10, 2024
9 of 11 checks passed
@sleepyyapril sleepyyapril deleted the cmo-drip-dlc branch November 10, 2024 23:47
TheDen-Bot pushed a commit that referenced this pull request Nov 10, 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 <123355664+flyingkarii@users.noreply.github.com>
Co-authored-by: sleepyyapril <123355664+sleepyyapril@users.noreply.github.com>
sleepyyapril added a commit to sleepyyapril/TheDen that referenced this pull request Jan 8, 2025
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