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

Fashion Update: Earrings & Makeup #1299

Merged

Conversation

angelofallars
Copy link
Contributor

@angelofallars angelofallars commented Dec 1, 2024

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

image

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

  • add: 80+ new markings have arrived, including earrings, makeup, bracelets, and watches. Sashay over to Character Setup to personalize your character like never before!
  • add: The Arachne species can now select markings above the leg, including cybernetics, makeup, tattoos, noses, earrings, heterochromia, bracelets, gauze, and more!
  • tweak: The available points for Head (Side), Left Hand, and Right Hand markings have been increased for most species to support the new markings.
  • tweak: The Nail Polish markings have been moved from the Overlay category to the Left Hand and Right Hand categories.

@github-actions 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
Copy link
Contributor

github-actions bot commented Dec 1, 2024

RSI Diff Bot; head commit 0b9ee93 merging into 8a368bb
This PR makes changes to 1 or more RSIs. Here is a summary of all changes:

Resources/Textures/Mobs/Customization/earrings.rsi

State Old New Status
bangle_l Added
bangle_r Added
crescent_l Added
crescent_r Added
cross_l Added
cross_r Added
cross_saint_peter_l Added
cross_saint_peter_r Added
crystal_long_tone_1_l Added
crystal_long_tone_1_r Added
crystal_long_tone_2_l Added
crystal_long_tone_2_r Added
crystal_tone_1_l Added
crystal_tone_1_r Added
crystal_tone_2_l Added
crystal_tone_2_r Added
dangle_long_tone_1_l Added
dangle_long_tone_1_r Added
dangle_long_tone_2_l Added
dangle_long_tone_2_r Added
dangle_tone_1_l Added
dangle_tone_1_r Added
dangle_tone_2_l Added
dangle_tone_2_r Added
drop_colored_tone_1_l Added
drop_colored_tone_1_r Added
drop_colored_tone_2_l Added
drop_colored_tone_2_r Added
drop_l Added
drop_long_tone_1_l Added
drop_long_tone_1_r Added
drop_long_tone_2_l Added
drop_long_tone_2_r Added
drop_r Added
eight_l Added
eight_r Added
gemstone_double_tone_1_l Added
gemstone_double_tone_1_r Added
gemstone_double_tone_2_l Added
gemstone_double_tone_2_r Added
gemstone_double_tone_3_l Added
gemstone_double_tone_3_r Added
gemstone_long_tone_1_l Added
gemstone_long_tone_1_r Added
gemstone_long_tone_2_l Added
gemstone_long_tone_2_r Added
gemstone_tone_1_l Added
gemstone_tone_1_r Added
gemstone_tone_2_l Added
gemstone_tone_2_r Added
heavy_l Added
heavy_r Added
hoop_l Added
hoop_mini_l Added
hoop_mini_r Added
hoop_r Added
stud_l Added
stud_r Added

Resources/Textures/Mobs/Customization/face.rsi

State Old New Status
bindi Added
cheekspot_l Added
cheekspot_r Added
chesire_l Added
chesire_r Added
crow_l Added
crow_r Added
ear_l Added
ear_r Added
eyebrow_l Added
eyebrow_r Added
eyebrows Added
eyecorner_l Added
eyecorner_r Added
eyelash_l Added
eyelash_r Added
eyestripe Added
fullblush Added
glabella Added
lipcorner_l Added
lipcorner_r Added
lowercheek_l Added
lowercheek_r Added
neck_f Added
neck_m Added
neck_thick_f Added
neck_thick_m Added
nosestripe Added
nosetape Added
nosetip Added
unibrow Added

Resources/Textures/Mobs/Customization/tattoos.rsi

State Old New Status
tattoo_eye_arachne_l Added
tattoo_eye_arachne_r Added

Resources/Textures/Mobs/Customization/wrist.rsi

State Old New Status
bracelet_arm_l Added
bracelet_arm_r Added
bracelet_l Added
bracelet_r Added
watch_colorable_l_tone_1 Added
watch_colorable_l_tone_2 Added
watch_colorable_r_tone_1 Added
watch_colorable_r_tone_2 Added
watch_gold_l Added
watch_gold_r Added
watch_holo_l Added
watch_holo_r Added
watch_l Added
watch_leather_l Added
watch_leather_r Added
watch_r Added
watch_silver_l Added
watch_silver_r Added

Edit: diff updated after 0b9ee93

@DEATHB4DEFEAT
Copy link
Member

I love the looks of these characters you keep making

@VMSolidus
Copy link
Member

image

THAT WAS A BUG THIS WHOLE TIME? GUH I CAN'T BELIEVE I NEVER BOTHERED LOOKING AT THE MARKINGS CODE ABOUT IT. GUH.

@VMSolidus VMSolidus closed this Dec 1, 2024
@VMSolidus VMSolidus reopened this Dec 1, 2024
@VMSolidus
Copy link
Member

VMSolidus commented Dec 1, 2024

>Go to click comment
>Accidentally click close with comment
Truly my fat fingers knows no bounds.

@angelofallars
Copy link
Contributor Author

@VMSolidus Arachne markings are here.
image

@github-actions github-actions bot added the Status: Needs Review Someone please review this label Dec 1, 2024
@sleepyyapril sleepyyapril merged commit 932f9e3 into Simple-Station:master Dec 1, 2024
12 of 13 checks passed
@sleepyyapril 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
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants