Fashion Update: Earrings & Makeup

Content.Shared/Humanoid/Markings/MarkingsSet.cs

@@ -283,8 +283,9 @@ public void EnsureDefault(Color? skinColor = null, Color? eyeColor = null, Marki
                 continue;
             }
 
-            var index = 0;
-            while (points.Points > 0 || index < points.DefaultMarkings.Count)
+            var index = Markings.TryGetValue(category, out var markings) ? markings.Count : 0;
+
+            while (points.Points > 0 && index < points.DefaultMarkings.Count)
             {
                 if (markingManager.Markings.TryGetValue(points.DefaultMarkings[index], out var prototype))
                 {

Resources/Locale/en-US/markings/earrings.ftl

@@ -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

Resources/Locale/en-US/markings/face.ftl

@@ -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)

Resources/Locale/en-US/markings/makeup.ftl

@@ -4,11 +4,11 @@ marking-MakeupLips = Lips
 marking-MakeupBlush-blush = Blush
 marking-MakeupBlush = Blush
 
-marking-MakeupNailPolishLeft-nail_polish_l = Nail Polish (Left)
-marking-MakeupNailPolishLeft = Nail Polish (Left)
+marking-MakeupNailPolishLeft-nail_polish_l = Left Nail Polish
+marking-MakeupNailPolishLeft = Left Nail Polish
 
-marking-MakeupNailPolishRight-nail_polish_r = Nail Polish (Right)
-marking-MakeupNailPolishRight = Nail Polish (Right)
+marking-MakeupNailPolishRight-nail_polish_r = Right Nail Polish
+marking-MakeupNailPolishRight = Right Nail Polish
 
 marking-MakeupMothBlush-moth_blush = Moth Blush
 marking-MakeupMothBlush = Moth Blush

Resources/Locale/en-US/markings/tattoos.ftl

@@ -27,3 +27,9 @@ marking-TattooEyeRight = Right Eye
 
 marking-TattooEyeLeft-tattoo_eye_l = Left Eye
 marking-TattooEyeLeft = Left Eye
+
+marking-TattooEyeArachneRight-tattoo_eye_arachne_r = Right Arachne Eye
+marking-TattooEyeArachneRight = Right Arachne Eye
+
+marking-TattooEyeArachneLeft-tattoo_eye_arachne_l = Left Arachne Eye
+marking-TattooEyeArachneLeft = Left Arachne Eye

Resources/Locale/en-US/markings/wrist.ftl

@@ -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

Resources/Prototypes/DeltaV/Species/vulpkanin.yml

@@ -46,9 +46,6 @@
       points: 1
       required: true
       defaultMarkings: [ VulpTail ]
-    Head:
-      points: 1
-      required: false
     RightLeg:
       points: 2
       required: false
@@ -65,13 +62,13 @@
       points: 2
       required: false
     RightHand:
-      points: 2
+      points: 3
       required: false
     LeftArm:
       points: 2
       required: false
     LeftHand:
-      points: 2
+      points: 3
       required: false
     Snout:
       points: 1
@@ -80,6 +77,9 @@
       points: 1
       required: true
       defaultMarkings: [ VulpEar ]
+    HeadSide:
+      points: 2
+      required: false
 
 - type: humanoidBaseSprite
   id: MobVulpkaninHead