Merge pull request #1204 from hivehum/markings

markings bugfixes

Resources/Locale/en-US/_Impstation/markings/misc.ftl

@@ -6,10 +6,10 @@ marking-SpiderMirror-spidermirror = Mirror
 marking-SpiderGlowEyes = Glowing Eyes
 marking-SpiderGlowEyes-spidergloweyes = Glowing Eyes
 marking-SpiderEyesMulti = Multicolor Eyes
-marking-SpiderEyesMulti-spidereyesmilti1 = Top
+marking-SpiderEyesMulti-spidereyesmulti1 = Top
-marking-SpiderEyesMulti-spidereyesmilti2 = Middle Top
+marking-SpiderEyesMulti-spidereyesmulti2 = Middle Top
-marking-SpiderEyesMulti-spidereyesmilti3 = Middle Bottom
+marking-SpiderEyesMulti-spidereyesmulti3 = Middle Bottom
-marking-SpiderEyesMulti-spidereyesmilti4 = Bottom
+marking-SpiderEyesMulti-spidereyesmulti4 = Bottom
 
 # diona
 marking-DionaLivingNymph = Living Nymphs
@@ -34,65 +34,67 @@ marking-DwarfConstellationHead = Head Constellation
 marking-DwarfConstellationHead-dwarfconstellationhead = Head Constellation
 marking-DwarfConstellationChest = Chest Constellation
 marking-DwarfConstellationChest-dwarfconstellationchest = Chest Constellation
-marking-DwarfConstellationLArm = Left Arm Constellation
+marking-DwarfConstellationLArm = Arm Constellation (Left)
-marking-DwarfConstellationLArm-dwarfconstellationlarm = Left Arm Constellation
+marking-DwarfConstellationLArm-dwarfconstellationlarm = Arm Constellation (Left)
-marking-DwarfConstellationRArm = Right Arm Constellation
+marking-DwarfConstellationRArm = Arm Constellation (Right)
-marking-DwarfConstellationRArm-dwarfconstellationrarm = Right Arm Constellation
+marking-DwarfConstellationRArm-dwarfconstellationrarm = Arm Constellation (Right)
-marking-DwarfConstellationLHand = Left Hand Constellation
+marking-DwarfConstellationLHand = Hand Constellation (Left)
-marking-DwarfConstellationLHand-dwarfconstellationlhand = Left Hand Constellation
+marking-DwarfConstellationLHand-dwarfconstellationlhand = Hand Constellation (Left)
-marking-DwarfConstellationRHand = Right Hand Constellation
+marking-DwarfConstellationRHand = Hand Constellation (Right)
-marking-DwarfConstellationRHand-dwarfconstellationrhand = Right Hand Constellation
+marking-DwarfConstellationRHand-dwarfconstellationrhand = Hand Constellation (Right)
-marking-DwarfConstellationLLeg = Left Leg Constellation
+marking-DwarfConstellationLLeg = Leg Constellation (Left)
-marking-DwarfConstellationLLeg-dwarfconstellationlleg = Left Leg Constellation
+marking-DwarfConstellationLLeg-dwarfconstellationlleg = Leg Constellation (Left)
-marking-DwarfConstellationRLeg = Right Leg Constellation
+marking-DwarfConstellationRLeg = Leg Constellation (Right)
-marking-DwarfConstellationRLeg-dwarfconstellationrleg = Right Leg Constellation
+marking-DwarfConstellationRLeg-dwarfconstellationrleg = Leg Constellation (Right)
-marking-DwarfConstellationLFoot = Left Foot Constellation
+marking-DwarfConstellationLFoot = Foot Constellation (Left)
-marking-DwarfConstellationLFoot-dwarfconstellationlfoot = Left Foot Constellation
+marking-DwarfConstellationLFoot-dwarfconstellationlfoot = Foot Constellation (Left)
-marking-DwarfConstellationRFoot = Right Foot Constellation
+marking-DwarfConstellationRFoot = Foot Constellation (Right)
-marking-DwarfConstellationRFoot-dwarfconstellationrfoot = Right Foot Constellation
+marking-DwarfConstellationRFoot-dwarfconstellationrfoot = Foot Constellation (Right)
-marking-DwarfChestHair = Hairy Chest
+marking-DwarfChestHair = Chest Hair
-marking-DwarfChestHair-dwarfchesthair = Hairy Chest
+marking-DwarfChestHair-dwarfchesthair = Chest Hair
-marking-DwarfArmHair = Hairy Arms
+marking-DwarfArmHair = Arm Hair
-marking-DwarfArmHair-dwarfarmhair = Hairy Arms
+marking-DwarfArmHair-dwarfarmhair = Arm Hair
-marking-DwarfLegHair = Hairy Legs
+marking-DwarfLegHair = Leg Hair
-marking-DwarfLegHair-dwarfleghair = Hairy Legs
+marking-DwarfLegHair-dwarfleghair = Leg Hair
 marking-DwarfTattooShootingStar = Shooting Star Tattoo
 marking-DwarfTattooShootingStar-dwarftattooshootingstar = Shooting Star Tattoo
 marking-DwarfMarkBear = Mark of the Bear
 marking-DwarfMarkBear-dwarfmarkbear = Mark of the Bear
-marking-DwarfMarkKangarooLHand = Mark of the Kangaroo
+marking-DwarfMarkKangarooLHand = Mark of the Kangaroo (Left)
-marking-DwarfMarkKangarooLHand-dwarfmarkkangaroo = Mark of the Kangaroo
+marking-DwarfMarkKangarooLHand-dwarfmarkkangaroolhand = Mark of the Kangaroo (Left)
+marking-DwarfMarkKangarooRHand = Mark of the Kangaroo (Right)
+marking-DwarfMarkKangarooRHand-dwarfmarkkangaroo = Mark of the Kangaroo (Right)
 marking-DwarfMarkCobra = Mark of the Cobra
 marking-DwarfMarkCobra-dwarfmarkcobra = Mark of the Cobra
 marking-DwarfMarkSpider = Mark of the Spider
 marking-DwarfMarkSpider-dwafmarkspider = Mark of the Spider
 
 # humans
-marking-VitiligoHeadL = Vitiligo Left Eye
+marking-VitiligoHeadL = Vitiligo (Left Eye)
-marking-VitiligoHeadR = Vitiligo Right Eye
+marking-VitiligoHeadR = Vitiligo (Right Eye)
-marking-VitiligoHeadJaw = Vitiligo Jawline
+marking-VitiligoHeadJaw = Vitiligo (Jawline)
-marking-VitiligoHandR = Vitiligo Right Hand
+marking-VitiligoHandR = Vitiligo (Right Hand)
-marking-VitiligoArmR = Vitiligo Right Arm
+marking-VitiligoArmR = Vitiligo (Right Arm)
-marking-VitiligoLegR = Vitiligo Right Leg
+marking-VitiligoLegR = Vitiligo (Right)
-marking-VitiligoHandL = Vitiligo Left Hand
+marking-VitiligoHandL = Vitiligo (Left Hand)
-marking-VitiligoArmL = Vitiligo Left Arm
+marking-VitiligoArmL = Vitiligo (Left Arm)
-marking-VitiligoLegL = Vitiligo Left Leg
+marking-VitiligoLegL = Vitiligo (Left)
-marking-VitiligoChestF = Vitiligo Chest Spread
+marking-VitiligoChestF = Vitiligo Spread
-marking-VitiligoChestSpots = Vitiligo Chest Spots
+marking-VitiligoChestSpots = Vitiligo Spots
 
 # moths
 marking-MothTrueButterfly = Rainbow Wings
 marking-MothTrueButterfly-mothtruebutterfly1 = Stripes
 marking-MothTrueButterfly-mothtruebutterfly2 = Dots
 marking-MothTrueButterfly-mothtruebutterfly3 = Wings
-marking-MothGlowAntenna = Antenna (Glowing)
+marking-MothGlowAntenna = Glowing Antenna
 marking-MothGlowAntenna-mothglowantenna = Glowing Antenna
 marking-MothFireflyOverlay = Firefly Overlay
 marking-MothFireflyOverlay-mothfirefly1 = Firefly Overlay
 marking-MothFirefly = Firefly Wings
 marking-MothFirefly-mothfirefly2 = Firefly Wings
 marking-MothBee = Bumblebee
-marking-MothBee-bee1 = Outter stripes
+marking-MothBee-bee1 = Outer stripes
 marking-MothBee-bee2 = Wings
 marking-MothBee-bee3 = Inner stripe
 marking-MothBeetleTail = Beetle Wings (Junebug)
@@ -109,7 +111,7 @@ marking-MothSnoth = Snoth Wings
 marking-MothSnoth-snoth1 = Wings
 marking-MothSnoth-snoth2 = Shell
 marking-MothGlasswing = Glasswing
-marking-MothGlasswing-glasswing1 = Outter
+marking-MothGlasswing-glasswing1 = Outer
 marking-MothGlasswing-glasswing2 = Inner
 marking-MothGlasswing-glasswing3 = Stripe
 marking-MothRhinoBeetle = Beetle Wings (Rhino)
@@ -138,10 +140,10 @@ marking-VoxCocktail-voxcocktail3 = Feathers
 marking-VoxCocktail-voxcocktail4 = Tail
 marking-VoxTailStripes = Tail Stripes
 marking-VoxTailStripes-voxtailstripes = Tail Stripes
-marking-VoxLArmProsthetic = Left Arm Prosthetic
+marking-VoxLArmProsthetic = Prosthetic (Left)
-marking-VoxLArmProsthetic-voxarmprostheticl = Left Arm Prosthetic
+marking-VoxLArmProsthetic-voxarmprostheticl = Prosthetic (Left)
-marking-VoxRArmProsthetic = Right Arm Prosthetic
+marking-VoxRArmProsthetic = Prosthetic (Right)
-marking-VoxRArmProsthetic-voxarmprostheticr = Right Arm Prosthetic
+marking-VoxRArmProsthetic-voxarmprostheticr = Prosthetic (Right)
 marking-VoxBeakColor = Colorable Beak
 marking-VoxBeakColor-voxbeakcolor = Colorable Beak
 marking-VoxBeakSplit = Split Color Beak
@@ -153,23 +155,23 @@ marking-VoxChestPlumage = Chest Plumage
 marking-VoxChestPlumage-voxchestplumage = Chest Plumage
 marking-VoxFootSpines = Leg Spines
 marking-VoxFootSpines-voxfootspines = Leg Spines
-marking-VoxFootGradientLFoot = Solid Foot Left
+marking-VoxFootGradientLFoot = Solid (Left Foot)
-marking-VoxFootGradientLFoot-voxfootgradientl1 = Solid Foot Left
+marking-VoxFootGradientLFoot-voxfootgradientl1 = Solid (Left Foot)
-marking-VoxFootGradientRFoot = Solid Foot Right
+marking-VoxFootGradientRFoot = Solid (Right Foot)
-marking-VoxFootGradientRFoot-voxfootgradientr1 = Solid Foot Right
+marking-VoxFootGradientRFoot-voxfootgradientr1 = Solid (Right Foot)
-marking-VoxLegGradientLLeg = Solid Leg Left
+marking-VoxLegGradientLLeg = Solid (Left Leg)
-marking-VoxLegGradientLLeg-voxfootgradientl2 = Solid Leg Left
+marking-VoxLegGradientLLeg-voxfootgradientl2 = Solid (Left Leg)
-marking-VoxLegGradientRLeg = Solid Leg Right
+marking-VoxLegGradientRLeg = Solid (Right Leg)
-marking-VoxLegGradientRLeg-voxfootgradientr2 = Solid Leg Left
+marking-VoxLegGradientRLeg-voxfootgradientr2 = Solid (Left Leg)
-marking-VoxHandGradientRHand = Right Hand Gradient
+marking-VoxHandGradientRHand = Gradient (Right Hand)
 marking-VoxHandGradientRHand-voxhandgradientr1 = Bottom
 marking-VoxHandGradientRHand-voxhandgradientr2 = Middle
 marking-VoxHandGradientRHand-voxhandgradientr3 = Top
-marking-VoxHandGradientLHand = Left Hand Gradient
+marking-VoxHandGradientLHand = Gradient (Left Hand)
 marking-VoxHandGradientLHand-voxhandgradientl1 = Bottom
 marking-VoxHandGradientLHand-voxhandgradientl2 = Middle
 marking-VoxHandGradientLHand-voxhandgradientl3 = Top
-marking-VoxHeadGradient = Head Gradient
+marking-VoxHeadGradient = Gradient
 marking-VoxHeadGradient-voxheadgradient1 = Front
 marking-VoxHeadGradient-voxheadgradient2 = Middle
 marking-VoxHeadGradient-voxheadgradient3 = Back
@@ -180,20 +182,20 @@ marking-VoxTailBack = Back Tail
 marking-VoxBackTail-voxtailcolorable = Back Tail
 marking-VoxTailLantern = Lantern
 marking-VoxTailLantern-voxtaillantern = Lantern
-marking-VoxTailSingleStripe = Tail Stripe
+marking-VoxTailSingleStripe = Single Tail Stripe
-marking-VoxTailSingleStripe-voxtailsinglestripe = Tail Stripe
+marking-VoxTailSingleStripe-voxtailsinglestripe = Single Tail Stripe
 marking-VoxTailSmallPlume = Small Plume
 marking-VoxTailSmallPlume-voxtailsmallplume = Small Plume
 marking-VoxTailSpines = Tail Spines
 marking-VoxTailSpines-voxtailspines = Tail Spines
-marking-VoxArmsStripesLHand = Left Arm Stripes
+marking-VoxArmsStripesLHand = Stripes (Left Arm)
-marking-VoxArmsStripesLHand-voxarmsstripesl = Left Arm Stripes
+marking-VoxArmsStripesLHand-voxarmsstripesl = Stripes (Left Arm)
-marking-VoxArmsStripesRHand = Right Arm Stripes
+marking-VoxArmsStripesRHand = Stripes (Right Arm)
-marking-VoxArmsStripesRHand-voxarmsstripesr = Right Arm Stripes
+marking-VoxArmsStripesRHand-voxarmsstripesr = Stripes (Right Arm)
-marking-VoxLegsStripesLLeg = Left Leg Stripes
+marking-VoxLegsStripesLLeg = Stripes (Left)
-marking-VoxLegsStripesLLeg-voxlegsstripesl = Left Leg Stripes
+marking-VoxLegsStripesLLeg-voxlegsstripesl = Stripes (Left)
-marking-VoxLegsStripesRLeg = Right Leg Stripes
+marking-VoxLegsStripesRLeg = Stripes (Right)
-marking-VoxLegsStripesRLeg-voxlegsstripesr = Right Leg Stripes
+marking-VoxLegsStripesRLeg-voxlegsstripesr = Stripes (Right)
 marking-VoxChains = Chains
 marking-VoxChains-voxchains = Chains
 marking-VoxSunAndMoon = Sun and Moon
@@ -204,7 +206,6 @@ marking-VoxBelly = Belly
 marking-VoxBelly-voxbelly = Belly
 marking-VoxTailBalled = Thrasher
 marking-VoxTailBalled-voxtailballed = Thrasher
-marking-VoxTailSplit = Twinned
 
 # upstream vox markings dont have localized names. lmfao
 marking-VoxLArmScales = Scaled Left Arm

Resources/Locale/en-US/_Impstation/markings/moth.ftl

@@ -0,0 +1,76 @@
+marking-MothBodyClaw = Claw Scars
+marking-MothBodyClaw-moth_body_claw = Claw Scars
+marking-MothBurnLeft = Burn Scar (Left)
+marking-MothBurnLeft-moth_burn_l = Burn Scar (Left)
+marking-MothBurnRight = Burn Scar (Right)
+marking-MothBurnRight-moth_burn_r = Burn Scar (Right)
+marking-MothFaceClaw = Claw Scars (Face)
+marking-MothFaceClaw-moth_face_claw = Claw Scars (Face)
+marking-MothSlashLeft = Claw Scars (Left)
+marking-MothSlashLeft-moth_slash_l = Claw Scars (Left)
+marking-MothSlashRight = Claw Scars (Right)
+marking-MothSlashRight-moth_slash_r = Claw Scars (Right)
+marking-ChimeraArmLeftMoth = Chimera (Arm)
+marking-ChimeraArmLeftMoth-arm_l_chimera_moth = Chimera (Arm)
+marking-ProstheticArmLeftMoth = Prosthetic (Left)
+marking-ProstheticArmLeftMoth-arm_l_prosthetic_moth = Prosthetic (Left)
+marking-TwistingArmLeftMoth = Twisted Scar (Left Arm)
+marking-TwistingArmLeftMoth-arm_l_twisting_moth = Twisted Scar (Left Arm)
+marking-ProstheticArmRightMoth = Prosthetic (Right)
+marking-ProstheticArmRightMoth-arm_r_prosthetic_moth = Prosthetic (Right)
+marking-TwistingArmRightMoth = Twisted Scar (Right)
+marking-TwistingArmRightMoth-arm_r_twisting_moth = Twisted Scar (Right)
+marking-WingsBackstabbed = Backstabbed
+marking-WingsBackstabbed-wings_backstabbed = Backstabbed
+marking-ChestChimeraFemaleMoth = Chimera
+marking-ChestChimeraFemaleMoth-chest_chimera_f_moth = Chimera
+marking-ChestChimeraMaleMoth = Chimera
+marking-ChestChimeraMaleMoth-chest_chimera_m_moth = Chimera
+marking-ChestTwistingLeftFemaleMoth = Twisted Scar (Left)
+marking-ChestTwistingLeftFemaleMoth-chest_l_twisting_f_moth = Twisted Scar (Left)
+marking-ChestTwistingLeftMaleMoth = Twisted Scar (Left)
+marking-ChestTwistingLeftMaleMoth-chest_l_twisting_m_moth = Twisted Scar (Left)
+marking-ChestTwistingRightFemaleMoth = Twisted Scar (Right)
+marking-ChestTwistingRightFemaleMoth-chest_r_twisting_f_moth = Twisted Scar (Right)
+marking-ChestTwistingRightMaleMoth = Twisted Scar (Right)
+marking-ChestTwistingRightMaleMoth-chest_r_twisting_m_moth = Twisted Scar (Right)
+marking-ChestStarMoth = Star Scar
+marking-ChestStarMoth-chest_star_moth = Star Scar
+marking-HeterochromiaMoth = Heterophobia
+marking-HeterochromiaMoth-eyes_heterochromia_moth = Heterophobia
+marking-FootChimeraLeftMoth = Chimera (Foot)
+marking-FootChimeraLeftMoth-foot_l_chimera_moth = Chimera (Foot)
+marking-FootProstheticLeftMoth = Prosthetic (Left Foot)
+marking-FootProstheticLeftMoth-foot_l_prosthetic_moth = Prosthetic (Left Foot)
+marking-FootProstheticRightMoth = Prosthetic (Right Foot)
+marking-FootProstheticRightMoth-foot_r_prosthetic_moth = Prosthetic (Right Foot)
+marking-HandChimeraLeftMoth = Chimera (Hand)
+marking-HandChimeraLeftMoth-hand_l_chimera_moth = Chimera (Hand)
+marking-HandProstheticLeftMoth = Prosthetic (Left Hand)
+marking-HandProstheticLeftMoth-hand_l_prosthetic_moth = Prosthetic (Left Hand)
+marking-HandTwistingLeftMoth = Twisted Scar (Left Hand)
+marking-HandTwistingLeftMoth-hand_l_twisting_moth = Twisted Scar (Left Hand)
+marking-HandProstheticRightMoth = Prosthetic Hand (Right)
+marking-HandProstheticRightMoth-hand_r_prosthetic_moth = Prosthetic Hand (Right)
+marking-HandTwistingRightMoth = Twisted Scar (Right Hand)
+marking-HandTwistingRightMoth-hand_r_twisting_moth = Twisted Scar (Right Hand)
+marking-BadmoltMoth = Bad Molt
+marking-BadmoltMoth-hand_badmolt_moth = Bad Molt
+marking-HeadChimeraMoth = Chimera
+marking-HeadChimeraMoth-head_chimera_moth = Chimera
+marking-EyebagsMoth = Eyebags
+marking-EyebagsMoth-head_eyebags_moth = Eyebags
+marking-HeadTwistingMoth = Twisted Scar
+marking-HeadTwistingMoth-head_twisting_moth = Twisted Scar
+marking-LegChimeraLeftMoth = Chimera (Leg)
+marking-LegChimeraLeftMoth-leg_l_chimera_moth = Chimera (Leg)
+marking-LegProstheticLeftMoth = Prosthetic (Left Leg)
+marking-LegProstheticLeftMoth-leg_l_prosthetic_moth = Prosthetic (Left Leg)
+marking-LegTwistingLeftMoth = Twisted Scar (Left)
+marking-LegTwistingLeftMoth-leg_l_twisting_moth = Twisted Scar (Left)
+marking-LegProstheticRightMoth = Prosthetic (Right Leg)
+marking-LegProstheticRightMoth-leg_r_prosthetic_moth = Prosthetic (Right Leg)
+marking-LegTwistingRightMoth = Twisted Scar (Right)
+marking-LegTwistingRightMoth-leg_r_twisting_moth = Twisted Scar (Right)
+marking-TorsoIncisionMoth = Torso Incision
+marking-TorsoIncisionMoth-torso_incision_moth = Torso Incision

Resources/Locale/en-US/_Impstation/markings/scars.ftl

@@ -0,0 +1,42 @@
+marking-ArmProstheticLeft = Prosthetic (Left Arm)
+marking-ArmProstheticLeft-arm_r_prosthetic = Prosthetic (Left Arm)
+marking-ArmTwistingLeft = Twisted Scar (Left Arm)
+marking-ArmTwistingLeft-arm_l_twisting = Twisted Scar (Left Arm)
+marking-ArmProstheticRight = Prosthetic (Right Arm)
+marking-ArmProstheticRight-arm_r_prosthetic = Prosthetic (Right Arm)
+marking-ArmTwistingRight = Twisted Scar (Right Arm)
+marking-ArmTwistingRight-arm_r_twisting = Twisted Scar (Right Arm)
+marking-ChestBackstabbed = Backstabbed
+marking-ChestBackstabbed-chest_backstabbed = Backstabbed
+marking-ChestTwistingLeft = Twisted Scar (Left)
+marking-ChestTwistingLeft-chest_l_twisting = Twisted Scar (Left)
+marking-ChestTwistingRight = Twisted Scar (Right)
+marking-ChestTwistingRight-chest_r_twisting = Twisted Scar (Right)
+marking-ChestStar = Star Scar
+marking-ChestStar-chest_star = Star Scar
+marking-FootProstheticLeft = Prosthetic (Left Foot)
+marking-FootProstheticLeft-foot_l_prosthetic = Prosthetic (Left Foot)
+marking-FootProstheticRight = Prosthetic (Right Foot)
+marking-FootProstheticRight-foot_r_prosthetic = Prosthetic (Right Foot)
+marking-HandProstheticLeft = Prosthetic (Left Hand)
+marking-HandProstheticLeft-hand_l_prosthetic = Prosthetic (Left Hand)
+marking-HandTwistingLeft = Twisted Scar (Left Hand)
+marking-HandTwistingLeft-hand_l_twisting = Twisted Scar (Left Hand)
+marking-HandProstheticRight = Prosthetic (Right Hand)
+marking-HandProstheticRight-hand_r_prosthetic = Prosthetic (Right Hand)
+marking-HandTwistingRight = Twisted Scar (Right Hand)
+marking-HandTwistingRight-hand_r_twisting = Twisted Scar (Right Hand)
+marking-SmileScars = The Jonker
+marking-SmileScars-head_smile = The Jonker
+marking-HeadTwisting = Twisted Scar
+marking-HeadTwisting-head_twisting = Twisted Scar
+marking-LegProstheticLeft = Prosthetic (Left Leg)
+marking-LegProstheticLeft-leg_l_prosthetic = Prosthetic (Left Leg)
+marking-LegTwistingLeft = Twisted Scar (Left Leg)
+marking-LegTwistingLeft-leg_t_twisting = Twisted Scar (Left Leg)
+marking-LegProstheticRight = Prosthetic (Right Leg)
+marking-LegProstheticRight-leg_r_prosthetic = Prosthetic (Right Leg)
+marking-LegTwistingRight = Twisted Scar (Right Leg)
+marking-LegTwistingRight-leg_r_twisting = Twisted Scar (Right Leg)
+marking-TorsoIncision = Torso Incision
+marking-TorsoIncision-torso_incision = Torso Incision

Resources/Locale/en-US/_Impstation/markings/slimeperson.ftl

@@ -0,0 +1,47 @@
+marking-SlimeNose-nose = Nose (Profile)
+marking-SlimeNose = Nose (Profile)
+
+marking-SlimeMouth-mouth = Mouth
+marking-SlimeMouth = Mouth
+
+marking-SlimeBrain-brain = Brain
+marking-SlimeBrain = Brain
+
+marking-SlimeEyeglow-eyeglow = Eye Glow
+marking-SlimeEyeglow = Eye Glow
+
+marking-SlimeCore-core = Core
+marking-SlimeCore = Core
+
+marking-SlimeLungs-lungs = Lungs
+marking-SlimeLungs = Lungs
+
+marking-SlimeBonehead-bonehead = Floating Skull
+marking-SlimeBonehead = Floating Skull
+
+marking-SlimeBonechest-bonechest = Floating Ribcage
+marking-SlimeBonechest = Floating Ribcage
+
+marking-SlimeBonearmleft-bonearmleft = Floating Bones (Left Arm)
+marking-SlimeBonearmleft = Floating Bones (Left Arm)
+
+marking-SlimeBonearmright-bonearmright = Floating Bones (Right Arm)
+marking-SlimeBonearmright = Floating Bones (Right Arm)
+
+marking-SlimeBonefootleft-bonefootleft = Floating Bones (Left Foot)
+marking-SlimeBonefootleft = Floating Bones (Left Foot)
+
+marking-SlimeBonefootright-bonefootright = Floating Bones (Right Foot)
+marking-SlimeBonefootright = Floating Bones (Right Foot)
+
+marking-SlimeBonehandleft-bonehandleft = Floating Bones (Left Hand)
+marking-SlimeBonehandleft = Floating Bones (Left Hand)
+
+marking-SlimeBonehandright-bonehandright = Floating Bones (Right Hand)
+marking-SlimeBonehandright = Floating Bones (Right Hand)
+
+marking-SlimeBonelegleft-bonelegleft = Floating Bones (Left Leg)
+marking-SlimeBonelegleft = Floating Bones (Left Leg)
+
+marking-SlimeBonelegright-bonelegright = Floating Bones (Right Leg)
+marking-SlimeBonelegright = Floating Bones (Right Leg)

Resources/Locale/en-US/_Impstation/markings/vox_scars.ftl

@@ -0,0 +1,20 @@
+marking-ScarsVoxRoadrashLeftHead-roadrash_l_head = Road Rash (Left)
+marking-ScarsVoxRoadrashLeftHead = Road Rash (Left)
+
+marking-ScarsVoxRoadrashRightHead-roadrash_r_head = Road Rash (Right)
+marking-ScarsVoxRoadrashRightHead = Road Rash (Right)
+
+marking-ScarsVoxBigslashLeftHead-bigslash_l_head = Big Slash (Left)
+marking-ScarsVoxBigslashLeftHead = Big Slash (Left)
+
+marking-ScarsVoxBigslashRightHead-roadrash_r_head = Big Slash (Right)
+marking-ScarsVoxBigslashRightHead = Big Slash (Right)
+
+marking-ScarsVoxSlashLeftHead-slash_l_head = Slash (Left)
+marking-ScarsVoxSlashLeftHead = Slash (Left)
+
+marking-ScarsVoxSlashRightHead-slash_r_head = Slash (Right)
+marking-ScarsVoxSlashRightHead = Slash (Right)
+
+marking-ScarsVoxClawTorso-claw_torso = Claw Scar
+marking-ScarsVoxClawTorso = Claw Scar

Resources/Prototypes/Entities/Objects/Misc/utensils.yml

@@ -146,7 +146,7 @@
   parent: UtensilBase
   id: BarSpoon
   name: bar spoon
-  description: Your personal helper to mix drinks and changes lives.
+  description: Your personal helper to mix drinks and change lives.
   components:
   - type: Tag
     tags:

Resources/Prototypes/Species/vox.yml

@@ -6,7 +6,7 @@
   sprites: MobVoxSprites
   markingLimits: MobVoxMarkingLimits
   dollPrototype: MobVoxDummy
-  skinColoration: Hues
+  skinColoration: VoxFeathers
   defaultSkinTone: "#6c741d"
   maleFirstNames: NamesVox
   femaleFirstNames: NamesVox
@@ -71,8 +71,6 @@
       required: false
     Chest:
       points: 2
-    Overlay:
-      points: 4
       required: false
     Tail:
       points: 1

Resources/Prototypes/_Impstation/Entities/Mobs/Customization/Markings/misc.yml

@@ -160,7 +160,11 @@
   bodyPart: Head
   markingCategory: Overlay
   speciesRestriction: [ Dwarf ]
-  forcedColoring: true
+  coloring:
+    default:
+      type:
+        !type:SimpleColoring
+        color: "#FFFFFF"
   followSkinColor: false
   sprites:
   - sprite: _Impstation/Mobs/Customization/animatedmarkings.rsi
@@ -172,7 +176,11 @@
   bodyPart: Chest
   markingCategory: Overlay
   speciesRestriction: [ Dwarf ]
-  forcedColoring: true
+  coloring:
+    default:
+      type:
+        !type:SimpleColoring
+        color: "#FFFFFF"
   followSkinColor: false
   sprites:
   - sprite: _Impstation/Mobs/Customization/animatedmarkings.rsi
@@ -184,7 +192,11 @@
   bodyPart: LArm
   markingCategory: Overlay
   speciesRestriction: [ Dwarf ]
-  forcedColoring: true
+  coloring:
+    default:
+      type:
+        !type:SimpleColoring
+        color: "#FFFFFF"
   followSkinColor: false
   sprites:
   - sprite: _Impstation/Mobs/Customization/animatedmarkings.rsi
@@ -196,7 +208,11 @@
   bodyPart: LHand
   markingCategory: Overlay
   speciesRestriction: [ Dwarf ]
-  forcedColoring: true
+  coloring:
+    default:
+      type:
+        !type:SimpleColoring
+        color: "#FFFFFF"
   followSkinColor: false
   sprites:
   - sprite: _Impstation/Mobs/Customization/animatedmarkings.rsi
@@ -208,7 +224,11 @@
   bodyPart: RArm
   markingCategory: Overlay
   speciesRestriction: [ Dwarf ]
-  forcedColoring: true
+  coloring:
+    default:
+      type:
+        !type:SimpleColoring
+        color: "#FFFFFF"
   followSkinColor: false
   sprites:
   - sprite: _Impstation/Mobs/Customization/animatedmarkings.rsi
@@ -220,7 +240,11 @@
   bodyPart: RHand
   markingCategory: Overlay
   speciesRestriction: [ Dwarf ]
-  forcedColoring: true
+  coloring:
+    default:
+      type:
+        !type:SimpleColoring
+        color: "#FFFFFF"
   followSkinColor: false
   sprites:
   - sprite: _Impstation/Mobs/Customization/animatedmarkings.rsi
@@ -232,7 +256,11 @@
   bodyPart: LLeg
   markingCategory: Overlay
   speciesRestriction: [ Dwarf ]
-  forcedColoring: true
+  coloring:
+    default:
+      type:
+        !type:SimpleColoring
+        color: "#FFFFFF"
   followSkinColor: false
   sprites:
   - sprite: _Impstation/Mobs/Customization/animatedmarkings.rsi
@@ -244,7 +272,11 @@
   bodyPart: LFoot
   markingCategory: Overlay
   speciesRestriction: [ Dwarf ]
-  forcedColoring: true
+  coloring:
+    default:
+      type:
+        !type:SimpleColoring
+        color: "#FFFFFF"
   followSkinColor: false
   sprites:
   - sprite: _Impstation/Mobs/Customization/animatedmarkings.rsi
@@ -256,7 +288,11 @@
   bodyPart: RLeg
   markingCategory: Overlay
   speciesRestriction: [ Dwarf ]
-  forcedColoring: true
+  coloring:
+    default:
+      type:
+        !type:SimpleColoring
+        color: "#FFFFFF"
   followSkinColor: false
   sprites:
   - sprite: _Impstation/Mobs/Customization/animatedmarkings.rsi
@@ -268,7 +304,11 @@
   bodyPart: RFoot
   markingCategory: Overlay
   speciesRestriction: [ Dwarf ]
-  forcedColoring: true
+  coloring:
+    default:
+      type:
+        !type:SimpleColoring
+        color: "#FFFFFF"
   followSkinColor: false
   sprites:
   - sprite: _Impstation/Mobs/Customization/animatedmarkings.rsi
@@ -344,7 +384,7 @@
         color: "#FFFFFF"
   sprites:
   - sprite: _Impstation/Mobs/Customization/animatedmarkings.rsi
-    state: dwarfmarkkangaroo
+    state: dwarfmarkkangaroolhand
   shader: unshaded
 
 - type: marking
@@ -969,7 +1009,7 @@
   id: VitiligoHeadL
   bodyPart: Head
   markingCategory: Head
-  speciesRestriction: [ Human,  ]
+  speciesRestriction: [ Human,  Dwarf ]
   forcedColoring: true
   coloring:
     default:

Resources/Textures/_Impstation/Mobs/Customization/animatedmarkings.rsi/meta.json

@@ -887,6 +887,32 @@
           ]
         ]
       },
+      {
+        "name": "dwarfmarkkangaroolhand",
+        "directions": 4,
+        "delays": [
+          [
+            0.2,
+            0.2,
+            0.2
+          ],
+          [
+            0.2,
+            0.2,
+            0.2
+          ],
+          [
+            0.2,
+            0.2,
+            0.2
+          ],
+          [
+            0.2,
+            0.2,
+            0.2
+          ]
+        ]
+      },
       {
         "name": "dwarfmarkcobra",
         "directions": 4,