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

Resprites humans, gives humans a choice of 9 bodies, replaces ethnicity system #6073

Merged
merged 11 commits into from
Jun 6, 2024

Conversation

GrrrKitten
Copy link
Contributor

@GrrrKitten GrrrKitten commented Apr 3, 2024

About the pull request

Major Changes:
-gives humans (and human passing synths) a choice of body size: Thin, Average, Large (determines the 'weight class' look)

-gives humans (and human passing synths) a choice of body muscularity: No Muscles, Lean, Ripped (determines how beefy they look)

-Humans/synths can mix and match this to create 9 unique body shapes

-Redoes most of the underwear to be less bad, removes the gender split from underwear bottom, redoes thongs and a hidden option into a Tanga for the bigger bunch and Satin for those who think regular underwear is too rough.

-Replaces the old ethnicity system with a new skintone, with there being 11 total options, Extra Pale, Pale 1,2,3, Tan 1,2,3, Dark 1,2,3, and Melanated.

-🎉black people are no longer purple🎉


Minor Changes:
-NEW: Changes dogtags to not be visible by default, adds an accessory dogtag for those who want it, the dogtags both looked bad and harmed sprite quality by just existing and being the way they were, this allows players who want it to show off their dogtags, it can look pretty good with a rolled down uniform

-Resprites most of the bra's to just look less bad

-Touches the way that icons are effected and drawn in order for this PR to work, I tested this PR excessively and could notice no bugs but pls look over this part, it took me some hours to get it functional.


Notes: this doesnt change the human shape or ratio at all, they still fit in exactly what they did before. the only notable sprite change is that humans are now on a palette of 5 (sometimes 4 if they have no muscle and arent large) instead of a constant 6 to 7

Explain why it's good for the game

Our human sprites were pretty outdated, this touchup gives both a lot of player customization to their characters, opens up ideas for funny RP, makes being thin not look ????, makes being overweight look actually overweight, in general makes being shirtless at all look less awful (it was so bad), replaces our old ethnicity system which looked like it was designed by an 19th century anthropologist who was obsessed with phrenology (seriously, orient hasn't been used in anthropology in nearly a century), also black people no longer are purple so rejoice

Testing Photographs and Procedure

Screenshots & Videos

As of 2:00PM EST on May 30th, the large and muscled sprite has been updated to not have abs anymore cause it looked weird, the back sprites for skinny + no muscle and skinny + lean have also been adjusted, this is how the human sprites look now.

image

image

As of 7:13PM EST on April 5th, the large body no muscle sprite has been updated to be smoother (side sprite has been edited too but I dont feel like getting the pic for that)

image

image

image

note: not all skintones are 1:1
image

image

image

image

image

image

image

tiny.mp4

(finally, overweight sprites that dont look dumb, also shoutout to this scene, link starts at 00:15, for my inspiration for bigger marines https://youtu.be/eWH2w-LUVc0?si=uu9ybD61HjLw_Xqn&t=15)

Changelog

🆑
add: replaces the old ethnicity system with a new skintone system
imageadd: Resprites humans, adds 9 new mix and match body options to replace the old 3 options
add: resprites dogtags and adds an accessory dogtag that can be made visible via attaching to suit/armor
imageadd: Touches up a lot of the underwear sprites
/:cl:

@github-actions github-actions bot added Sprites Remove the soul from the game. Feature Feature coder badge labels Apr 3, 2024
@GrrrKitten GrrrKitten changed the title Resprites humans, gives humans a choice of 9 bodies, Resprites humans, gives humans a choice of 9 bodies, replaces ethnicity system Apr 3, 2024
@Bancrose
Copy link

Bancrose commented Apr 3, 2024

Can you believe it guys? An accurate depiction of black people!!!! Yay!!!! WE ARE NOT ASHY PURPLE! YAY1!!11!!

@harryob harryob marked this pull request as draft April 6, 2024 11:03
@TacticalSpacePilot
Copy link

Can you add obese weight class? Preferably for ship side personnel. I want to go for that overweight commander look.

@GrrrKitten
Copy link
Contributor Author

Can you add obese weight class? Preferably for ship side personnel. I want to go for that overweight commander look.

I dont think I could get much bigger than the no muscle large body size option, its already maxxing out the allotted work space

Copy link
Contributor

This PR has been inactive for long enough to be automatically marked as stale. This means it is at risk of being auto closed in ~ 7 days, please address any outstanding review items and ensure your PR is finished, if these are all true and you are auto-staled anyway, you need to actively ask maintainers if your PR will be merged. Once you have done any of the previous actions then you should request a maintainer remove the stale label on your PR, to reset the stale timer. If you feel no maintainer will respond in that time, you may wish to close this PR youself, while you seek maintainer comment, as you will then be able to reopen the PR yourself

@github-actions github-actions bot added the Stale beg a maintainer to review your PR label Apr 17, 2024
@github-actions github-actions bot closed this Apr 24, 2024
@harryob harryob reopened this Apr 24, 2024
@harryob harryob removed the Stale beg a maintainer to review your PR label Apr 24, 2024
Copy link
Contributor

github-actions bot commented May 2, 2024

This PR has been inactive for long enough to be automatically marked as stale. This means it is at risk of being auto closed in ~ 7 days, please address any outstanding review items and ensure your PR is finished, if these are all true and you are auto-staled anyway, you need to actively ask maintainers if your PR will be merged. Once you have done any of the previous actions then you should request a maintainer remove the stale label on your PR, to reset the stale timer. If you feel no maintainer will respond in that time, you may wish to close this PR youself, while you seek maintainer comment, as you will then be able to reopen the PR yourself

@github-actions github-actions bot added the Stale beg a maintainer to review your PR label May 2, 2024
@github-actions github-actions bot closed this May 9, 2024
@Drulikar Drulikar reopened this May 28, 2024
@GrrrKitten GrrrKitten marked this pull request as ready for review May 30, 2024 17:22
@GrrrKitten GrrrKitten marked this pull request as draft May 30, 2024 17:28
@GrrrKitten GrrrKitten marked this pull request as ready for review May 30, 2024 18:30
@GrrrKitten GrrrKitten requested a review from harryob May 30, 2024 18:30
@GrrrKitten
Copy link
Contributor Author

All sprite stuff and everything has been polished off, ran into zero issues during testing and there are a good amount of safeguards such that things cant really break, should be good for review :)

@github-actions github-actions bot removed the Stale beg a maintainer to review your PR label May 31, 2024
Copy link
Contributor

@sleepynecrons sleepynecrons left a comment

Choose a reason for hiding this comment

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

sprites good

@sleepynecrons sleepynecrons added the Sprites Approved confirmed no stray pixels label Jun 2, 2024
@harryob harryob added this pull request to the merge queue Jun 6, 2024
Merged via the queue into cmss13-devs:master with commit 884ab17 Jun 6, 2024
30 checks passed
cm13-github added a commit that referenced this pull request Jun 6, 2024
Git-Nivrak pushed a commit to Git-Nivrak/cmss13 that referenced this pull request Jun 9, 2024
…ty system (cmss13-devs#6073)

<!-- Write **BELOW** The Headers and **ABOVE** The comments else it may
not be viewable. -->

# About the pull request

<!-- Remove this text and explain what the purpose of your PR is.

Mention if you have tested your changes. If you changed a map, make sure
you used the mapmerge tool.
If this is an Issue Correction, you can type "Fixes Issue #169420" to
link the PR to the corresponding Issue number #169420.

Remember: something that is self-evident to you might not be to others.
Explain your rationale fully, even if you feel it goes without saying.
-->

**Major Changes:**
-gives humans (and human passing synths) a choice of body size: Thin,
Average, Large (determines the 'weight class' look)

-gives humans (and human passing synths) a choice of body muscularity:
No Muscles, Lean, Ripped (determines how beefy they look)

-Humans/synths can mix and match this to create 9 unique body shapes

-Redoes most of the underwear to be less bad, removes the gender split
from underwear bottom, redoes thongs and a hidden option into a Tanga
for the bigger bunch and Satin for those who think regular underwear is
too rough.

-Replaces the old ethnicity system with a new skintone, with there being
11 total options, Extra Pale, Pale 1,2,3, Tan 1,2,3, Dark 1,2,3, and
Melanated.

-🎉black people are no longer purple🎉

---

**Minor Changes:**
-**NEW**: Changes dogtags to not be visible by default, adds an
accessory dogtag for those who want it, the dogtags both looked bad and
harmed sprite quality by just existing and being the way they were, this
allows players who want it to show off their dogtags, it can look pretty
good with a rolled down uniform

-Resprites most of the bra's to just look less bad

-Touches the way that icons are effected and drawn in order for this PR
to work, I tested this PR excessively and could notice no bugs but pls
look over this part, it took me some hours to get it functional.

---

Notes: this doesnt change the human shape or ratio at all, they still
fit in exactly what they did before. the only notable sprite change is
that humans are now on a palette of 5 (sometimes 4 if they have no
muscle and arent large) instead of a constant 6 to 7

# Explain why it's good for the game

<!-- 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, and may discourage maintainers from reviewing or merging
your PR. This section is not strictly required for (non-controversial)
fix PRs or backend PRs. -->

Our human sprites were pretty outdated, this touchup gives both a lot of
player customization to their characters, opens up ideas for funny RP,
makes being thin not look ????, makes being overweight look actually
overweight, in general makes being shirtless at all look less awful (it
was so bad), replaces our old ethnicity system which looked like it was
designed by an 19th century anthropologist who was obsessed with
phrenology (seriously, orient hasn't been used in anthropology in nearly
a century), also black people no longer are purple so rejoice

# Testing Photographs and Procedure
<!-- Include any screenshots/videos/debugging steps of the modified code
functioning successfully, ideally including edge cases. -->

<!-- !! If you are modifying sprites, you **must** include one or more
in-game screenshots or videos of the new sprites. !! -->

<details>
<summary>Screenshots & Videos</summary>

As of 2:00PM EST on May 30th, the large and muscled sprite has been
updated to not have abs anymore cause it looked weird, the back sprites
for skinny + no muscle and skinny + lean have also been adjusted, this
is how the human sprites look now.


![image](https://github.com/cmss13-devs/cmss13/assets/158611449/24b67a64-7286-4f8a-beed-5887291b809c)


![image](https://github.com/cmss13-devs/cmss13/assets/158611449/8809efd0-6f0b-47a7-ba57-a81216dfd1ba)


As of 7:13PM EST on April 5th, the large body no muscle sprite has been
updated to be smoother (side sprite has been edited too but I dont feel
like getting the pic for that)


![image](https://github.com/cmss13-devs/cmss13/assets/158611449/7b8a5e05-6a7a-459c-aa70-8e490a06da12)



![image](https://github.com/cmss13-devs/cmss13/assets/158611449/850b202f-0125-4440-be37-374f7be07c2f)



![image](https://github.com/cmss13-devs/cmss13/assets/158611449/93c8d602-42bf-46e0-84ac-6c2724125db9)

note: not all skintones are 1:1

![image](https://github.com/cmss13-devs/cmss13/assets/158611449/07ac5a74-0285-4262-aa7e-34749e487f9c)


![image](https://github.com/cmss13-devs/cmss13/assets/158611449/30f8d1b4-676f-4373-bd5e-d03d8c3e47e6)


![image](https://github.com/cmss13-devs/cmss13/assets/158611449/83093ef8-2130-4712-a935-61af701495f8)


![image](https://github.com/cmss13-devs/cmss13/assets/158611449/957f0346-95e1-4431-888e-5e44aa2e0c92)


![image](https://github.com/cmss13-devs/cmss13/assets/158611449/69b24fb5-06d1-4562-bc4b-8d994c00ec66)


![image](https://github.com/cmss13-devs/cmss13/assets/158611449/a19d3761-0e89-49e8-8d0f-434a1d1edbf3)


![image](https://github.com/cmss13-devs/cmss13/assets/158611449/56d2b2f8-aa86-4c8a-a13a-3647b10b9df8)


https://github.com/cmss13-devs/cmss13/assets/158611449/a65557d0-2a06-4d06-a1c2-4dd8d4fe503b

(finally, overweight sprites that dont look dumb, also shoutout to this
scene, link starts at 00:15, for my inspiration for bigger marines
https://youtu.be/eWH2w-LUVc0?si=uu9ybD61HjLw_Xqn&t=15)

</details>


# Changelog

<!-- If your PR modifies aspects of the game that can be concretely
observed by players or admins you should add a changelog. If your change
does NOT meet this description, remove this section. Be sure to properly
label your changes in the changelog. Please note that maintainers freely
reserve the right to remove and add tags should they deem it
appropriate. You can attempt to finagle the system all you want, but
it's best to shoot for clear communication right off the bat. -->
<!-- If you add a name after the ':cl', that name will be used in the
changelog. You must add your CKEY after the CL if your GitHub name
doesn't match. Maintainers freely reserve the right to remove and add
tags should they deem it appropriate. -->

:cl:
add: replaces the old ethnicity system with a new skintone system
imageadd: Resprites humans, adds 9 new mix and match body options to
replace the old 3 options
add: resprites dogtags and adds an accessory dogtag that can be made
visible via attaching to suit/armor
imageadd: Touches up a lot of the underwear sprites
/:cl:

<!-- Both :cl:'s are required for the changelog to work! -->

---------

Co-authored-by: Vero <[email protected]>
Git-Nivrak pushed a commit to Git-Nivrak/cmss13 that referenced this pull request Jun 9, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Feature Feature coder badge Sprites Approved confirmed no stray pixels Sprites Remove the soul from the game.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

8 participants