-
Notifications
You must be signed in to change notification settings - Fork 165
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
Fashion Update: Earrings & Makeup #1299
Merged
sleepyyapril
merged 14 commits into
Simple-Station:master
from
angelofallars:fashion-update-markings
Dec 1, 2024
Merged
Fashion Update: Earrings & Makeup #1299
sleepyyapril
merged 14 commits into
Simple-Station:master
from
angelofallars:fashion-update-markings
Dec 1, 2024
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
…ngines into fashion-update-markings
github-actions
bot
added
Changes: C#
Changes any cs files
Changes: Localization
Changes any ftl files
Changes: YML
Changes any yml files
Changes: Sprite
Changes any png or json in an RSI
labels
Dec 1, 2024
RSI Diff Bot; head commit 0b9ee93 merging into 8a368bb Resources/Textures/Mobs/Customization/earrings.rsi
Resources/Textures/Mobs/Customization/face.rsi
Resources/Textures/Mobs/Customization/tattoos.rsi
Resources/Textures/Mobs/Customization/wrist.rsi
|
I love the looks of these characters you keep making |
>Go to click comment |
VMSolidus
requested changes
Dec 1, 2024
Resources/Prototypes/Entities/Mobs/Customization/Markings/earrings.yml
Outdated
Show resolved
Hide resolved
@VMSolidus Arachne markings are here. |
VMSolidus
approved these changes
Dec 1, 2024
sleepyyapril
approved these changes
Dec 1, 2024
sleepyyapril
added
Priority: 4-Low
Should be resolved at some point
Size: 2-Large
For large issues/PRs
Type: Feature
Creation of or significant changes to a feature
and removed
Status: Needs Review
Someone please review this
labels
Dec 1, 2024
sleepyyapril
pushed a commit
to VMSolidus/Einstein-Engines
that referenced
this pull request
Dec 1, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Labels
Changes: C#
Changes any cs files
Changes: Localization
Changes any ftl files
Changes: Sprite
Changes any png or json in an RSI
Changes: YML
Changes any yml files
Priority: 4-Low
Should be resolved at some point
Size: 2-Large
For large issues/PRs
Type: Feature
Creation of or significant changes to a feature
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
Adds 38 new earrings, 31 new face markings, and 16 bracelet/watch markings, based from Aurorastation cosmetics. Each earring, bracelet, and watch marking is applied to just one side of the body, allowing for greater customizability and mixing-and-matching markings.
Most notably, the new face markings unlock full customization of every pixel in the 5x4 pixel space of the face. Examples of this are shown below.
Arachne now have access to more than a hundred markings above the leg, after not having any markings in their 2 years of existence.
Media
Pauline
Head (Side): Drop Earrings (Left), Drop Earrings (Right)
Left Hand: Left Bracelet
Red and Blue
Head: Cheek Spot (Left), Eye Corner (Left), Cheek Spot (Right), Eye Corner (Right)
Head (Side): Double Gemstone Earrings (Left), Double Gemstone Earrings (Right)
Left Hand: Left Watch (Colorable)
Left Arm: Left Arm Bracelet
Right Hand: Right Watch (Colorable)
Right Arm: Right Arm Bracelet
Pink
Head (Side): Hoop Earrings (Left), Double Gemstone Earrings (Right)
Left Hand: Left Bracelet
Left Arm: Left Arm Bracelet
Right Hand: Right Bracelet
Right Arm: Right Arm Bracelet
Psychic
Head: Bindi, Full Blush
Head (Side): Long Crystal Earrings (Left), Long Crystal Earrings (Right)
Left Hand: Left Bracelet
Right Hand: Right Bracelet
Right Arm: Right Arm Bracelet
Cyclops
Head [Eyes]: Bindi, Glabella, Nose Tape
Head [Cover for mouth area]: Lip Corner (Left), Lip Corner (Right), Cheek Spot (Left), Cheek Spot (Right), Lips
Head (Side): Cross Earrings (Left), Cross Earrings (Right)
😂
Arachne
Head: Left Arachne Eye, Right Arachne Eye, Lips, Neck Cover (Slim Thick)
Head (Side): Long Crystal Earrings (Left), Long Crystal Earrings (Right)
Left Arm: Left Robotic Arm from Hesphiastos Industries
Left Hand: Left Robotic Arm from Bishop Cybernetics
Right Arm: Right Arm Bracelet
Right Hand: Right Watch (Colorable), Right Nail Polish
Technical Details
I did a quick fix in MarkingsSet.cs to handle a list index out of bounds error where the number of default markings was lower than the maximum allowed markings, like with Onis who have a default horn but can wear 2 earrings.
Changelog
🆑 Skubman