Den Downstream Merge 02-13-25 #1773
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
<!-- 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]? --> This SHOULD allow Shadowkins without the blackeye trait to take the power traits now. ---
for our mappers TODO: port to ee
…ion#1805) (Simple-Station#250) mappies Co-authored-by: deltanedas <[email protected]>
<!-- 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 is tara's fault --- # 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 --> - [ ] Task - [x] Completed Task --- <!-- 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 --> <details><summary><h1>Media</h1></summary> <p>  </p> </details> --- # 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: - tweak: Copyright law --------- Co-authored-by: KyuPolaris <[email protected]>
<!-- 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]? --> Arachne can use that large abdomen of theirs to produce silk. (They couldn't take the bionic spinnerette trait and their placed webs do not produce silk) --- # 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] spider butt --- # 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: Added ability for Arachne to produce silk Co-authored-by: KyuPolaris <[email protected]> Co-authored-by: sleepyyapril <[email protected]>
<!-- 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]? --> Tweaked tool belts and mantis belts to take more tools and removed plushies from an earlier port. --- <!-- 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: - tweak: Tweaked tool belts to take more tools and mantis belts to be able to fit certain epistemics tools.
…mple-Station#224) <!-- 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 Added "hop" and "hops" to the triggers for the Jump emote --- # 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: Hopping, that's it. *hop and *hops now triggers the jump emote. --------- Co-authored-by: KyuPolaris <[email protected]> Co-authored-by: sleepyyapril <[email protected]>
<!-- 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 in a Senior Trooper uniform by request of fatfsaam2 on the discord for Security use. --- <!-- 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 a Trooper Uniform and Hat for Security use.
<!-- 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]? --> Harpies can now do "*hoots" to hoot to their hearts content --- # 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] Hoot 🦉 --- <!-- 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 --> <details><summary><h1>Media</h1></summary> <p> https://github.com/user-attachments/assets/f424862e-e721-468f-9a5e-40f1068d2af3 </p> </details> --- # 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: Harpies have gained the ability to hoot Co-authored-by: KyuPolaris <[email protected]>
angelofallars
requested review from
DEATHB4DEFEAT,
sleepyyapril and
Remuchi
as code owners
github-actions
bot
added
Status: Needs Review
|
RSI Diff Bot; head commit a97ef9a merging into e0b1159 Resources/Textures/DeltaV/Structures/Doors/Airlocks/Glass/roboticist.rsi
Resources/Textures/DeltaV/Structures/Doors/Airlocks/Standard/roboticist.rsi
Resources/Textures/_DEN/Clothing/Head/Hats/seniortrooperhat.rsi
Resources/Textures/_DEN/Clothing/Uniforms/Jumpsuit/seniortrooper.rsi
|
🆑 - add: Ported the Robotics Airlock and some justice stuff
angelofallars
force-pushed
the
den-downstream-merge-2
branch
3 times, most recently
from
893fa07 to
a97ef9a
Compare
VMSolidus
approved these changes
Feb 13, 2025
SimpleStation14
added a commit
that referenced
this pull request
Feb 13, 2025
|
solidus....... |
Oh my god. |
|
Oh no |
|
YOU FOOL |
|
I am glad my little sillies are good enough for upstream <3 |
|
every time this happens I consider making mergebot |
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
!!! DO NOT "Squash and commit", ONLY "Create a merge commit" !!!
Merges some PRs from The Den, YML changes only:
Mapper-only PRs:
Changelog
🆑 The Den Contributors