The Den Mass Cherry-Pick 01/06/25 #1443
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
github-actions
bot
added
Changes: Localization
angelofallars
changed the title
|
RSI Diff Bot; head commit 3922f11 merging into e31692d Resources/Textures/Nyanotrasen/Clothing/Uniforms/Jumpsuit/summer_security.rsi
Resources/Textures/Clothing/Head/Misc/head_mirror.rsi
Resources/Textures/Clothing/Mask/gascaptaincombat.rsi
Resources/Textures/Clothing/OuterClothing/Coats/cap_trenchcoat.rsi
Resources/Textures/Clothing/Uniforms/Jumpskirt/cmo_turtle.rsi
Resources/Textures/Clothing/Uniforms/Jumpsuit/cmo_turtle.rsi
|
Prescription Medhud/Sechud Fix
<!-- 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!
<!-- 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 --> # Description <!-- 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]? --> Fixed sec's summer uniform sprite having uneven pants. --- # 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: - fix: Fixed uneven pants leg on summer security uniforms.
Fixes the pronouns in the character preview to not show they/them pronouns for characters that use it/its <!-- 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 --> # Description <!-- 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]? --> This just adds another condition in the fluent file that controls the character preview text. Essentially, characters that use it/its pronouns will go from: "This is [character]. They are X years old." to "This is [character]. It is X years old." --- # TODO <!-- A list of everything you have to do before this PR is "complete" You probably won't have to complete everything before merging but it's good to leave future references --> - [x] Probably test it, maybe. --- <!-- This is default collapsed, readers click to expand it and see all your media The PR media section can get very large at times, so this is a good way to keep it clean The title is written using HTML tags The title must be within the <summary> tags or you won't see it --> # 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: Azzy - fix: Fixed they/them pronouns being displayed for it/its characters in the character preview.
# Description Re-adds CMO Turtleneck to the loadout (I swear to fucking god if I have to re-add it again I am going to commit many war crimes) --- # TODO - [x] turtle neck 👍 # 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: - add: CMO Turtleneck back to loadout
<!-- 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.
angelofallars
force-pushed
the
the-den-downstream-merge-01-06-25
branch
from
38d7913 to
3922f11
Compare
|
im going to hate you when i upstream merge if you change namespaces. |
oops |
VMSolidus
approved these changes
Jan 5, 2025
SimpleStation14
added a commit
that referenced
this pull request
Jan 5, 2025
|
FUCK I SQUASHED IT WITHOUT REALIZING WHAT I WAS DOING. GODDAMNIT. |
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
(Use a MERGE COMMIT, not squash if possible to
avoidreduce merge conflicts for our downstream)Cherry-picks some PRs from The Den:
Changelog
🆑 The Den Contributors