-
Notifications
You must be signed in to change notification settings - Fork 166
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Fashion Update: Earrings & Makeup (#1299)
# 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 <img height=270px src="https://github.com/user-attachments/assets/8316effb-34b3-4fa1-a80f-af2a3cd670c2"> <img height=270px src="https://github.com/user-attachments/assets/be75770a-c5bb-46a7-afb4-2ec54bd5a5e5"> **Head (Side):** Drop Earrings (Left), Drop Earrings (Right) **Left Hand:** Left Bracelet ### Red and Blue <img height=270px src="https://github.com/user-attachments/assets/8c1356fc-6eaa-484f-afb6-5ace7f45d895"> **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 <img height=270px src="https://github.com/user-attachments/assets/ae376cc3-7cd5-4e91-a3a0-ebe48202f5e6"> **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 <img height=270px src="https://github.com/user-attachments/assets/eaa8069a-2e51-4456-a315-414aa64cd41a"> **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 <img height=270px src="https://github.com/user-attachments/assets/55e67db9-0aa4-488d-a25b-32e8fd92044b"> **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) ### 😂 <img height=270px src="https://github.com/user-attachments/assets/4001b95a-60e1-431c-8463-1e2904cf767a"> ### Arachne ![image](https://github.com/user-attachments/assets/b9935347-8977-4424-9b9b-b08aecb458b2) **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](https://github.com/Simple-Station/Einstein-Engines/compare/master...angelofallars:Einstein-Engines:fashion-update-markings?expand=1#diff-54373833c74b35579f9b3293d5bb0c17eda0d214c11f27dcb40c334ef8c6b513) 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 <!-- 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: 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.
- Loading branch information
1 parent
8a368bb
commit 932f9e3
Showing
140 changed files
with
2,146 additions
and
70 deletions.
There are no files selected for viewing
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 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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,133 @@ | ||
marking-EarringsStudLeft = Stud Earrings (Left) | ||
marking-EarringsStudLeft-stud_l = Stud Earrings (Left) | ||
marking-EarringsStudRight = Stud Earrings (Right) | ||
marking-EarringsStudRight-stud_r = Stud Earrings (Right) | ||
marking-EarringsHeavyLeft = Heavy Earrings (Left) | ||
marking-EarringsHeavyLeft-heavy_l = Heavy Earrings (Left) | ||
marking-EarringsHeavyRight = Heavy Earrings (Right) | ||
marking-EarringsHeavyRight-heavy_r = Heavy Earrings (Right) | ||
marking-EarringsDropBasicLeft = Drop Earrings (Left) | ||
marking-EarringsDropBasicLeft-drop_l = Drop Earrings (Left) | ||
marking-EarringsDropBasicRight = Drop Earrings (Right) | ||
marking-EarringsDropBasicRight-drop_r = Drop Earrings (Right) | ||
marking-EarringsDropColoredLeft = Colored Drop Earrings (Left) | ||
marking-EarringsDropColoredLeft-drop_colored_tone_1_l = Material | ||
marking-EarringsDropColoredLeft-drop_colored_tone_2_l = Ornament | ||
marking-EarringsDropColoredRight = Colored Drop Earrings (Right) | ||
marking-EarringsDropColoredRight-drop_colored_tone_1_r = Material | ||
marking-EarringsDropColoredRight-drop_colored_tone_2_r = Ornament | ||
marking-EarringsDropLongLeft = Long Drop Earrings (Left) | ||
marking-EarringsDropLongLeft-drop_long_tone_1_l = Material | ||
marking-EarringsDropLongLeft-drop_long_tone_2_l = Ornament | ||
marking-EarringsDropLongRight = Long Drop Earrings (Right) | ||
marking-EarringsDropLongRight-drop_long_tone_1_r = Material | ||
marking-EarringsDropLongRight-drop_long_tone_2_r = Ornament | ||
marking-EarringsCrescentLeft = Crescent Earrings (Left) | ||
marking-EarringsCrescentLeft-crescent_l = Crescent Earrings (Left) | ||
marking-EarringsCrescentRight = Crescent Earrings (Right) | ||
marking-EarringsCrescentRight-crescent_r = Crescent Earrings (Right) | ||
marking-EarringsBangleLeft = Bangle Earrings (Left) | ||
marking-EarringsBangleLeft-bangle_l = Bangle Earrings (Left) | ||
marking-EarringsBangleRight = Bangle Earrings (Right) | ||
marking-EarringsBangleRight-bangle_r = Bangle Earrings (Right) | ||
marking-EarringsHoopBasicLeft = Hoop Earrings (Left) | ||
marking-EarringsHoopBasicLeft-hoop_l = Hoop Earrings (Left) | ||
marking-EarringsHoopBasicRight = Hoop Earrings (Right) | ||
marking-EarringsHoopBasicRight-hoop_r = Hoop Earrings (Right) | ||
marking-EarringsHoopMiniLeft = Mini Hoop Earrings (Left) | ||
marking-EarringsHoopMiniLeft-hoop_mini_l = Mini Hoop Earrings (Left) | ||
marking-EarringsHoopMiniRight = Mini Hoop Earrings (Right) | ||
marking-EarringsHoopMiniRight-hoop_mini_r = Mini Hoop Earrings (Right) | ||
marking-EarringsCrossBasicLeft = Cross Earrings (Left) | ||
marking-EarringsCrossBasicLeft-cross_l = Cross Earrings (Left) | ||
marking-EarringsCrossBasicRight = Cross Earrings (Right) | ||
marking-EarringsCrossBasicRight-cross_r = Cross Earrings (Right) | ||
marking-EarringsCrossSaintPeterLeft = St. Peter Cross Earrings (Left) | ||
marking-EarringsCrossSaintPeterLeft-cross_saint_peter_l = St. Peter Cross Earrings (Left) | ||
marking-EarringsCrossSaintPeterRight = St. Peter Cross Earrings (Right) | ||
marking-EarringsCrossSaintPeterRight-cross_saint_peter_r = St. Peter Cross Earrings (Right) | ||
marking-EarringsGemstoneBasicLeft = Gemstone Earrings (Left) | ||
marking-EarringsGemstoneBasicLeft-gemstone_tone_1_l = Material | ||
marking-EarringsGemstoneBasicLeft-gemstone_tone_2_l = Ornament | ||
marking-EarringsGemstoneBasicRight = Gemstone Earrings (Right) | ||
marking-EarringsGemstoneBasicRight-gemstone_tone_1_r = Material | ||
marking-EarringsGemstoneBasicRight-gemstone_tone_2_r = Ornament | ||
marking-EarringsGemstoneLongLeft = Long Gemstone Earrings (Left) | ||
marking-EarringsGemstoneLongLeft-gemstone_long_tone_1_l = Material | ||
marking-EarringsGemstoneLongLeft-gemstone_long_tone_2_l = Ornament | ||
marking-EarringsGemstoneLongRight = Long Gemstone Earrings (Right) | ||
marking-EarringsGemstoneLongRight-gemstone_long_tone_1_r = Material | ||
marking-EarringsGemstoneLongRight-gemstone_long_tone_2_r = Ornament | ||
marking-EarringsGemstoneDoubleLeft = Double Gemstone Earrings (Left) | ||
marking-EarringsGemstoneDoubleLeft-gemstone_double_tone_1_l = Material | ||
marking-EarringsGemstoneDoubleLeft-gemstone_double_tone_2_l = Upper Ornament | ||
marking-EarringsGemstoneDoubleLeft-gemstone_double_tone_3_l = Lower Ornament | ||
marking-EarringsGemstoneDoubleRight = Double Gemstone Earrings (Right) | ||
marking-EarringsGemstoneDoubleRight-gemstone_double_tone_1_r = Material | ||
marking-EarringsGemstoneDoubleRight-gemstone_double_tone_2_r = Upper Ornament | ||
marking-EarringsGemstoneDoubleRight-gemstone_double_tone_3_r = Lower Ornament | ||
marking-EarringsDangleBasicLeft = Dangle Earrings (Left) | ||
marking-EarringsDangleBasicLeft-dangle_tone_1_l = Material | ||
marking-EarringsDangleBasicLeft-dangle_tone_2_l = Ornament | ||
marking-EarringsDangleBasicRight = Dangle Earrings (Right) | ||
marking-EarringsDangleBasicRight-dangle_tone_1_r = Material | ||
marking-EarringsDangleBasicRight-dangle_tone_2_r = Ornament | ||
marking-EarringsDangleLongLeft = Long Dangle Earrings (Left) | ||
marking-EarringsDangleLongLeft-dangle_long_tone_1_l = Material | ||
marking-EarringsDangleLongLeft-dangle_long_tone_2_l = Ornament | ||
marking-EarringsDangleLongRight = Long Dangle Earrings (Right) | ||
marking-EarringsDangleLongRight-dangle_long_tone_1_r = Material | ||
marking-EarringsDangleLongRight-dangle_long_tone_2_r = Ornament | ||
marking-EarringsEightLeft = Eight Earrings (Left) | ||
marking-EarringsEightLeft-eight_l = Eight Earrings (Left) | ||
marking-EarringsEightRight = Eight Earrings (Right) | ||
marking-EarringsEightRight-eight_r = Eight Earrings (Right) | ||
marking-EarringsCrystalBasicLeft = Crystal Earrings (Left) | ||
marking-EarringsCrystalBasicLeft-crystal_tone_1_l = Material | ||
marking-EarringsCrystalBasicLeft-crystal_tone_2_l = Ornament | ||
marking-EarringsCrystalBasicRight = Crystal Earrings (Right) | ||
marking-EarringsCrystalBasicRight-crystal_tone_1_r = Material | ||
marking-EarringsCrystalBasicRight-crystal_tone_2_r = Ornament | ||
marking-EarringsCrystalLongLeft = Long Crystal Earrings (Left) | ||
marking-EarringsCrystalLongLeft-crystal_long_tone_1_l = Material | ||
marking-EarringsCrystalLongLeft-crystal_long_tone_2_l = Ornament | ||
marking-EarringsCrystalLongRight = Long Crystal Earrings (Right) | ||
marking-EarringsCrystalLongRight-crystal_long_tone_1_r = Material | ||
marking-EarringsCrystalLongRight-crystal_long_tone_2_r = Ornament |
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,92 @@ | ||
marking-FaceBindi = Bindi | ||
marking-FaceBindi-bindi = Bindi | ||
marking-FaceFullblush = Full Blush | ||
marking-FaceFullblush-fullblush = Full Blush | ||
marking-FaceCheekspotRight = Cheek Spot (Right) | ||
marking-FaceCheekspotRight-cheekspot_r = Cheek Spot (Right) | ||
marking-FaceCheekspotLeft = Cheek Spot (Left) | ||
marking-FaceCheekspotLeft-cheekspot_l = Cheek Spot (Left) | ||
marking-FaceChesireRight = Chesire Grin (Right) | ||
marking-FaceChesireRight-chesire_r = Chesire Grin (Right) | ||
marking-FaceChesireLeft = Chesire Grin (Left) | ||
marking-FaceChesireLeft-chesire_l = Chesire Grin (Left) | ||
marking-FaceCrowRight = Crow's Feet (Right) | ||
marking-FaceCrowRight-crow_r = Crow's Feet (Right) | ||
marking-FaceCrowLeft = Crow's Feet (Left) | ||
marking-FaceCrowLeft-crow_l = Crow's Feet (Left) | ||
marking-FaceEarRight = Ear Cover (Right) | ||
marking-FaceEarRight-ear_r = Ear Cover (Right) | ||
marking-FaceEarLeft = Ear Cover (Left) | ||
marking-FaceEarLeft-ear_l = Ear Cover (Left) | ||
marking-FaceEyebrowRight = Eyebrow (Right) | ||
marking-FaceEyebrowRight-eyebrow_r = Eyebrow (Right) | ||
marking-FaceEyebrowLeft = Eyebrow (Left) | ||
marking-FaceEyebrowLeft-eyebrow_l = Eyebrow (Left) | ||
marking-FaceEyebrows = Eyebrows | ||
marking-FaceEyebrows-eyebrows = Eyebrows | ||
marking-FaceEyecornerRight = Eye Corner (Right) | ||
marking-FaceEyecornerRight-eyecorner_r = Eye Corner (Right) | ||
marking-FaceEyecornerLeft = Eye Corner (Left) | ||
marking-FaceEyecornerLeft-eyecorner_l = Eye Corner (Left) | ||
marking-FaceEyelashRight = Eyelash (Right) | ||
marking-FaceEyelashRight-eyelash_r = Eyelash (Right) | ||
marking-FaceEyelashLeft = Eyelash (Left) | ||
marking-FaceEyelashLeft-eyelash_l = Eyelash (Left) | ||
marking-FaceEyestripe = Eye Stripe | ||
marking-FaceEyestripe-eyestripe = Eye Stripe | ||
marking-FaceLipcornerRight = Lip Corner (Right) | ||
marking-FaceLipcornerRight-lipcorner_r = Lip Corner (Right) | ||
marking-FaceLipcornerLeft = Lip Corner (Left) | ||
marking-FaceLipcornerLeft-lipcorner_l = Lip Corner (Left) | ||
marking-FaceGlabella = Glabella | ||
marking-FaceGlabella-blabella = Glabella | ||
marking-FaceLowercheekRight = Lower Cheek (Right) | ||
marking-FaceLowercheekRight-lowercheek_r = Lower Cheek (Right) | ||
marking-FaceLowercheekLeft = Lower Cheek (Left) | ||
marking-FaceLowercheekLeft-lowercheek_l = Lower Cheek (Left) | ||
marking-FaceNosetape = Nose Tape | ||
marking-FaceNosetape-nosetape = Nose Tape | ||
marking-FaceNosetip = Nose Tip | ||
marking-FaceNosetip-nosetip = Nose Tip | ||
marking-FaceNosestripe = Nose Stripe | ||
marking-FaceNosestripe-nosestripe = Nose Stripe | ||
marking-FaceUnibrow = Unibrow | ||
marking-FaceUnibrow-unibrow = Unibrow | ||
marking-FaceNeckSlim = Neck Cover (Slim) | ||
marking-FaceNeckSlim-neck_f = Neck Cover (Slim) | ||
marking-FaceNeckWide = Neck Cover (Wide) | ||
marking-FaceNeckWide-neck_m = Neck Cover (Wide) | ||
marking-FaceNeckSlimThick = Neck Cover (Slim Thick) | ||
marking-FaceNeckSlimThick-neck_thick_f = Neck Cover (Slim Thick) | ||
marking-FaceNeckWideThick = Neck Cover (Wide Thick) | ||
marking-FaceNeckWideThick-neck_thick_m = Neck Cover (Wide Thick) |
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 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 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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,49 @@ | ||
marking-WristBraceletRight = Right Bracelet | ||
marking-WristBraceletRight-bracelet_r = Right Bracelet | ||
marking-WristBraceletLeft = Left Bracelet | ||
marking-WristBraceletLeft-bracelet_l = Left Bracelet | ||
marking-WristBraceletArmRight = Right Arm Bracelet | ||
marking-WristBraceletArmRight-bracelet_arm_r = Right Arm Bracelet | ||
marking-WristBraceletArmLeft = Left Arm Bracelet | ||
marking-WristBraceletArmLeft-bracelet_arm_l = Left Arm Bracelet | ||
marking-WristWatchRight = Right Watch | ||
marking-WristWatchRight-watch_r = Right Watch | ||
marking-WristWatchLeft = Left Watch | ||
marking-WristWatchLeft-watch_l = Left Watch | ||
marking-WristWatchSilverRight = Right Silver Watch | ||
marking-WristWatchSilverRight-watch_silver_r = Right Silver Watch | ||
marking-WristWatchSilverLeft = Left Silver Watch | ||
marking-WristWatchSilverLeft-watch_silver_l = Left Silver Watch | ||
marking-WristWatchGoldRight = Right Gold Watch | ||
marking-WristWatchGoldRight-watch_gold_r = Right Gold Watch | ||
marking-WristWatchGoldLeft = Left Gold Watch | ||
marking-WristWatchGoldLeft-watch_gold_l = Left Gold Watch | ||
marking-WristWatchHoloRight = Right Holographic Watch | ||
marking-WristWatchHoloRight-watch_holo_r = Right Holographic Watch | ||
marking-WristWatchHoloLeft = Left Holographic Watch | ||
marking-WristWatchHoloLeft-watch_holo_l = Left Holographic Watch | ||
marking-WristWatchLeatherRight = Right Leather Watch | ||
marking-WristWatchLeatherRight-watch_leather_r = Right Leather Watch | ||
marking-WristWatchLeatherLeft = Left Leather Watch | ||
marking-WristWatchLeatherLeft-watch_leather_l = Left Leather Watch | ||
marking-WristWatchColorableRight = Right Watch (Colorable) | ||
marking-WristWatchColorableRight-watch_colorable_r_tone_1 = Strap | ||
marking-WristWatchColorableRight-watch_colorable_r_tone_2 = Watch Face | ||
marking-WristWatchColorableLeft = Left Watch (Colorable) | ||
marking-WristWatchColorableLeft-watch_colorable_l_tone_1 = Strap | ||
marking-WristWatchColorableLeft-watch_colorable_l_tone_2 = Watch Face |
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
Oops, something went wrong.