DeltaV-Station · hivehum · Feb 8, 2025 · Feb 8, 2025 · Feb 8, 2025
@@ -298,7 +298,13 @@ private void ApplyMarking(MarkingPrototype markingPrototype,
                 sprite.LayerMapSet(layerId, layer);
                 sprite.LayerSetSprite(layerId, rsi);
             }
-
+            // impstation edit begin - check if there's a shader defined in the markingPrototype's shader datafield, and if there is...
+            if (markingPrototype.Shader != null)
+            {
+                // use spriteComponent's layersetshader function to set the layer's shader to that which is specified.
+                sprite.LayerSetShader(layerId, markingPrototype.Shader);
+            }
+            // impstation edit end
             sprite.LayerSetVisible(layerId, visible);
 
             if (!visible || setting == null) // this is kinda implied

@@ -35,6 +35,10 @@ public sealed partial class MarkingPrototype : IPrototype
         [DataField("sprites", required: true)]
         public List<SpriteSpecifier> Sprites { get; private set; } = default!;
 
+        // impstation edit - allow markings to support shaders
+        [DataField("shader")]
+        public string? Shader { get; private set; } = null;
+        // end impstation edit
         public Marking AsMarking()
         {
             return new Marking(ID, Sprites.Count);

@@ -46,7 +46,9 @@ marking-HarpyWingBat-bat_wings_tone_2 = Membrane
 
 marking-HarpyWingBionic = Simple Bionic Wings (Whitescale)
 marking-HarpyWingBionic-bionic_wings_tone_1 = Wings
-marking-HarpyWingBionic-bionic_wings_tone_2 = Lights (Unshaded)
+
+marking-HarpyWingBionicHighlights = Simple Bionic Wings (Lights)
+marking-HarpyWingBionicHighlights-bionic_wings_tone_2 = Lights (Unshaded)
 
 marking-HarpyEarsDefault = Feather Tufts
 marking-HarpyEarsDefault-harpy_ears_default = Tufts

@@ -0,0 +1,26 @@
+marking-BurqaSolid = Burqa
+marking-BurqaSolidLizard = Burqa
+marking-BurqaSolidLizard-burqasolidlizard = Burqa
+marking-HijabFashionable = Hijab (Fashionable)
+marking-HijabFashionableLizard = Hijab (Fashionable)
+marking-HijabFashionableLizard-hijabchiclizard = Hijab (Fashionable)
+marking-HijabFashionableVox = Hijab (Fashionable)
+marking-HijabFashionableVox-hijabchicvox = Hijab (Fashionable)
+marking-HijabSimple = Hijab (Simple)
+marking-HijabSimpleLizard = Hijab (Simple)
+marking-HijabSimpleLizard-hijabsimplelizard = Hijab (Simple)
+marking-HijabSimpleVox = Hijab (Simple)
+marking-HijabSimpleVox-hijabsimplevox = Hijab (Simple)
+marking-Niqab = Niqab
+marking-NiqabLizard = Niqab
+marking-NiqabLizard-niqablizard = Niqab
+marking-TichelFashionable = Tichel (Fashionable)
+marking-TichelFashionableLizard = Tichel (Fashionable)
+marking-TichelFashionableLizard-tichelfashionablelizard = Tichel (Fashionable)
+marking-TichelFashionableVox = Tichel (Fashionable)
+marking-TichelFashionableVox-tichelfashionablevox = Tichel (Fashionable)
+marking-TichelSimple = Tichel (Simple)
+marking-TichelSimpleLizard = Tichel (Simple)
+marking-TichelSimpleLizard-tichelsimplelizard = Tichel (Simple)
+marking-TichelSimpleVox = Tichel (Simple)
+marking-TichelSimpleVox-tichelsimplevox = Tichel (Simple)
@@ -0,0 +1,3 @@
+marking-HumanHairGatheredlow = Gathered Low
+marking-HumanHairFrenchBraid = French Braid
+marking-HumanHairLowpigtails = Low Pigtails
@@ -0,0 +1,8 @@
+marking-BodyhairHumanMale-human_bodyhair_male = Body Hair
+marking-BodyhairHumanMale = Body Hair
+
+marking-BodyhairHumanFemale-human_bodyhair_female = Body Hair
+marking-BodyhairHumanFemale = Body Hair
+
+marking-BodyhairHumanUnsexed-human_bodyhair_unsexed = Body Hair
+marking-BodyhairHumanUnsexed = Body Hair
@@ -0,0 +1,178 @@
+# this file is subject to getting its shit moved to other files at a later date#
+
+# arachnids
+marking-SpiderMirror = Mirror
+marking-SpiderMirror-spidermirror = Mirror
+marking-SpiderGlowEyes = Glowing Eyes
+marking-SpiderGlowEyes-spidergloweyes = Glowing Eyes
+marking-SpiderEyesMulti = Multicolor Eyes
+marking-SpiderEyesMulti-spidereyesmulti1 = Top
+marking-SpiderEyesMulti-spidereyesmulti2 = Middle Top
+marking-SpiderEyesMulti-spidereyesmulti3 = Middle Bottom
+marking-SpiderEyesMulti-spidereyesmulti4 = Bottom
+
+# diona
+marking-DionaLivingNymph = Living Nymphs
+marking-DionaLivingNymph-dionalivingnymph = Living Nymphs
+marking-DionaMossChest = Moss Drape
+marking-DionaMossChest-dionamosschest = Moss Drape
+marking-DionaMoonBloom = Moon Bloom
+marking-DionaMoonBloom-dionamoonbloom = Moon Bloom
+marking-DionaBigFirefly = Big Fireflies
+marking-DionaBigFirefly-dionabigfirefly = Big Fireflies
+marking-DionaFirefly = Fireflies
+marking-DionaFirefly-dionafirefly = Fireflies
+marking-DionaPollenDust = Pollen Cloud
+marking-DionaPollenDust-dionapollendust = Pollen Cloud
+
+# 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)
+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 = 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 = Outer stripes
+marking-MothBee-bee2 = Wings
+marking-MothBee-bee3 = Inner stripe
+marking-MothBeetleTail = Beetle Wings (Junebug)
+marking-MothBeetleTail-beetle1 = Outline
+marking-MothBeetleTail-beetle2 = Wings
+marking-MothBeetleTail-beetle3 = Shine
+marking-MothBeetleHorn1 = Beetle Horn (Pronged)
+marking-MothBeetleHorn1-mothbeetlehorn1 = Beetle Horn (Pronged)
+marking-MothBeetleHorn2 = Beetle Horn (Lance)
+marking-MothBeetleHorn2-mothbeetlehorn2 = Beetle Horn (Lance)
+marking-MothBiggerEyes = Bigger Eyes
+marking-MothBiggerEyes-mothbiggereyes = Bigger Eyes
+marking-MothSnoth = Snoth Wings
+marking-MothSnoth-snoth1 = Wings
+marking-MothSnoth-snoth2 = Shell
+marking-MothGlasswing = Glasswing
+marking-MothGlasswing-glasswing1 = Outer
+marking-MothGlasswing-glasswing2 = Inner
+marking-MothGlasswing-glasswing3 = Stripe
+marking-MothRhinoBeetle = Beetle Wings (Rhino)
+marking-MothRhinoBeetle-rhinobeetle1 = Outline
+marking-MothRhinoBeetle-rhinobeetle2 = Shine
+marking-MothRhinoBeetle-rhinobeetle3 = Wings
+
+# slimes
+marking-fizz = Fizz
+marking-fizz-fizz = Fizz
+marking-bubble = Bubbles
+marking-bubble-bubble = Bubbles
+marking-fishbowl = Fishbowl
+marking-fishbowl-fishbowl1 = Fish
+marking-fishbowl-fishbowl2 = Fish bubbles
+marking-FadingStars = Fading Starlight
+marking-FadingStars-fadingstars1 = Brightest
+marking-FadingStars-fadingstars2 = Middling
+marking-FadingStars-fadingstars3 = Darkest
+
+# vox
+marking-VoxCocktail = Cocktail
+marking-VoxCocktail-voxcocktail1 = Feathers
+marking-VoxCocktail-voxcocktail2 = Feathers
+marking-VoxCocktail-voxcocktail3 = Feathers
+marking-VoxCocktail-voxcocktail4 = Tail
+marking-VoxTailStripes = Tail Stripes
+marking-VoxTailStripes-voxtailstripes = Tail Stripes
+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
+marking-VoxBeakSplit-voxbeaksplit1 = Top
+marking-VoxBeakSplit-voxbeaksplit2 = Bottom
+marking-VoxBeakTipped = Tipped Beak
+marking-VoxBeakTipped-voxbeaktipped = Tipped Beak
+marking-VoxChestPlumage = Chest Plumage
+marking-VoxChestPlumage-voxchestplumage = Chest Plumage
+marking-VoxFootSpines = Leg Spines
+marking-VoxFootSpines-voxfootspines = Leg Spines
+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 = Gradient (Left Hand)
+marking-VoxHandGradientLHand-voxhandgradientl1 = Bottom
+marking-VoxHandGradientLHand-voxhandgradientl2 = Middle
+marking-VoxHandGradientLHand-voxhandgradientl3 = Top
+marking-VoxHeadGradient = Gradient
+marking-VoxHeadGradient-voxheadgradient1 = Front
+marking-VoxHeadGradient-voxheadgradient2 = Middle
+marking-VoxHeadGradient-voxheadgradient3 = Back
+marking-VoxTailBell = Bell
+marking-VoxTailBell-voxtailbell1 = Bell
+marking-VoxTailBell-voxtailbell2 = Back Tail
+marking-VoxTailBack = Back Tail
+marking-VoxBackTail-voxtailcolorable = Back Tail
+marking-VoxTailLantern = Lantern
+marking-VoxTailLantern-voxtaillantern = Lantern
+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 = 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
+marking-VoxSunAndMoon-voxsunandmoon = Sun and Moon
+marking-VoxCheeks = Cheeks
+marking-VoxCheeks-voxcheeks = Cheeks
+marking-VoxBelly = Belly
+marking-VoxBelly-voxbelly = Belly
+marking-VoxTailBalled = Thrasher
+marking-VoxTailBalled-voxtailballed = Thrasher
+marking-VoxTailSplit = Twinned
+marking-VoxTailSplit-voxtailsplit = Twinned
+
+# upstream vox markings dont have localized names. lmfao
+marking-VoxBeak = Default Beak [DO NOT USE]
+marking-VoxLArmScales = Arm Scales L
+marking-VoxLHandScales = Hand Scales L
+marking-VoxRArmScales = Arm Scales R
+marking-VoxRHandScales = Hand Scales R
+marking-VoxTail = Default Tail [DO NOT USE]
+marking-VoxLFootScales = Foot Scales L
+marking-VoxLLegScales = Leg Scales L
+marking-VoxRFootScales = Foot Scales R
+marking-VoxRLegScales = Leg Scales R
@@ -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
@@ -0,0 +1,12 @@
+marking-LizardSnoutpiercings-piercings1 = Piercings
+marking-LizardSnoutpiercings = Piercings
+
+marking-LizardHornsNubby-horns_nubby = Lizard Horns (Nubby)
+marking-LizardHornsNubby = Lizard Horns (Nubby)
+
+marking-LizardHornsKoboldEarspiercings = Lizard Ears (Kobold, Pierced)
+marking-LizardHornsKoboldEarspiercings-horns_kobold_ears = Ears
+marking-LizardHornsKoboldEarspiercings-horns_kobold_ears_piercings = Piercings
+
+marking-Fangs = Lizard Fangs
+marking-Fangs-Fangs = Fangs
@@ -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