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

the great underwear purge #2121

Merged
merged 26 commits into from
Jul 21, 2023
Merged

Conversation

thgvr
Copy link
Member

@thgvr thgvr commented Jul 2, 2023

About The Pull Request

sprites from tg, skyrat, and my aseprite file
Done by me, various others I can't count, Halcyon, Onule
Medical clothes sprites from TG

Organizes sprite_accessories.dm into sane files

Why It's Good For The Game

look good = better
better = good

Changelog

🆑
add: Resprites underwear/socks/undershirts, adds a bunch of new ones, greyscales some
add: Redesigns athletic shorts
add: Resprites the basic pants in loadouts
add: Hoodies, they're in loadouts. Couple colors selectable
add: Resprites organs, by Onule
add: Support for Kepori underwear/socks/undershirt
del: Some underwear/shirts were removed
del: Medical job alt outfits
/:cl:

sprites from tg, skyrat, and my aseprite file
@github-actions github-actions bot added DME Edit Sprites A bikeshed full of soulless bikes. Code change Watch something violently break. labels Jul 2, 2023
@github-actions github-actions bot added the Merge Conflict Use Git Hooks, you're welcome. label Jul 5, 2023
@github-actions
Copy link
Contributor

github-actions bot commented Jul 5, 2023

This pull request has conflicts, please resolve those before we can evaluate the pull request.

@github-actions github-actions bot removed the Merge Conflict Use Git Hooks, you're welcome. label Jul 5, 2023
@thgvr
Copy link
Member Author

thgvr commented Jul 5, 2023

i'll update pr body when im done. so far the scope has changed from just underwear

@github-actions github-actions bot added the Map Change Tile placing is hard. Thank you for your service. label Jul 9, 2023
@MarkSuckerberg
Copy link
Member

Ough!

@github-actions github-actions bot added the Merge Conflict Use Git Hooks, you're welcome. label Jul 14, 2023
@github-actions
Copy link
Contributor

This pull request has conflicts, please resolve those before we can evaluate the pull request.

@github-actions github-actions bot removed the Merge Conflict Use Git Hooks, you're welcome. label Jul 14, 2023
@thgvr thgvr marked this pull request as ready for review July 16, 2023 23:17
@thgvr thgvr requested review from a team as code owners July 16, 2023 23:17
@github-actions github-actions bot added the Merge Conflict Use Git Hooks, you're welcome. label Jul 17, 2023
@github-actions
Copy link
Contributor

This pull request has conflicts, please resolve those before we can evaluate the pull request.

@thgvr
Copy link
Member Author

thgvr commented Jul 18, 2023

mother fuckeer

@github-actions github-actions bot removed the Merge Conflict Use Git Hooks, you're welcome. label Jul 18, 2023
Copy link
Member

@MarkSuckerberg MarkSuckerberg left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

we're so fucking back

@MarkSuckerberg MarkSuckerberg added this pull request to the merge queue Jul 21, 2023
Merged via the queue into shiptest-ss13:master with commit 143dd5b Jul 21, 2023
12 checks passed
@thgvr thgvr deleted the underwearstuff branch July 24, 2023 22:58
MarkSuckerberg pushed a commit to MarkSuckerberg/Shiptest that referenced this pull request Aug 11, 2023
## About The Pull Request
sprites from tg, skyrat, and my aseprite file
Done by me, various others I can't count, Halcyon, Onule
Medical clothes sprites from TG

Organizes sprite_accessories.dm into sane files
<!-- Describe The Pull Request. Please be sure every change is
documented or this can delay review and even discourage maintainers from
merging your PR! -->

## Why It's Good For The Game
look good = better
better = good
<!-- Please add a short description of why you think these changes would
benefit the game. If you can't justify it in words, it might not be
worth adding. -->

## Changelog

:cl:
add: Resprites underwear/socks/undershirts, adds a bunch of new ones,
greyscales some
add: Redesigns athletic shorts
add: Resprites the basic pants in loadouts
add: Hoodies, they're in loadouts. Couple colors selectable
add: Resprites organs, by Onule
add: Support for Kepori underwear/socks/undershirt
del: Some underwear/shirts were removed
del: Medical job alt outfits
/:cl:

<!-- Both :cl:'s are required for the changelog to work! You can put
your name to the right of the first :cl: if you want to overwrite your
GitHub username as author ingame. -->
<!-- You can use multiple of the same prefix (they're only used for the
icon ingame) and delete the unneeded ones. Despite some of the tags,
changelogs should generally represent how a player might be affected by
the changes rather than a summary of the PR's contents. -->
MarkSuckerberg pushed a commit to MarkSuckerberg/Shiptest that referenced this pull request Aug 11, 2023
MarkSuckerberg pushed a commit to MarkSuckerberg/Shiptest that referenced this pull request Sep 13, 2023
## About The Pull Request
sprites from tg, skyrat, and my aseprite file
Done by me, various others I can't count, Halcyon, Onule
Medical clothes sprites from TG

Organizes sprite_accessories.dm into sane files
<!-- Describe The Pull Request. Please be sure every change is
documented or this can delay review and even discourage maintainers from
merging your PR! -->

## Why It's Good For The Game
look good = better
better = good
<!-- Please add a short description of why you think these changes would
benefit the game. If you can't justify it in words, it might not be
worth adding. -->

## Changelog

:cl:
add: Resprites underwear/socks/undershirts, adds a bunch of new ones,
greyscales some
add: Redesigns athletic shorts
add: Resprites the basic pants in loadouts
add: Hoodies, they're in loadouts. Couple colors selectable
add: Resprites organs, by Onule
add: Support for Kepori underwear/socks/undershirt
del: Some underwear/shirts were removed
del: Medical job alt outfits
/:cl:

<!-- Both :cl:'s are required for the changelog to work! You can put
your name to the right of the first :cl: if you want to overwrite your
GitHub username as author ingame. -->
<!-- You can use multiple of the same prefix (they're only used for the
icon ingame) and delete the unneeded ones. Despite some of the tags,
changelogs should generally represent how a player might be affected by
the changes rather than a summary of the PR's contents. -->
MarkSuckerberg pushed a commit to MarkSuckerberg/Shiptest that referenced this pull request Sep 13, 2023
github-merge-queue bot pushed a commit that referenced this pull request Jul 12, 2024
<!-- Write **BELOW** The Headers and **ABOVE** The comments else it may
not be viewable. -->
<!-- You can view Contributing.MD for a detailed description of the pull
request process. -->

## About The Pull Request
Winter coats lost their innate storage due to an oversight in
#2121. This fixes that!

Additionally, this PR matches the items you can fit in the suit storage
slot across hoodies and coats. As an added bonus, you can now fit pill
bottles in both!
<!-- Describe The Pull Request. Please be sure every change is
documented or this can delay review and even discourage maintainers from
merging your PR! -->

## Why It's Good For The Game
Things working as intended is good, and one should reasonably be able to
fit a pill bottle in your coat pocket.
<!-- Please add a short description of why you think these changes would
benefit the game. If you can't justify it in words, it might not be
worth adding. -->

## Changelog

:cl:
balance: you can now fit radios and pill bottles in both hoodies and
winter coats
fix: the innate storage on winter coats has been restored, alt click to
access!
/:cl:

<!-- Both :cl:'s are required for the changelog to work! You can put
your name to the right of the first :cl: if you want to overwrite your
GitHub username as author ingame. -->
<!-- You can use multiple of the same prefix (they're only used for the
icon ingame) and delete the unneeded ones. Despite some of the tags,
changelogs should generally represent how a player might be affected by
the changes rather than a summary of the PR's contents. -->
MysticalFaceLesS pushed a commit to CeladonSS13/Shiptest that referenced this pull request Jul 13, 2024
<!-- Write **BELOW** The Headers and **ABOVE** The comments else it may
not be viewable. -->
<!-- You can view Contributing.MD for a detailed description of the pull
request process. -->

## About The Pull Request
Winter coats lost their innate storage due to an oversight in
shiptest-ss13#2121. This fixes that!

Additionally, this PR matches the items you can fit in the suit storage
slot across hoodies and coats. As an added bonus, you can now fit pill
bottles in both!
<!-- Describe The Pull Request. Please be sure every change is
documented or this can delay review and even discourage maintainers from
merging your PR! -->

## Why It's Good For The Game
Things working as intended is good, and one should reasonably be able to
fit a pill bottle in your coat pocket.
<!-- Please add a short description of why you think these changes would
benefit the game. If you can't justify it in words, it might not be
worth adding. -->

## Changelog

:cl:
balance: you can now fit radios and pill bottles in both hoodies and
winter coats
fix: the innate storage on winter coats has been restored, alt click to
access!
/:cl:

<!-- Both :cl:'s are required for the changelog to work! You can put
your name to the right of the first :cl: if you want to overwrite your
GitHub username as author ingame. -->
<!-- You can use multiple of the same prefix (they're only used for the
icon ingame) and delete the unneeded ones. Despite some of the tags,
changelogs should generally represent how a player might be affected by
the changes rather than a summary of the PR's contents. -->
FalloutFalcon pushed a commit to FalloutFalcon/ShiptestF that referenced this pull request Aug 30, 2024
<!-- Write **BELOW** The Headers and **ABOVE** The comments else it may
not be viewable. -->
<!-- You can view Contributing.MD for a detailed description of the pull
request process. -->

## About The Pull Request
Winter coats lost their innate storage due to an oversight in
shiptest-ss13#2121. This fixes that!

Additionally, this PR matches the items you can fit in the suit storage
slot across hoodies and coats. As an added bonus, you can now fit pill
bottles in both!
<!-- Describe The Pull Request. Please be sure every change is
documented or this can delay review and even discourage maintainers from
merging your PR! -->

## Why It's Good For The Game
Things working as intended is good, and one should reasonably be able to
fit a pill bottle in your coat pocket.
<!-- Please add a short description of why you think these changes would
benefit the game. If you can't justify it in words, it might not be
worth adding. -->

## Changelog

:cl:
balance: you can now fit radios and pill bottles in both hoodies and
winter coats
fix: the innate storage on winter coats has been restored, alt click to
access!
/:cl:

<!-- Both :cl:'s are required for the changelog to work! You can put
your name to the right of the first :cl: if you want to overwrite your
GitHub username as author ingame. -->
<!-- You can use multiple of the same prefix (they're only used for the
icon ingame) and delete the unneeded ones. Despite some of the tags,
changelogs should generally represent how a player might be affected by
the changes rather than a summary of the PR's contents. -->
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Code change Watch something violently break. DME Edit Map Change Tile placing is hard. Thank you for your service. Sprites A bikeshed full of soulless bikes.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants