From 4f2f9eced9893865c68561a8b46894d1c1d8ff3b Mon Sep 17 00:00:00 2001 From: Dark Date: Mon, 6 Jan 2025 22:40:27 +0000 Subject: [PATCH] Merge pull request #1204 from hivehum/markings markings bugfixes --- .../en-US/_Impstation/markings/misc.ftl | 137 +++++++++--------- .../en-US/_Impstation/markings/moth.ftl | 76 ++++++++++ .../en-US/_Impstation/markings/scars.ftl | 42 ++++++ .../_Impstation/markings/slimeperson.ftl | 47 ++++++ .../en-US/_Impstation/markings/vox_scars.ftl | 20 +++ .../Entities/Objects/Misc/utensils.yml | 2 +- Resources/Prototypes/Species/vox.yml | 4 +- .../Mobs/Customization/Markings/misc.yml | 64 ++++++-- .../dwarfmarkkangaroolhand.png | Bin 0 -> 7515 bytes .../animatedmarkings.rsi/meta.json | 26 ++++ 10 files changed, 334 insertions(+), 84 deletions(-) create mode 100644 Resources/Locale/en-US/_Impstation/markings/moth.ftl create mode 100644 Resources/Locale/en-US/_Impstation/markings/scars.ftl create mode 100644 Resources/Locale/en-US/_Impstation/markings/slimeperson.ftl create mode 100644 Resources/Locale/en-US/_Impstation/markings/vox_scars.ftl create mode 100644 Resources/Textures/_Impstation/Mobs/Customization/animatedmarkings.rsi/dwarfmarkkangaroolhand.png diff --git a/Resources/Locale/en-US/_Impstation/markings/misc.ftl b/Resources/Locale/en-US/_Impstation/markings/misc.ftl index cfba272225..15b054f5af 100644 --- a/Resources/Locale/en-US/_Impstation/markings/misc.ftl +++ b/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-spidereyesmilti2 = Middle Top -marking-SpiderEyesMulti-spidereyesmilti3 = Middle Bottom -marking-SpiderEyesMulti-spidereyesmilti4 = Bottom +marking-SpiderEyesMulti-spidereyesmulti1 = Top +marking-SpiderEyesMulti-spidereyesmulti2 = Middle Top +marking-SpiderEyesMulti-spidereyesmulti3 = Middle 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-dwarfconstellationlarm = Left Arm Constellation -marking-DwarfConstellationRArm = Right Arm Constellation -marking-DwarfConstellationRArm-dwarfconstellationrarm = Right Arm Constellation -marking-DwarfConstellationLHand = Left Hand Constellation -marking-DwarfConstellationLHand-dwarfconstellationlhand = Left Hand Constellation -marking-DwarfConstellationRHand = Right Hand Constellation -marking-DwarfConstellationRHand-dwarfconstellationrhand = Right Hand Constellation -marking-DwarfConstellationLLeg = Left Leg Constellation -marking-DwarfConstellationLLeg-dwarfconstellationlleg = Left Leg Constellation -marking-DwarfConstellationRLeg = Right Leg Constellation -marking-DwarfConstellationRLeg-dwarfconstellationrleg = Right Leg Constellation -marking-DwarfConstellationLFoot = Left Foot Constellation -marking-DwarfConstellationLFoot-dwarfconstellationlfoot = Left Foot Constellation -marking-DwarfConstellationRFoot = Right Foot Constellation -marking-DwarfConstellationRFoot-dwarfconstellationrfoot = Right Foot Constellation -marking-DwarfChestHair = Hairy Chest -marking-DwarfChestHair-dwarfchesthair = Hairy Chest -marking-DwarfArmHair = Hairy Arms -marking-DwarfArmHair-dwarfarmhair = Hairy Arms -marking-DwarfLegHair = Hairy Legs -marking-DwarfLegHair-dwarfleghair = Hairy Legs +marking-DwarfConstellationLArm = Arm Constellation (Left) +marking-DwarfConstellationLArm-dwarfconstellationlarm = Arm Constellation (Left) +marking-DwarfConstellationRArm = Arm Constellation (Right) +marking-DwarfConstellationRArm-dwarfconstellationrarm = Arm Constellation (Right) +marking-DwarfConstellationLHand = Hand Constellation (Left) +marking-DwarfConstellationLHand-dwarfconstellationlhand = Hand Constellation (Left) +marking-DwarfConstellationRHand = Hand Constellation (Right) +marking-DwarfConstellationRHand-dwarfconstellationrhand = Hand Constellation (Right) +marking-DwarfConstellationLLeg = Leg Constellation (Left) +marking-DwarfConstellationLLeg-dwarfconstellationlleg = Leg Constellation (Left) +marking-DwarfConstellationRLeg = Leg Constellation (Right) +marking-DwarfConstellationRLeg-dwarfconstellationrleg = Leg Constellation (Right) +marking-DwarfConstellationLFoot = Foot Constellation (Left) +marking-DwarfConstellationLFoot-dwarfconstellationlfoot = Foot Constellation (Left) +marking-DwarfConstellationRFoot = Foot Constellation (Right) +marking-DwarfConstellationRFoot-dwarfconstellationrfoot = Foot Constellation (Right) +marking-DwarfChestHair = Chest Hair +marking-DwarfChestHair-dwarfchesthair = Chest Hair +marking-DwarfArmHair = Arm Hair +marking-DwarfArmHair-dwarfarmhair = Arm Hair +marking-DwarfLegHair = Leg Hair +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-dwarfmarkkangaroo = Mark of the Kangaroo +marking-DwarfMarkKangarooLHand = Mark of the Kangaroo (Left) +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-VitiligoHeadR = Vitiligo Right Eye -marking-VitiligoHeadJaw = Vitiligo Jawline -marking-VitiligoHandR = Vitiligo Right Hand -marking-VitiligoArmR = Vitiligo Right Arm -marking-VitiligoLegR = Vitiligo Right Leg -marking-VitiligoHandL = Vitiligo Left Hand -marking-VitiligoArmL = Vitiligo Left Arm -marking-VitiligoLegL = Vitiligo Left Leg -marking-VitiligoChestF = Vitiligo Chest Spread -marking-VitiligoChestSpots = Vitiligo Chest Spots +marking-VitiligoHeadL = Vitiligo (Left Eye) +marking-VitiligoHeadR = Vitiligo (Right Eye) +marking-VitiligoHeadJaw = Vitiligo (Jawline) +marking-VitiligoHandR = Vitiligo (Right Hand) +marking-VitiligoArmR = Vitiligo (Right Arm) +marking-VitiligoLegR = Vitiligo (Right) +marking-VitiligoHandL = Vitiligo (Left Hand) +marking-VitiligoArmL = Vitiligo (Left Arm) +marking-VitiligoLegL = Vitiligo (Left) +marking-VitiligoChestF = Vitiligo Spread +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-voxarmprostheticl = Left Arm Prosthetic -marking-VoxRArmProsthetic = Right Arm Prosthetic -marking-VoxRArmProsthetic-voxarmprostheticr = Right Arm Prosthetic +marking-VoxLArmProsthetic = Prosthetic (Left) +marking-VoxLArmProsthetic-voxarmprostheticl = Prosthetic (Left) +marking-VoxRArmProsthetic = Prosthetic (Right) +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-voxfootgradientl1 = Solid Foot Left -marking-VoxFootGradientRFoot = Solid Foot Right -marking-VoxFootGradientRFoot-voxfootgradientr1 = Solid Foot Right -marking-VoxLegGradientLLeg = Solid Leg Left -marking-VoxLegGradientLLeg-voxfootgradientl2 = Solid Leg Left -marking-VoxLegGradientRLeg = Solid Leg Right -marking-VoxLegGradientRLeg-voxfootgradientr2 = Solid Leg Left -marking-VoxHandGradientRHand = Right Hand Gradient +marking-VoxFootGradientLFoot = Solid (Left Foot) +marking-VoxFootGradientLFoot-voxfootgradientl1 = Solid (Left Foot) +marking-VoxFootGradientRFoot = Solid (Right Foot) +marking-VoxFootGradientRFoot-voxfootgradientr1 = Solid (Right Foot) +marking-VoxLegGradientLLeg = Solid (Left Leg) +marking-VoxLegGradientLLeg-voxfootgradientl2 = Solid (Left Leg) +marking-VoxLegGradientRLeg = Solid (Right Leg) +marking-VoxLegGradientRLeg-voxfootgradientr2 = Solid (Left Leg) +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-voxtailsinglestripe = Tail Stripe +marking-VoxTailSingleStripe = Single 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-voxarmsstripesl = Left Arm Stripes -marking-VoxArmsStripesRHand = Right Arm Stripes -marking-VoxArmsStripesRHand-voxarmsstripesr = Right Arm Stripes -marking-VoxLegsStripesLLeg = Left Leg Stripes -marking-VoxLegsStripesLLeg-voxlegsstripesl = Left Leg Stripes -marking-VoxLegsStripesRLeg = Right Leg Stripes -marking-VoxLegsStripesRLeg-voxlegsstripesr = Right Leg Stripes +marking-VoxArmsStripesLHand = Stripes (Left Arm) +marking-VoxArmsStripesLHand-voxarmsstripesl = Stripes (Left Arm) +marking-VoxArmsStripesRHand = Stripes (Right Arm) +marking-VoxArmsStripesRHand-voxarmsstripesr = Stripes (Right Arm) +marking-VoxLegsStripesLLeg = Stripes (Left) +marking-VoxLegsStripesLLeg-voxlegsstripesl = Stripes (Left) +marking-VoxLegsStripesRLeg = Stripes (Right) +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 diff --git a/Resources/Locale/en-US/_Impstation/markings/moth.ftl b/Resources/Locale/en-US/_Impstation/markings/moth.ftl new file mode 100644 index 0000000000..d0adc8f367 --- /dev/null +++ b/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 diff --git a/Resources/Locale/en-US/_Impstation/markings/scars.ftl b/Resources/Locale/en-US/_Impstation/markings/scars.ftl new file mode 100644 index 0000000000..1a626045d5 --- /dev/null +++ b/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 diff --git a/Resources/Locale/en-US/_Impstation/markings/slimeperson.ftl b/Resources/Locale/en-US/_Impstation/markings/slimeperson.ftl new file mode 100644 index 0000000000..accf8f183a --- /dev/null +++ b/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) diff --git a/Resources/Locale/en-US/_Impstation/markings/vox_scars.ftl b/Resources/Locale/en-US/_Impstation/markings/vox_scars.ftl new file mode 100644 index 0000000000..0c421fadbd --- /dev/null +++ b/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 diff --git a/Resources/Prototypes/Entities/Objects/Misc/utensils.yml b/Resources/Prototypes/Entities/Objects/Misc/utensils.yml index 9c9156ec50..a7a777d318 100644 --- a/Resources/Prototypes/Entities/Objects/Misc/utensils.yml +++ b/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: diff --git a/Resources/Prototypes/Species/vox.yml b/Resources/Prototypes/Species/vox.yml index a796a99c1b..b29709b0f2 100644 --- a/Resources/Prototypes/Species/vox.yml +++ b/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 diff --git a/Resources/Prototypes/_Impstation/Entities/Mobs/Customization/Markings/misc.yml b/Resources/Prototypes/_Impstation/Entities/Mobs/Customization/Markings/misc.yml index 48fc3fdc64..2055e61607 100644 --- a/Resources/Prototypes/_Impstation/Entities/Mobs/Customization/Markings/misc.yml +++ b/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: diff --git a/Resources/Textures/_Impstation/Mobs/Customization/animatedmarkings.rsi/dwarfmarkkangaroolhand.png b/Resources/Textures/_Impstation/Mobs/Customization/animatedmarkings.rsi/dwarfmarkkangaroolhand.png new file mode 100644 index 0000000000000000000000000000000000000000..42a726509607cbac458dd98cf5387353e0e58625 GIT binary patch literal 7515 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 JzNcv$^gr81W2FE9 literal 0 HcmV?d00001 diff --git a/Resources/Textures/_Impstation/Mobs/Customization/animatedmarkings.rsi/meta.json b/Resources/Textures/_Impstation/Mobs/Customization/animatedmarkings.rsi/meta.json index 53afa94a3d..4a5f88876c 100644 --- a/Resources/Textures/_Impstation/Mobs/Customization/animatedmarkings.rsi/meta.json +++ b/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,