diff --git a/Resources/Locale/en-US/_Impstation/accessories/thaven-hair.ftl b/Resources/Locale/en-US/_Impstation/accessories/thaven-hair.ftl deleted file mode 100644 index 9c553688114..00000000000 --- a/Resources/Locale/en-US/_Impstation/accessories/thaven-hair.ftl +++ /dev/null @@ -1,207 +0,0 @@ -marking-ThavenHairAfro = Afro -marking-ThavenHairAfro2 = Afro 2 -marking-ThavenHairBigafro = Afro (Large) -marking-ThavenHairAntenna = Ahoge -marking-ThavenHairBalding = Balding Hair -marking-ThavenHairBedhead = Bedhead -marking-ThavenHairBedheadv2 = Bedhead 2 -marking-ThavenHairBedheadv3 = Bedhead 3 -marking-ThavenHairLongBedhead = Long Bedhead -marking-ThavenHairLongBedhead2 = Long Bedhead 2 -marking-ThavenHairFloorlengthBedhead = Floorlength Bedhead -marking-ThavenHairBeehive = Beehive -marking-ThavenHairBeehive2 = Beehive 2 -marking-ThavenHairBob = Bob Hair -marking-ThavenHairBob2 = Bob Hair 2 -marking-ThavenHairBobcut = Bob Hair 3 -marking-ThavenHairBob4 = Bob Hair 4 -marking-ThavenHairBob5 = Bob Hair 5 -marking-ThavenHairBobcurl = Bobcurl -marking-ThavenHairBoddicker = Boddicker -marking-ThavenHairBowlcut = Bowlcut -marking-ThavenHairBowlcut2 = Bowlcut 2 -marking-ThavenHairBraid = Braid (Floorlength) -marking-ThavenHairBraided = Braided -marking-ThavenHairBraidfront = Braided Front -marking-ThavenHairBraid2 = Braid (High) -marking-ThavenHairHbraid = Braid (Low) -marking-ThavenHairShortbraid = Braid (Short) -marking-ThavenHairBraidtail = Braided Tail -marking-ThavenHairBun = Bun Head -marking-ThavenHairBunhead2 = Bun Head 2 -marking-ThavenHairBun3 = Bun Head 3 -marking-ThavenHairLargebun = Bun (Large) -marking-ThavenHairManbun = Bun (Manbun) -marking-ThavenHairTightbun = Bun (Tight) -marking-ThavenHairBusiness = Business Hair -marking-ThavenHairBusiness2 = Business Hair 2 -marking-ThavenHairBusiness3 = Business Hair 3 -marking-ThavenHairBusiness4 = Business Hair 4 -marking-ThavenHairBuzzcut = Buzzcut -marking-ThavenHairCia = CIA -marking-ThavenHairClassicAfro = Classic Afro -marking-ThavenHairClassicBigAfro = Classic Big Afro -marking-ThavenHairClassicBusiness = Classic Business Hair -marking-ThavenHairClassicciaBusiness = Classic CIA -marking-ThavenHairClassicCornrows = Classic Cornrows -marking-ThavenHairClassicCornrows2 = Classic Cornrows 2 -marking-ThavenHairClassicFloorlengthBedhead = Classic Floorlength Bedhead -marking-ThavenHairClassicLong2 = Classic Long Hair 2 -marking-ThavenHairClassicLong3 = Classic Long Hair 3 -marking-ThavenHairClassicModern = Classic Modern -marking-ThavenHairClassicMulder = Classic Mulder -marking-ThavenHairClassicWisp = Classic Wisp -marking-ThavenHairCoffeeHouse = Coffee House -marking-ThavenHairCombover = Combover -marking-ThavenHairCornrows = Cornrows -marking-ThavenHairCornrows2 = Cornrows 2 -marking-ThavenHairCornrowbun = Cornrow Bun -marking-ThavenHairCornrowbraid = Cornrow Braid -marking-ThavenHairCornrowtail = Cornrow Tail -marking-ThavenHairCrewcut = Crewcut -marking-ThavenHairCrewcut2 = Crewcut 2 -marking-ThavenHairCurls = Curls -marking-ThavenHairC = Cut Hair -marking-ThavenHairDandypompadour = Dandy Pompadour -marking-ThavenHairDevilock = Devil Lock -marking-ThavenHairDoublebun = Double Bun -marking-ThavenHairDoublebunLong = Double Bun Long -marking-ThavenHairDreads = Dreadlocks -marking-ThavenHairDrillHair = Drill Hair -marking-ThavenHairDrillruru = Drillruru -marking-ThavenHairDrillhairextended = Drill Hair (Extended) -marking-ThavenHairEmo = Emo -marking-ThavenHairEmo2 = Emo2 -marking-ThavenHairLongeremo = Longer Emo -marking-ThavenHairEmofringe = Emo Fringe -marking-ThavenHairNofade = Fade (None) -marking-ThavenHairHighfade = Fade (High) -marking-ThavenHairMedfade = Fade (Medium) -marking-ThavenHairLowfade = Fade (Low) -marking-ThavenHairBaldfade = Fade (Bald) -marking-ThavenHairFeather = Feather -marking-ThavenHairFather = Father -marking-ThavenHairSargeant = Flat Top -marking-ThavenHairFlair = Flair -marking-ThavenHairBigflattop = Flat Top (Big) -marking-ThavenHairFlow = Flow Hair -marking-ThavenHairGelled = Gelled Back -marking-ThavenHairGentle = Gentle -marking-ThavenHairHalfbang = Half-banged Hair -marking-ThavenHairHalfbang2 = Half-banged Hair 2 -marking-ThavenHairHalfshaved = Half-shaved -marking-ThavenHairHedgehog = Hedgehog Hair -marking-ThavenHairHimecut = Hime Cut -marking-ThavenHairHimecut2 = Hime Cut 2 -marking-ThavenHairShorthime = Hime Cut (Short) -marking-ThavenHairHimeup = Hime Updo -marking-ThavenHairHitop = Hitop -marking-ThavenHairJade = Jade -marking-ThavenHairJensen = Jensen Hair -marking-ThavenHairJoestar = Joestar -marking-ThavenHairKeanu = Keanu Hair -marking-ThavenHairKusanagi = Kusanagi Hair -marking-ThavenHairLongBow = Long Bow -marking-ThavenHairLong = Long Hair 1 -marking-ThavenHairLong2 = Long Hair 2 -marking-ThavenHairLong3 = Long Hair 3 -marking-ThavenHairLongWithBundles = Long With Bundles -marking-ThavenHairLongovereye = Long Over Eye -marking-ThavenHairLbangs = Long Bangs -marking-ThavenHairLongemo = Long Emo -marking-ThavenHairLongfringe = Long Fringe -marking-ThavenHairLongsidepart = Long Side Part -marking-ThavenHairMediumSidepart = Medium Side Part -marking-ThavenHairMegaeyebrows = Mega Eyebrows -marking-ThavenHairMessy = Messy -marking-ThavenHairModern = Modern -marking-ThavenHairMohawk = Mohawk -marking-ThavenHairNitori = Nitori -marking-ThavenHairReversemohawk = Mohawk (Reverse) -marking-ThavenHairUnshavenMohawk = Mohawk (Unshaven) -marking-ThavenHairMulder = Mulder -marking-ThavenHairOdango = Odango -marking-ThavenHairOmbre = Ombre -marking-ThavenHairOneshoulder = One Shoulder -marking-ThavenHairShortovereye = Over Eye -marking-ThavenHairOxton = Oxton -marking-ThavenHairParted = Parted -marking-ThavenHairPart = Parted (Side) -marking-ThavenHairKagami = Pigtails -marking-ThavenHairPigtails = Pigtails 2 -marking-ThavenHairPigtails2 = Pigtails 3 -marking-ThavenHairPixie = Pixie Cut -marking-ThavenHairPompadour = Pompadour -marking-ThavenHairBigpompadour = Pompadour (Big) -marking-ThavenHairPonytail = Ponytail -marking-ThavenHairPonytail2 = Ponytail 2 -marking-ThavenHairPonytail3 = Ponytail 3 -marking-ThavenHairPonytail4 = Ponytail 4 -marking-ThavenHairPonytail5 = Ponytail 5 -marking-ThavenHairPonytail6 = Ponytail 6 -marking-ThavenHairPonytail7 = Ponytail 7 -marking-ThavenHairHighponytail = Ponytail (High) -marking-ThavenHairStail = Ponytail (Short) -marking-ThavenHairLongstraightponytail = Ponytail (Long) -marking-ThavenHairCountry = Ponytail (Country) -marking-ThavenHairFringetail = Ponytail (Fringe) -marking-ThavenHairSidetail = Ponytail (Side) -marking-ThavenHairSidetail2 = Ponytail (Side) 2 -marking-ThavenHairSidetail3 = Ponytail (Side) 3 -marking-ThavenHairSidetail4 = Ponytail (Side) 4 -marking-ThavenHairSpikyponytail = Ponytail (Spiky) -marking-ThavenHairPoofy = Poofy -marking-ThavenHairBald = Bald -marking-ThavenHairClassicCia = Classic CIA -marking-ThavenHairQuiff = Quiff -marking-ThavenHairRonin = Ronin -marking-ThavenHairShaped = Shaped -marking-ThavenHairShaved = Shaved -marking-ThavenHairShavedMohawk = Shaved Mohawk -marking-ThavenHairShavedpart = Shaved Part -marking-ThavenHairShortbangs = Short Bangs -marking-ThavenHairA = Short Hair -marking-ThavenHairShorthair2 = Short Hair 2 -marking-ThavenHairShorthair3 = Short Hair 3 -marking-ThavenHairShorthair9 = Short Hair 9 -marking-ThavenHairD = Short Hair 4 -marking-ThavenHairE = Short Hair 5 -marking-ThavenHairF = Short Hair 6 -marking-ThavenHairShorthairg = Short Hair 7 -marking-ThavenHair80s = Short Hair 80s -marking-ThavenHairRosa = Short Hair Rosa -marking-ThavenHairB = Shoulder-length Hair -marking-ThavenHairShoulderLengthOverEye = Shoulder-length Over Eye -marking-ThavenHairSidecut = Sidecut -marking-ThavenHairSkinhead = Skinhead -marking-ThavenHairProtagonist = Slightly Long Hair -marking-ThavenHairSpikey = Spiky -marking-ThavenHairSpiky = Spiky 2 -marking-ThavenHairSpiky2 = Spiky 3 -marking-ThavenHairSpookyLong = Spooky Long -marking-ThavenHairSwept = Swept Back Hair -marking-ThavenHairSwept2 = Swept Back Hair 2 -marking-ThavenHairTailed = Tailed -marking-ThavenHairThinning = Thinning -marking-ThavenHairThinningfront = Thinning (Front) -marking-ThavenHairThinningrear = Thinning (Rear) -marking-ThavenHairTopknot = Topknot -marking-ThavenHairTressshoulder = Tress Shoulder -marking-ThavenHairTrimmed = Trimmed -marking-ThavenHairTrimflat = Trim Flat -marking-ThavenHairTwintail = Twintails -marking-ThavenHairTwoStrands = Two Strands -marking-ThavenHairUndercut = Undercut -marking-ThavenHairUndercutleft = Undercut Left -marking-ThavenHairUndercutright = Undercut Right -marking-ThavenHairUneven = Uneven -marking-ThavenHairUnkept = Unkept -marking-ThavenHairUpdo = Updo -marking-ThavenHairVlong = Very Long Hair -marking-ThavenHairLongest = Very Long Hair 2 -marking-ThavenHairLongest2 = Very Long Over Eye -marking-ThavenHairVeryshortovereyealternate = Very Short Over Eye -marking-ThavenHairVlongfringe = Very Long with Fringe -marking-ThavenHairVolaju = Volaju -marking-ThavenHairWisp = Wisp -marking-ThavenHairFrenchbraid = French Braid diff --git a/Resources/Locale/en-US/_Impstation/markings/thaven.ftl b/Resources/Locale/en-US/_Impstation/markings/thaven.ftl deleted file mode 100644 index 8b5a69c2dbb..00000000000 --- a/Resources/Locale/en-US/_Impstation/markings/thaven.ftl +++ /dev/null @@ -1,27 +0,0 @@ -marking-ThavenEars1-ears1 = Small Ears -marking-ThavenEars1 = Small Ears - -marking-ThavenEars2-ears2 = Medium Ears -marking-ThavenEars2 = Medium Ears - -marking-ThavenEars3-ears3 = Long Ears -marking-ThavenEars3 = Long Ears - -marking-ThavenEars4-ears4 = Droopy Ears -marking-ThavenEars4 = Droopy Ears - -marking-ThavenPiercings-piercings = Helix Piercing -marking-ThavenPiercings = Helix Piercing - -marking-ThavenPiercings2-piercings2 = Hoop Piercing -marking-ThavenPiercings2 = Hoop Piercing - -marking-ThavenChestTattoo1-chesttat1 = Back Tattoo -marking-ThavenChestTattoo1 = Back Tattoo - -marking-ThavenLArmTattoo1-larmtat1 = Arm Band (Left) -marking-ThavenLArmTattoo1 = Arm Band (Left) - -marking-ThavenRArmTattoo1-larmtat1 = Arm Band (Right) -marking-ThavenRArmTattoo1 = Arm Band (Right) - diff --git a/Resources/Locale/en-US/_MARCO/markings/thaven.ftl b/Resources/Locale/en-US/_MARCO/markings/thaven.ftl new file mode 100644 index 00000000000..123d0a0c36c --- /dev/null +++ b/Resources/Locale/en-US/_MARCO/markings/thaven.ftl @@ -0,0 +1,877 @@ +# Chest + +marking-BodyhairThaven = Body Hair +marking-BodyhairThaven-hair = Body Hair + +marking-Gills = Gills +marking-Gills-gills = Gills + +marking-ThavenAbs = Muscles +marking-ThavenAbs-muscular = Muscles + +marking-ThavenBiteMark = Big Bite Scar +marking-ThavenBiteMark-bitemark = Big Bite Scar + +marking-ThavenBodyStripes = Pinstripes +marking-ThavenBodyStripes-stripes = Pinstripes + +marking-ThavenChestScales = Scales +marking-ThavenChestScales-scales = Scales + +marking-ThavenChestTattoo1 = Back Tattoo +marking-ThavenChestTattoo1-tat1 = Back Tattoo + +marking-ThavenSpinechill = Spinechill +marking-ThavenSpinechill-spinechill = Spinechill + +marking-ThavenSpines = Spines +marking-ThavenSpines-spines = Spines + +marking-ThavenTattooWave = Wave Tattoo +marking-ThavenTattooWave-tattoowave = Wave Tattoo + +marking-ThavenTattooVines = Vine Tattoo +marking-ThavenTattooVines-tattoovines = Vine Tattoo + +marking-ThavenTiger = Tiger Stripes +marking-ThavenTiger-tiger1 = Tiger Belly +marking-ThavenTiger-tiger2 = Tiger Stripes + +marking-ThavenTopSurgery = Top Surgery +marking-ThavenTopSurgery-nonaturals = Top Surgery + +# Head + +marking-ThavenHeadCap = Dappled Crown +marking-ThavenHeadCap-cap1 = Crown +marking-ThavenHeadCap-cap2 = Dapples + +marking-ThavenHeadScales = Scales +marking-ThavenHeadScales-scales = Scales + +marking-ThavenHeadStripes = Pinstripes +marking-ThavenHeadStripes-stripes = Pinstripes + +marking-ThavenShadow = Gloomy +marking-ThavenShadow-shadowthaven = Gloomy + +# Snout + +# Eyes + +marking-SharkminnowEyeliner = Sharkminnow Eyeliner +marking-SharkminnowEyeliner-sharkminnoweyeliner = Sharkminnow Eyeliner + +marking-ThavenEyesSharkminnow = Sharkminnow Eyes +marking-ThavenEyesSharkminnow-sharkminnow = Sharkminnow Eyes + +marking-ThavenEyesSharkminnowGlowing = Glowing Sharkminnow Eyes +marking-ThavenEyesSharkminnowGlowing-sharkminnow = Glowing Sharkminnow Eyes + +marking-ThavenLEyeGlow = Glowing Eye (Left) +marking-ThavenLEyeGlow-glowleft = Glowing Eye (Left) + +marking-ThavenREyeGlow = Glowing Eye (Right) +marking-ThavenREyeGlow-glowright = Glowing Eye (Right) + +# RArm + +marking-ThavenRArmScales = Scales (Right Arm) +marking-ThavenRArmScales-scales = Scales (Right Arm) + +marking-ThavenRArmTattoo1 = Arm Band (Right) +marking-ThavenRArmTattoo1-tat1 = Arm Band (Right) + +marking-ThavenTigerRArm = Tiger Stripes (Right) +marking-ThavenTigerRArm-tiger = Tiger Stripes (Right) + +# LArm + +marking-ThavenLArmScales = Scales (Left Arm) +marking-ThavenLArmScales-scales = Scales (Left Arm) + +marking-ThavenLArmTattoo1 = Arm Band (Left) +marking-ThavenLArmTattoo1-tat1 = Arm Band (Left) + +marking-ThavenTigerLArm = Tiger Stripes (Left) +marking-ThavenTigerLArm-tiger = Tiger Stripes (Left) + +# RLeg + +marking-ThavenRLegScales = Scales (Right) +marking-ThavenRLegScales-scales = Scales (Right) + +# LLeg + +marking-ThavenLLegScales = Scales (Left) +marking-ThavenLLegScales-scales = Scales (Left) + +# UndergarmentBottom + +marking-UnderwearBriefsT = Briefs +marking-UnderwearBriefsT-briefs = Underwear + +marking-UnderwearDefaultT = Boxers +marking-UnderwearDefaultT-boxers = Underwear + +marking-UnderwearLowridersT = Lowriders +marking-UnderwearLowridersT-lowriders = Underwear + +marking-UnderwearSatinT = Satin +marking-UnderwearSatinT-satin = Underwear + +marking-UnderwearTangaT = Tanga +marking-UnderwearTangaT-tanga = Underwear + +# UndergarmentTop + +marking-UndergarmentTopBinderT = Binder +marking-UndergarmentTopBinderT-binder = Binder + +marking-UndershirtBraClassicT = Bra +marking-UndershirtBraClassicT-classic = Bra + +marking-UndershirtBraSportsT = Bra (Sports) +marking-UndershirtBraSportsT-sports = Bra + +marking-UndershirtBraStraplessT = Bra (Strapless) +marking-UndershirtBraStraplessT-strapless = Bra + +marking-UndershirtDefaultT = Undershirt +marking-UndershirtDefaultT-undershirt = Undershirt + +marking-UndershirtGrossSleevelessT = Tanktop (Gross) +marking-UndershirtGrossSleevelessT-grosssleeveless = Tanktop + +marking-UndershirtNanotrasenT = Undershirt (Nanotrasen) +marking-UndershirtNanotrasenT-nanotrasen = Undershirt + +marking-UndershirtRolledT = Undershirt (Cropped) +marking-UndershirtRolledT-rolledundershirt = Undershirt + +# LFoot + +# RFoot + +# LHand + +# RHand + +# FacialHair + +# Hair + +marking-BurqaSolidThaven = Burqa +marking-BurqaSolidThaven-burqa = Burqa + +marking-HairFloralLongThaven = Floral hair (Long) +marking-HairFloralLongThaven-florallong1 = Hair +marking-HairFloralLongThaven-florallong2 = Flowers + +marking-HairFloralMidThaven = Floral hair (Medium) +marking-HairFloralMidThaven-floralmid1 = Hair +marking-HairFloralMidThaven-floralmid2 = Flowers + +marking-HijabFashionableThaven = Hijab (Fashionable) +marking-HijabFashionableThaven-hijabchic = Hijab (Fashionable) + +marking-HijabSimpleThaven = Hijab (Simple) +marking-HijabSimpleThaven-hijabsimple = Hijab (Simple) + +marking-MessyPonytailThaven = Messy Ponytail +marking-MessyPonytailThaven-messyponytail = Messy Ponytail + +marking-NiqabThaven = Niqab +marking-NiqabThaven-niqab = Niqab + +marking-ThavenHair80s = Short Hair 80s +marking-ThavenHair80s-80s = Short Hair 80s + +marking-ThavenHairA = Short Hair +marking-ThavenHairA-a = Short Hair +# did anyone else hear just one single angelic note + +marking-ThavenHairB = Shoulder-length Hair +marking-ThavenHairB-b = Shoulder-length Hair + +marking-ThavenHairBald = Bald +marking-ThavenHairBald-bald = Bald + +marking-ThavenHairBaldfade = Fade (Bald) +marking-ThavenHairBaldfade-baldface = Fade (Bald) + +marking-ThavenHairBalding = Balding Hair +marking-ThavenHairBalding-e = Balding Hair + +marking-ThavenHairBedhead = Bedhead +marking-ThavenHairBedhead-bedhead = Bedhead + +marking-ThavenHairBedheadv2 = Bedhead 2 +marking-ThavenHairBedheadv2-bedhead2 = Bedhead 2 + +marking-ThavenHairBedheadv3 = Bedhead 3 +marking-ThavenHairBedheadv3-bedhead3 = Bedhead 3 + +marking-ThavenHairBeehive = Beehive +marking-ThavenHairBeehive-beehive = Beehive + +marking-ThavenHairBeehive2 = Beehive 2 +marking-ThavenHairBeehive2-beehive2 = Beehive 2 + +marking-ThavenHairBigflattop = Flat Top (Big) +marking-ThavenHairBigflattop-bigflattop = Flat Top (Big) + +marking-ThavenHairBigpompadour = Pompadour (Big) +marking-ThavenHairBigpompadour-bigpompadour = Pompadour (Big) + +marking-ThavenHairBob = Bob Hair +marking-ThavenHairBob-bob = Bob Hair + +marking-ThavenHairBob2 = Bob Hair 2 +marking-ThavenHairBob2-bob2 = Bob Hair 2 + +marking-ThavenHairBob4 = Bob Hair 4 +marking-ThavenHairBob4-bob4 = Bob Hair 4 + +marking-ThavenHairBob5 = Bob Hair 5 +marking-ThavenHairBob5-bob5 = Bob Hair 5 + +marking-ThavenHairBobcurl = Bobcurl +marking-ThavenHairBobcurl-bobcurl = Bobcurl + +marking-ThavenHairBobcut = Bob Hair 3 +marking-ThavenHairBobcut-bobcut = Bob Hair 3 + +marking-ThavenHairBowlcut = Bowlcut +marking-ThavenHairBowlcut-bowlcut = Bowlcut + +marking-ThavenHairBowlcut2 = Bowlcut 2 +marking-ThavenHairBowlcut2-bowlcut2 = Bowlcut 2 + +marking-ThavenHairBraid = Braid (Floorlength) +marking-ThavenHairBraid-braid = Braid (Floorlength) + +marking-ThavenHairBraid2 = Braid (High) +marking-ThavenHairBraid2-braid2 = Braid (High) + +marking-ThavenHairBraided = Braided +marking-ThavenHairBraided-braided = Braided + +marking-ThavenHairBraidfront = Braided Front +marking-ThavenHairBraidfront-braidfront = Braided Front + +marking-ThavenHairBraidtail = Braided Tail +marking-ThavenHairBraidtail-braidtail = Braided Tail + +marking-ThavenHairBun = Bun Head +marking-ThavenHairBun-bun = Bun Head + +marking-ThavenHairBun3 = Bun Head 3 +marking-ThavenHairBun3-bun3 = Bun Head 3 + +marking-ThavenHairBunhead2 = Bun Head 2 +marking-ThavenHairBunhead2-bunhead2 = Bun Head 2 + +marking-ThavenHairBusiness = Business Hair +marking-ThavenHairBusiness-business = Business Hair + +marking-ThavenHairBusiness2 = Business Hair 2 +marking-ThavenHairBusiness2-business2 = Business Hair 2 + +marking-ThavenHairBusiness3 = Business Hair 3 +marking-ThavenHairBusiness3-business3 = Business Hair 3 + +marking-ThavenHairBusiness4 = Business Hair 4 +marking-ThavenHairBusiness4-business4 = Business Hair 4 + +marking-ThavenHairBuzzcut = Buzzcut +marking-ThavenHairBuzzcut-buzzcut = Buzzcut + +marking-ThavenHairC = Cut Hair +marking-ThavenHairC-c = Cut Hair + +marking-ThavenHairCia = CIA +marking-ThavenHairCia-cia = CIA + +marking-ThavenHairClassicAfro = Classic Afro +marking-ThavenHairClassicAfro-classicafro = Classic Afro + +marking-ThavenHairClassicCia = Classic CIA +marking-ThavenHairClassicCia-classiccia = Classic CIA + +marking-ThavenHairClassicciaBusiness = Classic CIA Business +marking-ThavenHairClassicciaBusiness-classicciabusiness = Classic CIA Business + +marking-ThavenHairClassicCornrows = Classic Cornrows +marking-ThavenHairClassicCornrows-classiccornrows = Classic Cornrows + +marking-ThavenHairClassicCornrows2 = Classic Cornrows 2 +marking-ThavenHairClassicCornrows2-cornrows2 = Classic Cornrows 2 + +marking-ThavenHairClassicFloorlengthBedhead = Classic Floorlength Bedhead +marking-ThavenHairClassicFloorlengthBedhead-classicfloorlengthbedhead = Classic Floorlength Bedhead + +marking-ThavenHairClassicLong2 = Classic Long Hair 2 +marking-ThavenHairClassicLong2-classiclong2 = Classic Long Hair 2 + +marking-ThavenHairClassicLong3 = Classic Long Hair 3 +marking-ThavenHairClassicLong3-classiclong3 = Classic Long Hair 3 + +marking-ThavenHairClassicModern = Classic Modern +marking-ThavenHairClassicModern-modern = Classic Modern + +marking-ThavenHairClassicMulder = Classic Mulder +marking-ThavenHairClassicMulder-classicmulder = Classic Mulder + +marking-ThavenHairClassicWisp = Classic Wisp +marking-ThavenHairClassicWisp-classicwisp = Classic Wisp + +marking-ThavenHairCoffeeHouse = Coffee House +marking-ThavenHairCoffeeHouse-coffeehouse = Coffee House + +marking-ThavenHairCombover = Combover +marking-ThavenHairCombover-combover = Combover + +marking-ThavenHairCornrowbraid = Cornrow Braid +marking-ThavenHairCornrowbraid-cornrowbraid = Cornrow Braid + +marking-ThavenHairCornrowbun = Cornrow Bun +marking-ThavenHairCornrowbun-cornrowbun = Cornrow Bun + +marking-ThavenHairCornrows = Cornrows +marking-ThavenHairCornrows-cornrows = Cornrows + +marking-ThavenHairCornrows2 = Cornrows 2 +marking-ThavenHairCornrows2-cornrows2 = Cornrows 2 + +marking-ThavenHairCornrowtail = Cornrow Tail +marking-ThavenHairCornrowtail-cornrowtail = Cornrow Tail + +marking-ThavenHairCountry = Ponytail (Country) +marking-ThavenHairCountry-country = Ponytail (Country) + +marking-ThavenHairCrewcut = Crewcut +marking-ThavenHairCrewcut-crewcut = Crewcut + +marking-ThavenHairCrewcut2 = Crewcut 2 +marking-ThavenHairCrewcut2-crewcut2 = Crewcut 2 + +marking-ThavenHairCurls = Curls +marking-ThavenHairCurls-curls = Curls + +marking-ThavenHairDandypompadour = Dandy Pompadour +marking-ThavenHairDandypompadour-dandypompadour = Dandy Pompadour + +marking-ThavenHairDevilock = Devil Lock +marking-ThavenHairDevilock-devilock = Devil Lock + +marking-ThavenHairDoublebun = Double Bun +marking-ThavenHairDoublebun-doublebun = Double Bun + +marking-ThavenHairDoublebunLong = Double Bun Long +marking-ThavenHairDoublebunLong-doublebunlong = Double Bun Long + +marking-ThavenHairDreads = Dreadlocks +marking-ThavenHairDreads-dreads = Dreadlocks + +marking-ThavenHairDrillHair = Drill Hair +marking-ThavenHairDrillHair-drillhair = Drill Hair + +marking-ThavenHairDrillhairextended = Drill Hair (Extended) +marking-ThavenHairDrillhairextended-drillhairextended = Drill Hair (Extended) + +marking-ThavenHairDrillruru = Drillruru +marking-ThavenHairDrillruru-drillruru = Drillruru + +marking-ThavenHairDyedLong = Dyed Long +marking-ThavenHairDyedLong-dyedlong1 = Dyed Long + +marking-ThavenHairDyedShort = Dyed Short +marking-ThavenHairDyedShort-dyedshort1 = Dyed Short + +marking-ThavenHairEmo2 = Emo +marking-ThavenHairEmo2-emo2 = Emo + +marking-ThavenHairEmofringe = Emo Fringe +marking-ThavenHairEmofringe-emofringe = Emo Fringe + +marking-ThavenHairFather = Father +marking-ThavenHairFather-father = Father + +marking-ThavenHairFeather = Feather +marking-ThavenHairFeather-feather = Feather + +marking-ThavenHairFlair = Flair +marking-ThavenHairFlair-flair = Flair + +marking-ThavenHairFloorlengthBedhead = Floorlength Bedhead +marking-ThavenHairFloorlengthBedhead-floorlengthbedhead = Floorlength Bedhead + +marking-ThavenHairFlow = Flow Hair +marking-ThavenHairFlow-f = Flow Hair + +marking-ThavenHairFrenchbraid = French Braid +marking-ThavenHairFrenchbraid-frenchbraid = French Braid + +marking-ThavenHairFringetail = Ponytail (Fringe) +marking-ThavenHairFringetail-fringetail = Ponytail (Fringe) + +marking-ThavenHairGelled = Gelled Back +marking-ThavenHairGelled-gelled = Gelled Back + +marking-ThavenHairGentle = Gentle +marking-ThavenHairGentle-gentle = Gentle + +marking-ThavenHairHalfbang = Half-banged Hair +marking-ThavenHairHalfbang-halfbang = Half-banged Hair + +marking-ThavenHairHalfbang2 = Half-banged Hair 2 +marking-ThavenHairHalfbang2-halfbang2 = Half-banged Hair 2 + +marking-ThavenHairHalfshaved = Half-shaved +marking-ThavenHairHalfshaved-halfshaved = Half-shaved + +marking-ThavenHairHalfUpLong = Half-Up (Long) +marking-ThavenHairHalfUpLong-halfuplong = Half-Up (Long) + +marking-ThavenHairHalfUpShort = Half-Up (Short) +marking-ThavenHairHalfUpShort-halfupshort = Half-Up (Short) + +marking-ThavenHairHalfUpUndercut = Half-Up (Undercut) +marking-ThavenHairHalfUpUndercut-halfupundercut = Half-Up (Undercut) + +marking-ThavenHairHbraid = Braid (Low) +marking-ThavenHairHbraid-hbraid = Braid (Low) + +marking-ThavenHairHedgehog = Hedgehog Hair +marking-ThavenHairHedgehog-hedgehog = Hedgehog Hair + +marking-ThavenHairHighfade = Fade (High) +marking-ThavenHairHighfade-highfade = Fade (High) + +marking-ThavenHairHighponytail = Ponytail (High) +marking-ThavenHairHighponytail-highponytail = Ponytail (High) + +marking-ThavenHairHimecut = Hime Cut +marking-ThavenHairHimecut-himecut = Hime Cut + +marking-ThavenHairHimecut2 = Hime Cut 2 +marking-ThavenHairHimecut2-himecut2 = Hime Cut 2 + +marking-ThavenHairHimeup = Hime Updo +marking-ThavenHairHimeup-himeup = Hime Updo + +marking-ThavenHairHitop = Hitop +marking-ThavenHairHitop-hitop = Hitop + +marking-ThavenHairJade = Jade +marking-ThavenHairJade-jade = Jade + +marking-ThavenHairJensen = Jensen Hair +marking-ThavenHairJensen-jensen = Jensen Hair + +marking-ThavenHairJoestar = Joestar +marking-ThavenHairJoestar-joestar = Joestar + +marking-ThavenHairKagami = Pigtails +marking-ThavenHairKagami-kagami = Pigtails + +marking-ThavenHairKeanu = Keanu Hair +marking-ThavenHairKeanu-keanu = Keanu Hair + +marking-ThavenHairKusanagi = Kusanagi Hair +marking-ThavenHairKusanagi-kusanagi = Kusanagi Hair + +marking-ThavenHairLargebun = Bun (Large) +marking-ThavenHairLargebun-largebun = Bun (Large) + +marking-ThavenHairLbangs = Long Bangs +marking-ThavenHairLbangs-lbangs = Long Bangs + +marking-ThavenHairLong = Long Hair 1 +marking-ThavenHairLong-long = Long Hair 1 + +marking-ThavenHairLong2 = Long Hair 2 +marking-ThavenHairLong2-long2 = Long Hair 2 + +marking-ThavenHairLong3 = Long Hair 3 +marking-ThavenHairLong3-long3 = Long Hair 3 + +marking-ThavenHairLongBedhead = Long Bedhead +marking-ThavenHairLongBedhead-longbedhead = Long Bedhead + +marking-ThavenHairLongBedhead2 = Long Bedhead 2 +marking-ThavenHairLongBedhead2-longbedhead2 = Long Bedhead 2 + +marking-ThavenHairLongeremo = Longer Emo +marking-ThavenHairLongeremo-longeremo = Longer Emo + +marking-ThavenHairLongest = Very Long Hair 2 +marking-ThavenHairLongest-longest = Very Long Hair 2 + +marking-ThavenHairLongest2 = Very Long Over Eye +marking-ThavenHairLongest2-longest2 = Very Long Over Eye + +marking-ThavenHairLongfringe = Long Fringe +marking-ThavenHairLongfringe-longfringe = Long Fringe + +marking-ThavenHairLongovereye = Long Over Eye +marking-ThavenHairLongovereye-longovereye = Long Over Eye + +marking-ThavenHairLongsidepart = Long Side Part + +marking-ThavenHairLongstraightponytail = Ponytail (Long) +marking-ThavenHairLongstraightponytail-longsidepart = Ponytail (Long) + +marking-ThavenHairLongWithBundles = Long With Bundles +marking-ThavenHairLongWithBundles-longbundled = Long With Bundles + +marking-ThavenHairLowfade = Fade (Low) +marking-ThavenHairLowfade-lowfade = Fade (Low) + +marking-ThavenHairManbun = Bun (Manbun) +marking-ThavenHairManbun-manbun = Bun (Manbun) + +marking-ThavenHairMedfade = Fade (Medium) +marking-ThavenHairMedfade-medfade = Fade (Medium) + +marking-ThavenHairMediumSidepart = Medium Side Part +marking-ThavenHairMediumSidepart-mediumsidepart = Medium Side Part + +marking-ThavenHairMegaeyebrows = Mega Eyebrows +marking-ThavenHairMegaeyebrows-megaeyebrows = Mega Eyebrows + +marking-ThavenHairMessy = Messy +marking-ThavenHairMessy-messy = Messy + +marking-ThavenHairMidPartLong = Middle Part (Long) +marking-ThavenHairMidPartLong-midpartlong = Middle Part (Long) + +marking-ThavenHairMidPartLonger = Middle Part (Longer) +marking-ThavenHairMidPartLonger-midpartlonger = Middle Part (Longer) + +marking-ThavenHairModern = Modern +marking-ThavenHairModern-modern = Modern + +marking-ThavenHairMohawk = Mohawk +marking-ThavenHairMohawk-d = Mohawk + +marking-ThavenHairMulder = Mulder +marking-ThavenHairMulder-mulder = Mulder + +marking-ThavenHairMullet = Mullet +marking-ThavenHairMullet-mullet = Mullet + +marking-ThavenHairMulletSideshave = Mullet (Sideshave) +marking-ThavenHairMulletSideshave-mulletsideshave = Mullet (Sideshave) + +marking-ThavenHairNitori = Nitori +marking-ThavenHairNitori-nitori = Nitori + +marking-ThavenHairNofade = Fade (None) +marking-ThavenHairNofade-nofade = Fade (None) + +marking-ThavenHairOdango = Odango +marking-ThavenHairOdango-odango = Odango + +marking-ThavenHairOmbre = Ombre +marking-ThavenHairOmbre-ombre = Ombre + +marking-ThavenHairOneshoulder = One Shoulder +marking-ThavenHairOneshoulder-oneshoulder = One Shoulder + +marking-ThavenHairOxton = Oxton +marking-ThavenHairOxton-oxton = Oxton + +marking-ThavenHairPart = Parted (Side) +marking-ThavenHairPart-part = Parted (Side) + +marking-ThavenHairParted = Parted +marking-ThavenHairParted-parted = Parted + +marking-ThavenHairPigtails = Pigtails 2 +marking-ThavenHairPigtails-pigtails = Pigtails 2 + +marking-ThavenHairPigtails2 = Pigtails 3 +marking-ThavenHairPigtails2-pigtails2 = Pigtails 3 + +marking-ThavenHairPixie = Pixie Cut +marking-ThavenHairPixie-pixie = Pixie Cut + +marking-ThavenHairPompadour = Pompadour +marking-ThavenHairPompadour-pompadour = Pompadour + +marking-ThavenHairPonytail = Ponytail +marking-ThavenHairPonytail-ponytail = Ponytail + +marking-ThavenHairPonytail2 = Ponytail 2 +marking-ThavenHairPonytail2-ponytail2 = Ponytail 2 + +marking-ThavenHairPonytail3 = Ponytail 3 +marking-ThavenHairPonytail3-ponytail3 = Ponytail 3 + +marking-ThavenHairPonytail4 = Ponytail 4 +marking-ThavenHairPonytail4-ponytail4 = Ponytail 4 + +marking-ThavenHairPonytail5 = Ponytail 5 +marking-ThavenHairPonytail5-ponytail5 = Ponytail 5 + +marking-ThavenHairPonytail6 = Ponytail 6 +marking-ThavenHairPonytail6-ponytail6 = Ponytail 6 + +marking-ThavenHairPonytail7 = Ponytail 7 +marking-ThavenHairPonytail7-ponytail7 = Ponytail 7 + +marking-ThavenHairPoofy = Poofy +marking-ThavenHairPoofy-poofy = Poofy + +marking-ThavenHairProtagonist = Slightly Long Hair +marking-ThavenHairProtagonist-protagonist = Slightly Long Hair + +marking-ThavenHairQuiff = Quiff +marking-ThavenHairQuiff-quiff = Quiff + +marking-ThavenHairReversemohawk = Mohawk (Reverse) +marking-ThavenHairReversemohawk-reversemohawk = Mohawk (Reverse) + +marking-ThavenHairRonin = Ronin +marking-ThavenHairRonin-ronin = Ronin + +marking-ThavenHairRosa = Short Hair Rosa +marking-ThavenHairRosa-rosa = Short Hair Rosa + +marking-ThavenHairSargeant = Flat Top +marking-ThavenHairSargeant-sargeant = Flat Top + +marking-ThavenHairShaved = Shaved +marking-ThavenHairShaved-shaved = Shaved + +marking-ThavenHairShavedMohawk = Shaved Mohawk +marking-ThavenHairShavedMohawk-shavedmohawk = Shaved Mohawk + +marking-ThavenHairShavedpart = Shaved Part +marking-ThavenHairShavedpart-shavedpart = Shaved Part + +marking-ThavenHairShortbangs = Short Bangs +marking-ThavenHairShortbangs-shortbangs = Short Bangs + +marking-ThavenHairShortbraid = Braid (Short) +marking-ThavenHairShortbraid-shortbraid = Braid (Short) + +marking-ThavenHairShorthair2 = Short Hair 2 +marking-ThavenHairShorthair2-shorthair2 = Short Hair 2 + +marking-ThavenHairShorthair3 = Short Hair 3 +marking-ThavenHairShorthair3-shorthair3 = Short Hair 3 + +marking-ThavenHairShorthair9 = Short Hair 9 +marking-ThavenHairShorthair9-shorthair9 = Short Hair 9 + +marking-ThavenHairShorthime = Hime Cut (Short) +marking-ThavenHairShorthime-shorthime = Hime Cut (Short) + +marking-ThavenHairShortovereye = Over Eye +marking-ThavenHairShortovereye-shortovereye = Over Eye + +marking-ThavenHairShoulderLengthOverEye = Shoulder-length Over Eye +marking-ThavenHairShoulderLengthOverEye-shoulderlengthovereye = Shoulder-length Over Eye + +marking-ThavenHairSidecut = Sidecut +marking-ThavenHairSidecut-sidecut = Sidecut + +marking-ThavenHairSideshaveCurly = Sideshave (Curly) +marking-ThavenHairSideshaveCurly-sideshavecurly = Sideshave (Curly) + +marking-ThavenHairSidetail = Ponytail (Side) +marking-ThavenHairSidetail-sidetail = Ponytail (Side) + +marking-ThavenHairSidetail2 = Ponytail (Side) 2 +marking-ThavenHairSidetail2-sidetail2 = Ponytail (Side) 2 + +marking-ThavenHairSidetail3 = Ponytail (Side) 3 +marking-ThavenHairSidetail3-sidetail3 = Ponytail (Side) 3 + +marking-ThavenHairSidetail4 = Ponytail (Side) 4 +marking-ThavenHairSidetail4-sidetail4 = Ponytail (Side) 4 + +marking-ThavenHairSkinhead = High And Tight +marking-ThavenHairSkinhead-skinhead = High And Tight + +marking-ThavenHairSpiky = Spiky 2 +marking-ThavenHairSpiky-spiky = Spiky 2 + +marking-ThavenHairSpikyponytailLong = Ponytail (Spiky Long) +marking-ThavenHairSpikyponytailLong-spikyponytaillong = Ponytail (Spiky Long) + +marking-ThavenHairSpikyponytail = Ponytail (Spiky) +marking-ThavenHairSpikyponytail-spikyponytail = Ponytail (Spiky) + +marking-ThavenHairSpookyLong = Spooky Long +marking-ThavenHairSpookyLong-spookylong = Spooky Long + +marking-ThavenHairStail = Ponytail (Short) +marking-ThavenHairStail-stail = Ponytail (Short) + +marking-ThavenHairSwept = Swept Back Hair +marking-ThavenHairSwept-swept = Swept Back Hair + +marking-ThavenHairSwept2 = Swept Back Hair 2 +marking-ThavenHairSwept2-swept2 = Swept Back Hair 2 + +marking-ThavenHairTailed = Tailed +marking-ThavenHairTailed-tailed = Tailed + +marking-ThavenHairThinning = Thinning +marking-ThavenHairThinning-thinning = Thinning + +marking-ThavenHairThinningfront = Thinning (Front) +marking-ThavenHairThinningfront-thinningfront = Thinning (Front) + +marking-ThavenHairThinningrear = Thinning (Rear) +marking-ThavenHairThinningrear-thinningrear = Thinning (Rear) + +marking-ThavenHairTightbun = Bun (Tight) +marking-ThavenHairTightbun-tightbun = Bun (Tight) + +marking-ThavenHairTopknot = Topknot +marking-ThavenHairTopknot-topknot = Topknot + +marking-ThavenHairTressshoulder = Tress Shoulder +marking-ThavenHairTressshoulder-tressshoulder = Tress Shoulder + +marking-ThavenHairTrimflat = Trim Flat +marking-ThavenHairTrimflat-trimflat = Trim Flat + +marking-ThavenHairTrimmed = Trimmed +marking-ThavenHairTrimmed-trimmed = Trimmed + +marking-ThavenHairTwintail = Twintails +marking-ThavenHairTwintail-twintail = Twintails + +marking-ThavenHairTwoStrands = Two Strands +marking-ThavenHairTwoStrands-twostrands = Two Strands + +marking-ThavenHairUndercut = Undercut +marking-ThavenHairUndercut-undercut = Undercut + +marking-ThavenHairUndercutCurly = Undercut (Curly) +marking-ThavenHairUndercutCurly-undercutcurly = Undercut (Curly) + +marking-ThavenHairUndercutleft = Undercut Left +marking-ThavenHairUndercutleft-undercutleft = Undercut Left + +marking-ThavenHairUndercutright = Undercut Right +marking-ThavenHairUndercutright-undercutright = Undercut Right + +marking-ThavenHairUneven = Uneven +marking-ThavenHairUneven-uneven = Uneven + +marking-ThavenHairUnkept = Unkept +marking-ThavenHairUnkept-unkept = Unkept + +marking-ThavenHairVeryshortovereyealternate = Very Short Over Eye +marking-ThavenHairVeryshortovereyealternate-veryshortovereyealternate = Very Short Over Eye + +marking-ThavenHairVlong = Very Long Hair +marking-ThavenHairVlong-vlong = Very Long Hair + +marking-ThavenHairVlongfringe = Very Long with Fringe +marking-ThavenHairVlongfringe-vlongfringe = Very Long with Fringe + +marking-ThavenHairVolaju = Volaju +marking-ThavenHairVolaju-volaju = Volaju + +marking-ThavenHairWisp = Wisp +marking-ThavenHairWisp-wisp = Wisp + +marking-TichelFashionableThaven = Tichel (Fashionable) +marking-TichelFashionableThaven-tichelfashionable = Tichel (Fashionable) + +marking-TichelSimpleThaven = Tichel (Simple) +marking-TichelSimpleThaven-tichelsimple = Tichel (Simple) + +marking-ShaggyThaven = Shaggy +marking-ShaggyThaven-shaggythaven = Shaggy + +marking-ShaggyLongerThaven = Shaggy (Longer) +marking-ShaggyLongerThaven-shaggylongerthaven = Shaggy (Longer) + +marking-SusieThaven = Mean Girl (Bangs) +marking-SusieThaven-susiethaven = Mean Girl (Bangs) + +marking-SusieNoBangsThaven = Mean Girl +marking-SusieNoBangsThaven-susienobangsthaven = Mean Girl + +# HeadSide + +marking-ThavenEars1 = Small Ears +marking-ThavenEars1-ears1 = Small Ears + +marking-ThavenEars2 = Medium Ears +marking-ThavenEars2-ears2 = Medium Ears + +marking-ThavenEars3 = Long Ears +marking-ThavenEars3-ears3 = Long Ears + +marking-ThavenEars4 = Droopy Ears +marking-ThavenEars4-ears4 = Droopy Ears + +marking-ThavenEarsBigFins = Big Fins +marking-ThavenEarsBigFins-bigfins = Outer +marking-ThavenEarsBigFins-bigfins2 = Inner + +marking-ThavenEarsTwinFins = Twin Fins +marking-ThavenEarsTwinFins-twinfin = Twin Fins + +marking-ThavenFishEars = Finned Ears +marking-ThavenFishEars-fishears = Finned Ears + +marking-ThavenNoEars = Recolorable ears +marking-ThavenNoEars-noears = For use with head coverings + +# HeadTop + +marking-ThavenHibiscus = Hibiscus +marking-ThavenHibiscus-hibiscus1 = Petals +marking-ThavenHibiscus-hibiscus2 = Anthers + +marking-ThavenPiercings = Helix Piercing +marking-ThavenPiercings-piercings = Helix Piercing + +marking-ThavenPiercings2 = Hoop Piercing +marking-ThavenPiercings2-piercings2 = Hoop Piercing + +# Tail + +marking-ThavenBasicTail = Basic Tail +marking-ThavenBasicTail-basic = Basic Tail + +marking-ThavenBigTail = Big Tail +marking-ThavenBigTail-big1 = Tail +marking-ThavenBigTail-big2 = Fin + +marking-ThavenTadpoleTail = Tadpole Tail +marking-ThavenTadpoleTail-tadpole1 = Tail +marking-ThavenTadpoleTail-tadpole2 = Fin + +marking-ThavenTailEel = Eel Tail +marking-ThavenTailEel-eel1 = Eel Tail Trunk +marking-ThavenTailEel-eel2 = Eel Tail Tip + +marking-ThavenTailEelOverlay = Eel Tail (Overlay) +marking-ThavenTailEelOverlay-eel3 = Eel Inner +marking-ThavenTailEelOverlay-eel4 = Eel Outer + +marking-ThavenTailNurse = Swept Tail +marking-ThavenTailNurse-nurse1 = Tail +marking-ThavenTailNurse-nurse2 = Stripes + +marking-ThavenTailStub = Stub Tail +marking-ThavenTailStub-stub1 = Tail +marking-ThavenTailStub-stub2 = Stripes + +marking-ThavenTailThresher = Thresher Tail +marking-ThavenTailThresher-thresher1 = Tail +marking-ThavenTailThresher-thresher2 = Stripes + +# RArmExtension diff --git a/Resources/Prototypes/_Impstation/Body/Species/thaven.yml b/Resources/Prototypes/_Impstation/Body/Species/thaven.yml index 5d4de806dbc..3c8433a8762 100644 --- a/Resources/Prototypes/_Impstation/Body/Species/thaven.yml +++ b/Resources/Prototypes/_Impstation/Body/Species/thaven.yml @@ -1,4 +1,6 @@ -- type: markingsGroup +# Begin DeltaV Changes - This entire file was restructured for Nubody +- type: markingsGroup + parent: Undergarments id: Thaven onlyGroupWhitelisted: true limits: @@ -15,6 +17,9 @@ enum.HumanoidVisualLayers.Head: limit: 4 required: false + enum.HumanoidVisualLayers.FacialHair: + limit: 1 + required: false enum.HumanoidVisualLayers.Chest: limit: 4 required: false @@ -24,60 +29,69 @@ enum.HumanoidVisualLayers.RArm: limit: 4 required: false + enum.HumanoidVisualLayers.LHand: + limit: 1 + required: false + enum.HumanoidVisualLayers.RHand: + limit: 1 + required: false + enum.HumanoidVisualLayers.LLeg: + limit: 3 + required: false + enum.HumanoidVisualLayers.RLeg: + limit: 3 + required: false + enum.HumanoidVisualLayers.LFoot: + limit: 1 + required: false + enum.HumanoidVisualLayers.RFoot: + limit: 1 + required: false enum.HumanoidVisualLayers.Overlay: limit: 6 required: false enum.HumanoidVisualLayers.Snout: limit: 1 required: false + enum.HumanoidVisualLayers.Tail: + limit: 1 + required: false + enum.HumanoidVisualLayers.TailOverlay: + limit: 6 + required: false + enum.HumanoidVisualLayers.Special: + limit: 1 + required: false - type: entity parent: BaseSpeciesAppearance id: AppearanceThaven + categories: [ HideSpawnMenu ] name: thaven appearance components: - type: Inventory + speciesId: thaven templateId: thaven displacements: jumpsuit: sizeMaps: 32: - sprite: _Impstation/Mobs/Species/Thaven/displacement.rsi + sprite: _MACRO/Mobs/Species/Thaven/displacement.rsi state: jumpsuit - head: - sizeMaps: - 32: - sprite: _Impstation/Mobs/Species/Thaven/displacement.rsi - state: head - eyes: - sizeMaps: - 32: - sprite: _Impstation/Mobs/Species/Thaven/displacement.rsi - state: eyes - ears: - sizeMaps: - 32: - sprite: _Impstation/Mobs/Species/Thaven/displacement.rsi - state: head - mask: - sizeMaps: - 32: - sprite: _Impstation/Mobs/Species/Thaven/displacement.rsi - state: mask - neck: - sizeMaps: - 32: - sprite: _Impstation/Mobs/Species/Thaven/displacement.rsi - state: neck outerClothing: sizeMaps: 32: - sprite: _Impstation/Mobs/Species/Thaven/displacement.rsi + sprite: _MACRO/Mobs/Species/Thaven/displacement.rsi state: outerclothing_hardsuit + head: + sizeMaps: + 32: + sprite: _MACRO/Mobs/Species/Thaven/displacement.rsi + state: head gloves: sizeMaps: 32: - sprite: _Impstation/Mobs/Species/Thaven/displacement.rsi + sprite: _MACRO/Mobs/Species/Thaven/displacement.rsi state: hands - type: InitialBody organs: @@ -85,21 +99,19 @@ Head: OrganThavenHead ArmLeft: OrganThavenArmLeft ArmRight: OrganThavenArmRight - HandLeft: OrganThavenHandLeft HandRight: OrganThavenHandRight + HandLeft: OrganThavenHandLeft LegLeft: OrganThavenLegLeft LegRight: OrganThavenLegRight FootLeft: OrganThavenFootLeft FootRight: OrganThavenFootRight Brain: OrganThavenBrain Eyes: OrganThavenEyes - Ears: OrganHumanEars - Appendix: OrganHumanAppendix - Lungs: OrganHumanLungs - Heart: OrganHumanHeart - Stomach: OrganHumanStomach - Liver: OrganHumanLiver - Kidneys: OrganHumanKidneys + Lungs: OrganThavenLungs + Heart: OrganThavenHeart + Stomach: OrganThavenStomach + Liver: OrganThavenLiver + Kidneys: OrganThavenKidneys - type: HumanoidProfile species: Thaven @@ -111,7 +123,7 @@ name: Urist McEars components: - type: Icon - sprite: _Impstation/Mobs/Species/Thaven/parts.rsi # Unlike dwarves elves are NOT made of slime + sprite: _MACRO/Mobs/Species/Thaven/parts.rsi state: full - type: ThavenMoods - type: Respirator @@ -153,7 +165,7 @@ layer: - MobLayer - type: TypingIndicator - proto: Thaven # DeltaV unique typing indicator + proto: Thaven # DeltaV - unique typing indicator - type: Vocal sounds: Male: MaleThaven @@ -173,21 +185,21 @@ enum.StrippingUiKey.Key: type: StrippableBoundUserInterface - type: CosmicMarkVisuals # DeltaV - cosmic cult - offset: 0, 0.0625 #2 pixels up + offset: 0, 0.0625 # 2 pixels up - type: entity + abstract: true parent: OrganBase id: OrganThaven - abstract: true suffix: Thaven - type: entity + abstract: true parent: OrganThaven id: OrganThavenInternal - abstract: true components: - type: Sprite - sprite: Mobs/Species/Human/organs.rsi + sprite: _MACRO/Mobs/Species/Thaven/organs.rsi - type: entity parent: OrganThaven @@ -195,69 +207,55 @@ abstract: true components: - type: Sprite - sprite: _Impstation/Mobs/Species/Thaven/parts.rsi + sprite: _MACRO/Mobs/Species/Thaven/parts.rsi - type: VisualOrgan data: - sprite: _Impstation/Mobs/Species/Thaven/parts.rsi + sprite: _MACRO/Mobs/Species/Thaven/parts.rsi - type: VisualOrganMarkings markingData: group: Thaven -- type: entity - parent: [ OrganBaseEyes, OrganThavenExternal, OrganThavenInternal ] - id: OrganThavenEyes - components: - - type: Sprite - sprite: Mobs/Species/Human/organs.rsi - - type: VisualOrgan - layer: enum.HumanoidVisualLayers.Eyes - data: - sprite: _Impstation/Mobs/Species/Thaven/parts.rsi # Delta V - Using DV Eyes - state: eyes -# DV - Marking Displacement requires additional pr from may. -# - type: VisualOrganMarkings -# markingsDisplacement: -# Eyes: -# sizeMaps: -# 32: -# sprite: _Impstation/Mobs/Species/Thaven/displacement.rsi -# state: eyes - -- type: entity - parent: [ OrganBaseHead, OrganThavenExternal ] - id: OrganThavenHead - - type: entity parent: [ OrganBaseTorso, OrganThavenExternal ] id: OrganThavenTorso - type: entity - parent: [ OrganBaseLegLeft, OrganThavenExternal ] - id: OrganThavenLegLeft - -- type: entity - parent: [ OrganBaseHandLeft, OrganThavenExternal ] - id: OrganThavenHandLeft + parent: [ OrganBaseHead, OrganThavenExternal ] + id: OrganThavenHead + components: + - type: VisualOrganMarkings + hideableLayers: + - enum.HumanoidVisualLayers.Hair + - enum.HumanoidVisualLayers.HeadSide + - enum.HumanoidVisualLayers.Snout - type: entity parent: [ OrganBaseArmLeft, OrganThavenExternal ] id: OrganThavenArmLeft - type: entity - parent: [ OrganBaseFootLeft, OrganThavenExternal ] - id: OrganThavenFootLeft + parent: [ OrganBaseArmRight, OrganThavenExternal ] + id: OrganThavenArmRight - type: entity - parent: [ OrganBaseLegRight, OrganThavenExternal ] - id: OrganThavenLegRight + parent: [ OrganBaseHandLeft, OrganThavenExternal ] + id: OrganThavenHandLeft - type: entity parent: [ OrganBaseHandRight, OrganThavenExternal ] id: OrganThavenHandRight - type: entity - parent: [ OrganBaseArmRight, OrganThavenExternal ] - id: OrganThavenArmRight + parent: [ OrganBaseLegLeft, OrganThavenExternal ] + id: OrganThavenLegLeft + +- type: entity + parent: [ OrganBaseLegRight, OrganThavenExternal ] + id: OrganThavenLegRight + +- type: entity + parent: [ OrganBaseFootLeft, OrganThavenExternal ] + id: OrganThavenFootLeft - type: entity parent: [ OrganBaseFootRight, OrganThavenExternal ] @@ -266,5 +264,40 @@ - type: entity parent: [ OrganBaseBrain, OrganThavenInternal ] id: OrganThavenBrain - name: thaven brain description: "An organic positronic brain. Quite remarkable, really." + +- type: entity + parent: [ OrganBaseEyes, OrganThavenInternal, OrganThavenExternal ] + id: OrganThavenEyes + description: "The dark sclera have a faint, iridescent coating." + components: + - type: VisualOrgan + data: + sprite: _MACRO/Mobs/Species/Thaven/parts.rsi + state: eyes + +- type: entity + parent: [ OrganBaseLungs, OrganThavenInternal, OrganHumanMetabolizer ] + id: OrganThavenLungs + description: "Technically not lungs since they don't draw chemicals from the air, these strange, durable organs use the motion of respiration to provide energy for cell maintenance." + +- type: entity + parent: [ OrganBaseHeart, OrganThavenInternal, OrganHumanMetabolizer ] + id: OrganThavenHeart + description: "The toxic heart of a thaven. You're wearing gloves, right?" + +- type: entity + parent: [ OrganBaseStomach, OrganThavenInternal, OrganHumanMetabolizer ] + id: OrganThavenStomach + description: "Surprisingly similar to the stomach of a sharkminnow." + +- type: entity + parent: [ OrganBaseLiver, OrganThavenInternal, OrganHumanMetabolizer ] + id: OrganThavenLiver + description: "It loosely resembles a slab of dragon flesh." + +- type: entity + parent: [ OrganBaseKidneys, OrganThavenInternal, OrganHumanMetabolizer ] + id: OrganThavenKidneys + description: "Shiny, coppery veins make these the most ornate kidneys known to modern science." +# End DeltaV Changes - This entire file was restructured for Nubody diff --git a/Resources/Prototypes/_Impstation/Entities/Mobs/Customization/Markings/misc.yml b/Resources/Prototypes/_Impstation/Entities/Mobs/Customization/Markings/misc.yml deleted file mode 100644 index 7e728a20489..00000000000 --- a/Resources/Prototypes/_Impstation/Entities/Mobs/Customization/Markings/misc.yml +++ /dev/null @@ -1,238 +0,0 @@ -##i did markings for a lot of different species so for now theyre are all here## -##if no one else does it ill do a cleanup of all marking coding in a few months## -##-carousel## - -#- type: marking -# id: FullID -# bodyPart: Part -# groupWhitelist: [Species, Species] -# youre on your own for figuring out the coloring system, my friend -# sprites: -# - sprite: _Impstation/Mobs/Customization/filelocation.rsi -# state: filename -# shaded: unshaded //use for markings that ignore shader - -- type: marking - id: Gills - bodyPart: Chest - groupWhitelist: [ Thaven ] - forcedColoring: false - sprites: - - sprite: _Impstation/Mobs/Customization/markingsbundle1.rsi - state: thavenchestgills - -- type: marking - id: ThavenChestScales - bodyPart: Chest - groupWhitelist: [ Thaven ] - forcedColoring: false - sprites: - - sprite: _Impstation/Mobs/Customization/markingsbundle1.rsi - state: thavenchestscales - -- type: marking - id: ThavenHeadScales - bodyPart: Head - groupWhitelist: [ Thaven ] - forcedColoring: false - sprites: - - sprite: _Impstation/Mobs/Customization/markingsbundle1.rsi - state: thavenheadscales - -- type: marking - id: ThavenLArmScales - bodyPart: LArm - groupWhitelist: [ Thaven ] - forcedColoring: false - sprites: - - sprite: _Impstation/Mobs/Customization/markingsbundle1.rsi - state: thavenleftarmscales - -- type: marking - id: ThavenRArmScales - bodyPart: RArm - groupWhitelist: [ Thaven ] - forcedColoring: false - sprites: - - sprite: _Impstation/Mobs/Customization/markingsbundle1.rsi - state: thavenrightarmscales - -- type: marking - id: ThavenLLegScales - bodyPart: LLeg - groupWhitelist: [ Thaven ] - forcedColoring: false - sprites: - - sprite: _Impstation/Mobs/Customization/markingsbundle1.rsi - state: thavenleftlegscales - -- type: marking - id: ThavenRLegScales - bodyPart: RLeg - groupWhitelist: [ Thaven ] - forcedColoring: false - sprites: - - sprite: _Impstation/Mobs/Customization/markingsbundle1.rsi - state: thavenrightlegscales - -#- type: marking -# id: ThavenLHandScales -# bodyPart: LHand -# groupWhitelist: [ Thaven ] -# forcedColoring: false -# sprites: -# - sprite: _Impstation/Mobs/Customization/markingsbundle1.rsi -# state: thavenlefthandscales - -#- type: marking -# id: ThavenRHandScales -# bodyPart: RHand -# groupWhitelist: [ Thaven ] -# forcedColoring: false -# sprites: -# - sprite: _Impstation/Mobs/Customization/markingsbundle1.rsi -# state: thavenrighthandscales - -#- type: marking -# id: Thiddies -# bodyPart: Chest -# groupWhitelist: [ Thaven ] -# forcedColoring: true -# sprites: -# - sprite: _Impstation/Mobs/Customization/markingsbundle1.rsi -# state: thavenbignaturals -#commented out until i find a way to hide them under clothes - - -- type: marking - id: ThavenTopSurgery - bodyPart: Chest - groupWhitelist: [ Thaven ] - forcedColoring: true - sprites: - - sprite: _Impstation/Mobs/Customization/markingsbundle1.rsi - state: thavennonaturals - -- type: marking - id: ThavenFishEars - bodyPart: HeadSide - groupWhitelist: [ Thaven ] - forcedColoring: true - sprites: - - sprite: _Impstation/Mobs/Customization/markingsbundle1.rsi - state: thavenfishears - -- type: marking - id: ThavenTattooVines - bodyPart: Chest - groupWhitelist: [ Thaven ] - forcedColoring: false - sprites: - - sprite: _Impstation/Mobs/Customization/markingsbundle1.rsi - state: thaventattoovines - -- type: marking - id: ThavenSpines - bodyPart: Chest - groupWhitelist: [ Thaven ] - forcedColoring: false - sprites: - - sprite: _Impstation/Mobs/Customization/markingsbundle1.rsi - state: thavenspines - -- type: marking - id: ThavenBiteMark - bodyPart: Chest - groupWhitelist: [ Thaven ] - forcedColoring: false - sprites: - - sprite: _Impstation/Mobs/Customization/markingsbundle1.rsi - state: thavenbitemark - -- type: marking - id: ThavenTattooWave - bodyPart: Chest - groupWhitelist: [ Thaven ] - forcedColoring: false - sprites: - - sprite: _Impstation/Mobs/Customization/markingsbundle1.rsi - state: thaventattoowave - -- type: marking - id: SharkminnowEyeliner - bodyPart: HeadTop - groupWhitelist: [ Thaven ] - forcedColoring: false - sprites: - - sprite: _Impstation/Mobs/Customization/markingsbundle1.rsi - state: thaventattoosharkminnoweyeliner - -- type: marking - id: ThavenTiger - bodyPart: Chest - groupWhitelist: [ Thaven ] - forcedColoring: false - sprites: - - sprite: _Impstation/Mobs/Customization/markingsbundle1.rsi - state: thaventiger1 - - sprite: _Impstation/Mobs/Customization/markingsbundle1.rsi - state: thaventiger2 - -- type: marking - id: ThavenTigerRArm - bodyPart: RArm - groupWhitelist: [ Thaven ] - forcedColoring: false - sprites: - - sprite: _Impstation/Mobs/Customization/markingsbundle1.rsi - state: thaventigerarmsr - -- type: marking - id: ThavenTigerLArm - bodyPart: LArm - groupWhitelist: [ Thaven ] - forcedColoring: false - sprites: - - sprite: _Impstation/Mobs/Customization/markingsbundle1.rsi - state: thaventigerarmsl - -- type: marking - id: ThavenHeadStripes - bodyPart: Head - groupWhitelist: [ Thaven ] - forcedColoring: false - sprites: - - sprite: _Impstation/Mobs/Customization/markingsbundle1.rsi - state: thavenheadstripes - -- type: marking - id: ThavenBodyStripes - bodyPart: Chest - groupWhitelist: [ Thaven ] - forcedColoring: false - sprites: - - sprite: _Impstation/Mobs/Customization/markingsbundle1.rsi - state: thavenbodystripes - -- type: marking - id: ThavenEarsBigFins - bodyPart: HeadSide - groupWhitelist: [ Thaven ] - forcedColoring: false - sprites: - - sprite: _Impstation/Mobs/Customization/markingsbundle1.rsi - state: thavenearsbigfins - - sprite: _Impstation/Mobs/Customization/markingsbundle1.rsi - state: thavenearsbigfins2 - -- type: marking - id: ThavenHeadCap - bodyPart: Head - groupWhitelist: [ Thaven ] - forcedColoring: false - sprites: - - sprite: _Impstation/Mobs/Customization/markingsbundle1.rsi - state: thavenheadcap1 - - sprite: _Impstation/Mobs/Customization/markingsbundle1.rsi - state: thavenheadcap2 - diff --git a/Resources/Prototypes/_Impstation/Entities/Mobs/Customization/Markings/thaven.yml b/Resources/Prototypes/_Impstation/Entities/Mobs/Customization/Markings/thaven.yml deleted file mode 100644 index ae2b08a4000..00000000000 --- a/Resources/Prototypes/_Impstation/Entities/Mobs/Customization/Markings/thaven.yml +++ /dev/null @@ -1,92 +0,0 @@ -- type: marking - id: ThavenEars1 - bodyPart: HeadSide - groupWhitelist: [Thaven] - forcedColoring: true - sprites: - - sprite: _Impstation/Mobs/Customization/thaven/thaven.rsi - state: ears1 - -- type: marking - id: ThavenEars2 - bodyPart: HeadSide - groupWhitelist: [Thaven] - forcedColoring: true - sprites: - - sprite: _Impstation/Mobs/Customization/thaven/thaven.rsi - state: ears2 - -- type: marking - id: ThavenEars3 - bodyPart: HeadSide - groupWhitelist: [Thaven] - forcedColoring: true - sprites: - - sprite: _Impstation/Mobs/Customization/thaven/thaven.rsi - state: ears3 - -- type: marking - id: ThavenEars4 - bodyPart: HeadSide - groupWhitelist: [Thaven] - forcedColoring: true - sprites: - - sprite: _Impstation/Mobs/Customization/thaven/thaven.rsi - state: ears4 - -- type: marking - id: ThavenPiercings - bodyPart: HeadTop - groupWhitelist: [Thaven] - forcedColoring: false - sprites: - - sprite: _Impstation/Mobs/Customization/thaven/thaven.rsi - state: piercings - -- type: marking - id: ThavenPiercings2 - bodyPart: HeadTop - groupWhitelist: [Thaven] - forcedColoring: false - sprites: - - sprite: _Impstation/Mobs/Customization/thaven/thaven.rsi - state: piercings2 - -- type: marking - id: ThavenChestTattoo1 - bodyPart: Chest - groupWhitelist: [Thaven] - coloring: - default: - type: - !type:TattooColoring - fallbackColor: "#666666" - sprites: - - sprite: _Impstation/Mobs/Customization/thaven/thaven.rsi - state: chesttat1 - -- type: marking - id: ThavenLArmTattoo1 - bodyPart: LArm - groupWhitelist: [Thaven] - coloring: - default: - type: - !type:TattooColoring - fallbackColor: "#666666" - sprites: - - sprite: _Impstation/Mobs/Customization/thaven/thaven.rsi - state: larmtat1 - -- type: marking - id: ThavenRArmTattoo1 - bodyPart: RArm - groupWhitelist: [Thaven] - coloring: - default: - type: - !type:TattooColoring - fallbackColor: "#666666" - sprites: - - sprite: _Impstation/Mobs/Customization/thaven/thaven.rsi - state: rarmtat1 diff --git a/Resources/Prototypes/_Impstation/Entities/Mobs/Customization/Markings/thaven_hair.yml b/Resources/Prototypes/_Impstation/Entities/Mobs/Customization/Markings/thaven_hair.yml deleted file mode 100644 index 5ceb3a741d5..00000000000 --- a/Resources/Prototypes/_Impstation/Entities/Mobs/Customization/Markings/thaven_hair.yml +++ /dev/null @@ -1,1309 +0,0 @@ -- type: marking - id: ThavenHairBalding - bodyPart: Hair - groupWhitelist: [Thaven] - sprites: - - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi - state: e -- type: marking - id: ThavenHairBedhead - bodyPart: Hair - groupWhitelist: [Thaven] - sprites: - - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi - state: bedhead -- type: marking - id: ThavenHairBedheadv2 - bodyPart: Hair - groupWhitelist: [Thaven] - sprites: - - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi - state: bedhead2 -- type: marking - id: ThavenHairBedheadv3 - bodyPart: Hair - groupWhitelist: [Thaven] - sprites: - - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi - state: bedhead3 -- type: marking - id: ThavenHairLongBedhead - bodyPart: Hair - groupWhitelist: [Thaven] - sprites: - - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi - state: long_bedhead -- type: marking - id: ThavenHairLongBedhead2 - bodyPart: Hair - groupWhitelist: [Thaven] - sprites: - - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi - state: long_bedhead2 -- type: marking - id: ThavenHairFloorlengthBedhead - bodyPart: Hair - groupWhitelist: [Thaven] - sprites: - - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi - state: floorlength_bedhead -- type: marking - id: ThavenHairBeehive - bodyPart: Hair - groupWhitelist: [Thaven] - sprites: - - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi - state: beehive -- type: marking - id: ThavenHairBeehive2 - bodyPart: Hair - groupWhitelist: [Thaven] - sprites: - - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi - state: beehive2 -- type: marking - id: ThavenHairBob - bodyPart: Hair - groupWhitelist: [Thaven] - sprites: - - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi - state: bob -- type: marking - id: ThavenHairBob2 - bodyPart: Hair - groupWhitelist: [Thaven] - sprites: - - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi - state: bob2 -- type: marking - id: ThavenHairBobcut - bodyPart: Hair - groupWhitelist: [Thaven] - sprites: - - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi - state: bobcut -- type: marking - id: ThavenHairBob4 - bodyPart: Hair - groupWhitelist: [Thaven] - sprites: - - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi - state: bob4 -- type: marking - id: ThavenHairBob5 - bodyPart: Hair - groupWhitelist: [Thaven] - sprites: - - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi - state: bob5 -- type: marking - id: ThavenHairBobcurl - bodyPart: Hair - groupWhitelist: [Thaven] - sprites: - - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi - state: bobcurl -- type: marking - id: ThavenHairBowlcut - bodyPart: Hair - groupWhitelist: [Thaven] - sprites: - - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi - state: bowlcut -- type: marking - id: ThavenHairBowlcut2 - bodyPart: Hair - groupWhitelist: [Thaven] - sprites: - - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi - state: bowlcut2 -- type: marking - id: ThavenHairBraid - bodyPart: Hair - groupWhitelist: [Thaven] - sprites: - - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi - state: braid -- type: marking - id: ThavenHairBraided - bodyPart: Hair - groupWhitelist: [Thaven] - sprites: - - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi - state: braided -- type: marking - id: ThavenHairBraidfront - bodyPart: Hair - groupWhitelist: [Thaven] - sprites: - - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi - state: braidfront -- type: marking - id: ThavenHairBraid2 - bodyPart: Hair - groupWhitelist: [Thaven] - sprites: - - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi - state: braid2 -- type: marking - id: ThavenHairHbraid - bodyPart: Hair - groupWhitelist: [Thaven] - sprites: - - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi - state: hbraid -- type: marking - id: ThavenHairShortbraid - bodyPart: Hair - groupWhitelist: [Thaven] - sprites: - - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi - state: shortbraid -- type: marking - id: ThavenHairBraidtail - bodyPart: Hair - groupWhitelist: [Thaven] - sprites: - - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi - state: braidtail -- type: marking - id: ThavenHairBun - bodyPart: Hair - groupWhitelist: [Thaven] - sprites: - - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi - state: bun -- type: marking - id: ThavenHairBunhead2 - bodyPart: Hair - groupWhitelist: [Thaven] - sprites: - - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi - state: bunhead2 -- type: marking - id: ThavenHairBun3 - bodyPart: Hair - groupWhitelist: [Thaven] - sprites: - - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi - state: bun3 -- type: marking - id: ThavenHairLargebun - bodyPart: Hair - groupWhitelist: [Thaven] - sprites: - - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi - state: largebun -- type: marking - id: ThavenHairManbun - bodyPart: Hair - groupWhitelist: [Thaven] - sprites: - - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi - state: manbun -- type: marking - id: ThavenHairTightbun - bodyPart: Hair - groupWhitelist: [Thaven] - sprites: - - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi - state: tightbun -- type: marking - id: ThavenHairBusiness - bodyPart: Hair - groupWhitelist: [Thaven] - sprites: - - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi - state: business -- type: marking - id: ThavenHairBusiness2 - bodyPart: Hair - groupWhitelist: [Thaven] - sprites: - - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi - state: business2 -- type: marking - id: ThavenHairBusiness3 - bodyPart: Hair - groupWhitelist: [Thaven] - sprites: - - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi - state: business3 -- type: marking - id: ThavenHairBusiness4 - bodyPart: Hair - groupWhitelist: [Thaven] - sprites: - - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi - state: business4 -- type: marking - id: ThavenHairBuzzcut - bodyPart: Hair - groupWhitelist: [Thaven] - sprites: - - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi - state: buzzcut -- type: marking - id: ThavenHairCia - bodyPart: Hair - groupWhitelist: [Thaven] - sprites: - - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi - state: cia -- type: marking - id: ThavenHairClassicCia - bodyPart: Hair - groupWhitelist: [Thaven] - sprites: - - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi - state: classiccia -- type: marking - id: ThavenHairClassicFloorlengthBedhead - bodyPart: Hair - groupWhitelist: [Thaven] - sprites: - - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi - state: classicfloorlength_bedhead -- type: marking - id: ThavenHairClassicModern - bodyPart: Hair - groupWhitelist: [Thaven] - sprites: - - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi - state: classicmodern -- type: marking - id: ThavenHairClassicMulder - bodyPart: Hair - groupWhitelist: [Thaven] - sprites: - - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi - state: classicmulder -- type: marking - id: ThavenHairClassicWisp - bodyPart: Hair - groupWhitelist: [Thaven] - sprites: - - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi - state: classicwisp -- type: marking - id: ThavenHairCombover - bodyPart: Hair - groupWhitelist: [Thaven] - sprites: - - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi - state: combover -- type: marking - id: ThavenHairCornrows - bodyPart: Hair - groupWhitelist: [Thaven] - sprites: - - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi - state: cornrows -- type: marking - id: ThavenHairCornrows2 - bodyPart: Hair - groupWhitelist: [Thaven] - sprites: - - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi - state: cornrows2 -- type: marking - id: ThavenHairCornrowbun - bodyPart: Hair - groupWhitelist: [Thaven] - sprites: - - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi - state: cornrowbun -- type: marking - id: ThavenHairCornrowbraid - bodyPart: Hair - groupWhitelist: [Thaven] - sprites: - - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi - state: cornrowbraid -- type: marking - id: ThavenHairCornrowtail - bodyPart: Hair - groupWhitelist: [Thaven] - sprites: - - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi - state: cornrowtail -- type: marking - id: ThavenHairCrewcut - bodyPart: Hair - groupWhitelist: [Thaven] - sprites: - - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi - state: crewcut -- type: marking - id: ThavenHairCrewcut2 - bodyPart: Hair - groupWhitelist: [Thaven] - sprites: - - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi - state: crewcut2 -- type: marking - id: ThavenHairCurls - bodyPart: Hair - groupWhitelist: [Thaven] - sprites: - - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi - state: curls -- type: marking - id: ThavenHairC - bodyPart: Hair - groupWhitelist: [Thaven] - sprites: - - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi - state: c -- type: marking - id: ThavenHairDandypompadour - bodyPart: Hair - groupWhitelist: [Thaven] - sprites: - - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi - state: dandypompadour -- type: marking - id: ThavenHairDevilock - bodyPart: Hair - groupWhitelist: [Thaven] - sprites: - - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi - state: devilock -- type: marking - id: ThavenHairDoublebun - bodyPart: Hair - groupWhitelist: [Thaven] - sprites: - - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi - state: doublebun -- type: marking - id: ThavenHairDoublebunLong - bodyPart: Hair - groupWhitelist: [Thaven] - sprites: - - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi - state: doublebun_long -- type: marking - id: ThavenHairDreads - bodyPart: Hair - groupWhitelist: [Thaven] - sprites: - - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi - state: dreads -- type: marking - id: ThavenHairDrillruru - bodyPart: Hair - groupWhitelist: [Thaven] - sprites: - - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi - state: drillruru -- type: marking - id: ThavenHairDrillhairextended - bodyPart: Hair - groupWhitelist: [Thaven] - sprites: - - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi - state: drillhairextended -- type: marking - id: ThavenHairEmofringe - bodyPart: Hair - groupWhitelist: [Thaven] - sprites: - - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi - state: emofringe -- type: marking - id: ThavenHairNofade - bodyPart: Hair - groupWhitelist: [Thaven] - sprites: - - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi - state: nofade -- type: marking - id: ThavenHairHighfade - bodyPart: Hair - groupWhitelist: [Thaven] - sprites: - - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi - state: highfade -- type: marking - id: ThavenHairMedfade - bodyPart: Hair - groupWhitelist: [Thaven] - sprites: - - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi - state: medfade -- type: marking - id: ThavenHairLowfade - bodyPart: Hair - groupWhitelist: [Thaven] - sprites: - - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi - state: lowfade -- type: marking - id: ThavenHairBaldfade - bodyPart: Hair - groupWhitelist: [Thaven] - sprites: - - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi - state: baldface -- type: marking - id: ThavenHairFeather - bodyPart: Hair - groupWhitelist: [Thaven] - sprites: - - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi - state: feather -- type: marking - id: ThavenHairFather - bodyPart: Hair - groupWhitelist: [Thaven] - sprites: - - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi - state: father -- type: marking - id: ThavenHairSargeant - bodyPart: Hair - groupWhitelist: [Thaven] - sprites: - - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi - state: sargeant -- type: marking - id: ThavenHairFlair - bodyPart: Hair - groupWhitelist: [Thaven] - sprites: - - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi - state: flair -- type: marking - id: ThavenHairBigflattop - bodyPart: Hair - groupWhitelist: [Thaven] - sprites: - - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi - state: bigflattop -- type: marking - id: ThavenHairFlow - bodyPart: Hair - groupWhitelist: [Thaven] - sprites: - - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi - state: f -- type: marking - id: ThavenHairGelled - bodyPart: Hair - groupWhitelist: [Thaven] - sprites: - - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi - state: gelled -- type: marking - id: ThavenHairGentle - bodyPart: Hair - groupWhitelist: [Thaven] - sprites: - - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi - state: gentle -- type: marking - id: ThavenHairHalfbang - bodyPart: Hair - groupWhitelist: [Thaven] - sprites: - - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi - state: halfbang -- type: marking - id: ThavenHairHalfbang2 - bodyPart: Hair - groupWhitelist: [Thaven] - sprites: - - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi - state: halfbang2 -- type: marking - id: ThavenHairHalfshaved - bodyPart: Hair - groupWhitelist: [Thaven] - sprites: - - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi - state: halfshaved -- type: marking - id: ThavenHairHedgehog - bodyPart: Hair - groupWhitelist: [Thaven] - sprites: - - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi - state: hedgehog -- type: marking - id: ThavenHairHimecut - bodyPart: Hair - groupWhitelist: [Thaven] - sprites: - - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi - state: himecut -- type: marking - id: ThavenHairHimecut2 - bodyPart: Hair - groupWhitelist: [Thaven] - sprites: - - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi - state: himecut2 -- type: marking - id: ThavenHairShorthime - bodyPart: Hair - groupWhitelist: [Thaven] - sprites: - - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi - state: shorthime -- type: marking - id: ThavenHairHimeup - bodyPart: Hair - groupWhitelist: [Thaven] - sprites: - - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi - state: himeup -- type: marking - id: ThavenHairHitop - bodyPart: Hair - groupWhitelist: [Thaven] - sprites: - - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi - state: hitop -- type: marking - id: ThavenHairJade - bodyPart: Hair - groupWhitelist: [Thaven] - sprites: - - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi - state: jade -- type: marking - id: ThavenHairJensen - bodyPart: Hair - groupWhitelist: [Thaven] - sprites: - - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi - state: jensen -- type: marking - id: ThavenHairJoestar - bodyPart: Hair - groupWhitelist: [Thaven] - sprites: - - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi - state: joestar -- type: marking - id: ThavenHairKeanu - bodyPart: Hair - groupWhitelist: [Thaven] - sprites: - - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi - state: keanu -- type: marking - id: ThavenHairKusanagi - bodyPart: Hair - groupWhitelist: [Thaven] - sprites: - - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi - state: kusanagi -- type: marking - id: ThavenHairLong - bodyPart: Hair - groupWhitelist: [Thaven] - sprites: - - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi - state: long -- type: marking - id: ThavenHairLong2 - bodyPart: Hair - groupWhitelist: [Thaven] - sprites: - - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi - state: long2 -- type: marking - id: ThavenHairLong3 - bodyPart: Hair - groupWhitelist: [Thaven] - sprites: - - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi - state: long3 -- type: marking - id: ThavenHairLongWithBundles - bodyPart: Hair - groupWhitelist: [Thaven] - sprites: - - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi - state: longbundled -- type: marking - id: ThavenHairLongovereye - bodyPart: Hair - groupWhitelist: [Thaven] - sprites: - - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi - state: longovereye -- type: marking - id: ThavenHairLbangs - bodyPart: Hair - groupWhitelist: [Thaven] - sprites: - - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi - state: lbangs -- type: marking - id: ThavenHairLongeremo - bodyPart: Hair - groupWhitelist: [Thaven] - sprites: - - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi - state: longeremo -- type: marking - id: ThavenHairLongfringe - bodyPart: Hair - groupWhitelist: [Thaven] - sprites: - - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi - state: longfringe -- type: marking - id: ThavenHairLongsidepart - bodyPart: Hair - groupWhitelist: [Thaven] - sprites: - - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi - state: longsidepart -- type: marking - id: ThavenHairMegaeyebrows - bodyPart: Hair - groupWhitelist: [Thaven] - sprites: - - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi - state: megaeyebrows -- type: marking - id: ThavenHairMessy - bodyPart: Hair - groupWhitelist: [Thaven] - sprites: - - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi - state: messy -- type: marking - id: ThavenHairModern - bodyPart: Hair - groupWhitelist: [Thaven] - sprites: - - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi - state: modern -- type: marking - id: ThavenHairMohawk - bodyPart: Hair - groupWhitelist: [Thaven] - sprites: - - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi - state: d -- type: marking - id: ThavenHairNitori - bodyPart: Hair - groupWhitelist: [Thaven] - sprites: - - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi - state: nitori -- type: marking - id: ThavenHairReversemohawk - bodyPart: Hair - groupWhitelist: [Thaven] - sprites: - - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi - state: reversemohawk -- type: marking - id: ThavenHairMulder - bodyPart: Hair - groupWhitelist: [Thaven] - sprites: - - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi - state: mulder -- type: marking - id: ThavenHairOdango - bodyPart: Hair - groupWhitelist: [Thaven] - sprites: - - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi - state: odango -- type: marking - id: ThavenHairOmbre - bodyPart: Hair - groupWhitelist: [Thaven] - sprites: - - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi - state: ombre -- type: marking - id: ThavenHairOneshoulder - bodyPart: Hair - groupWhitelist: [Thaven] - sprites: - - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi - state: oneshoulder -- type: marking - id: ThavenHairShortovereye - bodyPart: Hair - groupWhitelist: [Thaven] - sprites: - - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi - state: shortovereye -- type: marking - id: ThavenHairOxton - bodyPart: Hair - groupWhitelist: [Thaven] - sprites: - - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi - state: oxton -- type: marking - id: ThavenHairParted - bodyPart: Hair - groupWhitelist: [Thaven] - sprites: - - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi - state: parted -- type: marking - id: ThavenHairPart - bodyPart: Hair - groupWhitelist: [Thaven] - sprites: - - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi - state: part -- type: marking - id: ThavenHairKagami - bodyPart: Hair - groupWhitelist: [Thaven] - sprites: - - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi - state: kagami -- type: marking - id: ThavenHairPigtails - bodyPart: Hair - groupWhitelist: [Thaven] - sprites: - - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi - state: pigtails -- type: marking - id: ThavenHairPigtails2 - bodyPart: Hair - groupWhitelist: [Thaven] - sprites: - - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi - state: pigtails2 -- type: marking - id: ThavenHairPixie - bodyPart: Hair - groupWhitelist: [Thaven] - sprites: - - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi - state: pixie -- type: marking - id: ThavenHairPompadour - bodyPart: Hair - groupWhitelist: [Thaven] - sprites: - - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi - state: pompadour -- type: marking - id: ThavenHairBigpompadour - bodyPart: Hair - groupWhitelist: [Thaven] - sprites: - - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi - state: bigpompadour -- type: marking - id: ThavenHairPonytail - bodyPart: Hair - groupWhitelist: [Thaven] - sprites: - - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi - state: ponytail -- type: marking - id: ThavenHairPonytail2 - bodyPart: Hair - groupWhitelist: [Thaven] - sprites: - - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi - state: ponytail2 -- type: marking - id: ThavenHairPonytail3 - bodyPart: Hair - groupWhitelist: [Thaven] - sprites: - - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi - state: ponytail3 -- type: marking - id: ThavenHairPonytail4 - bodyPart: Hair - groupWhitelist: [Thaven] - sprites: - - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi - state: ponytail4 -- type: marking - id: ThavenHairPonytail5 - bodyPart: Hair - groupWhitelist: [Thaven] - sprites: - - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi - state: ponytail5 -- type: marking - id: ThavenHairPonytail6 - bodyPart: Hair - groupWhitelist: [Thaven] - sprites: - - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi - state: ponytail6 -- type: marking - id: ThavenHairPonytail7 - bodyPart: Hair - groupWhitelist: [Thaven] - sprites: - - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi - state: ponytail7 -- type: marking - id: ThavenHairHighponytail - bodyPart: Hair - groupWhitelist: [Thaven] - sprites: - - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi - state: highponytail -- type: marking - id: ThavenHairStail - bodyPart: Hair - groupWhitelist: [Thaven] - sprites: - - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi - state: stail -- type: marking - id: ThavenHairLongstraightponytail - bodyPart: Hair - groupWhitelist: [Thaven] - sprites: - - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi - state: longstraightponytail -- type: marking - id: ThavenHairCountry - bodyPart: Hair - groupWhitelist: [Thaven] - sprites: - - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi - state: country -- type: marking - id: ThavenHairFringetail - bodyPart: Hair - groupWhitelist: [Thaven] - sprites: - - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi - state: fringetail -- type: marking - id: ThavenHairSidetail - bodyPart: Hair - groupWhitelist: [Thaven] - sprites: - - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi - state: sidetail -- type: marking - id: ThavenHairSidetail2 - bodyPart: Hair - groupWhitelist: [Thaven] - sprites: - - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi - state: sidetail2 -- type: marking - id: ThavenHairSidetail3 - bodyPart: Hair - groupWhitelist: [Thaven] - sprites: - - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi - state: sidetail3 -- type: marking - id: ThavenHairSidetail4 - bodyPart: Hair - groupWhitelist: [Thaven] - sprites: - - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi - state: sidetail4 -- type: marking - id: ThavenHairSpikyponytail - bodyPart: Hair - groupWhitelist: [Thaven] - sprites: - - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi - state: spikyponytail -- type: marking - id: ThavenHairPoofy - bodyPart: Hair - groupWhitelist: [Thaven] - sprites: - - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi - state: poofy -- type: marking - id: ThavenHairQuiff - bodyPart: Hair - groupWhitelist: [Thaven] - sprites: - - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi - state: quiff -- type: marking - id: ThavenHairRonin - bodyPart: Hair - groupWhitelist: [Thaven] - sprites: - - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi - state: ronin -- type: marking - id: ThavenHairShaved - bodyPart: Hair - groupWhitelist: [Thaven] - sprites: - - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi - state: shaved -- type: marking - id: ThavenHairShavedpart - bodyPart: Hair - groupWhitelist: [Thaven] - sprites: - - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi - state: shavedpart -- type: marking - id: ThavenHairShortbangs - bodyPart: Hair - groupWhitelist: [Thaven] - sprites: - - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi - state: shortbangs -- type: marking - id: ThavenHairA - bodyPart: Hair - groupWhitelist: [Thaven] - sprites: - - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi - state: a -- type: marking - id: ThavenHairShorthair2 - bodyPart: Hair - groupWhitelist: [Thaven] - sprites: - - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi - state: shorthair2 -- type: marking - id: ThavenHairShorthair3 - bodyPart: Hair - groupWhitelist: [Thaven] - sprites: - - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi - state: shorthair3 -- type: marking - id: ThavenHairShorthair9 - bodyPart: Hair - groupWhitelist: [Thaven] - sprites: - - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi - state: shorthair9 -- type: marking - id: ThavenHair80s - bodyPart: Hair - groupWhitelist: [Thaven] - sprites: - - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi - state: 80s -- type: marking - id: ThavenHairRosa - bodyPart: Hair - groupWhitelist: [Thaven] - sprites: - - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi - state: rosa -- type: marking - id: ThavenHairB - bodyPart: Hair - groupWhitelist: [Thaven] - sprites: - - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi - state: b -- type: marking - id: ThavenHairSidecut - bodyPart: Hair - groupWhitelist: [Thaven] - sprites: - - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi - state: sidecut -- type: marking - id: ThavenHairSkinhead - bodyPart: Hair - groupWhitelist: [Thaven] - sprites: - - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi - state: skinhead -- type: marking - id: ThavenHairProtagonist - bodyPart: Hair - groupWhitelist: [Thaven] - sprites: - - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi - state: protagonist -- type: marking - id: ThavenHairSpiky - bodyPart: Hair - groupWhitelist: [Thaven] - sprites: - - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi - state: spiky -- type: marking - id: ThavenHairSpookyLong - bodyPart: Hair - groupWhitelist: [Thaven] - sprites: - - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi - state: spookylong -- type: marking - id: ThavenHairSwept - bodyPart: Hair - groupWhitelist: [Thaven] - sprites: - - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi - state: swept -- type: marking - id: ThavenHairSwept2 - bodyPart: Hair - groupWhitelist: [Thaven] - sprites: - - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi - state: swept2 -- type: marking - id: ThavenHairShoulderLengthOverEye - bodyPart: Hair - groupWhitelist: [Thaven] - sprites: - - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi - state: shoulderlengthovereye -- type: marking - id: ThavenHairThinning - bodyPart: Hair - groupWhitelist: [Thaven] - sprites: - - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi - state: thinning -- type: marking - id: ThavenHairThinningfront - bodyPart: Hair - groupWhitelist: [Thaven] - sprites: - - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi - state: thinningfront -- type: marking - id: ThavenHairThinningrear - bodyPart: Hair - groupWhitelist: [Thaven] - sprites: - - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi - state: thinningrear -- type: marking - id: ThavenHairTopknot - bodyPart: Hair - groupWhitelist: [Thaven] - sprites: - - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi - state: topknot -- type: marking - id: ThavenHairTressshoulder - bodyPart: Hair - groupWhitelist: [Thaven] - sprites: - - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi - state: tressshoulder -- type: marking - id: ThavenHairTrimmed - bodyPart: Hair - groupWhitelist: [Thaven] - sprites: - - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi - state: trimmed -- type: marking - id: ThavenHairTrimflat - bodyPart: Hair - groupWhitelist: [Thaven] - sprites: - - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi - state: trimflat -- type: marking - id: ThavenHairTwintail - bodyPart: Hair - groupWhitelist: [Thaven] - sprites: - - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi - state: twintail -- type: marking - id: ThavenHairTwoStrands - bodyPart: Hair - groupWhitelist: [Thaven] - sprites: - - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi - state: twostrands -- type: marking - id: ThavenHairUndercut - bodyPart: Hair - groupWhitelist: [Thaven] - sprites: - - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi - state: undercut -- type: marking - id: ThavenHairUndercutleft - bodyPart: Hair - groupWhitelist: [Thaven] - sprites: - - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi - state: undercutleft -- type: marking - id: ThavenHairUndercutright - bodyPart: Hair - groupWhitelist: [Thaven] - sprites: - - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi - state: undercutright -- type: marking - id: ThavenHairUnkept - bodyPart: Hair - groupWhitelist: [Thaven] - sprites: - - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi - state: unkept -- type: marking - id: ThavenHairVlong - bodyPart: Hair - groupWhitelist: [Thaven] - sprites: - - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi - state: vlong -- type: marking - id: ThavenHairLongest - bodyPart: Hair - groupWhitelist: [Thaven] - sprites: - - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi - state: longest -- type: marking - id: ThavenHairLongest2 - bodyPart: Hair - groupWhitelist: [Thaven] - sprites: - - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi - state: longest2 -- type: marking - id: ThavenHairVeryshortovereyealternate - bodyPart: Hair - groupWhitelist: [Thaven] - sprites: - - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi - state: veryshortovereyealternate -- type: marking - id: ThavenHairVlongfringe - bodyPart: Hair - groupWhitelist: [Thaven] - sprites: - - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi - state: vlongfringe -- type: marking - id: ThavenHairVolaju - bodyPart: Hair - groupWhitelist: [Thaven] - sprites: - - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi - state: volaju -- type: marking - id: ThavenHairWisp - bodyPart: Hair - groupWhitelist: [Thaven] - sprites: - - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi - state: wisp -- type: marking - id: ThavenHairUneven - bodyPart: Hair - groupWhitelist: [Thaven] - sprites: - - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi - state: uneven -- type: marking - id: ThavenHairTailed - bodyPart: Hair - groupWhitelist: [Thaven] - sprites: - - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi - state: tailed -- type: marking - id: ThavenHairClassicLong2 - bodyPart: Hair - groupWhitelist: [Thaven] - sprites: - - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi - state: classiclong2 -- type: marking - id: ThavenHairClassicLong3 - bodyPart: Hair - groupWhitelist: [Thaven] - sprites: - - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi - state: classiclong3 -- type: marking - id: ThavenHairBald - bodyPart: Hair - groupWhitelist: [Thaven] - sprites: - - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi - state: bald -- type: marking - id: ThavenHairShavedMohawk - bodyPart: Hair - groupWhitelist: [Thaven] - sprites: - - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi - state: shavedmohawk -- type: marking - id: ThavenHairMediumSidepart - bodyPart: Hair - groupWhitelist: [Thaven] - sprites: - - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi - state: mediumsidepart -- type: marking - id: ThavenHairEmo2 - bodyPart: Hair - groupWhitelist: [Thaven] - sprites: - - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi - state: emo2 -- type: marking - id: ThavenHairDrillHair - bodyPart: Hair - groupWhitelist: [Thaven] - sprites: - - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi - state: drillhair -- type: marking - id: ThavenHairClassicAfro - bodyPart: Hair - groupWhitelist: [Thaven] - sprites: - - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi - state: classicafro -- type: marking - id: ThavenHairClassicciaBusiness - bodyPart: Hair - groupWhitelist: [Thaven] - sprites: - - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi - state: classicciabusiness -- type: marking - id: ThavenHairClassicCornrows - bodyPart: Hair - groupWhitelist: [Thaven] - sprites: - - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi - state: classiccornrows -- type: marking - id: ThavenHairCoffeeHouse - bodyPart: Hair - groupWhitelist: [Thaven] - sprites: - - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi - state: coffeehouse -- type: marking - id: ThavenHairFrenchbraid - bodyPart: Hair - groupWhitelist: [Thaven] - sprites: - - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi - state: frenchbraid diff --git a/Resources/Prototypes/_Impstation/Entities/Mobs/Customization/Markings/undershirt.yml b/Resources/Prototypes/_Impstation/Entities/Mobs/Customization/Markings/undershirt.yml deleted file mode 100644 index 5ac3359795f..00000000000 --- a/Resources/Prototypes/_Impstation/Entities/Mobs/Customization/Markings/undershirt.yml +++ /dev/null @@ -1,90 +0,0 @@ -- type: marking - id: UndershirtDefault - bodyPart: UndergarmentTop - groupWhitelist: null # DeltaV - removed restrictions - coloring: - default: - type: - !type:SimpleColoring - color: "#FFFFFF" - sprites: - - sprite: _Impstation/Mobs/Customization/undershirt.rsi - state: undershirt - -- type: marking - id: UndershirtRolled - bodyPart: UndergarmentTop - groupWhitelist: null # DeltaV - removed restrictions - coloring: - default: - type: - !type:SimpleColoring - color: "#FFFFFF" - sprites: - - sprite: _Impstation/Mobs/Customization/undershirt.rsi - state: rolled_undershirt - -- type: marking - id: UndershirtSleeveless - bodyPart: UndergarmentTop - groupWhitelist: null # DeltaV - removed restrictions - coloring: - default: - type: - !type:SimpleColoring - color: "#FFFFFF" - sprites: - - sprite: _Impstation/Mobs/Customization/undershirt.rsi - state: sleeveless - -- type: marking - id: UndershirtRolledSleeveless - bodyPart: UndergarmentTop - groupWhitelist: null # DeltaV - removed restrictions - coloring: - default: - type: - !type:SimpleColoring - color: "#FFFFFF" - sprites: - - sprite: _Impstation/Mobs/Customization/undershirt.rsi - state: rolled_undershirt_sleeveless - -- type: marking - id: UndershirtGrossSleeveless - bodyPart: UndergarmentTop - groupWhitelist: null # DeltaV - removed restrictions - coloring: - default: - type: - !type:SimpleColoring - color: "#FFFFFF" - sprites: - - sprite: _Impstation/Mobs/Customization/undershirt.rsi - state: gross_sleeveless - -- type: marking - id: UndershirtNanotrasen - bodyPart: UndergarmentTop - groupWhitelist: null # DeltaV - removed restrictions - coloring: - default: - type: - !type:SimpleColoring - color: "#FFFFFF" - sprites: - - sprite: _Impstation/Mobs/Customization/undershirt.rsi - state: nanotrasen - -- type: marking - id: UndershirtBraStrapless - bodyPart: UndergarmentTop - groupWhitelist: null # DeltaV - removed restrictions - coloring: - default: - type: - !type:SimpleColoring - color: "#FFFFFF" - sprites: - - sprite: _Impstation/Mobs/Customization/undershirt.rsi - state: strapless diff --git a/Resources/Prototypes/_Impstation/Entities/Mobs/Customization/Markings/underwear.yml b/Resources/Prototypes/_Impstation/Entities/Mobs/Customization/Markings/underwear.yml deleted file mode 100644 index 9980b3f3378..00000000000 --- a/Resources/Prototypes/_Impstation/Entities/Mobs/Customization/Markings/underwear.yml +++ /dev/null @@ -1,25 +0,0 @@ -- type: marking - id: UnderwearLowriders - bodyPart: UndergarmentBottom - groupWhitelist: null # DeltaV - removed restrictions - coloring: - default: - type: - !type:SimpleColoring - color: "#FFFFFF" - sprites: - - sprite: _Impstation/Mobs/Customization/underwear.rsi - state: lowriders - -- type: marking - id: UnderwearTanga - bodyPart: UndergarmentBottom - groupWhitelist: null # DeltaV - removed restrictions - coloring: - default: - type: - !type:SimpleColoring - color: "#FFFFFF" - sprites: - - sprite: _Impstation/Mobs/Customization/underwear.rsi - state: tanga diff --git a/Resources/Prototypes/_Impstation/InventoryTemplates/thaven_inventory_template.yml b/Resources/Prototypes/_Impstation/InventoryTemplates/thaven_inventory_template.yml index c47ef9f7dbd..099218194b9 100644 --- a/Resources/Prototypes/_Impstation/InventoryTemplates/thaven_inventory_template.yml +++ b/Resources/Prototypes/_Impstation/InventoryTemplates/thaven_inventory_template.yml @@ -34,12 +34,14 @@ uiWindowPos: 0,2 strippingWindowPos: 0,1 displayName: Neck + offset: 0, 0.03 - name: mask slotTexture: mask slotFlags: MASK uiWindowPos: 1,2 strippingWindowPos: 1,1 displayName: Mask + offset: 0, 0.0655 - name: eyes slotTexture: glasses slotFlags: EYES @@ -47,6 +49,7 @@ uiWindowPos: 0,3 strippingWindowPos: 0,0 displayName: Eyes + offset: 0, 0.0655 - name: ears slotTexture: ears slotFlags: EARS @@ -54,12 +57,14 @@ uiWindowPos: 2,2 strippingWindowPos: 2,0 displayName: Ears + offset: 0, 0.0615 - name: head slotTexture: head slotFlags: HEAD uiWindowPos: 1,3 strippingWindowPos: 1,0 displayName: Head + offset: 0, 0.06 - name: pocket1 slotTexture: pocket fullTextureName: template_small diff --git a/Resources/Prototypes/_MARCO/Entities/Mobs/Customization/Markings/thaven.yml b/Resources/Prototypes/_MARCO/Entities/Mobs/Customization/Markings/thaven.yml new file mode 100644 index 00000000000..bef1f2ebe1d --- /dev/null +++ b/Resources/Prototypes/_MARCO/Entities/Mobs/Customization/Markings/thaven.yml @@ -0,0 +1,2444 @@ +# Chest + +- type: marking + id: BodyhairThaven + bodyPart: Chest + groupWhitelist: [ Thaven ] + sprites: + - sprite: _MACRO/Mobs/Customization/Thaven/chest.rsi + state: hair + +- type: marking + id: Gills + bodyPart: Chest + groupWhitelist: [ Thaven ] + sprites: + - sprite: _MACRO/Mobs/Customization/Thaven/chest.rsi + state: gills + +- type: marking + id: ThavenAbs + bodyPart: Chest + groupWhitelist: [ Thaven ] + sprites: + - sprite: _MACRO/Mobs/Customization/Thaven/chest.rsi + state: muscular + +- type: marking + id: ThavenBiteMark + bodyPart: Chest + groupWhitelist: [ Thaven ] + sprites: + - sprite: _MACRO/Mobs/Customization/Thaven/chest.rsi + state: bitemark + +- type: marking + id: ThavenBodyStripes + bodyPart: Chest + groupWhitelist: [ Thaven ] + sprites: + - sprite: _MACRO/Mobs/Customization/Thaven/chest.rsi + state: stripes + +- type: marking + id: ThavenChestScales + bodyPart: Chest + groupWhitelist: [ Thaven ] + sprites: + - sprite: _MACRO/Mobs/Customization/Thaven/chest.rsi + state: scales + +- type: marking + id: ThavenChestTattoo1 + bodyPart: Chest + groupWhitelist: [ Thaven ] + coloring: + default: + type: + !type:TattooColoring + fallbackColor: "#666666" + sprites: + - sprite: _MACRO/Mobs/Customization/Thaven/chest.rsi + state: tat1 + +- type: marking + id: ThavenSpinechill + bodyPart: Chest + groupWhitelist: [ Thaven ] + coloring: + default: + type: + !type:EyeColoring + negative: false + sprites: + - sprite: _MACRO/Mobs/Customization/Thaven/chest.rsi + state: spinechill +# shaders: # DeltaV - Uncomment when we get marking shaders. +# spinechill: unshaded + +- type: marking + id: ThavenSpines + bodyPart: Chest + groupWhitelist: [ Thaven ] + sprites: + - sprite: _MACRO/Mobs/Customization/Thaven/chest.rsi + state: spines +# shaders: # DeltaV - Uncomment when we get marking shaders. +# spines: unshaded + +- type: marking + id: ThavenTattooWave + bodyPart: Chest + groupWhitelist: [ Thaven ] + sprites: + - sprite: _MACRO/Mobs/Customization/Thaven/chest.rsi + state: tattoowave + +- type: marking + id: ThavenTattooVines + bodyPart: Chest + groupWhitelist: [ Thaven ] + sprites: + - sprite: _MACRO/Mobs/Customization/Thaven/chest.rsi + state: tattoovines + +- type: marking + id: ThavenTiger + bodyPart: Chest + groupWhitelist: [ Thaven ] + sprites: + - sprite: _MACRO/Mobs/Customization/Thaven/chest.rsi + state: tiger1 + - sprite: _MACRO/Mobs/Customization/Thaven/chest.rsi + state: tiger2 + +- type: marking + id: ThavenTopSurgery + bodyPart: Chest + groupWhitelist: [ Thaven ] + forcedColoring: true + sprites: + - sprite: _MACRO/Mobs/Customization/Thaven/chest.rsi + state: nonaturals + +# Head + +- type: marking + id: ThavenHeadCap + bodyPart: Head + groupWhitelist: [ Thaven ] + sprites: + - sprite: _MACRO/Mobs/Customization/Thaven/head.rsi + state: cap1 + - sprite: _MACRO/Mobs/Customization/Thaven/head.rsi + state: cap2 + +- type: marking + id: ThavenHeadScales + bodyPart: Head + groupWhitelist: [ Thaven ] + sprites: + - sprite: _MACRO/Mobs/Customization/Thaven/head.rsi + state: scales + +- type: marking + id: ThavenHeadStripes + bodyPart: Head + groupWhitelist: [ Thaven ] + sprites: + - sprite: _MACRO/Mobs/Customization/Thaven/head.rsi + state: stripes + +- type: marking + id: ThavenShadow + bodyPart: Head + groupWhitelist: [ Thaven ] + forcedColoring: true + coloring: + default: + type: + !type:SimpleColoring + color: "#000000" + sprites: + - sprite: _MACRO/Mobs/Customization/Thaven/head.rsi + state: shadowthaven + +# Snout + +# Eyes + +- type: marking + id: SharkminnowEyeliner + bodyPart: Eyes + groupWhitelist: [ Thaven ] + sprites: + - sprite: _MACRO/Mobs/Customization/Thaven/eyes.rsi + state: sharkminnoweyeliner + +- type: marking + id: ThavenEyesSharkminnow + bodyPart: Eyes + groupWhitelist: [ Thaven ] + coloring: + default: + type: + !type:EyeColoring + negative: false + sprites: + - sprite: _MACRO/Mobs/Customization/Thaven/eyes.rsi + state: sharkminnow + +- type: marking + id: ThavenEyesSharkminnowGlowing + bodyPart: Eyes + groupWhitelist: [ Thaven ] + coloring: + default: + type: + !type:EyeColoring + negative: false + sprites: + - sprite: _MACRO/Mobs/Customization/Thaven/eyes.rsi + state: sharkminnow +# shaders: # DeltaV - Uncomment when we get marking shaders. +# sharkminnow: unshaded + +- type: marking + id: ThavenLEyeGlow + bodyPart: Eyes + groupWhitelist: [ Thaven ] + coloring: + default: + type: + !type:EyeColoring + negative: false + sprites: + - sprite: _MACRO/Mobs/Customization/Thaven/eyes.rsi + state: glowleft +# shaders: # DeltaV - Uncomment when we get marking shaders. +# glowleft: unshaded + +- type: marking + id: ThavenREyeGlow + bodyPart: Eyes + groupWhitelist: [ Thaven ] + coloring: + default: + type: + !type:EyeColoring + negative: false + sprites: + - sprite: _MACRO/Mobs/Customization/Thaven/eyes.rsi + state: glowright +# shaders: # DeltaV - Uncomment when we get marking shaders. +# glowright: unshaded + +# RArm + +- type: marking + id: ThavenRArmScales + bodyPart: RArm + groupWhitelist: [ Thaven ] + sprites: + - sprite: _MACRO/Mobs/Customization/Thaven/rarm.rsi + state: scales + +- type: marking + id: ThavenRArmTattoo1 + bodyPart: RArm + groupWhitelist: [ Thaven ] + coloring: + default: + type: + !type:TattooColoring + fallbackColor: "#666666" + sprites: + - sprite: _MACRO/Mobs/Customization/Thaven/rarm.rsi + state: tat1 + +- type: marking + id: ThavenTigerRArm + bodyPart: RArm + groupWhitelist: [ Thaven ] + sprites: + - sprite: _MACRO/Mobs/Customization/Thaven/rarm.rsi + state: tiger + +# LArm + +- type: marking + id: ThavenLArmScales + bodyPart: LArm + groupWhitelist: [ Thaven ] + sprites: + - sprite: _MACRO/Mobs/Customization/Thaven/larm.rsi + state: scales + +- type: marking + id: ThavenLArmTattoo1 + bodyPart: LArm + groupWhitelist: [ Thaven ] + coloring: + default: + type: + !type:TattooColoring + fallbackColor: "#666666" + sprites: + - sprite: _MACRO/Mobs/Customization/Thaven/larm.rsi + state: tat1 + +- type: marking + id: ThavenTigerLArm + bodyPart: LArm + groupWhitelist: [ Thaven ] + sprites: + - sprite: _MACRO/Mobs/Customization/Thaven/larm.rsi + state: tiger + +# RLeg + +- type: marking + id: ThavenRLegScales + bodyPart: RLeg + groupWhitelist: [ Thaven ] + sprites: + - sprite: _MACRO/Mobs/Customization/Thaven/rleg.rsi + state: scales + +# LLeg + +- type: marking + id: ThavenLLegScales + bodyPart: LLeg + groupWhitelist: [ Thaven ] + sprites: + - sprite: _MACRO/Mobs/Customization/Thaven/lleg.rsi + state: scales + +# UndergarmentBottom + +- type: marking + id: UnderwearBriefsT + bodyPart: UndergarmentBottom + groupWhitelist: [ Thaven ] + coloring: + default: + type: + !type:SimpleColoring + color: "#FFFFFF" + sprites: + - sprite: _MACRO/Mobs/Customization/Thaven/undergarmentbottom.rsi + state: briefs + +- type: marking + id: UnderwearDefaultT + bodyPart: UndergarmentBottom + groupWhitelist: [ Thaven ] + coloring: + default: + type: + !type:SimpleColoring + color: "#FFFFFF" + sprites: + - sprite: _MACRO/Mobs/Customization/Thaven/undergarmentbottom.rsi + state: boxers + +- type: marking + id: UnderwearLowridersT + bodyPart: UndergarmentBottom + groupWhitelist: [ Thaven ] + coloring: + default: + type: + !type:SimpleColoring + color: "#FFFFFF" + sprites: + - sprite: _MACRO/Mobs/Customization/Thaven/undergarmentbottom.rsi + state: lowriders + +- type: marking + id: UnderwearSatinT + bodyPart: UndergarmentBottom + groupWhitelist: [ Thaven ] + coloring: + default: + type: + !type:SimpleColoring + color: "#FFFFFF" + sprites: + - sprite: _MACRO/Mobs/Customization/Thaven/undergarmentbottom.rsi + state: satin + +- type: marking + id: UnderwearTangaT + bodyPart: UndergarmentBottom + groupWhitelist: [ Thaven ] + coloring: + default: + type: + !type:SimpleColoring + color: "#FFFFFF" + sprites: + - sprite: _MACRO/Mobs/Customization/Thaven/undergarmentbottom.rsi + state: tanga + +# UndergarmentTop + +- type: marking + id: UndergarmentTopBinderT + bodyPart: UndergarmentTop + groupWhitelist: [ Thaven ] + coloring: + default: + type: null + fallbackColor: '#FFFFFF' + sprites: + - sprite: _MACRO/Mobs/Customization/Thaven/undergarmenttop.rsi + state: binder + +- type: marking + id: UndershirtBraClassicT + bodyPart: UndergarmentTop + groupWhitelist: [ Thaven ] + coloring: + default: + type: + !type:SimpleColoring + color: "#FFFFFF" + sprites: + - sprite: _MACRO/Mobs/Customization/Thaven/undergarmenttop.rsi + state: classic + +- type: marking + id: UndershirtBraSportsT + bodyPart: UndergarmentTop + groupWhitelist: [ Thaven ] + coloring: + default: + type: + !type:SimpleColoring + color: "#FFFFFF" + sprites: + - sprite: _MACRO/Mobs/Customization/Thaven/undergarmenttop.rsi + state: sports + +- type: marking + id: UndershirtBraStraplessT + bodyPart: UndergarmentTop + groupWhitelist: [ Thaven ] + coloring: + default: + type: + !type:SimpleColoring + color: "#FFFFFF" + sprites: + - sprite: _MACRO/Mobs/Customization/Thaven/undergarmenttop.rsi + state: strapless + +- type: marking + id: UndershirtDefaultT + bodyPart: UndergarmentTop + groupWhitelist: [ Thaven ] + coloring: + default: + type: + !type:SimpleColoring + color: "#FFFFFF" + sprites: + - sprite: _MACRO/Mobs/Customization/Thaven/undergarmenttop.rsi + state: undershirt + +- type: marking + id: UndershirtGrossSleevelessT + bodyPart: UndergarmentTop + groupWhitelist: [ Thaven ] + coloring: + default: + type: + !type:SimpleColoring + color: "#FFFFFF" + sprites: + - sprite: _MACRO/Mobs/Customization/Thaven/undergarmenttop.rsi + state: grosssleeveless + +- type: marking + id: UndershirtNanotrasenT + bodyPart: UndergarmentTop + groupWhitelist: [ Thaven ] + coloring: + default: + type: + !type:SimpleColoring + color: "#FFFFFF" + sprites: + - sprite: _MACRO/Mobs/Customization/Thaven/undergarmenttop.rsi + state: nanotrasen + +- type: marking + id: UndershirtRolledT + bodyPart: UndergarmentTop + groupWhitelist: [ Thaven ] + coloring: + default: + type: + !type:SimpleColoring + color: "#FFFFFF" + sprites: + - sprite: _MACRO/Mobs/Customization/Thaven/undergarmenttop.rsi + state: rolledundershirt + +# LFoot + +# RFoot + +# LHand + +# RHand + +# FacialHair + +# Hair +# i cant wait until marking displacements are real and i can set this entire category on fire + +- type: marking + id: BurqaSolidThaven + bodyPart: Hair + groupWhitelist: [ Thaven ] + sprites: + - sprite: _MACRO/Mobs/Customization/Thaven/hair.rsi + state: burqa + +- type: marking + id: HairFloralLongThaven + bodyPart: Hair + groupWhitelist: [ Thaven ] + coloring: + default: + type: + !type:SimpleColoring + color: "#FFFFFF" + sprites: + - sprite: _MACRO/Mobs/Customization/Thaven/hair.rsi + state: florallong1 + - sprite: _MACRO/Mobs/Customization/Thaven/hair.rsi + state: florallong2 + +- type: marking + id: HairFloralMidThaven + bodyPart: Hair + groupWhitelist: [ Thaven ] + coloring: + default: + type: + !type:SimpleColoring + color: "#FFFFFF" + sprites: + - sprite: _MACRO/Mobs/Customization/Thaven/hair.rsi + state: floralmid1 + - sprite: _MACRO/Mobs/Customization/Thaven/hair.rsi + state: floralmid2 + +- type: marking + id: HijabFashionableThaven + bodyPart: Hair + groupWhitelist: [ Thaven ] + sprites: + - sprite: _MACRO/Mobs/Customization/Thaven/hair.rsi + state: hijabchic + +- type: marking + id: HijabSimpleThaven + bodyPart: Hair + groupWhitelist: [ Thaven ] + sprites: + - sprite: _MACRO/Mobs/Customization/Thaven/hair.rsi + state: hijabsimple + +- type: marking + id: MessyPonytailThaven + bodyPart: Hair + groupWhitelist: [ Thaven ] + sprites: + - sprite: _MACRO/Mobs/Customization/Thaven/hair.rsi + state: messyponytail + +- type: marking + id: NiqabThaven + bodyPart: Hair + groupWhitelist: [ Thaven ] + sprites: + - sprite: _MACRO/Mobs/Customization/Thaven/hair.rsi + state: niqab + +- type: marking + id: ThavenHair80s + bodyPart: Hair + groupWhitelist: [ Thaven ] + sprites: + - sprite: _MACRO/Mobs/Customization/Thaven/hair.rsi + state: 80s + +- type: marking + id: ThavenHairA + bodyPart: Hair + groupWhitelist: [ Thaven ] + sprites: + - sprite: _MACRO/Mobs/Customization/Thaven/hair.rsi + state: a + +- type: marking + id: ThavenHairB + bodyPart: Hair + groupWhitelist: [ Thaven ] + sprites: + - sprite: _MACRO/Mobs/Customization/Thaven/hair.rsi + state: b + +- type: marking + id: ThavenHairBald + bodyPart: Hair + groupWhitelist: [ Thaven ] + sprites: + - sprite: _MACRO/Mobs/Customization/Thaven/hair.rsi + state: bald + +- type: marking + id: ThavenHairBaldfade + bodyPart: Hair + groupWhitelist: [ Thaven ] + sprites: + - sprite: _MACRO/Mobs/Customization/Thaven/hair.rsi + state: baldface + +- type: marking + id: ThavenHairBalding + bodyPart: Hair + groupWhitelist: [ Thaven ] + sprites: + - sprite: _MACRO/Mobs/Customization/Thaven/hair.rsi + state: e + +- type: marking + id: ThavenHairBedhead + bodyPart: Hair + groupWhitelist: [ Thaven ] + sprites: + - sprite: _MACRO/Mobs/Customization/Thaven/hair.rsi + state: bedhead + +- type: marking + id: ThavenHairBedheadv2 + bodyPart: Hair + groupWhitelist: [ Thaven ] + sprites: + - sprite: _MACRO/Mobs/Customization/Thaven/hair.rsi + state: bedhead2 + +- type: marking + id: ThavenHairBedheadv3 + bodyPart: Hair + groupWhitelist: [ Thaven ] + sprites: + - sprite: _MACRO/Mobs/Customization/Thaven/hair.rsi + state: bedhead3 + +- type: marking + id: ThavenHairBeehive + bodyPart: Hair + groupWhitelist: [ Thaven ] + sprites: + - sprite: _MACRO/Mobs/Customization/Thaven/hair.rsi + state: beehive + +- type: marking + id: ThavenHairBeehive2 + bodyPart: Hair + groupWhitelist: [ Thaven ] + sprites: + - sprite: _MACRO/Mobs/Customization/Thaven/hair.rsi + state: beehive2 + +- type: marking + id: ThavenHairBigflattop + bodyPart: Hair + groupWhitelist: [ Thaven ] + sprites: + - sprite: _MACRO/Mobs/Customization/Thaven/hair.rsi + state: bigflattop + +- type: marking + id: ThavenHairBigpompadour + bodyPart: Hair + groupWhitelist: [ Thaven ] + sprites: + - sprite: _MACRO/Mobs/Customization/Thaven/hair.rsi + state: bigpompadour + +- type: marking + id: ThavenHairBob + bodyPart: Hair + groupWhitelist: [ Thaven ] + sprites: + - sprite: _MACRO/Mobs/Customization/Thaven/hair.rsi + state: bob + +- type: marking + id: ThavenHairBob2 + bodyPart: Hair + groupWhitelist: [ Thaven ] + sprites: + - sprite: _MACRO/Mobs/Customization/Thaven/hair.rsi + state: bob2 + +- type: marking + id: ThavenHairBob4 + bodyPart: Hair + groupWhitelist: [ Thaven ] + sprites: + - sprite: _MACRO/Mobs/Customization/Thaven/hair.rsi + state: bob4 + +- type: marking + id: ThavenHairBob5 + bodyPart: Hair + groupWhitelist: [ Thaven ] + sprites: + - sprite: _MACRO/Mobs/Customization/Thaven/hair.rsi + state: bob5 + +- type: marking + id: ThavenHairBobcurl + bodyPart: Hair + groupWhitelist: [ Thaven ] + sprites: + - sprite: _MACRO/Mobs/Customization/Thaven/hair.rsi + state: bobcurl + +- type: marking + id: ThavenHairBobcut + bodyPart: Hair + groupWhitelist: [ Thaven ] + sprites: + - sprite: _MACRO/Mobs/Customization/Thaven/hair.rsi + state: bobcut + +- type: marking + id: ThavenHairBowlcut + bodyPart: Hair + groupWhitelist: [ Thaven ] + sprites: + - sprite: _MACRO/Mobs/Customization/Thaven/hair.rsi + state: bowlcut + +- type: marking + id: ThavenHairBowlcut2 + bodyPart: Hair + groupWhitelist: [ Thaven ] + sprites: + - sprite: _MACRO/Mobs/Customization/Thaven/hair.rsi + state: bowlcut2 + +- type: marking + id: ThavenHairBraid + bodyPart: Hair + groupWhitelist: [ Thaven ] + sprites: + - sprite: _MACRO/Mobs/Customization/Thaven/hair.rsi + state: braid + +- type: marking + id: ThavenHairBraid2 + bodyPart: Hair + groupWhitelist: [ Thaven ] + sprites: + - sprite: _MACRO/Mobs/Customization/Thaven/hair.rsi + state: braid2 + +- type: marking + id: ThavenHairBraided + bodyPart: Hair + groupWhitelist: [ Thaven ] + sprites: + - sprite: _MACRO/Mobs/Customization/Thaven/hair.rsi + state: braided + +- type: marking + id: ThavenHairBraidfront + bodyPart: Hair + groupWhitelist: [ Thaven ] + sprites: + - sprite: _MACRO/Mobs/Customization/Thaven/hair.rsi + state: braidfront + +- type: marking + id: ThavenHairBraidtail + bodyPart: Hair + groupWhitelist: [ Thaven ] + sprites: + - sprite: _MACRO/Mobs/Customization/Thaven/hair.rsi + state: braidtail + +- type: marking + id: ThavenHairBun + bodyPart: Hair + groupWhitelist: [ Thaven ] + sprites: + - sprite: _MACRO/Mobs/Customization/Thaven/hair.rsi + state: bun + +- type: marking + id: ThavenHairBun3 + bodyPart: Hair + groupWhitelist: [ Thaven ] + sprites: + - sprite: _MACRO/Mobs/Customization/Thaven/hair.rsi + state: bun3 + +- type: marking + id: ThavenHairBunhead2 + bodyPart: Hair + groupWhitelist: [ Thaven ] + sprites: + - sprite: _MACRO/Mobs/Customization/Thaven/hair.rsi + state: bunhead2 + +- type: marking + id: ThavenHairBusiness + bodyPart: Hair + groupWhitelist: [ Thaven ] + sprites: + - sprite: _MACRO/Mobs/Customization/Thaven/hair.rsi + state: business + +- type: marking + id: ThavenHairBusiness2 + bodyPart: Hair + groupWhitelist: [ Thaven ] + sprites: + - sprite: _MACRO/Mobs/Customization/Thaven/hair.rsi + state: business2 + +- type: marking + id: ThavenHairBusiness3 + bodyPart: Hair + groupWhitelist: [ Thaven ] + sprites: + - sprite: _MACRO/Mobs/Customization/Thaven/hair.rsi + state: business3 + +- type: marking + id: ThavenHairBusiness4 + bodyPart: Hair + groupWhitelist: [ Thaven ] + sprites: + - sprite: _MACRO/Mobs/Customization/Thaven/hair.rsi + state: business4 + +- type: marking + id: ThavenHairBuzzcut + bodyPart: Hair + groupWhitelist: [ Thaven ] + sprites: + - sprite: _MACRO/Mobs/Customization/Thaven/hair.rsi + state: buzzcut + +- type: marking + id: ThavenHairC + bodyPart: Hair + groupWhitelist: [ Thaven ] + sprites: + - sprite: _MACRO/Mobs/Customization/Thaven/hair.rsi + state: c + +- type: marking + id: ThavenHairCia + bodyPart: Hair + groupWhitelist: [ Thaven ] + sprites: + - sprite: _MACRO/Mobs/Customization/Thaven/hair.rsi + state: cia + +- type: marking + id: ThavenHairClassicAfro + bodyPart: Hair + groupWhitelist: [ Thaven ] + sprites: + - sprite: _MACRO/Mobs/Customization/Thaven/hair.rsi + state: classicafro + +- type: marking + id: ThavenHairClassicCia + bodyPart: Hair + groupWhitelist: [ Thaven ] + sprites: + - sprite: _MACRO/Mobs/Customization/Thaven/hair.rsi + state: classiccia + +- type: marking + id: ThavenHairClassicciaBusiness + bodyPart: Hair + groupWhitelist: [ Thaven ] + sprites: + - sprite: _MACRO/Mobs/Customization/Thaven/hair.rsi + state: classicciabusiness + +- type: marking + id: ThavenHairClassicCornrows + bodyPart: Hair + groupWhitelist: [ Thaven ] + sprites: + - sprite: _MACRO/Mobs/Customization/Thaven/hair.rsi + state: classiccornrows + +- type: marking + id: ThavenHairClassicFloorlengthBedhead + bodyPart: Hair + groupWhitelist: [ Thaven ] + sprites: + - sprite: _MACRO/Mobs/Customization/Thaven/hair.rsi + state: classicfloorlengthbedhead + +- type: marking + id: ThavenHairClassicLong2 + bodyPart: Hair + groupWhitelist: [ Thaven ] + sprites: + - sprite: _MACRO/Mobs/Customization/Thaven/hair.rsi + state: classiclong2 + +- type: marking + id: ThavenHairClassicLong3 + bodyPart: Hair + groupWhitelist: [ Thaven ] + sprites: + - sprite: _MACRO/Mobs/Customization/Thaven/hair.rsi + state: classiclong3 + +- type: marking + id: ThavenHairClassicModern + bodyPart: Hair + groupWhitelist: [ Thaven ] + sprites: + - sprite: _MACRO/Mobs/Customization/Thaven/hair.rsi + state: classicmodern + +- type: marking + id: ThavenHairClassicMulder + bodyPart: Hair + groupWhitelist: [ Thaven ] + sprites: + - sprite: _MACRO/Mobs/Customization/Thaven/hair.rsi + state: classicmulder + +- type: marking + id: ThavenHairClassicWisp + bodyPart: Hair + groupWhitelist: [ Thaven ] + sprites: + - sprite: _MACRO/Mobs/Customization/Thaven/hair.rsi + state: classicwisp + +- type: marking + id: ThavenHairCoffeeHouse + bodyPart: Hair + groupWhitelist: [ Thaven ] + sprites: + - sprite: _MACRO/Mobs/Customization/Thaven/hair.rsi + state: coffeehouse + +- type: marking + id: ThavenHairCombover + bodyPart: Hair + groupWhitelist: [ Thaven ] + sprites: + - sprite: _MACRO/Mobs/Customization/Thaven/hair.rsi + state: combover + +- type: marking + id: ThavenHairCornrowbraid + bodyPart: Hair + groupWhitelist: [ Thaven ] + sprites: + - sprite: _MACRO/Mobs/Customization/Thaven/hair.rsi + state: cornrowbraid + +- type: marking + id: ThavenHairCornrowbun + bodyPart: Hair + groupWhitelist: [ Thaven ] + sprites: + - sprite: _MACRO/Mobs/Customization/Thaven/hair.rsi + state: cornrowbun + +- type: marking + id: ThavenHairCornrows + bodyPart: Hair + groupWhitelist: [ Thaven ] + sprites: + - sprite: _MACRO/Mobs/Customization/Thaven/hair.rsi + state: cornrows + +- type: marking + id: ThavenHairCornrows2 + bodyPart: Hair + groupWhitelist: [ Thaven ] + sprites: + - sprite: _MACRO/Mobs/Customization/Thaven/hair.rsi + state: cornrows2 + +- type: marking + id: ThavenHairCornrowtail + bodyPart: Hair + groupWhitelist: [ Thaven ] + sprites: + - sprite: _MACRO/Mobs/Customization/Thaven/hair.rsi + state: cornrowtail + +- type: marking + id: ThavenHairCountry + bodyPart: Hair + groupWhitelist: [ Thaven ] + sprites: + - sprite: _MACRO/Mobs/Customization/Thaven/hair.rsi + state: country + +- type: marking + id: ThavenHairCrewcut + bodyPart: Hair + groupWhitelist: [ Thaven ] + sprites: + - sprite: _MACRO/Mobs/Customization/Thaven/hair.rsi + state: crewcut + +- type: marking + id: ThavenHairCrewcut2 + bodyPart: Hair + groupWhitelist: [ Thaven ] + sprites: + - sprite: _MACRO/Mobs/Customization/Thaven/hair.rsi + state: crewcut2 + +- type: marking + id: ThavenHairCurls + bodyPart: Hair + groupWhitelist: [ Thaven ] + sprites: + - sprite: _MACRO/Mobs/Customization/Thaven/hair.rsi + state: curls + +- type: marking + id: ThavenHairDandypompadour + bodyPart: Hair + groupWhitelist: [ Thaven ] + sprites: + - sprite: _MACRO/Mobs/Customization/Thaven/hair.rsi + state: dandypompadour + +- type: marking + id: ThavenHairDevilock + bodyPart: Hair + groupWhitelist: [ Thaven ] + sprites: + - sprite: _MACRO/Mobs/Customization/Thaven/hair.rsi + state: devilock + +- type: marking + id: ThavenHairDoublebun + bodyPart: Hair + groupWhitelist: [ Thaven ] + sprites: + - sprite: _MACRO/Mobs/Customization/Thaven/hair.rsi + state: doublebun + +- type: marking + id: ThavenHairDoublebunLong + bodyPart: Hair + groupWhitelist: [ Thaven ] + sprites: + - sprite: _MACRO/Mobs/Customization/Thaven/hair.rsi + state: doublebunlong + +- type: marking + id: ThavenHairDreads + bodyPart: Hair + groupWhitelist: [ Thaven ] + sprites: + - sprite: _MACRO/Mobs/Customization/Thaven/hair.rsi + state: dreads + +- type: marking + id: ThavenHairDrillHair + bodyPart: Hair + groupWhitelist: [ Thaven ] + sprites: + - sprite: _MACRO/Mobs/Customization/Thaven/hair.rsi + state: drillhair + +- type: marking + id: ThavenHairDrillhairextended + bodyPart: Hair + groupWhitelist: [ Thaven ] + sprites: + - sprite: _MACRO/Mobs/Customization/Thaven/hair.rsi + state: drillhairextended + +- type: marking + id: ThavenHairDrillruru + bodyPart: Hair + groupWhitelist: [ Thaven ] + sprites: + - sprite: _MACRO/Mobs/Customization/Thaven/hair.rsi + state: drillruru + +- type: marking + id: ThavenHairDyedLong + bodyPart: Hair + groupWhitelist: [ Thaven ] + sprites: + - sprite: _MACRO/Mobs/Customization/Thaven/hair.rsi + state: dyedlong1 + +- type: marking + id: ThavenHairDyedShort + bodyPart: Hair + groupWhitelist: [ Thaven ] + sprites: + - sprite: _MACRO/Mobs/Customization/Thaven/hair.rsi + state: dyedshort1 + +- type: marking + id: ThavenHairEmo2 + bodyPart: Hair + groupWhitelist: [ Thaven ] + sprites: + - sprite: _MACRO/Mobs/Customization/Thaven/hair.rsi + state: emo2 + +- type: marking + id: ThavenHairEmofringe + bodyPart: Hair + groupWhitelist: [ Thaven ] + sprites: + - sprite: _MACRO/Mobs/Customization/Thaven/hair.rsi + state: emofringe + +- type: marking + id: ThavenHairFather + bodyPart: Hair + groupWhitelist: [ Thaven ] + sprites: + - sprite: _MACRO/Mobs/Customization/Thaven/hair.rsi + state: father + +- type: marking + id: ThavenHairFeather + bodyPart: Hair + groupWhitelist: [ Thaven ] + sprites: + - sprite: _MACRO/Mobs/Customization/Thaven/hair.rsi + state: feather + +- type: marking + id: ThavenHairFlair + bodyPart: Hair + groupWhitelist: [ Thaven ] + sprites: + - sprite: _MACRO/Mobs/Customization/Thaven/hair.rsi + state: flair + +- type: marking + id: ThavenHairFloorlengthBedhead + bodyPart: Hair + groupWhitelist: [ Thaven ] + sprites: + - sprite: _MACRO/Mobs/Customization/Thaven/hair.rsi + state: floorlengthbedhead + +- type: marking + id: ThavenHairFlow + bodyPart: Hair + groupWhitelist: [ Thaven ] + sprites: + - sprite: _MACRO/Mobs/Customization/Thaven/hair.rsi + state: f + +- type: marking + id: ThavenHairFrenchbraid + bodyPart: Hair + groupWhitelist: [ Thaven ] + sprites: + - sprite: _MACRO/Mobs/Customization/Thaven/hair.rsi + state: frenchbraid + +- type: marking + id: ThavenHairFringetail + bodyPart: Hair + groupWhitelist: [ Thaven ] + sprites: + - sprite: _MACRO/Mobs/Customization/Thaven/hair.rsi + state: fringetail + +- type: marking + id: ThavenHairGelled + bodyPart: Hair + groupWhitelist: [ Thaven ] + sprites: + - sprite: _MACRO/Mobs/Customization/Thaven/hair.rsi + state: gelled + +- type: marking + id: ThavenHairGentle + bodyPart: Hair + groupWhitelist: [ Thaven ] + sprites: + - sprite: _MACRO/Mobs/Customization/Thaven/hair.rsi + state: gentle + +- type: marking + id: ThavenHairHalfbang + bodyPart: Hair + groupWhitelist: [ Thaven ] + sprites: + - sprite: _MACRO/Mobs/Customization/Thaven/hair.rsi + state: halfbang + +- type: marking + id: ThavenHairHalfbang2 + bodyPart: Hair + groupWhitelist: [ Thaven ] + sprites: + - sprite: _MACRO/Mobs/Customization/Thaven/hair.rsi + state: halfbang2 + +- type: marking + id: ThavenHairHalfshaved + bodyPart: Hair + groupWhitelist: [ Thaven ] + sprites: + - sprite: _MACRO/Mobs/Customization/Thaven/hair.rsi + state: halfshaved + +- type: marking + id: ThavenHairHalfUpLong + bodyPart: Hair + groupWhitelist: [ Thaven ] + sprites: + - sprite: _MACRO/Mobs/Customization/Thaven/hair.rsi + state: halfuplong + +- type: marking + id: ThavenHairHalfUpShort + bodyPart: Hair + groupWhitelist: [ Thaven ] + sprites: + - sprite: _MACRO/Mobs/Customization/Thaven/hair.rsi + state: halfupshort + +- type: marking + id: ThavenHairHalfUpUndercut + bodyPart: Hair + groupWhitelist: [ Thaven ] + sprites: + - sprite: _MACRO/Mobs/Customization/Thaven/hair.rsi + state: halfupundercut + +- type: marking + id: ThavenHairHbraid + bodyPart: Hair + groupWhitelist: [ Thaven ] + sprites: + - sprite: _MACRO/Mobs/Customization/Thaven/hair.rsi + state: hbraid + +- type: marking + id: ThavenHairHedgehog + bodyPart: Hair + groupWhitelist: [ Thaven ] + sprites: + - sprite: _MACRO/Mobs/Customization/Thaven/hair.rsi + state: hedgehog + +- type: marking + id: ThavenHairHighfade + bodyPart: Hair + groupWhitelist: [ Thaven ] + sprites: + - sprite: _MACRO/Mobs/Customization/Thaven/hair.rsi + state: highfade + +- type: marking + id: ThavenHairHighponytail + bodyPart: Hair + groupWhitelist: [ Thaven ] + sprites: + - sprite: _MACRO/Mobs/Customization/Thaven/hair.rsi + state: highponytail + +- type: marking + id: ThavenHairHimecut + bodyPart: Hair + groupWhitelist: [ Thaven ] + sprites: + - sprite: _MACRO/Mobs/Customization/Thaven/hair.rsi + state: himecut + +- type: marking + id: ThavenHairHimecut2 + bodyPart: Hair + groupWhitelist: [ Thaven ] + sprites: + - sprite: _MACRO/Mobs/Customization/Thaven/hair.rsi + state: himecut2 + +- type: marking + id: ThavenHairHimeup + bodyPart: Hair + groupWhitelist: [ Thaven ] + sprites: + - sprite: _MACRO/Mobs/Customization/Thaven/hair.rsi + state: himeup + +- type: marking + id: ThavenHairHitop + bodyPart: Hair + groupWhitelist: [ Thaven ] + sprites: + - sprite: _MACRO/Mobs/Customization/Thaven/hair.rsi + state: hitop + +- type: marking + id: ThavenHairJade + bodyPart: Hair + groupWhitelist: [ Thaven ] + sprites: + - sprite: _MACRO/Mobs/Customization/Thaven/hair.rsi + state: jade + +- type: marking + id: ThavenHairJensen + bodyPart: Hair + groupWhitelist: [ Thaven ] + sprites: + - sprite: _MACRO/Mobs/Customization/Thaven/hair.rsi + state: jensen + +- type: marking + id: ThavenHairJoestar + bodyPart: Hair + groupWhitelist: [ Thaven ] + sprites: + - sprite: _MACRO/Mobs/Customization/Thaven/hair.rsi + state: joestar + +- type: marking + id: ThavenHairKagami + bodyPart: Hair + groupWhitelist: [ Thaven ] + sprites: + - sprite: _MACRO/Mobs/Customization/Thaven/hair.rsi + state: kagami + +- type: marking + id: ThavenHairKeanu + bodyPart: Hair + groupWhitelist: [ Thaven ] + sprites: + - sprite: _MACRO/Mobs/Customization/Thaven/hair.rsi + state: keanu + +- type: marking + id: ThavenHairKusanagi + bodyPart: Hair + groupWhitelist: [ Thaven ] + sprites: + - sprite: _MACRO/Mobs/Customization/Thaven/hair.rsi + state: kusanagi + +- type: marking + id: ThavenHairLargebun + bodyPart: Hair + groupWhitelist: [ Thaven ] + sprites: + - sprite: _MACRO/Mobs/Customization/Thaven/hair.rsi + state: largebun + +- type: marking + id: ThavenHairLbangs + bodyPart: Hair + groupWhitelist: [ Thaven ] + sprites: + - sprite: _MACRO/Mobs/Customization/Thaven/hair.rsi + state: lbangs + +- type: marking + id: ThavenHairLong + bodyPart: Hair + groupWhitelist: [ Thaven ] + sprites: + - sprite: _MACRO/Mobs/Customization/Thaven/hair.rsi + state: long + +- type: marking + id: ThavenHairLong2 + bodyPart: Hair + groupWhitelist: [ Thaven ] + sprites: + - sprite: _MACRO/Mobs/Customization/Thaven/hair.rsi + state: long2 + +- type: marking + id: ThavenHairLong3 + bodyPart: Hair + groupWhitelist: [ Thaven ] + sprites: + - sprite: _MACRO/Mobs/Customization/Thaven/hair.rsi + state: long3 + +- type: marking + id: ThavenHairLongBedhead + bodyPart: Hair + groupWhitelist: [ Thaven ] + sprites: + - sprite: _MACRO/Mobs/Customization/Thaven/hair.rsi + state: longbedhead + +- type: marking + id: ThavenHairLongBedhead2 + bodyPart: Hair + groupWhitelist: [ Thaven ] + sprites: + - sprite: _MACRO/Mobs/Customization/Thaven/hair.rsi + state: longbedhead2 + +- type: marking + id: ThavenHairLongeremo + bodyPart: Hair + groupWhitelist: [ Thaven ] + sprites: + - sprite: _MACRO/Mobs/Customization/Thaven/hair.rsi + state: longeremo + +- type: marking + id: ThavenHairLongest + bodyPart: Hair + groupWhitelist: [ Thaven ] + sprites: + - sprite: _MACRO/Mobs/Customization/Thaven/hair.rsi + state: longest + +- type: marking + id: ThavenHairLongest2 + bodyPart: Hair + groupWhitelist: [ Thaven ] + sprites: + - sprite: _MACRO/Mobs/Customization/Thaven/hair.rsi + state: longest2 + +- type: marking + id: ThavenHairLongfringe + bodyPart: Hair + groupWhitelist: [ Thaven ] + sprites: + - sprite: _MACRO/Mobs/Customization/Thaven/hair.rsi + state: longfringe + +- type: marking + id: ThavenHairLongovereye + bodyPart: Hair + groupWhitelist: [ Thaven ] + sprites: + - sprite: _MACRO/Mobs/Customization/Thaven/hair.rsi + state: longovereye + +- type: marking + id: ThavenHairLongsidepart + bodyPart: Hair + groupWhitelist: [ Thaven ] + sprites: + - sprite: _MACRO/Mobs/Customization/Thaven/hair.rsi + state: longsidepart + +- type: marking + id: ThavenHairLongstraightponytail + bodyPart: Hair + groupWhitelist: [ Thaven ] + sprites: + - sprite: _MACRO/Mobs/Customization/Thaven/hair.rsi + state: longstraightponytail + +- type: marking + id: ThavenHairLongWithBundles + bodyPart: Hair + groupWhitelist: [ Thaven ] + sprites: + - sprite: _MACRO/Mobs/Customization/Thaven/hair.rsi + state: longbundled + +- type: marking + id: ThavenHairLowfade + bodyPart: Hair + groupWhitelist: [ Thaven ] + sprites: + - sprite: _MACRO/Mobs/Customization/Thaven/hair.rsi + state: lowfade + +- type: marking + id: ThavenHairManbun + bodyPart: Hair + groupWhitelist: [ Thaven ] + sprites: + - sprite: _MACRO/Mobs/Customization/Thaven/hair.rsi + state: manbun + +- type: marking + id: ThavenHairMedfade + bodyPart: Hair + groupWhitelist: [ Thaven ] + sprites: + - sprite: _MACRO/Mobs/Customization/Thaven/hair.rsi + state: medfade + +- type: marking + id: ThavenHairMediumSidepart + bodyPart: Hair + groupWhitelist: [ Thaven ] + sprites: + - sprite: _MACRO/Mobs/Customization/Thaven/hair.rsi + state: mediumsidepart + +- type: marking + id: ThavenHairMegaeyebrows + bodyPart: Hair + groupWhitelist: [ Thaven ] + sprites: + - sprite: _MACRO/Mobs/Customization/Thaven/hair.rsi + state: megaeyebrows + +- type: marking + id: ThavenHairMessy + bodyPart: Hair + groupWhitelist: [ Thaven ] + sprites: + - sprite: _MACRO/Mobs/Customization/Thaven/hair.rsi + state: messy + +- type: marking + id: ThavenHairMidPartLong + bodyPart: Hair + groupWhitelist: [ Thaven ] + sprites: + - sprite: _MACRO/Mobs/Customization/Thaven/hair.rsi + state: midpartlong + +- type: marking + id: ThavenHairMidPartLonger + bodyPart: Hair + groupWhitelist: [ Thaven ] + sprites: + - sprite: _MACRO/Mobs/Customization/Thaven/hair.rsi + state: midpartlonger + +- type: marking + id: ThavenHairModern + bodyPart: Hair + groupWhitelist: [ Thaven ] + sprites: + - sprite: _MACRO/Mobs/Customization/Thaven/hair.rsi + state: modern + +- type: marking + id: ThavenHairMohawk + bodyPart: Hair + groupWhitelist: [ Thaven ] + sprites: + - sprite: _MACRO/Mobs/Customization/Thaven/hair.rsi + state: d + +- type: marking + id: ThavenHairMulder + bodyPart: Hair + groupWhitelist: [ Thaven ] + sprites: + - sprite: _MACRO/Mobs/Customization/Thaven/hair.rsi + state: mulder + +- type: marking + id: ThavenHairMullet + bodyPart: Hair + groupWhitelist: [ Thaven ] + sprites: + - sprite: _MACRO/Mobs/Customization/Thaven/hair.rsi + state: mullet + +- type: marking + id: ThavenHairMulletSideshave + bodyPart: Hair + groupWhitelist: [ Thaven ] + sprites: + - sprite: _MACRO/Mobs/Customization/Thaven/hair.rsi + state: mulletsideshave + +- type: marking + id: ThavenHairNitori + bodyPart: Hair + groupWhitelist: [ Thaven ] + sprites: + - sprite: _MACRO/Mobs/Customization/Thaven/hair.rsi + state: nitori + +- type: marking + id: ThavenHairNofade + bodyPart: Hair + groupWhitelist: [ Thaven ] + sprites: + - sprite: _MACRO/Mobs/Customization/Thaven/hair.rsi + state: nofade + +- type: marking + id: ThavenHairOdango + bodyPart: Hair + groupWhitelist: [ Thaven ] + sprites: + - sprite: _MACRO/Mobs/Customization/Thaven/hair.rsi + state: odango + +- type: marking + id: ThavenHairOmbre + bodyPart: Hair + groupWhitelist: [ Thaven ] + sprites: + - sprite: _MACRO/Mobs/Customization/Thaven/hair.rsi + state: ombre + +- type: marking + id: ThavenHairOneshoulder + bodyPart: Hair + groupWhitelist: [ Thaven ] + sprites: + - sprite: _MACRO/Mobs/Customization/Thaven/hair.rsi + state: oneshoulder + +- type: marking + id: ThavenHairOxton + bodyPart: Hair + groupWhitelist: [ Thaven ] + sprites: + - sprite: _MACRO/Mobs/Customization/Thaven/hair.rsi + state: oxton + +- type: marking + id: ThavenHairPart + bodyPart: Hair + groupWhitelist: [ Thaven ] + sprites: + - sprite: _MACRO/Mobs/Customization/Thaven/hair.rsi + state: part + +- type: marking + id: ThavenHairParted + bodyPart: Hair + groupWhitelist: [ Thaven ] + sprites: + - sprite: _MACRO/Mobs/Customization/Thaven/hair.rsi + state: parted + +- type: marking + id: ThavenHairPigtails + bodyPart: Hair + groupWhitelist: [ Thaven ] + sprites: + - sprite: _MACRO/Mobs/Customization/Thaven/hair.rsi + state: pigtails + +- type: marking + id: ThavenHairPigtails2 + bodyPart: Hair + groupWhitelist: [ Thaven ] + sprites: + - sprite: _MACRO/Mobs/Customization/Thaven/hair.rsi + state: pigtails2 + +- type: marking + id: ThavenHairPixie + bodyPart: Hair + groupWhitelist: [ Thaven ] + sprites: + - sprite: _MACRO/Mobs/Customization/Thaven/hair.rsi + state: pixie + +- type: marking + id: ThavenHairPompadour + bodyPart: Hair + groupWhitelist: [ Thaven ] + sprites: + - sprite: _MACRO/Mobs/Customization/Thaven/hair.rsi + state: pompadour + +- type: marking + id: ThavenHairPonytail + bodyPart: Hair + groupWhitelist: [ Thaven ] + sprites: + - sprite: _MACRO/Mobs/Customization/Thaven/hair.rsi + state: ponytail + +- type: marking + id: ThavenHairPonytail2 + bodyPart: Hair + groupWhitelist: [ Thaven ] + sprites: + - sprite: _MACRO/Mobs/Customization/Thaven/hair.rsi + state: ponytail2 + +- type: marking + id: ThavenHairPonytail3 + bodyPart: Hair + groupWhitelist: [ Thaven ] + sprites: + - sprite: _MACRO/Mobs/Customization/Thaven/hair.rsi + state: ponytail3 + +- type: marking + id: ThavenHairPonytail4 + bodyPart: Hair + groupWhitelist: [ Thaven ] + sprites: + - sprite: _MACRO/Mobs/Customization/Thaven/hair.rsi + state: ponytail4 + +- type: marking + id: ThavenHairPonytail5 + bodyPart: Hair + groupWhitelist: [ Thaven ] + sprites: + - sprite: _MACRO/Mobs/Customization/Thaven/hair.rsi + state: ponytail5 + +- type: marking + id: ThavenHairPonytail6 + bodyPart: Hair + groupWhitelist: [ Thaven ] + sprites: + - sprite: _MACRO/Mobs/Customization/Thaven/hair.rsi + state: ponytail6 + +- type: marking + id: ThavenHairPonytail7 + bodyPart: Hair + groupWhitelist: [ Thaven ] + sprites: + - sprite: _MACRO/Mobs/Customization/Thaven/hair.rsi + state: ponytail7 + +- type: marking + id: ThavenHairPoofy + bodyPart: Hair + groupWhitelist: [ Thaven ] + sprites: + - sprite: _MACRO/Mobs/Customization/Thaven/hair.rsi + state: poofy + +- type: marking + id: ThavenHairProtagonist + bodyPart: Hair + groupWhitelist: [ Thaven ] + sprites: + - sprite: _MACRO/Mobs/Customization/Thaven/hair.rsi + state: protagonist + +- type: marking + id: ThavenHairQuiff + bodyPart: Hair + groupWhitelist: [ Thaven ] + sprites: + - sprite: _MACRO/Mobs/Customization/Thaven/hair.rsi + state: quiff + +- type: marking + id: ThavenHairReversemohawk + bodyPart: Hair + groupWhitelist: [ Thaven ] + sprites: + - sprite: _MACRO/Mobs/Customization/Thaven/hair.rsi + state: reversemohawk + +- type: marking + id: ThavenHairRonin + bodyPart: Hair + groupWhitelist: [ Thaven ] + sprites: + - sprite: _MACRO/Mobs/Customization/Thaven/hair.rsi + state: ronin + +- type: marking + id: ThavenHairRosa + bodyPart: Hair + groupWhitelist: [ Thaven ] + sprites: + - sprite: _MACRO/Mobs/Customization/Thaven/hair.rsi + state: rosa + +- type: marking + id: ThavenHairSargeant + bodyPart: Hair + groupWhitelist: [ Thaven ] + sprites: + - sprite: _MACRO/Mobs/Customization/Thaven/hair.rsi + state: sargeant + +- type: marking + id: ThavenHairShaved + bodyPart: Hair + groupWhitelist: [ Thaven ] + sprites: + - sprite: _MACRO/Mobs/Customization/Thaven/hair.rsi + state: shaved + +- type: marking + id: ThavenHairShavedMohawk + bodyPart: Hair + groupWhitelist: [ Thaven ] + sprites: + - sprite: _MACRO/Mobs/Customization/Thaven/hair.rsi + state: shavedmohawk + +- type: marking + id: ThavenHairShavedpart + bodyPart: Hair + groupWhitelist: [ Thaven ] + sprites: + - sprite: _MACRO/Mobs/Customization/Thaven/hair.rsi + state: shavedpart + +- type: marking + id: ThavenHairShortbangs + bodyPart: Hair + groupWhitelist: [ Thaven ] + sprites: + - sprite: _MACRO/Mobs/Customization/Thaven/hair.rsi + state: shortbangs + +- type: marking + id: ThavenHairShortbraid + bodyPart: Hair + groupWhitelist: [ Thaven ] + sprites: + - sprite: _MACRO/Mobs/Customization/Thaven/hair.rsi + state: shortbraid + +- type: marking + id: ThavenHairShorthair2 + bodyPart: Hair + groupWhitelist: [ Thaven ] + sprites: + - sprite: _MACRO/Mobs/Customization/Thaven/hair.rsi + state: shorthair2 + +- type: marking + id: ThavenHairShorthair3 + bodyPart: Hair + groupWhitelist: [ Thaven ] + sprites: + - sprite: _MACRO/Mobs/Customization/Thaven/hair.rsi + state: shorthair3 + +- type: marking + id: ThavenHairShorthair9 + bodyPart: Hair + groupWhitelist: [ Thaven ] + sprites: + - sprite: _MACRO/Mobs/Customization/Thaven/hair.rsi + state: shorthair9 + +- type: marking + id: ThavenHairShorthime + bodyPart: Hair + groupWhitelist: [ Thaven ] + sprites: + - sprite: _MACRO/Mobs/Customization/Thaven/hair.rsi + state: shorthime + +- type: marking + id: ThavenHairShortovereye + bodyPart: Hair + groupWhitelist: [ Thaven ] + sprites: + - sprite: _MACRO/Mobs/Customization/Thaven/hair.rsi + state: shortovereye + +- type: marking + id: ThavenHairShoulderLengthOverEye + bodyPart: Hair + groupWhitelist: [ Thaven ] + sprites: + - sprite: _MACRO/Mobs/Customization/Thaven/hair.rsi + state: shoulderlengthovereye + +- type: marking + id: ThavenHairSidecut + bodyPart: Hair + groupWhitelist: [ Thaven ] + sprites: + - sprite: _MACRO/Mobs/Customization/Thaven/hair.rsi + state: sidecut + +- type: marking + id: ThavenHairSideshaveCurly + bodyPart: Hair + groupWhitelist: [ Thaven ] + sprites: + - sprite: _MACRO/Mobs/Customization/Thaven/hair.rsi + state: sideshavecurly + +- type: marking + id: ThavenHairSidetail + bodyPart: Hair + groupWhitelist: [ Thaven ] + sprites: + - sprite: _MACRO/Mobs/Customization/Thaven/hair.rsi + state: sidetail + +- type: marking + id: ThavenHairSidetail2 + bodyPart: Hair + groupWhitelist: [ Thaven ] + sprites: + - sprite: _MACRO/Mobs/Customization/Thaven/hair.rsi + state: sidetail2 + +- type: marking + id: ThavenHairSidetail3 + bodyPart: Hair + groupWhitelist: [ Thaven ] + sprites: + - sprite: _MACRO/Mobs/Customization/Thaven/hair.rsi + state: sidetail3 + +- type: marking + id: ThavenHairSidetail4 + bodyPart: Hair + groupWhitelist: [ Thaven ] + sprites: + - sprite: _MACRO/Mobs/Customization/Thaven/hair.rsi + state: sidetail4 + +- type: marking + id: ThavenHairSkinhead + bodyPart: Hair + groupWhitelist: [ Thaven ] + sprites: + - sprite: _MACRO/Mobs/Customization/Thaven/hair.rsi + state: skinhead + +- type: marking + id: ThavenHairSpiky + bodyPart: Hair + groupWhitelist: [ Thaven ] + sprites: + - sprite: _MACRO/Mobs/Customization/Thaven/hair.rsi + state: spiky + +- type: marking + id: ThavenHairSpikyponytailLong + bodyPart: Hair + groupWhitelist: [ Thaven ] + sprites: + - sprite: _MACRO/Mobs/Customization/Thaven/hair.rsi + state: spikyponytaillong + +- type: marking + id: ThavenHairSpikyponytail + bodyPart: Hair + groupWhitelist: [ Thaven ] + sprites: + - sprite: _MACRO/Mobs/Customization/Thaven/hair.rsi + state: spikyponytail + +- type: marking + id: ThavenHairSpookyLong + bodyPart: Hair + groupWhitelist: [ Thaven ] + sprites: + - sprite: _MACRO/Mobs/Customization/Thaven/hair.rsi + state: spookylong + +- type: marking + id: ThavenHairStail + bodyPart: Hair + groupWhitelist: [ Thaven ] + sprites: + - sprite: _MACRO/Mobs/Customization/Thaven/hair.rsi + state: stail + +- type: marking + id: ThavenHairSwept + bodyPart: Hair + groupWhitelist: [ Thaven ] + sprites: + - sprite: _MACRO/Mobs/Customization/Thaven/hair.rsi + state: swept + +- type: marking + id: ThavenHairSwept2 + bodyPart: Hair + groupWhitelist: [ Thaven ] + sprites: + - sprite: _MACRO/Mobs/Customization/Thaven/hair.rsi + state: swept2 + +- type: marking + id: ThavenHairTailed + bodyPart: Hair + groupWhitelist: [ Thaven ] + sprites: + - sprite: _MACRO/Mobs/Customization/Thaven/hair.rsi + state: tailed + +- type: marking + id: ThavenHairThinning + bodyPart: Hair + groupWhitelist: [ Thaven ] + sprites: + - sprite: _MACRO/Mobs/Customization/Thaven/hair.rsi + state: thinning + +- type: marking + id: ThavenHairThinningfront + bodyPart: Hair + groupWhitelist: [ Thaven ] + sprites: + - sprite: _MACRO/Mobs/Customization/Thaven/hair.rsi + state: thinningfront + +- type: marking + id: ThavenHairThinningrear + bodyPart: Hair + groupWhitelist: [ Thaven ] + sprites: + - sprite: _MACRO/Mobs/Customization/Thaven/hair.rsi + state: thinningrear + +- type: marking + id: ThavenHairTightbun + bodyPart: Hair + groupWhitelist: [ Thaven ] + sprites: + - sprite: _MACRO/Mobs/Customization/Thaven/hair.rsi + state: tightbun + +- type: marking + id: ThavenHairTopknot + bodyPart: Hair + groupWhitelist: [ Thaven ] + sprites: + - sprite: _MACRO/Mobs/Customization/Thaven/hair.rsi + state: topknot + +- type: marking + id: ThavenHairTressshoulder + bodyPart: Hair + groupWhitelist: [ Thaven ] + sprites: + - sprite: _MACRO/Mobs/Customization/Thaven/hair.rsi + state: tressshoulder + +- type: marking + id: ThavenHairTrimflat + bodyPart: Hair + groupWhitelist: [ Thaven ] + sprites: + - sprite: _MACRO/Mobs/Customization/Thaven/hair.rsi + state: trimflat + +- type: marking + id: ThavenHairTrimmed + bodyPart: Hair + groupWhitelist: [ Thaven ] + sprites: + - sprite: _MACRO/Mobs/Customization/Thaven/hair.rsi + state: trimmed + +- type: marking + id: ThavenHairTwintail + bodyPart: Hair + groupWhitelist: [ Thaven ] + sprites: + - sprite: _MACRO/Mobs/Customization/Thaven/hair.rsi + state: twintail + +- type: marking + id: ThavenHairTwoStrands + bodyPart: Hair + groupWhitelist: [ Thaven ] + sprites: + - sprite: _MACRO/Mobs/Customization/Thaven/hair.rsi + state: twostrands + +- type: marking + id: ThavenHairUndercut + bodyPart: Hair + groupWhitelist: [ Thaven ] + sprites: + - sprite: _MACRO/Mobs/Customization/Thaven/hair.rsi + state: undercut + +- type: marking + id: ThavenHairUndercutCurly + bodyPart: Hair + groupWhitelist: [ Thaven ] + sprites: + - sprite: _MACRO/Mobs/Customization/Thaven/hair.rsi + state: undercutcurly + +- type: marking + id: ThavenHairUndercutleft + bodyPart: Hair + groupWhitelist: [ Thaven ] + sprites: + - sprite: _MACRO/Mobs/Customization/Thaven/hair.rsi + state: undercutleft + +- type: marking + id: ThavenHairUndercutright + bodyPart: Hair + groupWhitelist: [ Thaven ] + sprites: + - sprite: _MACRO/Mobs/Customization/Thaven/hair.rsi + state: undercutright + +- type: marking + id: ThavenHairUneven + bodyPart: Hair + groupWhitelist: [ Thaven ] + sprites: + - sprite: _MACRO/Mobs/Customization/Thaven/hair.rsi + state: uneven + +- type: marking + id: ThavenHairUnkept + bodyPart: Hair + groupWhitelist: [ Thaven ] + sprites: + - sprite: _MACRO/Mobs/Customization/Thaven/hair.rsi + state: unkept + +- type: marking + id: ThavenHairVeryshortovereyealternate + bodyPart: Hair + groupWhitelist: [ Thaven ] + sprites: + - sprite: _MACRO/Mobs/Customization/Thaven/hair.rsi + state: veryshortovereyealternate + +- type: marking + id: ThavenHairVlong + bodyPart: Hair + groupWhitelist: [ Thaven ] + sprites: + - sprite: _MACRO/Mobs/Customization/Thaven/hair.rsi + state: vlong + +- type: marking + id: ThavenHairVlongfringe + bodyPart: Hair + groupWhitelist: [ Thaven ] + sprites: + - sprite: _MACRO/Mobs/Customization/Thaven/hair.rsi + state: vlongfringe + +- type: marking + id: ThavenHairVolaju + bodyPart: Hair + groupWhitelist: [ Thaven ] + sprites: + - sprite: _MACRO/Mobs/Customization/Thaven/hair.rsi + state: volaju + +- type: marking + id: ThavenHairWisp + bodyPart: Hair + groupWhitelist: [ Thaven ] + sprites: + - sprite: _MACRO/Mobs/Customization/Thaven/hair.rsi + state: wisp + +- type: marking + id: TichelFashionableThaven + bodyPart: Hair + groupWhitelist: [ Thaven ] + sprites: + - sprite: _MACRO/Mobs/Customization/Thaven/hair.rsi + state: tichelfashionable + +- type: marking + id: TichelSimpleThaven + bodyPart: Hair + groupWhitelist: [ Thaven ] + sprites: + - sprite: _MACRO/Mobs/Customization/Thaven/hair.rsi + state: tichelsimple + +- type: marking + id: ShaggyThaven + bodyPart: Hair + groupWhitelist: [ Thaven ] + sprites: + - sprite: _MACRO/Mobs/Customization/Thaven/hair.rsi + state: shaggythaven + +- type: marking + id: ShaggyLongerThaven + bodyPart: Hair + groupWhitelist: [ Thaven ] + sprites: + - sprite: _MACRO/Mobs/Customization/Thaven/hair.rsi + state: shaggylongerthaven + +- type: marking + id: SusieThaven + bodyPart: Hair + groupWhitelist: [ Thaven ] + sprites: + - sprite: _MACRO/Mobs/Customization/Thaven/hair.rsi + state: susiethaven + +- type: marking + id: SusieNoBangsThaven + bodyPart: Hair + groupWhitelist: [ Thaven ] + sprites: + - sprite: _MACRO/Mobs/Customization/Thaven/hair.rsi + state: susienobangsthaven + +# HeadSide + +- type: marking + id: ThavenEars1 + bodyPart: HeadSide + groupWhitelist: [ Thaven ] + forcedColoring: true + sprites: + - sprite: _MACRO/Mobs/Customization/Thaven/headside.rsi + state: ears1 + +- type: marking + id: ThavenEars2 + bodyPart: HeadSide + groupWhitelist: [ Thaven ] + forcedColoring: true + sprites: + - sprite: _MACRO/Mobs/Customization/Thaven/headside.rsi + state: ears2 + +- type: marking + id: ThavenEars3 + bodyPart: HeadSide + groupWhitelist: [ Thaven ] + forcedColoring: true + sprites: + - sprite: _MACRO/Mobs/Customization/Thaven/headside.rsi + state: ears3 + +- type: marking + id: ThavenEars4 + bodyPart: HeadSide + groupWhitelist: [ Thaven ] + forcedColoring: true + sprites: + - sprite: _MACRO/Mobs/Customization/Thaven/headside.rsi + state: ears4 + +- type: marking + id: ThavenEarsBigFins + bodyPart: HeadSide + groupWhitelist: [ Thaven ] + sprites: + - sprite: _MACRO/Mobs/Customization/Thaven/headside.rsi + state: bigfins + - sprite: _MACRO/Mobs/Customization/Thaven/headside.rsi + state: bigfins2 + +- type: marking + id: ThavenEarsTwinFins + bodyPart: HeadSide + groupWhitelist: [ Thaven ] + forcedColoring: true + sprites: + - sprite: _MACRO/Mobs/Customization/Thaven/headside.rsi + state: twinfin + +- type: marking + id: ThavenFishEars + bodyPart: HeadSide + groupWhitelist: [ Thaven ] + forcedColoring: true + sprites: + - sprite: _MACRO/Mobs/Customization/Thaven/headside.rsi + state: fishears + +- type: marking + id: ThavenNoEars + bodyPart: HeadSide + groupWhitelist: [ Thaven ] + sprites: + - sprite: _MACRO/Mobs/Customization/Thaven/headside.rsi + state: noears + +# HeadTop + +- type: marking + id: ThavenHibiscus + bodyPart: HeadTop + groupWhitelist: [ Thaven ] + coloring: + default: + type: + !type:EyeColoring + negative: false + sprites: + - sprite: _MACRO/Mobs/Customization/Thaven/headtop.rsi + state: hibiscus1 + - sprite: _MACRO/Mobs/Customization/Thaven/headtop.rsi + state: hibiscus2 + +- type: marking + id: ThavenPiercings + bodyPart: HeadTop + groupWhitelist: [ Thaven ] + coloring: + default: + type: + !type:SimpleColoring + color: "#FFFFFF" + sprites: + - sprite: _MACRO/Mobs/Customization/Thaven/headtop.rsi + state: piercings + +- type: marking + id: ThavenPiercings2 + bodyPart: HeadTop + groupWhitelist: [ Thaven ] + coloring: + default: + type: + !type:SimpleColoring + color: "#FFFFFF" + sprites: + - sprite: _MACRO/Mobs/Customization/Thaven/headtop.rsi + state: piercings2 + +# Tail + +- type: marking + id: ThavenBasicTail + bodyPart: Tail + groupWhitelist: [ Thaven ] + coloring: + default: + type: + !type:SkinColoring + sprites: + - sprite: _MACRO/Mobs/Customization/Thaven/tail.rsi + state: basic + +- type: marking + id: ThavenBigTail + bodyPart: Tail + groupWhitelist: [ Thaven ] + coloring: + default: + type: + !type:SkinColoring + sprites: + - sprite: _MACRO/Mobs/Customization/Thaven/tail.rsi + state: big1 + - sprite: _MACRO/Mobs/Customization/Thaven/tail.rsi + state: big2 + +- type: marking + id: ThavenTadpoleTail + bodyPart: Tail + groupWhitelist: [ Thaven ] + coloring: + default: + type: + !type:SkinColoring + sprites: + - sprite: _MACRO/Mobs/Customization/Thaven/tail.rsi + state: tadpole1 + - sprite: _MACRO/Mobs/Customization/Thaven/tail.rsi + state: tadpole2 + +- type: marking + id: ThavenTailEel + bodyPart: Tail + groupWhitelist: [ Thaven ] + coloring: + default: + type: + !type:SkinColoring + sprites: + - sprite: _MACRO/Mobs/Customization/Thaven/tail.rsi + state: eel1 + - sprite: _MACRO/Mobs/Customization/Thaven/tail.rsi + state: eel2 + +- type: marking + id: ThavenTailEelOverlay + bodyPart: TailOverlay + groupWhitelist: [ Thaven ] + coloring: + default: + type: + !type:EyeColoring + negative: false + sprites: + - sprite: _MACRO/Mobs/Customization/Thaven/tail.rsi + state: eel3 + - sprite: _MACRO/Mobs/Customization/Thaven/tail.rsi + state: eel4 +# shaders: +# eel3: unshaded +# eel4: unshaded + +- type: marking + id: ThavenTailNurse + bodyPart: Tail + groupWhitelist: [ Thaven ] + coloring: + default: + type: + !type:SkinColoring + sprites: + - sprite: _MACRO/Mobs/Customization/Thaven/tail.rsi + state: nurse1 + - sprite: _MACRO/Mobs/Customization/Thaven/tail.rsi + state: nurse2 + +- type: marking + id: ThavenTailStub + bodyPart: Tail + groupWhitelist: [ Thaven ] + coloring: + default: + type: + !type:SkinColoring + sprites: + - sprite: _MACRO/Mobs/Customization/Thaven/tail.rsi + state: stub1 + - sprite: _MACRO/Mobs/Customization/Thaven/tail.rsi + state: stub2 + +- type: marking + id: ThavenTailThresher + bodyPart: Tail + groupWhitelist: [ Thaven ] + coloring: + default: + type: + !type:SkinColoring + sprites: + - sprite: _MACRO/Mobs/Customization/Thaven/tail.rsi + state: thresher1 + - sprite: _MACRO/Mobs/Customization/Thaven/tail.rsi + state: thresher2 diff --git a/Resources/Textures/_Impstation/Mobs/Customization/markingsbundle1.rsi/meta.json b/Resources/Textures/_Impstation/Mobs/Customization/markingsbundle1.rsi/meta.json deleted file mode 100644 index 3b15319bc4e..00000000000 --- a/Resources/Textures/_Impstation/Mobs/Customization/markingsbundle1.rsi/meta.json +++ /dev/null @@ -1,111 +0,0 @@ -{ - "version": 1, - "license": "CC-BY-SA-3.0", - "copyright": "Drawn by Carousel for Impstation", - "size": { - "x": 32, - "y": 32 - }, - "states": [ - { - "name": "thavenchestgills", - "directions": 4 - }, - { - "name": "thavenchestscales", - "directions": 4 - }, - { - "name": "thavenheadscales", - "directions": 4 - }, - { - "name": "thavenleftarmscales", - "directions": 4 - }, - { - "name": "thavenrightarmscales", - "directions": 4 - }, - { - "name": "thavenleftlegscales", - "directions": 4 - }, - { - "name": "thavenrightlegscales", - "directions": 4 - }, - { - "name": "thavenbignaturals", - "directions": 4 - }, - { - "name": "thavennonaturals", - "directions": 4 - }, - { - "name": "thavenfishears", - "directions": 4 - }, - { - "name": "thavenbitemark", - "directions": 4 - }, - { - "name": "thaventattoovines", - "directions": 4 - }, - { - "name": "thavenspines", - "directions": 4 - }, - { - "name": "thaventattoowave", - "directions": 4 - }, - { - "name": "thaventattoosharkminnoweyeliner", - "directions": 4 - }, - { - "name": "thaventiger1", - "directions": 4 - }, - { - "name": "thaventiger2", - "directions": 4 - }, - { - "name": "thaventigerarmsl", - "directions": 4 - }, - { - "name": "thaventigerarmsr", - "directions": 4 - }, - { - "name": "thavenbodystripes", - "directions": 4 - }, - { - "name": "thavenheadstripes", - "directions": 4 - }, - { - "name": "thavenearsbigfins", - "directions": 4 - }, - { - "name": "thavenearsbigfins2", - "directions": 4 - }, - { - "name": "thavenheadcap1", - "directions": 4 - }, - { - "name": "thavenheadcap2", - "directions": 4 - } - ] - } diff --git a/Resources/Textures/_Impstation/Mobs/Customization/markingsbundle1.rsi/thavenbignaturals.png b/Resources/Textures/_Impstation/Mobs/Customization/markingsbundle1.rsi/thavenbignaturals.png deleted file mode 100644 index ffac641f6b7..00000000000 Binary files a/Resources/Textures/_Impstation/Mobs/Customization/markingsbundle1.rsi/thavenbignaturals.png and /dev/null differ diff --git a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven.rsi/meta.json b/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven.rsi/meta.json deleted file mode 100644 index 17f6720f2ee..00000000000 --- a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven.rsi/meta.json +++ /dev/null @@ -1,47 +0,0 @@ -{ - "version": 1, - "license": "CC-BY-SA-3.0", - "copyright": "by Widgetbeck", - "size": { - "x": 32, - "y": 32 - }, - "states": [ - { - "name": "ears1", - "directions": 4 - }, - { - "name": "ears2", - "directions": 4 - }, - { - "name": "ears3", - "directions": 4 - }, - { - "name": "ears4", - "directions": 4 - }, - { - "name": "piercings", - "directions": 4 - }, - { - "name": "piercings2", - "directions": 4 - }, - { - "name": "chesttat1", - "directions": 4 - }, - { - "name": "larmtat1", - "directions": 4 - }, - { - "name": "rarmtat1", - "directions": 4 - } - ] -} diff --git a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven.rsi/piercings.png b/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven.rsi/piercings.png deleted file mode 100644 index aee5f3e8616..00000000000 Binary files a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven.rsi/piercings.png and /dev/null differ diff --git a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven.rsi/piercings2.png b/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven.rsi/piercings2.png deleted file mode 100644 index e7743d12d8d..00000000000 Binary files a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven.rsi/piercings2.png and /dev/null differ diff --git a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/80s.png b/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/80s.png deleted file mode 100644 index c6947da0f17..00000000000 Binary files a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/80s.png and /dev/null differ diff --git a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/braidtail.png b/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/braidtail.png deleted file mode 100644 index ec9dc6f3720..00000000000 Binary files a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/braidtail.png and /dev/null differ diff --git a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/classicmodern.png b/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/classicmodern.png deleted file mode 100644 index adca06ce496..00000000000 Binary files a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/classicmodern.png and /dev/null differ diff --git a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/doublebun_long.png b/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/doublebun_long.png deleted file mode 100644 index ce92b9c88ec..00000000000 Binary files a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/doublebun_long.png and /dev/null differ diff --git a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/flair.png b/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/flair.png deleted file mode 100644 index c5eb356d609..00000000000 Binary files a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/flair.png and /dev/null differ diff --git a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/himecut.png b/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/himecut.png deleted file mode 100644 index 52a68643971..00000000000 Binary files a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/himecut.png and /dev/null differ diff --git a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/kagami.png b/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/kagami.png deleted file mode 100644 index d2100a1bfed..00000000000 Binary files a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/kagami.png and /dev/null differ diff --git a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/long.png b/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/long.png deleted file mode 100644 index 8fff78dd653..00000000000 Binary files a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/long.png and /dev/null differ diff --git a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/longeremo.png b/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/longeremo.png deleted file mode 100644 index 9b8b5cb6ec2..00000000000 Binary files a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/longeremo.png and /dev/null differ diff --git a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/longest.png b/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/longest.png deleted file mode 100644 index c543fd3efdc..00000000000 Binary files a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/longest.png and /dev/null differ diff --git a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/longest2.png b/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/longest2.png deleted file mode 100644 index 73a218ce266..00000000000 Binary files a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/longest2.png and /dev/null differ diff --git a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/longfringe.png b/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/longfringe.png deleted file mode 100644 index a59faffafc0..00000000000 Binary files a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/longfringe.png and /dev/null differ diff --git a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/longovereye.png b/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/longovereye.png deleted file mode 100644 index 362bc1d4537..00000000000 Binary files a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/longovereye.png and /dev/null differ diff --git a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/meta.json b/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/meta.json deleted file mode 100644 index 19107c5b765..00000000000 --- a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/meta.json +++ /dev/null @@ -1,759 +0,0 @@ -{ - "version": 1, - "size": { - "x": 32, - "y": 32 - }, - "copyright": "Taken from https://github.com/tgstation/tgstation/blob/05ec94e46349c35e29ca91e5e97d0c88ae26ad44/icons/mob/species/human/human_face.dmi ,resprited by Alekshhh, a modified by potato1234x, uneven and tailed is drawn by Ubaser, doublebun_long by Emisse, longbundled and bob5 sprited by github:DreamlyJack(624946166152298517)", - "license": "CC-BY-SA-3.0", - "states": [ - { - "name": "80s", - "directions": 4 - }, - { - "name": "a", - "directions": 4 - }, - { - "name": "b", - "directions": 4 - }, - { - "name": "bald", - "directions": 4 - }, - { - "name": "baldface", - "directions": 4 - }, - { - "name": "bedhead", - "directions": 4 - }, - { - "name": "bedhead2", - "directions": 4 - }, - { - "name": "bedhead3", - "directions": 4 - }, - { - "name": "beehive", - "directions": 4 - }, - { - "name": "beehive2", - "directions": 4 - }, - { - "name": "bigflattop", - "directions": 4 - }, - { - "name": "bigpompadour", - "directions": 4 - }, - { - "name": "bob", - "directions": 4 - }, - { - "name": "bob2", - "directions": 4 - }, - { - "name": "bob4", - "directions": 4 - }, - { - "name": "bob5", - "directions": 4 - }, - { - "name": "bobcurl", - "directions": 4 - }, - { - "name": "bobcut", - "directions": 4 - }, - { - "name": "bowlcut", - "directions": 4 - }, - { - "name": "bowlcut2", - "directions": 4 - }, - { - "name": "braid", - "directions": 4 - }, - { - "name": "braid2", - "directions": 4 - }, - { - "name": "braided", - "directions": 4 - }, - { - "name": "braidfront", - "directions": 4 - }, - { - "name": "braidtail", - "directions": 4 - }, - { - "name": "bun", - "directions": 4 - }, - { - "name": "bun3", - "directions": 4 - }, - { - "name": "bunhead2", - "directions": 4 - }, - { - "name": "business", - "directions": 4 - }, - { - "name": "business2", - "directions": 4 - }, - { - "name": "business3", - "directions": 4 - }, - { - "name": "business4", - "directions": 4 - }, - { - "name": "buzzcut", - "directions": 4 - }, - { - "name": "c", - "directions": 4 - }, - { - "name": "classicciabusiness", - "directions": 4 - }, - { - "name": "classiccia", - "directions": 4 - }, - { - "name": "classiccornrows", - "directions": 4 - }, - { - "name": "classicfloorlength_bedhead", - "directions": 4 - }, - { - "name": "classicmodern", - "directions": 4 - }, - { - "name": "classicmulder", - "directions": 4 - }, - { - "name": "classicwisp", - "directions": 4 - }, - { - "name": "cia", - "directions": 4 - }, - { - "name": "coffeehouse", - "directions": 4 - }, - { - "name": "combover", - "directions": 4 - }, - { - "name": "cornrowbraid", - "directions": 4 - }, - { - "name": "cornrowbun", - "directions": 4 - }, - { - "name": "cornrows", - "directions": 4 - }, - { - "name": "cornrows2", - "directions": 4 - }, - { - "name": "cornrowtail", - "directions": 4 - }, - { - "name": "country", - "directions": 4 - }, - { - "name": "crewcut", - "directions": 4 - }, - { - "name": "crewcut2", - "directions": 4 - }, - { - "name": "curls", - "directions": 4 - }, - { - "name": "d", - "directions": 4 - }, - { - "name": "dandypompadour", - "directions": 4 - }, - { - "name": "devilock", - "directions": 4 - }, - { - "name": "doublebun", - "directions": 4 - }, - { - "name": "doublebun_long", - "directions": 4 - }, - { - "name": "dreads", - "directions": 4 - }, - { - "name": "drillhair", - "directions": 4 - }, - { - "name": "drillhairextended", - "directions": 4 - }, - { - "name": "drillruru", - "directions": 4 - }, - { - "name": "e", - "directions": 4 - }, - { - "name": "emo2", - "directions": 4 - }, - { - "name": "emofringe", - "directions": 4 - }, - { - "name": "f", - "directions": 4 - }, - { - "name": "father", - "directions": 4 - }, - { - "name": "feather", - "directions": 4 - }, - { - "name": "flair", - "directions": 4 - }, - { - "name": "floorlength_bedhead", - "directions": 4 - }, - { - "name": "fringetail", - "directions": 4 - }, - { - "name": "gelled", - "directions": 4 - }, - { - "name": "gentle", - "directions": 4 - }, - { - "name": "halfbang", - "directions": 4 - }, - { - "name": "halfbang2", - "directions": 4 - }, - { - "name": "halfshaved", - "directions": 4 - }, - { - "name": "hbraid", - "directions": 4 - }, - { - "name": "hedgehog", - "directions": 4 - }, - { - "name": "highfade", - "directions": 4 - }, - { - "name": "highponytail", - "directions": 4 - }, - { - "name": "himecut", - "directions": 4 - }, - { - "name": "himecut2", - "directions": 4 - }, - { - "name": "himeup", - "directions": 4 - }, - { - "name": "hitop", - "directions": 4 - }, - { - "name": "jade", - "directions": 4 - }, - { - "name": "jensen", - "directions": 4 - }, - { - "name": "joestar", - "directions": 4 - }, - { - "name": "kagami", - "directions": 4 - }, - { - "name": "keanu", - "directions": 4 - }, - { - "name": "kusanagi", - "directions": 4 - }, - { - "name": "largebun", - "directions": 4 - }, - { - "name": "lbangs", - "directions": 4 - }, - { - "name": "long", - "directions": 4 - }, - { - "name": "long2", - "directions": 4 - }, - { - "name": "long3", - "directions": 4 - }, - { - "name": "longbundled", - "directions": 4 - }, - { - "name": "long_bedhead", - "directions": 4 - }, - { - "name": "long_bedhead2", - "directions": 4 - }, - { - "name": "longest", - "directions": 4 - }, - { - "name": "longest2", - "directions": 4 - }, - { - "name": "longfringe", - "directions": 4 - }, - { - "name": "longovereye", - "directions": 4 - }, - { - "name": "longsidepart", - "directions": 4 - }, - { - "name": "longstraightponytail", - "directions": 4 - }, - { - "name": "lowfade", - "directions": 4 - }, - { - "name": "manbun", - "directions": 4 - }, - { - "name": "medfade", - "directions": 4 - }, - { - "name": "mediumsidepart", - "directions": 4 - }, - { - "name": "megaeyebrows", - "directions": 4 - }, - { - "name": "messy", - "directions": 4 - }, - { - "name": "modern", - "directions": 4 - }, - { - "name": "mulder", - "directions": 4 - }, - { - "name": "nitori", - "directions": 4 - }, - { - "name": "nofade", - "directions": 4 - }, - { - "name": "odango", - "directions": 4 - }, - { - "name": "ombre", - "directions": 4 - }, - { - "name": "oneshoulder", - "directions": 4 - }, - { - "name": "oxton", - "directions": 4 - }, - { - "name": "part", - "directions": 4 - }, - { - "name": "parted", - "directions": 4 - }, - { - "name": "pigtails", - "directions": 4 - }, - { - "name": "pigtails2", - "directions": 4 - }, - { - "name": "pixie", - "directions": 4 - }, - { - "name": "pompadour", - "directions": 4 - }, - { - "name": "ponytail", - "directions": 4 - }, - { - "name": "ponytail2", - "directions": 4 - }, - { - "name": "ponytail3", - "directions": 4 - }, - { - "name": "ponytail4", - "directions": 4 - }, - { - "name": "ponytail5", - "directions": 4 - }, - { - "name": "ponytail6", - "directions": 4 - }, - { - "name": "ponytail7", - "directions": 4 - }, - { - "name": "poofy", - "directions": 4 - }, - { - "name": "protagonist", - "directions": 4 - }, - { - "name": "quiff", - "directions": 4 - }, - { - "name": "reversemohawk", - "directions": 4 - }, - { - "name": "ronin", - "directions": 4 - }, - { - "name": "rosa", - "directions": 4 - }, - { - "name": "sargeant", - "directions": 4 - }, - { - "name": "shaved", - "directions": 4 - }, - { - "name": "shavedmohawk", - "directions": 4 - }, - { - "name": "shavedpart", - "directions": 4 - }, - { - "name": "shortbangs", - "directions": 4 - }, - { - "name": "shortbraid", - "directions": 4 - }, - { - "name": "shorthair2", - "directions": 4 - }, - { - "name": "shorthair3", - "directions": 4 - }, - { - "name": "shorthair9", - "directions": 4 - }, - { - "name": "shorthime", - "directions": 4 - }, - { - "name": "shortovereye", - "directions": 4 - }, - { - "name": "sidecut", - "directions": 4 - }, - { - "name": "sidetail", - "directions": 4 - }, - { - "name": "sidetail2", - "directions": 4 - }, - { - "name": "sidetail3", - "directions": 4 - }, - { - "name": "sidetail4", - "directions": 4 - }, - { - "name": "skinhead", - "directions": 4 - }, - { - "name": "spiky", - "directions": 4 - }, - { - "name": "spikyponytail", - "directions": 4 - }, - { - "name": "spookylong", - "directions": 4 - }, - { - "name": "stail", - "directions": 4 - }, - { - "name": "swept", - "directions": 4 - }, - { - "name": "swept2", - "directions": 4 - }, - { - "name": "shoulderlengthovereye", - "directions": 4 - }, - { - "name": "thinning", - "directions": 4 - }, - { - "name": "thinningfront", - "directions": 4 - }, - { - "name": "thinningrear", - "directions": 4 - }, - { - "name": "tightbun", - "directions": 4 - }, - { - "name": "topknot", - "directions": 4 - }, - { - "name": "tressshoulder", - "directions": 4 - }, - { - "name": "trimflat", - "directions": 4 - }, - { - "name": "trimmed", - "directions": 4 - }, - { - "name": "twintail", - "directions": 4 - }, - { - "name": "twostrands", - "directions": 4 - }, - { - "name": "undercut", - "directions": 4 - }, - { - "name": "undercutleft", - "directions": 4 - }, - { - "name": "undercutright", - "directions": 4 - }, - { - "name": "unkept", - "directions": 4 - }, - { - "name": "veryshortovereyealternate", - "directions": 4 - }, - { - "name": "vlong", - "directions": 4 - }, - { - "name": "vlongfringe", - "directions": 4 - }, - { - "name": "volaju", - "directions": 4 - }, - { - "name": "wisp", - "directions": 4 - }, - { - "name": "uneven", - "directions": 4 - }, - { - "name": "tailed", - "directions": 4 - }, - { - "name": "classiclong2", - "directions": 4 - }, - { - "name": "classiclong3", - "directions": 4 - }, - { - "name": "classicafro", - "directions": 4 - }, - { - "name": "longeremo", - "directions": 4 - }, - { - "name": "frenchbraid", - "directions": 4 - } - ] - } diff --git a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/modern.png b/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/modern.png deleted file mode 100644 index dcd10140a88..00000000000 Binary files a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/modern.png and /dev/null differ diff --git a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/mulder.png b/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/mulder.png deleted file mode 100644 index 1e83cd8a59e..00000000000 Binary files a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/mulder.png and /dev/null differ diff --git a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/ombre.png b/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/ombre.png deleted file mode 100644 index 33a3fbafbde..00000000000 Binary files a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/ombre.png and /dev/null differ diff --git a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/oxton.png b/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/oxton.png deleted file mode 100644 index 29afa9ee881..00000000000 Binary files a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/oxton.png and /dev/null differ diff --git a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/ponytail.png b/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/ponytail.png deleted file mode 100644 index 5bff29fa82f..00000000000 Binary files a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/ponytail.png and /dev/null differ diff --git a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/ponytail2.png b/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/ponytail2.png deleted file mode 100644 index ad24f5706d5..00000000000 Binary files a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/ponytail2.png and /dev/null differ diff --git a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/ponytail4.png b/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/ponytail4.png deleted file mode 100644 index e0b4255cb77..00000000000 Binary files a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/ponytail4.png and /dev/null differ diff --git a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/shavedmohawk.png b/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/shavedmohawk.png deleted file mode 100644 index 8395ae19e12..00000000000 Binary files a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/shavedmohawk.png and /dev/null differ diff --git a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/spikyponytail.png b/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/spikyponytail.png deleted file mode 100644 index 8f439234dae..00000000000 Binary files a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/spikyponytail.png and /dev/null differ diff --git a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/stail.png b/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/stail.png deleted file mode 100644 index db9f7b439d9..00000000000 Binary files a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/stail.png and /dev/null differ diff --git a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/tailed.png b/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/tailed.png deleted file mode 100644 index b957423e4c5..00000000000 Binary files a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/tailed.png and /dev/null differ diff --git a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/uneven.png b/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/uneven.png deleted file mode 100644 index e2d2c99914a..00000000000 Binary files a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/uneven.png and /dev/null differ diff --git a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/unkept.png b/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/unkept.png deleted file mode 100644 index a849ea073fa..00000000000 Binary files a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/unkept.png and /dev/null differ diff --git a/Resources/Textures/_Impstation/Mobs/Species/Thaven/displacement.rsi/eyes.png b/Resources/Textures/_Impstation/Mobs/Species/Thaven/displacement.rsi/eyes.png deleted file mode 100644 index 6c3e479bb49..00000000000 Binary files a/Resources/Textures/_Impstation/Mobs/Species/Thaven/displacement.rsi/eyes.png and /dev/null differ diff --git a/Resources/Textures/_Impstation/Mobs/Species/Thaven/displacement.rsi/head.png b/Resources/Textures/_Impstation/Mobs/Species/Thaven/displacement.rsi/head.png deleted file mode 100644 index 6c3e479bb49..00000000000 Binary files a/Resources/Textures/_Impstation/Mobs/Species/Thaven/displacement.rsi/head.png and /dev/null differ diff --git a/Resources/Textures/_Impstation/Mobs/Species/Thaven/displacement.rsi/mask.png b/Resources/Textures/_Impstation/Mobs/Species/Thaven/displacement.rsi/mask.png deleted file mode 100644 index 6c3e479bb49..00000000000 Binary files a/Resources/Textures/_Impstation/Mobs/Species/Thaven/displacement.rsi/mask.png and /dev/null differ diff --git a/Resources/Textures/_Impstation/Mobs/Species/Thaven/displacement.rsi/neck.png b/Resources/Textures/_Impstation/Mobs/Species/Thaven/displacement.rsi/neck.png deleted file mode 100644 index 647ff28ea94..00000000000 Binary files a/Resources/Textures/_Impstation/Mobs/Species/Thaven/displacement.rsi/neck.png and /dev/null differ diff --git a/Resources/Textures/_Impstation/Mobs/Species/Thaven/organs.rsi/brain-inhand-left.png b/Resources/Textures/_Impstation/Mobs/Species/Thaven/organs.rsi/brain-inhand-left.png deleted file mode 100644 index a8a98321133..00000000000 Binary files a/Resources/Textures/_Impstation/Mobs/Species/Thaven/organs.rsi/brain-inhand-left.png and /dev/null differ diff --git a/Resources/Textures/_Impstation/Mobs/Species/Thaven/organs.rsi/brain-inhand-right.png b/Resources/Textures/_Impstation/Mobs/Species/Thaven/organs.rsi/brain-inhand-right.png deleted file mode 100644 index 2a237f173df..00000000000 Binary files a/Resources/Textures/_Impstation/Mobs/Species/Thaven/organs.rsi/brain-inhand-right.png and /dev/null differ diff --git a/Resources/Textures/_Impstation/Mobs/Species/Thaven/organs.rsi/brain-thaven.png b/Resources/Textures/_Impstation/Mobs/Species/Thaven/organs.rsi/brain-thaven.png deleted file mode 100644 index 2b2cc2fc09c..00000000000 Binary files a/Resources/Textures/_Impstation/Mobs/Species/Thaven/organs.rsi/brain-thaven.png and /dev/null differ diff --git a/Resources/Textures/_Impstation/Mobs/Species/Thaven/organs.rsi/meta.json b/Resources/Textures/_Impstation/Mobs/Species/Thaven/organs.rsi/meta.json deleted file mode 100644 index 33560e8bc2b..00000000000 --- a/Resources/Textures/_Impstation/Mobs/Species/Thaven/organs.rsi/meta.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "version": 1, - "license": "CC-BY-SA-3.0", - "copyright": "Sprited by Nimfar11 (Github) for Space Station 14, modified by Widgetbeck", - "size": { - "x": 32, - "y": 32 - }, - "states": [ - { - "name": "brain-thaven" - }, - { - "name": "brain-inhand-left", - "directions": 4 - }, - { - "name": "brain-inhand-right", - "directions": 4 - } - ] -} diff --git a/Resources/Textures/_Impstation/Mobs/Species/Thaven/parts.rsi/full.png b/Resources/Textures/_Impstation/Mobs/Species/Thaven/parts.rsi/full.png deleted file mode 100644 index 9d2c746b630..00000000000 Binary files a/Resources/Textures/_Impstation/Mobs/Species/Thaven/parts.rsi/full.png and /dev/null differ diff --git a/Resources/Textures/_Impstation/Mobs/Species/Thaven/parts.rsi/head.png b/Resources/Textures/_Impstation/Mobs/Species/Thaven/parts.rsi/head.png deleted file mode 100644 index 36a3740e57b..00000000000 Binary files a/Resources/Textures/_Impstation/Mobs/Species/Thaven/parts.rsi/head.png and /dev/null differ diff --git a/Resources/Textures/_Impstation/Mobs/Species/Thaven/parts.rsi/l_arm.png b/Resources/Textures/_Impstation/Mobs/Species/Thaven/parts.rsi/l_arm.png deleted file mode 100644 index 4effd642161..00000000000 Binary files a/Resources/Textures/_Impstation/Mobs/Species/Thaven/parts.rsi/l_arm.png and /dev/null differ diff --git a/Resources/Textures/_Impstation/Mobs/Species/Thaven/parts.rsi/l_foot.png b/Resources/Textures/_Impstation/Mobs/Species/Thaven/parts.rsi/l_foot.png deleted file mode 100644 index a1029f4cf1e..00000000000 Binary files a/Resources/Textures/_Impstation/Mobs/Species/Thaven/parts.rsi/l_foot.png and /dev/null differ diff --git a/Resources/Textures/_Impstation/Mobs/Species/Thaven/parts.rsi/l_hand.png b/Resources/Textures/_Impstation/Mobs/Species/Thaven/parts.rsi/l_hand.png deleted file mode 100644 index f698637d0f1..00000000000 Binary files a/Resources/Textures/_Impstation/Mobs/Species/Thaven/parts.rsi/l_hand.png and /dev/null differ diff --git a/Resources/Textures/_Impstation/Mobs/Species/Thaven/parts.rsi/l_leg.png b/Resources/Textures/_Impstation/Mobs/Species/Thaven/parts.rsi/l_leg.png deleted file mode 100644 index d2b4c62f206..00000000000 Binary files a/Resources/Textures/_Impstation/Mobs/Species/Thaven/parts.rsi/l_leg.png and /dev/null differ diff --git a/Resources/Textures/_Impstation/Mobs/Species/Thaven/parts.rsi/r_arm.png b/Resources/Textures/_Impstation/Mobs/Species/Thaven/parts.rsi/r_arm.png deleted file mode 100644 index db3e3eecf05..00000000000 Binary files a/Resources/Textures/_Impstation/Mobs/Species/Thaven/parts.rsi/r_arm.png and /dev/null differ diff --git a/Resources/Textures/_Impstation/Mobs/Species/Thaven/parts.rsi/r_foot.png b/Resources/Textures/_Impstation/Mobs/Species/Thaven/parts.rsi/r_foot.png deleted file mode 100644 index aca12db26d6..00000000000 Binary files a/Resources/Textures/_Impstation/Mobs/Species/Thaven/parts.rsi/r_foot.png and /dev/null differ diff --git a/Resources/Textures/_Impstation/Mobs/Species/Thaven/parts.rsi/r_hand.png b/Resources/Textures/_Impstation/Mobs/Species/Thaven/parts.rsi/r_hand.png deleted file mode 100644 index 8051570e6fc..00000000000 Binary files a/Resources/Textures/_Impstation/Mobs/Species/Thaven/parts.rsi/r_hand.png and /dev/null differ diff --git a/Resources/Textures/_Impstation/Mobs/Species/Thaven/parts.rsi/r_leg.png b/Resources/Textures/_Impstation/Mobs/Species/Thaven/parts.rsi/r_leg.png deleted file mode 100644 index 8345a65482d..00000000000 Binary files a/Resources/Textures/_Impstation/Mobs/Species/Thaven/parts.rsi/r_leg.png and /dev/null differ diff --git a/Resources/Textures/_Impstation/Mobs/Species/Thaven/parts.rsi/torso.png b/Resources/Textures/_Impstation/Mobs/Species/Thaven/parts.rsi/torso.png deleted file mode 100644 index 8f485e0f9c4..00000000000 Binary files a/Resources/Textures/_Impstation/Mobs/Species/Thaven/parts.rsi/torso.png and /dev/null differ diff --git a/Resources/Textures/_Impstation/Mobs/Customization/markingsbundle1.rsi/thavenbitemark.png b/Resources/Textures/_MACRO/Mobs/Customization/Thaven/chest.rsi/bitemark.png similarity index 100% rename from Resources/Textures/_Impstation/Mobs/Customization/markingsbundle1.rsi/thavenbitemark.png rename to Resources/Textures/_MACRO/Mobs/Customization/Thaven/chest.rsi/bitemark.png diff --git a/Resources/Textures/_Impstation/Mobs/Customization/markingsbundle1.rsi/thavenchestgills.png b/Resources/Textures/_MACRO/Mobs/Customization/Thaven/chest.rsi/gills.png similarity index 100% rename from Resources/Textures/_Impstation/Mobs/Customization/markingsbundle1.rsi/thavenchestgills.png rename to Resources/Textures/_MACRO/Mobs/Customization/Thaven/chest.rsi/gills.png diff --git a/Resources/Textures/_MACRO/Mobs/Customization/Thaven/chest.rsi/hair.png b/Resources/Textures/_MACRO/Mobs/Customization/Thaven/chest.rsi/hair.png new file mode 100644 index 00000000000..cf670a97a44 Binary files /dev/null and b/Resources/Textures/_MACRO/Mobs/Customization/Thaven/chest.rsi/hair.png differ diff --git a/Resources/Textures/_MACRO/Mobs/Customization/Thaven/chest.rsi/meta.json b/Resources/Textures/_MACRO/Mobs/Customization/Thaven/chest.rsi/meta.json new file mode 100644 index 00000000000..db60503c446 --- /dev/null +++ b/Resources/Textures/_MACRO/Mobs/Customization/Thaven/chest.rsi/meta.json @@ -0,0 +1,101 @@ +{ + "version": 1, + "copyright": "hair by honeyed-lemons (github), tat1 by widgetbeck, rest by crocodilecarousel (github)", + "license": "CC-BY-SA-4.0", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "bitemark", + "directions": 4 + }, + { + "name": "gills", + "directions": 4 + }, + { + "name": "hair", + "directions": 4 + }, + { + "name": "muscular", + "directions": 4 + }, + { + "name": "scales", + "directions": 4 + }, + { + "name": "stripes", + "directions": 4 + }, + { + "name": "spinechill", + "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 + ], + [ + 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": "spines", + "directions": 4 + }, + { + "name": "tat1", + "directions": 4 + }, + { + "name": "tattoovines", + "directions": 4 + }, + { + "name": "tattoowave", + "directions": 4 + }, + { + "name": "tiger1", + "directions": 4 + }, + { + "name": "tiger2", + "directions": 4 + }, + { + "name": "nonaturals", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/_MACRO/Mobs/Customization/Thaven/chest.rsi/muscular.png b/Resources/Textures/_MACRO/Mobs/Customization/Thaven/chest.rsi/muscular.png new file mode 100644 index 00000000000..5463139d59f Binary files /dev/null and b/Resources/Textures/_MACRO/Mobs/Customization/Thaven/chest.rsi/muscular.png differ diff --git a/Resources/Textures/_Impstation/Mobs/Customization/markingsbundle1.rsi/thavennonaturals.png b/Resources/Textures/_MACRO/Mobs/Customization/Thaven/chest.rsi/nonaturals.png similarity index 100% rename from Resources/Textures/_Impstation/Mobs/Customization/markingsbundle1.rsi/thavennonaturals.png rename to Resources/Textures/_MACRO/Mobs/Customization/Thaven/chest.rsi/nonaturals.png diff --git a/Resources/Textures/_Impstation/Mobs/Customization/markingsbundle1.rsi/thavenchestscales.png b/Resources/Textures/_MACRO/Mobs/Customization/Thaven/chest.rsi/scales.png similarity index 100% rename from Resources/Textures/_Impstation/Mobs/Customization/markingsbundle1.rsi/thavenchestscales.png rename to Resources/Textures/_MACRO/Mobs/Customization/Thaven/chest.rsi/scales.png diff --git a/Resources/Textures/_MACRO/Mobs/Customization/Thaven/chest.rsi/spinechill.png b/Resources/Textures/_MACRO/Mobs/Customization/Thaven/chest.rsi/spinechill.png new file mode 100644 index 00000000000..74b44f6739f Binary files /dev/null and b/Resources/Textures/_MACRO/Mobs/Customization/Thaven/chest.rsi/spinechill.png differ diff --git a/Resources/Textures/_Impstation/Mobs/Customization/markingsbundle1.rsi/thavenspines.png b/Resources/Textures/_MACRO/Mobs/Customization/Thaven/chest.rsi/spines.png similarity index 100% rename from Resources/Textures/_Impstation/Mobs/Customization/markingsbundle1.rsi/thavenspines.png rename to Resources/Textures/_MACRO/Mobs/Customization/Thaven/chest.rsi/spines.png diff --git a/Resources/Textures/_Impstation/Mobs/Customization/markingsbundle1.rsi/thavenbodystripes.png b/Resources/Textures/_MACRO/Mobs/Customization/Thaven/chest.rsi/stripes.png similarity index 100% rename from Resources/Textures/_Impstation/Mobs/Customization/markingsbundle1.rsi/thavenbodystripes.png rename to Resources/Textures/_MACRO/Mobs/Customization/Thaven/chest.rsi/stripes.png diff --git a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven.rsi/chesttat1.png b/Resources/Textures/_MACRO/Mobs/Customization/Thaven/chest.rsi/tat1.png similarity index 100% rename from Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven.rsi/chesttat1.png rename to Resources/Textures/_MACRO/Mobs/Customization/Thaven/chest.rsi/tat1.png diff --git a/Resources/Textures/_Impstation/Mobs/Customization/markingsbundle1.rsi/thaventattoovines.png b/Resources/Textures/_MACRO/Mobs/Customization/Thaven/chest.rsi/tattoovines.png similarity index 100% rename from Resources/Textures/_Impstation/Mobs/Customization/markingsbundle1.rsi/thaventattoovines.png rename to Resources/Textures/_MACRO/Mobs/Customization/Thaven/chest.rsi/tattoovines.png diff --git a/Resources/Textures/_Impstation/Mobs/Customization/markingsbundle1.rsi/thaventattoowave.png b/Resources/Textures/_MACRO/Mobs/Customization/Thaven/chest.rsi/tattoowave.png similarity index 100% rename from Resources/Textures/_Impstation/Mobs/Customization/markingsbundle1.rsi/thaventattoowave.png rename to Resources/Textures/_MACRO/Mobs/Customization/Thaven/chest.rsi/tattoowave.png diff --git a/Resources/Textures/_Impstation/Mobs/Customization/markingsbundle1.rsi/thaventiger1.png b/Resources/Textures/_MACRO/Mobs/Customization/Thaven/chest.rsi/tiger1.png similarity index 100% rename from Resources/Textures/_Impstation/Mobs/Customization/markingsbundle1.rsi/thaventiger1.png rename to Resources/Textures/_MACRO/Mobs/Customization/Thaven/chest.rsi/tiger1.png diff --git a/Resources/Textures/_Impstation/Mobs/Customization/markingsbundle1.rsi/thaventiger2.png b/Resources/Textures/_MACRO/Mobs/Customization/Thaven/chest.rsi/tiger2.png similarity index 100% rename from Resources/Textures/_Impstation/Mobs/Customization/markingsbundle1.rsi/thaventiger2.png rename to Resources/Textures/_MACRO/Mobs/Customization/Thaven/chest.rsi/tiger2.png diff --git a/Resources/Textures/_MACRO/Mobs/Customization/Thaven/eyes.rsi/glowleft.png b/Resources/Textures/_MACRO/Mobs/Customization/Thaven/eyes.rsi/glowleft.png new file mode 100644 index 00000000000..3238e0407c5 Binary files /dev/null and b/Resources/Textures/_MACRO/Mobs/Customization/Thaven/eyes.rsi/glowleft.png differ diff --git a/Resources/Textures/_MACRO/Mobs/Customization/Thaven/eyes.rsi/glowright.png b/Resources/Textures/_MACRO/Mobs/Customization/Thaven/eyes.rsi/glowright.png new file mode 100644 index 00000000000..8c4295f4c8b Binary files /dev/null and b/Resources/Textures/_MACRO/Mobs/Customization/Thaven/eyes.rsi/glowright.png differ diff --git a/Resources/Textures/_MACRO/Mobs/Customization/Thaven/eyes.rsi/meta.json b/Resources/Textures/_MACRO/Mobs/Customization/Thaven/eyes.rsi/meta.json new file mode 100644 index 00000000000..7412e0a59d4 --- /dev/null +++ b/Resources/Textures/_MACRO/Mobs/Customization/Thaven/eyes.rsi/meta.json @@ -0,0 +1,27 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "glow and sharkminnow made by Sha-Seng (github). sharkminnoweyeliner by crocodilecarousel (github)", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "glowleft", + "directions": 4 + }, + { + "name": "glowright", + "directions": 4 + }, + { + "name": "sharkminnow", + "directions": 4 + }, + { + "name": "sharkminnoweyeliner", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/_MACRO/Mobs/Customization/Thaven/eyes.rsi/sharkminnow.png b/Resources/Textures/_MACRO/Mobs/Customization/Thaven/eyes.rsi/sharkminnow.png new file mode 100644 index 00000000000..e5b4aef939c Binary files /dev/null and b/Resources/Textures/_MACRO/Mobs/Customization/Thaven/eyes.rsi/sharkminnow.png differ diff --git a/Resources/Textures/_Impstation/Mobs/Customization/markingsbundle1.rsi/thaventattoosharkminnoweyeliner.png b/Resources/Textures/_MACRO/Mobs/Customization/Thaven/eyes.rsi/sharkminnoweyeliner.png similarity index 100% rename from Resources/Textures/_Impstation/Mobs/Customization/markingsbundle1.rsi/thaventattoosharkminnoweyeliner.png rename to Resources/Textures/_MACRO/Mobs/Customization/Thaven/eyes.rsi/sharkminnoweyeliner.png diff --git a/Resources/Textures/_MACRO/Mobs/Customization/Thaven/hair.rsi/80s.png b/Resources/Textures/_MACRO/Mobs/Customization/Thaven/hair.rsi/80s.png new file mode 100644 index 00000000000..61de0fb496b Binary files /dev/null and b/Resources/Textures/_MACRO/Mobs/Customization/Thaven/hair.rsi/80s.png differ diff --git a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/a.png b/Resources/Textures/_MACRO/Mobs/Customization/Thaven/hair.rsi/a.png similarity index 100% rename from Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/a.png rename to Resources/Textures/_MACRO/Mobs/Customization/Thaven/hair.rsi/a.png diff --git a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/b.png b/Resources/Textures/_MACRO/Mobs/Customization/Thaven/hair.rsi/b.png similarity index 100% rename from Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/b.png rename to Resources/Textures/_MACRO/Mobs/Customization/Thaven/hair.rsi/b.png diff --git a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/bald.png b/Resources/Textures/_MACRO/Mobs/Customization/Thaven/hair.rsi/bald.png similarity index 100% rename from Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/bald.png rename to Resources/Textures/_MACRO/Mobs/Customization/Thaven/hair.rsi/bald.png diff --git a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/baldface.png b/Resources/Textures/_MACRO/Mobs/Customization/Thaven/hair.rsi/baldface.png similarity index 100% rename from Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/baldface.png rename to Resources/Textures/_MACRO/Mobs/Customization/Thaven/hair.rsi/baldface.png diff --git a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/bedhead.png b/Resources/Textures/_MACRO/Mobs/Customization/Thaven/hair.rsi/bedhead.png similarity index 100% rename from Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/bedhead.png rename to Resources/Textures/_MACRO/Mobs/Customization/Thaven/hair.rsi/bedhead.png diff --git a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/bedhead2.png b/Resources/Textures/_MACRO/Mobs/Customization/Thaven/hair.rsi/bedhead2.png similarity index 100% rename from Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/bedhead2.png rename to Resources/Textures/_MACRO/Mobs/Customization/Thaven/hair.rsi/bedhead2.png diff --git a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/bedhead3.png b/Resources/Textures/_MACRO/Mobs/Customization/Thaven/hair.rsi/bedhead3.png similarity index 100% rename from Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/bedhead3.png rename to Resources/Textures/_MACRO/Mobs/Customization/Thaven/hair.rsi/bedhead3.png diff --git a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/beehive.png b/Resources/Textures/_MACRO/Mobs/Customization/Thaven/hair.rsi/beehive.png similarity index 100% rename from Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/beehive.png rename to Resources/Textures/_MACRO/Mobs/Customization/Thaven/hair.rsi/beehive.png diff --git a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/beehive2.png b/Resources/Textures/_MACRO/Mobs/Customization/Thaven/hair.rsi/beehive2.png similarity index 100% rename from Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/beehive2.png rename to Resources/Textures/_MACRO/Mobs/Customization/Thaven/hair.rsi/beehive2.png diff --git a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/bigflattop.png b/Resources/Textures/_MACRO/Mobs/Customization/Thaven/hair.rsi/bigflattop.png similarity index 100% rename from Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/bigflattop.png rename to Resources/Textures/_MACRO/Mobs/Customization/Thaven/hair.rsi/bigflattop.png diff --git a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/bigpompadour.png b/Resources/Textures/_MACRO/Mobs/Customization/Thaven/hair.rsi/bigpompadour.png similarity index 100% rename from Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/bigpompadour.png rename to Resources/Textures/_MACRO/Mobs/Customization/Thaven/hair.rsi/bigpompadour.png diff --git a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/bob.png b/Resources/Textures/_MACRO/Mobs/Customization/Thaven/hair.rsi/bob.png similarity index 100% rename from Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/bob.png rename to Resources/Textures/_MACRO/Mobs/Customization/Thaven/hair.rsi/bob.png diff --git a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/bob2.png b/Resources/Textures/_MACRO/Mobs/Customization/Thaven/hair.rsi/bob2.png similarity index 100% rename from Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/bob2.png rename to Resources/Textures/_MACRO/Mobs/Customization/Thaven/hair.rsi/bob2.png diff --git a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/bob4.png b/Resources/Textures/_MACRO/Mobs/Customization/Thaven/hair.rsi/bob4.png similarity index 100% rename from Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/bob4.png rename to Resources/Textures/_MACRO/Mobs/Customization/Thaven/hair.rsi/bob4.png diff --git a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/bob5.png b/Resources/Textures/_MACRO/Mobs/Customization/Thaven/hair.rsi/bob5.png similarity index 100% rename from Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/bob5.png rename to Resources/Textures/_MACRO/Mobs/Customization/Thaven/hair.rsi/bob5.png diff --git a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/bobcurl.png b/Resources/Textures/_MACRO/Mobs/Customization/Thaven/hair.rsi/bobcurl.png similarity index 100% rename from Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/bobcurl.png rename to Resources/Textures/_MACRO/Mobs/Customization/Thaven/hair.rsi/bobcurl.png diff --git a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/bobcut.png b/Resources/Textures/_MACRO/Mobs/Customization/Thaven/hair.rsi/bobcut.png similarity index 100% rename from Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/bobcut.png rename to Resources/Textures/_MACRO/Mobs/Customization/Thaven/hair.rsi/bobcut.png diff --git a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/bowlcut.png b/Resources/Textures/_MACRO/Mobs/Customization/Thaven/hair.rsi/bowlcut.png similarity index 100% rename from Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/bowlcut.png rename to Resources/Textures/_MACRO/Mobs/Customization/Thaven/hair.rsi/bowlcut.png diff --git a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/bowlcut2.png b/Resources/Textures/_MACRO/Mobs/Customization/Thaven/hair.rsi/bowlcut2.png similarity index 100% rename from Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/bowlcut2.png rename to Resources/Textures/_MACRO/Mobs/Customization/Thaven/hair.rsi/bowlcut2.png diff --git a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/braid.png b/Resources/Textures/_MACRO/Mobs/Customization/Thaven/hair.rsi/braid.png similarity index 100% rename from Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/braid.png rename to Resources/Textures/_MACRO/Mobs/Customization/Thaven/hair.rsi/braid.png diff --git a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/braid2.png b/Resources/Textures/_MACRO/Mobs/Customization/Thaven/hair.rsi/braid2.png similarity index 100% rename from Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/braid2.png rename to Resources/Textures/_MACRO/Mobs/Customization/Thaven/hair.rsi/braid2.png diff --git a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/braided.png b/Resources/Textures/_MACRO/Mobs/Customization/Thaven/hair.rsi/braided.png similarity index 100% rename from Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/braided.png rename to Resources/Textures/_MACRO/Mobs/Customization/Thaven/hair.rsi/braided.png diff --git a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/braidfront.png b/Resources/Textures/_MACRO/Mobs/Customization/Thaven/hair.rsi/braidfront.png similarity index 100% rename from Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/braidfront.png rename to Resources/Textures/_MACRO/Mobs/Customization/Thaven/hair.rsi/braidfront.png diff --git a/Resources/Textures/_MACRO/Mobs/Customization/Thaven/hair.rsi/braidtail.png b/Resources/Textures/_MACRO/Mobs/Customization/Thaven/hair.rsi/braidtail.png new file mode 100644 index 00000000000..bea04a07517 Binary files /dev/null and b/Resources/Textures/_MACRO/Mobs/Customization/Thaven/hair.rsi/braidtail.png differ diff --git a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/bun.png b/Resources/Textures/_MACRO/Mobs/Customization/Thaven/hair.rsi/bun.png similarity index 100% rename from Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/bun.png rename to Resources/Textures/_MACRO/Mobs/Customization/Thaven/hair.rsi/bun.png diff --git a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/bun3.png b/Resources/Textures/_MACRO/Mobs/Customization/Thaven/hair.rsi/bun3.png similarity index 100% rename from Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/bun3.png rename to Resources/Textures/_MACRO/Mobs/Customization/Thaven/hair.rsi/bun3.png diff --git a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/bunhead2.png b/Resources/Textures/_MACRO/Mobs/Customization/Thaven/hair.rsi/bunhead2.png similarity index 100% rename from Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/bunhead2.png rename to Resources/Textures/_MACRO/Mobs/Customization/Thaven/hair.rsi/bunhead2.png diff --git a/Resources/Textures/_MACRO/Mobs/Customization/Thaven/hair.rsi/burqa.png b/Resources/Textures/_MACRO/Mobs/Customization/Thaven/hair.rsi/burqa.png new file mode 100644 index 00000000000..89d400d65f6 Binary files /dev/null and b/Resources/Textures/_MACRO/Mobs/Customization/Thaven/hair.rsi/burqa.png differ diff --git a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/business.png b/Resources/Textures/_MACRO/Mobs/Customization/Thaven/hair.rsi/business.png similarity index 100% rename from Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/business.png rename to Resources/Textures/_MACRO/Mobs/Customization/Thaven/hair.rsi/business.png diff --git a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/business2.png b/Resources/Textures/_MACRO/Mobs/Customization/Thaven/hair.rsi/business2.png similarity index 100% rename from Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/business2.png rename to Resources/Textures/_MACRO/Mobs/Customization/Thaven/hair.rsi/business2.png diff --git a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/business3.png b/Resources/Textures/_MACRO/Mobs/Customization/Thaven/hair.rsi/business3.png similarity index 100% rename from Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/business3.png rename to Resources/Textures/_MACRO/Mobs/Customization/Thaven/hair.rsi/business3.png diff --git a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/business4.png b/Resources/Textures/_MACRO/Mobs/Customization/Thaven/hair.rsi/business4.png similarity index 100% rename from Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/business4.png rename to Resources/Textures/_MACRO/Mobs/Customization/Thaven/hair.rsi/business4.png diff --git a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/buzzcut.png b/Resources/Textures/_MACRO/Mobs/Customization/Thaven/hair.rsi/buzzcut.png similarity index 100% rename from Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/buzzcut.png rename to Resources/Textures/_MACRO/Mobs/Customization/Thaven/hair.rsi/buzzcut.png diff --git a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/c.png b/Resources/Textures/_MACRO/Mobs/Customization/Thaven/hair.rsi/c.png similarity index 100% rename from Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/c.png rename to Resources/Textures/_MACRO/Mobs/Customization/Thaven/hair.rsi/c.png diff --git a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/cia.png b/Resources/Textures/_MACRO/Mobs/Customization/Thaven/hair.rsi/cia.png similarity index 100% rename from Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/cia.png rename to Resources/Textures/_MACRO/Mobs/Customization/Thaven/hair.rsi/cia.png diff --git a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/classicafro.png b/Resources/Textures/_MACRO/Mobs/Customization/Thaven/hair.rsi/classicafro.png similarity index 100% rename from Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/classicafro.png rename to Resources/Textures/_MACRO/Mobs/Customization/Thaven/hair.rsi/classicafro.png diff --git a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/classiccia.png b/Resources/Textures/_MACRO/Mobs/Customization/Thaven/hair.rsi/classiccia.png similarity index 100% rename from Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/classiccia.png rename to Resources/Textures/_MACRO/Mobs/Customization/Thaven/hair.rsi/classiccia.png diff --git a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/classicciabusiness.png b/Resources/Textures/_MACRO/Mobs/Customization/Thaven/hair.rsi/classicciabusiness.png similarity index 100% rename from Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/classicciabusiness.png rename to Resources/Textures/_MACRO/Mobs/Customization/Thaven/hair.rsi/classicciabusiness.png diff --git a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/classiccornrows.png b/Resources/Textures/_MACRO/Mobs/Customization/Thaven/hair.rsi/classiccornrows.png similarity index 100% rename from Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/classiccornrows.png rename to Resources/Textures/_MACRO/Mobs/Customization/Thaven/hair.rsi/classiccornrows.png diff --git a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/classicfloorlength_bedhead.png b/Resources/Textures/_MACRO/Mobs/Customization/Thaven/hair.rsi/classicfloorlengthbedhead.png similarity index 100% rename from Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/classicfloorlength_bedhead.png rename to Resources/Textures/_MACRO/Mobs/Customization/Thaven/hair.rsi/classicfloorlengthbedhead.png diff --git a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/classiclong2.png b/Resources/Textures/_MACRO/Mobs/Customization/Thaven/hair.rsi/classiclong2.png similarity index 100% rename from Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/classiclong2.png rename to Resources/Textures/_MACRO/Mobs/Customization/Thaven/hair.rsi/classiclong2.png diff --git a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/classiclong3.png b/Resources/Textures/_MACRO/Mobs/Customization/Thaven/hair.rsi/classiclong3.png similarity index 100% rename from Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/classiclong3.png rename to Resources/Textures/_MACRO/Mobs/Customization/Thaven/hair.rsi/classiclong3.png diff --git a/Resources/Textures/_MACRO/Mobs/Customization/Thaven/hair.rsi/classicmodern.png b/Resources/Textures/_MACRO/Mobs/Customization/Thaven/hair.rsi/classicmodern.png new file mode 100644 index 00000000000..bbd3924035e Binary files /dev/null and b/Resources/Textures/_MACRO/Mobs/Customization/Thaven/hair.rsi/classicmodern.png differ diff --git a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/classicmulder.png b/Resources/Textures/_MACRO/Mobs/Customization/Thaven/hair.rsi/classicmulder.png similarity index 100% rename from Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/classicmulder.png rename to Resources/Textures/_MACRO/Mobs/Customization/Thaven/hair.rsi/classicmulder.png diff --git a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/classicwisp.png b/Resources/Textures/_MACRO/Mobs/Customization/Thaven/hair.rsi/classicwisp.png similarity index 100% rename from Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/classicwisp.png rename to Resources/Textures/_MACRO/Mobs/Customization/Thaven/hair.rsi/classicwisp.png diff --git a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/coffeehouse.png b/Resources/Textures/_MACRO/Mobs/Customization/Thaven/hair.rsi/coffeehouse.png similarity index 100% rename from Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/coffeehouse.png rename to Resources/Textures/_MACRO/Mobs/Customization/Thaven/hair.rsi/coffeehouse.png diff --git a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/combover.png b/Resources/Textures/_MACRO/Mobs/Customization/Thaven/hair.rsi/combover.png similarity index 100% rename from Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/combover.png rename to Resources/Textures/_MACRO/Mobs/Customization/Thaven/hair.rsi/combover.png diff --git a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/cornrowbraid.png b/Resources/Textures/_MACRO/Mobs/Customization/Thaven/hair.rsi/cornrowbraid.png similarity index 100% rename from Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/cornrowbraid.png rename to Resources/Textures/_MACRO/Mobs/Customization/Thaven/hair.rsi/cornrowbraid.png diff --git a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/cornrowbun.png b/Resources/Textures/_MACRO/Mobs/Customization/Thaven/hair.rsi/cornrowbun.png similarity index 100% rename from Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/cornrowbun.png rename to Resources/Textures/_MACRO/Mobs/Customization/Thaven/hair.rsi/cornrowbun.png diff --git a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/cornrows.png b/Resources/Textures/_MACRO/Mobs/Customization/Thaven/hair.rsi/cornrows.png similarity index 100% rename from Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/cornrows.png rename to Resources/Textures/_MACRO/Mobs/Customization/Thaven/hair.rsi/cornrows.png diff --git a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/cornrows2.png b/Resources/Textures/_MACRO/Mobs/Customization/Thaven/hair.rsi/cornrows2.png similarity index 100% rename from Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/cornrows2.png rename to Resources/Textures/_MACRO/Mobs/Customization/Thaven/hair.rsi/cornrows2.png diff --git a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/cornrowtail.png b/Resources/Textures/_MACRO/Mobs/Customization/Thaven/hair.rsi/cornrowtail.png similarity index 100% rename from Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/cornrowtail.png rename to Resources/Textures/_MACRO/Mobs/Customization/Thaven/hair.rsi/cornrowtail.png diff --git a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/country.png b/Resources/Textures/_MACRO/Mobs/Customization/Thaven/hair.rsi/country.png similarity index 100% rename from Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/country.png rename to Resources/Textures/_MACRO/Mobs/Customization/Thaven/hair.rsi/country.png diff --git a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/crewcut.png b/Resources/Textures/_MACRO/Mobs/Customization/Thaven/hair.rsi/crewcut.png similarity index 100% rename from Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/crewcut.png rename to Resources/Textures/_MACRO/Mobs/Customization/Thaven/hair.rsi/crewcut.png diff --git a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/crewcut2.png b/Resources/Textures/_MACRO/Mobs/Customization/Thaven/hair.rsi/crewcut2.png similarity index 100% rename from Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/crewcut2.png rename to Resources/Textures/_MACRO/Mobs/Customization/Thaven/hair.rsi/crewcut2.png diff --git a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/curls.png b/Resources/Textures/_MACRO/Mobs/Customization/Thaven/hair.rsi/curls.png similarity index 100% rename from Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/curls.png rename to Resources/Textures/_MACRO/Mobs/Customization/Thaven/hair.rsi/curls.png diff --git a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/d.png b/Resources/Textures/_MACRO/Mobs/Customization/Thaven/hair.rsi/d.png similarity index 100% rename from Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/d.png rename to Resources/Textures/_MACRO/Mobs/Customization/Thaven/hair.rsi/d.png diff --git a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/dandypompadour.png b/Resources/Textures/_MACRO/Mobs/Customization/Thaven/hair.rsi/dandypompadour.png similarity index 100% rename from Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/dandypompadour.png rename to Resources/Textures/_MACRO/Mobs/Customization/Thaven/hair.rsi/dandypompadour.png diff --git a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/devilock.png b/Resources/Textures/_MACRO/Mobs/Customization/Thaven/hair.rsi/devilock.png similarity index 100% rename from Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/devilock.png rename to Resources/Textures/_MACRO/Mobs/Customization/Thaven/hair.rsi/devilock.png diff --git a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/doublebun.png b/Resources/Textures/_MACRO/Mobs/Customization/Thaven/hair.rsi/doublebun.png similarity index 100% rename from Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/doublebun.png rename to Resources/Textures/_MACRO/Mobs/Customization/Thaven/hair.rsi/doublebun.png diff --git a/Resources/Textures/_MACRO/Mobs/Customization/Thaven/hair.rsi/doublebunlong.png b/Resources/Textures/_MACRO/Mobs/Customization/Thaven/hair.rsi/doublebunlong.png new file mode 100644 index 00000000000..3c3129f1747 Binary files /dev/null and b/Resources/Textures/_MACRO/Mobs/Customization/Thaven/hair.rsi/doublebunlong.png differ diff --git a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/dreads.png b/Resources/Textures/_MACRO/Mobs/Customization/Thaven/hair.rsi/dreads.png similarity index 100% rename from Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/dreads.png rename to Resources/Textures/_MACRO/Mobs/Customization/Thaven/hair.rsi/dreads.png diff --git a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/drillhair.png b/Resources/Textures/_MACRO/Mobs/Customization/Thaven/hair.rsi/drillhair.png similarity index 100% rename from Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/drillhair.png rename to Resources/Textures/_MACRO/Mobs/Customization/Thaven/hair.rsi/drillhair.png diff --git a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/drillhairextended.png b/Resources/Textures/_MACRO/Mobs/Customization/Thaven/hair.rsi/drillhairextended.png similarity index 100% rename from Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/drillhairextended.png rename to Resources/Textures/_MACRO/Mobs/Customization/Thaven/hair.rsi/drillhairextended.png diff --git a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/drillruru.png b/Resources/Textures/_MACRO/Mobs/Customization/Thaven/hair.rsi/drillruru.png similarity index 100% rename from Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/drillruru.png rename to Resources/Textures/_MACRO/Mobs/Customization/Thaven/hair.rsi/drillruru.png diff --git a/Resources/Textures/_MACRO/Mobs/Customization/Thaven/hair.rsi/dyedlong1.png b/Resources/Textures/_MACRO/Mobs/Customization/Thaven/hair.rsi/dyedlong1.png new file mode 100644 index 00000000000..da38cdcf329 Binary files /dev/null and b/Resources/Textures/_MACRO/Mobs/Customization/Thaven/hair.rsi/dyedlong1.png differ diff --git a/Resources/Textures/_MACRO/Mobs/Customization/Thaven/hair.rsi/dyedshort1.png b/Resources/Textures/_MACRO/Mobs/Customization/Thaven/hair.rsi/dyedshort1.png new file mode 100644 index 00000000000..7956359c205 Binary files /dev/null and b/Resources/Textures/_MACRO/Mobs/Customization/Thaven/hair.rsi/dyedshort1.png differ diff --git a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/e.png b/Resources/Textures/_MACRO/Mobs/Customization/Thaven/hair.rsi/e.png similarity index 100% rename from Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/e.png rename to Resources/Textures/_MACRO/Mobs/Customization/Thaven/hair.rsi/e.png diff --git a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/emo2.png b/Resources/Textures/_MACRO/Mobs/Customization/Thaven/hair.rsi/emo2.png similarity index 100% rename from Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/emo2.png rename to Resources/Textures/_MACRO/Mobs/Customization/Thaven/hair.rsi/emo2.png diff --git a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/emofringe.png b/Resources/Textures/_MACRO/Mobs/Customization/Thaven/hair.rsi/emofringe.png similarity index 100% rename from Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/emofringe.png rename to Resources/Textures/_MACRO/Mobs/Customization/Thaven/hair.rsi/emofringe.png diff --git a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/f.png b/Resources/Textures/_MACRO/Mobs/Customization/Thaven/hair.rsi/f.png similarity index 100% rename from Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/f.png rename to Resources/Textures/_MACRO/Mobs/Customization/Thaven/hair.rsi/f.png diff --git a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/father.png b/Resources/Textures/_MACRO/Mobs/Customization/Thaven/hair.rsi/father.png similarity index 100% rename from Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/father.png rename to Resources/Textures/_MACRO/Mobs/Customization/Thaven/hair.rsi/father.png diff --git a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/feather.png b/Resources/Textures/_MACRO/Mobs/Customization/Thaven/hair.rsi/feather.png similarity index 100% rename from Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/feather.png rename to Resources/Textures/_MACRO/Mobs/Customization/Thaven/hair.rsi/feather.png diff --git a/Resources/Textures/_MACRO/Mobs/Customization/Thaven/hair.rsi/flair.png b/Resources/Textures/_MACRO/Mobs/Customization/Thaven/hair.rsi/flair.png new file mode 100644 index 00000000000..c62903876c3 Binary files /dev/null and b/Resources/Textures/_MACRO/Mobs/Customization/Thaven/hair.rsi/flair.png differ diff --git a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/floorlength_bedhead.png b/Resources/Textures/_MACRO/Mobs/Customization/Thaven/hair.rsi/floorlengthbedhead.png similarity index 100% rename from Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/floorlength_bedhead.png rename to Resources/Textures/_MACRO/Mobs/Customization/Thaven/hair.rsi/floorlengthbedhead.png diff --git a/Resources/Textures/_MACRO/Mobs/Customization/Thaven/hair.rsi/florallong1.png b/Resources/Textures/_MACRO/Mobs/Customization/Thaven/hair.rsi/florallong1.png new file mode 100644 index 00000000000..a4f0ff872ef Binary files /dev/null and b/Resources/Textures/_MACRO/Mobs/Customization/Thaven/hair.rsi/florallong1.png differ diff --git a/Resources/Textures/_MACRO/Mobs/Customization/Thaven/hair.rsi/florallong2.png b/Resources/Textures/_MACRO/Mobs/Customization/Thaven/hair.rsi/florallong2.png new file mode 100644 index 00000000000..84696c37d66 Binary files /dev/null and b/Resources/Textures/_MACRO/Mobs/Customization/Thaven/hair.rsi/florallong2.png differ diff --git a/Resources/Textures/_MACRO/Mobs/Customization/Thaven/hair.rsi/floralmid1.png b/Resources/Textures/_MACRO/Mobs/Customization/Thaven/hair.rsi/floralmid1.png new file mode 100644 index 00000000000..b51b5995afd Binary files /dev/null and b/Resources/Textures/_MACRO/Mobs/Customization/Thaven/hair.rsi/floralmid1.png differ diff --git a/Resources/Textures/_MACRO/Mobs/Customization/Thaven/hair.rsi/floralmid2.png b/Resources/Textures/_MACRO/Mobs/Customization/Thaven/hair.rsi/floralmid2.png new file mode 100644 index 00000000000..c9a72cd9007 Binary files /dev/null and b/Resources/Textures/_MACRO/Mobs/Customization/Thaven/hair.rsi/floralmid2.png differ diff --git a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/frenchbraid.png b/Resources/Textures/_MACRO/Mobs/Customization/Thaven/hair.rsi/frenchbraid.png similarity index 100% rename from Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/frenchbraid.png rename to Resources/Textures/_MACRO/Mobs/Customization/Thaven/hair.rsi/frenchbraid.png diff --git a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/fringetail.png b/Resources/Textures/_MACRO/Mobs/Customization/Thaven/hair.rsi/fringetail.png similarity index 100% rename from Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/fringetail.png rename to Resources/Textures/_MACRO/Mobs/Customization/Thaven/hair.rsi/fringetail.png diff --git a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/gelled.png b/Resources/Textures/_MACRO/Mobs/Customization/Thaven/hair.rsi/gelled.png similarity index 100% rename from Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/gelled.png rename to Resources/Textures/_MACRO/Mobs/Customization/Thaven/hair.rsi/gelled.png diff --git a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/gentle.png b/Resources/Textures/_MACRO/Mobs/Customization/Thaven/hair.rsi/gentle.png similarity index 100% rename from Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/gentle.png rename to Resources/Textures/_MACRO/Mobs/Customization/Thaven/hair.rsi/gentle.png diff --git a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/halfbang.png b/Resources/Textures/_MACRO/Mobs/Customization/Thaven/hair.rsi/halfbang.png similarity index 100% rename from Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/halfbang.png rename to Resources/Textures/_MACRO/Mobs/Customization/Thaven/hair.rsi/halfbang.png diff --git a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/halfbang2.png b/Resources/Textures/_MACRO/Mobs/Customization/Thaven/hair.rsi/halfbang2.png similarity index 100% rename from Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/halfbang2.png rename to Resources/Textures/_MACRO/Mobs/Customization/Thaven/hair.rsi/halfbang2.png diff --git a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/halfshaved.png b/Resources/Textures/_MACRO/Mobs/Customization/Thaven/hair.rsi/halfshaved.png similarity index 100% rename from Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/halfshaved.png rename to Resources/Textures/_MACRO/Mobs/Customization/Thaven/hair.rsi/halfshaved.png diff --git a/Resources/Textures/_MACRO/Mobs/Customization/Thaven/hair.rsi/halfuplong.png b/Resources/Textures/_MACRO/Mobs/Customization/Thaven/hair.rsi/halfuplong.png new file mode 100644 index 00000000000..8c8200fe2ee Binary files /dev/null and b/Resources/Textures/_MACRO/Mobs/Customization/Thaven/hair.rsi/halfuplong.png differ diff --git a/Resources/Textures/_MACRO/Mobs/Customization/Thaven/hair.rsi/halfupshort.png b/Resources/Textures/_MACRO/Mobs/Customization/Thaven/hair.rsi/halfupshort.png new file mode 100644 index 00000000000..96e79adf9a9 Binary files /dev/null and b/Resources/Textures/_MACRO/Mobs/Customization/Thaven/hair.rsi/halfupshort.png differ diff --git a/Resources/Textures/_MACRO/Mobs/Customization/Thaven/hair.rsi/halfupundercut.png b/Resources/Textures/_MACRO/Mobs/Customization/Thaven/hair.rsi/halfupundercut.png new file mode 100644 index 00000000000..c9819c445e5 Binary files /dev/null and b/Resources/Textures/_MACRO/Mobs/Customization/Thaven/hair.rsi/halfupundercut.png differ diff --git a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/hbraid.png b/Resources/Textures/_MACRO/Mobs/Customization/Thaven/hair.rsi/hbraid.png similarity index 100% rename from Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/hbraid.png rename to Resources/Textures/_MACRO/Mobs/Customization/Thaven/hair.rsi/hbraid.png diff --git a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/hedgehog.png b/Resources/Textures/_MACRO/Mobs/Customization/Thaven/hair.rsi/hedgehog.png similarity index 100% rename from Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/hedgehog.png rename to Resources/Textures/_MACRO/Mobs/Customization/Thaven/hair.rsi/hedgehog.png diff --git a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/highfade.png b/Resources/Textures/_MACRO/Mobs/Customization/Thaven/hair.rsi/highfade.png similarity index 100% rename from Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/highfade.png rename to Resources/Textures/_MACRO/Mobs/Customization/Thaven/hair.rsi/highfade.png diff --git a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/highponytail.png b/Resources/Textures/_MACRO/Mobs/Customization/Thaven/hair.rsi/highponytail.png similarity index 100% rename from Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/highponytail.png rename to Resources/Textures/_MACRO/Mobs/Customization/Thaven/hair.rsi/highponytail.png diff --git a/Resources/Textures/_MACRO/Mobs/Customization/Thaven/hair.rsi/hijabchic.png b/Resources/Textures/_MACRO/Mobs/Customization/Thaven/hair.rsi/hijabchic.png new file mode 100644 index 00000000000..20955bd181b Binary files /dev/null and b/Resources/Textures/_MACRO/Mobs/Customization/Thaven/hair.rsi/hijabchic.png differ diff --git a/Resources/Textures/_MACRO/Mobs/Customization/Thaven/hair.rsi/hijabsimple.png b/Resources/Textures/_MACRO/Mobs/Customization/Thaven/hair.rsi/hijabsimple.png new file mode 100644 index 00000000000..139cde57f07 Binary files /dev/null and b/Resources/Textures/_MACRO/Mobs/Customization/Thaven/hair.rsi/hijabsimple.png differ diff --git a/Resources/Textures/_MACRO/Mobs/Customization/Thaven/hair.rsi/himecut.png b/Resources/Textures/_MACRO/Mobs/Customization/Thaven/hair.rsi/himecut.png new file mode 100644 index 00000000000..665babc543a Binary files /dev/null and b/Resources/Textures/_MACRO/Mobs/Customization/Thaven/hair.rsi/himecut.png differ diff --git a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/himecut2.png b/Resources/Textures/_MACRO/Mobs/Customization/Thaven/hair.rsi/himecut2.png similarity index 100% rename from Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/himecut2.png rename to Resources/Textures/_MACRO/Mobs/Customization/Thaven/hair.rsi/himecut2.png diff --git a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/himeup.png b/Resources/Textures/_MACRO/Mobs/Customization/Thaven/hair.rsi/himeup.png similarity index 100% rename from Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/himeup.png rename to Resources/Textures/_MACRO/Mobs/Customization/Thaven/hair.rsi/himeup.png diff --git a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/hitop.png b/Resources/Textures/_MACRO/Mobs/Customization/Thaven/hair.rsi/hitop.png similarity index 100% rename from Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/hitop.png rename to Resources/Textures/_MACRO/Mobs/Customization/Thaven/hair.rsi/hitop.png diff --git a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/jade.png b/Resources/Textures/_MACRO/Mobs/Customization/Thaven/hair.rsi/jade.png similarity index 100% rename from Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/jade.png rename to Resources/Textures/_MACRO/Mobs/Customization/Thaven/hair.rsi/jade.png diff --git a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/jensen.png b/Resources/Textures/_MACRO/Mobs/Customization/Thaven/hair.rsi/jensen.png similarity index 100% rename from Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/jensen.png rename to Resources/Textures/_MACRO/Mobs/Customization/Thaven/hair.rsi/jensen.png diff --git a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/joestar.png b/Resources/Textures/_MACRO/Mobs/Customization/Thaven/hair.rsi/joestar.png similarity index 100% rename from Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/joestar.png rename to Resources/Textures/_MACRO/Mobs/Customization/Thaven/hair.rsi/joestar.png diff --git a/Resources/Textures/_MACRO/Mobs/Customization/Thaven/hair.rsi/kagami.png b/Resources/Textures/_MACRO/Mobs/Customization/Thaven/hair.rsi/kagami.png new file mode 100644 index 00000000000..763563a4fdd Binary files /dev/null and b/Resources/Textures/_MACRO/Mobs/Customization/Thaven/hair.rsi/kagami.png differ diff --git a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/keanu.png b/Resources/Textures/_MACRO/Mobs/Customization/Thaven/hair.rsi/keanu.png similarity index 100% rename from Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/keanu.png rename to Resources/Textures/_MACRO/Mobs/Customization/Thaven/hair.rsi/keanu.png diff --git a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/kusanagi.png b/Resources/Textures/_MACRO/Mobs/Customization/Thaven/hair.rsi/kusanagi.png similarity index 100% rename from Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/kusanagi.png rename to Resources/Textures/_MACRO/Mobs/Customization/Thaven/hair.rsi/kusanagi.png diff --git a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/largebun.png b/Resources/Textures/_MACRO/Mobs/Customization/Thaven/hair.rsi/largebun.png similarity index 100% rename from Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/largebun.png rename to Resources/Textures/_MACRO/Mobs/Customization/Thaven/hair.rsi/largebun.png diff --git a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/lbangs.png b/Resources/Textures/_MACRO/Mobs/Customization/Thaven/hair.rsi/lbangs.png similarity index 100% rename from Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/lbangs.png rename to Resources/Textures/_MACRO/Mobs/Customization/Thaven/hair.rsi/lbangs.png diff --git a/Resources/Textures/_MACRO/Mobs/Customization/Thaven/hair.rsi/long.png b/Resources/Textures/_MACRO/Mobs/Customization/Thaven/hair.rsi/long.png new file mode 100644 index 00000000000..b680e07a4a8 Binary files /dev/null and b/Resources/Textures/_MACRO/Mobs/Customization/Thaven/hair.rsi/long.png differ diff --git a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/long2.png b/Resources/Textures/_MACRO/Mobs/Customization/Thaven/hair.rsi/long2.png similarity index 100% rename from Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/long2.png rename to Resources/Textures/_MACRO/Mobs/Customization/Thaven/hair.rsi/long2.png diff --git a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/long3.png b/Resources/Textures/_MACRO/Mobs/Customization/Thaven/hair.rsi/long3.png similarity index 100% rename from Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/long3.png rename to Resources/Textures/_MACRO/Mobs/Customization/Thaven/hair.rsi/long3.png diff --git a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/long_bedhead.png b/Resources/Textures/_MACRO/Mobs/Customization/Thaven/hair.rsi/longbedhead.png similarity index 100% rename from Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/long_bedhead.png rename to Resources/Textures/_MACRO/Mobs/Customization/Thaven/hair.rsi/longbedhead.png diff --git a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/long_bedhead2.png b/Resources/Textures/_MACRO/Mobs/Customization/Thaven/hair.rsi/longbedhead2.png similarity index 100% rename from Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/long_bedhead2.png rename to Resources/Textures/_MACRO/Mobs/Customization/Thaven/hair.rsi/longbedhead2.png diff --git a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/longbundled.png b/Resources/Textures/_MACRO/Mobs/Customization/Thaven/hair.rsi/longbundled.png similarity index 100% rename from Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/longbundled.png rename to Resources/Textures/_MACRO/Mobs/Customization/Thaven/hair.rsi/longbundled.png diff --git a/Resources/Textures/_MACRO/Mobs/Customization/Thaven/hair.rsi/longeremo.png b/Resources/Textures/_MACRO/Mobs/Customization/Thaven/hair.rsi/longeremo.png new file mode 100644 index 00000000000..d183f781eb7 Binary files /dev/null and b/Resources/Textures/_MACRO/Mobs/Customization/Thaven/hair.rsi/longeremo.png differ diff --git a/Resources/Textures/_MACRO/Mobs/Customization/Thaven/hair.rsi/longest.png b/Resources/Textures/_MACRO/Mobs/Customization/Thaven/hair.rsi/longest.png new file mode 100644 index 00000000000..f801862f5d8 Binary files /dev/null and b/Resources/Textures/_MACRO/Mobs/Customization/Thaven/hair.rsi/longest.png differ diff --git a/Resources/Textures/_MACRO/Mobs/Customization/Thaven/hair.rsi/longest2.png b/Resources/Textures/_MACRO/Mobs/Customization/Thaven/hair.rsi/longest2.png new file mode 100644 index 00000000000..cf389854b93 Binary files /dev/null and b/Resources/Textures/_MACRO/Mobs/Customization/Thaven/hair.rsi/longest2.png differ diff --git a/Resources/Textures/_MACRO/Mobs/Customization/Thaven/hair.rsi/longfringe.png b/Resources/Textures/_MACRO/Mobs/Customization/Thaven/hair.rsi/longfringe.png new file mode 100644 index 00000000000..dd27f408f67 Binary files /dev/null and b/Resources/Textures/_MACRO/Mobs/Customization/Thaven/hair.rsi/longfringe.png differ diff --git a/Resources/Textures/_MACRO/Mobs/Customization/Thaven/hair.rsi/longovereye.png b/Resources/Textures/_MACRO/Mobs/Customization/Thaven/hair.rsi/longovereye.png new file mode 100644 index 00000000000..570de0eafcc Binary files /dev/null and b/Resources/Textures/_MACRO/Mobs/Customization/Thaven/hair.rsi/longovereye.png differ diff --git a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/longsidepart.png b/Resources/Textures/_MACRO/Mobs/Customization/Thaven/hair.rsi/longsidepart.png similarity index 100% rename from Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/longsidepart.png rename to Resources/Textures/_MACRO/Mobs/Customization/Thaven/hair.rsi/longsidepart.png diff --git a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/longstraightponytail.png b/Resources/Textures/_MACRO/Mobs/Customization/Thaven/hair.rsi/longstraightponytail.png similarity index 100% rename from Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/longstraightponytail.png rename to Resources/Textures/_MACRO/Mobs/Customization/Thaven/hair.rsi/longstraightponytail.png diff --git a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/lowfade.png b/Resources/Textures/_MACRO/Mobs/Customization/Thaven/hair.rsi/lowfade.png similarity index 100% rename from Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/lowfade.png rename to Resources/Textures/_MACRO/Mobs/Customization/Thaven/hair.rsi/lowfade.png diff --git a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/manbun.png b/Resources/Textures/_MACRO/Mobs/Customization/Thaven/hair.rsi/manbun.png similarity index 100% rename from Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/manbun.png rename to Resources/Textures/_MACRO/Mobs/Customization/Thaven/hair.rsi/manbun.png diff --git a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/medfade.png b/Resources/Textures/_MACRO/Mobs/Customization/Thaven/hair.rsi/medfade.png similarity index 100% rename from Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/medfade.png rename to Resources/Textures/_MACRO/Mobs/Customization/Thaven/hair.rsi/medfade.png diff --git a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/mediumsidepart.png b/Resources/Textures/_MACRO/Mobs/Customization/Thaven/hair.rsi/mediumsidepart.png similarity index 100% rename from Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/mediumsidepart.png rename to Resources/Textures/_MACRO/Mobs/Customization/Thaven/hair.rsi/mediumsidepart.png diff --git a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/megaeyebrows.png b/Resources/Textures/_MACRO/Mobs/Customization/Thaven/hair.rsi/megaeyebrows.png similarity index 100% rename from Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/megaeyebrows.png rename to Resources/Textures/_MACRO/Mobs/Customization/Thaven/hair.rsi/megaeyebrows.png diff --git a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/messy.png b/Resources/Textures/_MACRO/Mobs/Customization/Thaven/hair.rsi/messy.png similarity index 100% rename from Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/messy.png rename to Resources/Textures/_MACRO/Mobs/Customization/Thaven/hair.rsi/messy.png diff --git a/Resources/Textures/_MACRO/Mobs/Customization/Thaven/hair.rsi/messyponytail.png b/Resources/Textures/_MACRO/Mobs/Customization/Thaven/hair.rsi/messyponytail.png new file mode 100644 index 00000000000..12c12a1dc98 Binary files /dev/null and b/Resources/Textures/_MACRO/Mobs/Customization/Thaven/hair.rsi/messyponytail.png differ diff --git a/Resources/Textures/_MACRO/Mobs/Customization/Thaven/hair.rsi/meta.json b/Resources/Textures/_MACRO/Mobs/Customization/Thaven/hair.rsi/meta.json new file mode 100644 index 00000000000..059aebeac15 --- /dev/null +++ b/Resources/Textures/_MACRO/Mobs/Customization/Thaven/hair.rsi/meta.json @@ -0,0 +1,867 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "copyright": "Taken from https://github.com/tgstation/tgstation/blob/05ec94e46349c35e29ca91e5e97d0c88ae26ad44/icons/mob/species/human/human_face.dmi, resprited by Alekshhh, a modified by potato1234x, uneven and tailed is drawn by Ubaser, doublebun_long by Emisse, longbundled and bob5 sprited by github:DreamlyJack(624946166152298517), fit to thaven by Sha-Seng (github), halfup styles, midpart styles, mullet styles, undercut_curly and sideshave_curly sprited by argentsunshine (github), headcovers, floral, and messyponytail by crocodilecarousel (github), spikyponytaillong edited from spikyponytail by mhachimagus (github), (thavenshaggy, thavenshaggylonger, susiethaven) by @animal_collective/animal-collective (github), twotone short and long by Faeling, gatheredlow by Sha-Seng (github)", + "license": "CC-BY-SA-3.0", + "states": [ + { + "name": "80s", + "directions": 4 + }, + { + "name": "a", + "directions": 4 + }, + { + "name": "b", + "directions": 4 + }, + { + "name": "bald", + "directions": 4 + }, + { + "name": "baldface", + "directions": 4 + }, + { + "name": "bedhead", + "directions": 4 + }, + { + "name": "bedhead2", + "directions": 4 + }, + { + "name": "bedhead3", + "directions": 4 + }, + { + "name": "beehive", + "directions": 4 + }, + { + "name": "beehive2", + "directions": 4 + }, + { + "name": "bigflattop", + "directions": 4 + }, + { + "name": "bigpompadour", + "directions": 4 + }, + { + "name": "bob", + "directions": 4 + }, + { + "name": "bob2", + "directions": 4 + }, + { + "name": "bob4", + "directions": 4 + }, + { + "name": "bob5", + "directions": 4 + }, + { + "name": "bobcurl", + "directions": 4 + }, + { + "name": "bobcut", + "directions": 4 + }, + { + "name": "bowlcut", + "directions": 4 + }, + { + "name": "bowlcut2", + "directions": 4 + }, + { + "name": "braid", + "directions": 4 + }, + { + "name": "braid2", + "directions": 4 + }, + { + "name": "braided", + "directions": 4 + }, + { + "name": "braidfront", + "directions": 4 + }, + { + "name": "braidtail", + "directions": 4 + }, + { + "name": "bun", + "directions": 4 + }, + { + "name": "bun3", + "directions": 4 + }, + { + "name": "bunhead2", + "directions": 4 + }, + { + "name": "burqa", + "directions": 4 + }, + { + "name": "business", + "directions": 4 + }, + { + "name": "business2", + "directions": 4 + }, + { + "name": "business3", + "directions": 4 + }, + { + "name": "business4", + "directions": 4 + }, + { + "name": "buzzcut", + "directions": 4 + }, + { + "name": "c", + "directions": 4 + }, + { + "name": "cia", + "directions": 4 + }, + { + "name": "classicafro", + "directions": 4 + }, + { + "name": "classiccia", + "directions": 4 + }, + { + "name": "classicciabusiness", + "directions": 4 + }, + { + "name": "classiccornrows", + "directions": 4 + }, + { + "name": "classicfloorlengthbedhead", + "directions": 4 + }, + { + "name": "classiclong2", + "directions": 4 + }, + { + "name": "classiclong3", + "directions": 4 + }, + { + "name": "classicmodern", + "directions": 4 + }, + { + "name": "classicmulder", + "directions": 4 + }, + { + "name": "classicwisp", + "directions": 4 + }, + { + "name": "coffeehouse", + "directions": 4 + }, + { + "name": "combover", + "directions": 4 + }, + { + "name": "cornrowbraid", + "directions": 4 + }, + { + "name": "cornrowbun", + "directions": 4 + }, + { + "name": "cornrows", + "directions": 4 + }, + { + "name": "cornrows2", + "directions": 4 + }, + { + "name": "cornrowtail", + "directions": 4 + }, + { + "name": "country", + "directions": 4 + }, + { + "name": "crewcut", + "directions": 4 + }, + { + "name": "crewcut2", + "directions": 4 + }, + { + "name": "curls", + "directions": 4 + }, + { + "name": "d", + "directions": 4 + }, + { + "name": "dandypompadour", + "directions": 4 + }, + { + "name": "devilock", + "directions": 4 + }, + { + "name": "doublebun", + "directions": 4 + }, + { + "name": "doublebunlong", + "directions": 4 + }, + { + "name": "dreads", + "directions": 4 + }, + { + "name": "drillhair", + "directions": 4 + }, + { + "name": "drillhairextended", + "directions": 4 + }, + { + "name": "drillruru", + "directions": 4 + }, + { + "name": "e", + "directions": 4 + }, + { + "name": "emo2", + "directions": 4 + }, + { + "name": "emofringe", + "directions": 4 + }, + { + "name": "f", + "directions": 4 + }, + { + "name": "father", + "directions": 4 + }, + { + "name": "feather", + "directions": 4 + }, + { + "name": "flair", + "directions": 4 + }, + { + "name": "floorlengthbedhead", + "directions": 4 + }, + { + "name": "florallong1", + "directions": 4 + }, + { + "name": "florallong2", + "directions": 4 + }, + { + "name": "floralmid1", + "directions": 4 + }, + { + "name": "floralmid2", + "directions": 4 + }, + { + "name": "frenchbraid", + "directions": 4 + }, + { + "name": "fringetail", + "directions": 4 + }, + { + "name": "gelled", + "directions": 4 + }, + { + "name": "gentle", + "directions": 4 + }, + { + "name": "halfbang", + "directions": 4 + }, + { + "name": "halfbang2", + "directions": 4 + }, + { + "name": "halfshaved", + "directions": 4 + }, + { + "name": "halfuplong", + "directions": 4 + }, + { + "name": "halfupshort", + "directions": 4 + }, + { + "name": "halfupundercut", + "directions": 4 + }, + { + "name": "hbraid", + "directions": 4 + }, + { + "name": "hedgehog", + "directions": 4 + }, + { + "name": "highfade", + "directions": 4 + }, + { + "name": "highponytail", + "directions": 4 + }, + { + "name": "hijabchic", + "directions": 4 + }, + { + "name": "hijabsimple", + "directions": 4 + }, + { + "name": "himecut", + "directions": 4 + }, + { + "name": "himecut2", + "directions": 4 + }, + { + "name": "himeup", + "directions": 4 + }, + { + "name": "hitop", + "directions": 4 + }, + { + "name": "jade", + "directions": 4 + }, + { + "name": "jensen", + "directions": 4 + }, + { + "name": "joestar", + "directions": 4 + }, + { + "name": "kagami", + "directions": 4 + }, + { + "name": "keanu", + "directions": 4 + }, + { + "name": "kusanagi", + "directions": 4 + }, + { + "name": "largebun", + "directions": 4 + }, + { + "name": "lbangs", + "directions": 4 + }, + { + "name": "long", + "directions": 4 + }, + { + "name": "long2", + "directions": 4 + }, + { + "name": "long3", + "directions": 4 + }, + { + "name": "longbedhead", + "directions": 4 + }, + { + "name": "longbedhead2", + "directions": 4 + }, + { + "name": "longbundled", + "directions": 4 + }, + { + "name": "longeremo", + "directions": 4 + }, + { + "name": "longest", + "directions": 4 + }, + { + "name": "longest2", + "directions": 4 + }, + { + "name": "longfringe", + "directions": 4 + }, + { + "name": "longovereye", + "directions": 4 + }, + { + "name": "longsidepart", + "directions": 4 + }, + { + "name": "longstraightponytail", + "directions": 4 + }, + { + "name": "lowfade", + "directions": 4 + }, + { + "name": "manbun", + "directions": 4 + }, + { + "name": "medfade", + "directions": 4 + }, + { + "name": "mediumsidepart", + "directions": 4 + }, + { + "name": "megaeyebrows", + "directions": 4 + }, + { + "name": "messy", + "directions": 4 + }, + { + "name": "messyponytail", + "directions": 4 + }, + { + "name": "midpartlong", + "directions": 4 + }, + { + "name": "midpartlonger", + "directions": 4 + }, + { + "name": "modern", + "directions": 4 + }, + { + "name": "mulder", + "directions": 4 + }, + { + "name": "mullet", + "directions": 4 + }, + { + "name": "mulletsideshave", + "directions": 4 + }, + { + "name": "niqab", + "directions": 4 + }, + { + "name": "nitori", + "directions": 4 + }, + { + "name": "nofade", + "directions": 4 + }, + { + "name": "odango", + "directions": 4 + }, + { + "name": "ombre", + "directions": 4 + }, + { + "name": "oneshoulder", + "directions": 4 + }, + { + "name": "oxton", + "directions": 4 + }, + { + "name": "part", + "directions": 4 + }, + { + "name": "parted", + "directions": 4 + }, + { + "name": "pigtails", + "directions": 4 + }, + { + "name": "pigtails2", + "directions": 4 + }, + { + "name": "pixie", + "directions": 4 + }, + { + "name": "pompadour", + "directions": 4 + }, + { + "name": "ponytail", + "directions": 4 + }, + { + "name": "ponytail2", + "directions": 4 + }, + { + "name": "ponytail3", + "directions": 4 + }, + { + "name": "ponytail4", + "directions": 4 + }, + { + "name": "ponytail5", + "directions": 4 + }, + { + "name": "ponytail6", + "directions": 4 + }, + { + "name": "ponytail7", + "directions": 4 + }, + { + "name": "poofy", + "directions": 4 + }, + { + "name": "protagonist", + "directions": 4 + }, + { + "name": "quiff", + "directions": 4 + }, + { + "name": "reversemohawk", + "directions": 4 + }, + { + "name": "ronin", + "directions": 4 + }, + { + "name": "rosa", + "directions": 4 + }, + { + "name": "sargeant", + "directions": 4 + }, + { + "name": "shaved", + "directions": 4 + }, + { + "name": "shavedmohawk", + "directions": 4 + }, + { + "name": "shavedpart", + "directions": 4 + }, + { + "name": "shortbangs", + "directions": 4 + }, + { + "name": "shortbraid", + "directions": 4 + }, + { + "name": "shorthair2", + "directions": 4 + }, + { + "name": "shorthair3", + "directions": 4 + }, + { + "name": "shorthair9", + "directions": 4 + }, + { + "name": "shorthime", + "directions": 4 + }, + { + "name": "shortovereye", + "directions": 4 + }, + { + "name": "shoulderlengthovereye", + "directions": 4 + }, + { + "name": "sidecut", + "directions": 4 + }, + { + "name": "sideshavecurly", + "directions": 4 + }, + { + "name": "sidetail", + "directions": 4 + }, + { + "name": "sidetail2", + "directions": 4 + }, + { + "name": "sidetail3", + "directions": 4 + }, + { + "name": "sidetail4", + "directions": 4 + }, + { + "name": "skinhead", + "directions": 4 + }, + { + "name": "spiky", + "directions": 4 + }, + { + "name": "spikyponytail", + "directions": 4 + }, + { + "name": "spikyponytaillong", + "directions": 4 + }, + { + "name": "spookylong", + "directions": 4 + }, + { + "name": "stail", + "directions": 4 + }, + { + "name": "swept", + "directions": 4 + }, + { + "name": "swept2", + "directions": 4 + }, + { + "name": "tailed", + "directions": 4 + }, + { + "name": "thinning", + "directions": 4 + }, + { + "name": "thinningfront", + "directions": 4 + }, + { + "name": "thinningrear", + "directions": 4 + }, + { + "name": "tichelfashionable", + "directions": 4 + }, + { + "name": "tichelsimple", + "directions": 4 + }, + { + "name": "tightbun", + "directions": 4 + }, + { + "name": "topknot", + "directions": 4 + }, + { + "name": "tressshoulder", + "directions": 4 + }, + { + "name": "trimflat", + "directions": 4 + }, + { + "name": "trimmed", + "directions": 4 + }, + { + "name": "twintail", + "directions": 4 + }, + { + "name": "twostrands", + "directions": 4 + }, + { + "name": "undercut", + "directions": 4 + }, + { + "name": "undercutcurly", + "directions": 4 + }, + { + "name": "undercutleft", + "directions": 4 + }, + { + "name": "undercutright", + "directions": 4 + }, + { + "name": "uneven", + "directions": 4 + }, + { + "name": "unkept", + "directions": 4 + }, + { + "name": "veryshortovereyealternate", + "directions": 4 + }, + { + "name": "vlong", + "directions": 4 + }, + { + "name": "vlongfringe", + "directions": 4 + }, + { + "name": "volaju", + "directions": 4 + }, + { + "name": "wisp", + "directions": 4 + }, + { + "name": "shaggythaven", + "directions": 4 + }, + { + "name": "shaggylongerthaven", + "directions": 4 + }, + { + "name": "susiethaven", + "directions": 4 + }, + { + "name": "susienobangsthaven", + "directions": 4 + }, + { + "name": "dyedlong1", + "directions": 4 + }, + { + "name": "dyedshort1", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/_MACRO/Mobs/Customization/Thaven/hair.rsi/midpartlong.png b/Resources/Textures/_MACRO/Mobs/Customization/Thaven/hair.rsi/midpartlong.png new file mode 100644 index 00000000000..43e98cd5a6b Binary files /dev/null and b/Resources/Textures/_MACRO/Mobs/Customization/Thaven/hair.rsi/midpartlong.png differ diff --git a/Resources/Textures/_MACRO/Mobs/Customization/Thaven/hair.rsi/midpartlonger.png b/Resources/Textures/_MACRO/Mobs/Customization/Thaven/hair.rsi/midpartlonger.png new file mode 100644 index 00000000000..4b16567094a Binary files /dev/null and b/Resources/Textures/_MACRO/Mobs/Customization/Thaven/hair.rsi/midpartlonger.png differ diff --git a/Resources/Textures/_MACRO/Mobs/Customization/Thaven/hair.rsi/modern.png b/Resources/Textures/_MACRO/Mobs/Customization/Thaven/hair.rsi/modern.png new file mode 100644 index 00000000000..b1919da8297 Binary files /dev/null and b/Resources/Textures/_MACRO/Mobs/Customization/Thaven/hair.rsi/modern.png differ diff --git a/Resources/Textures/_MACRO/Mobs/Customization/Thaven/hair.rsi/mulder.png b/Resources/Textures/_MACRO/Mobs/Customization/Thaven/hair.rsi/mulder.png new file mode 100644 index 00000000000..1f5bcc6406e Binary files /dev/null and b/Resources/Textures/_MACRO/Mobs/Customization/Thaven/hair.rsi/mulder.png differ diff --git a/Resources/Textures/_MACRO/Mobs/Customization/Thaven/hair.rsi/mullet.png b/Resources/Textures/_MACRO/Mobs/Customization/Thaven/hair.rsi/mullet.png new file mode 100644 index 00000000000..84b319a964d Binary files /dev/null and b/Resources/Textures/_MACRO/Mobs/Customization/Thaven/hair.rsi/mullet.png differ diff --git a/Resources/Textures/_MACRO/Mobs/Customization/Thaven/hair.rsi/mulletsideshave.png b/Resources/Textures/_MACRO/Mobs/Customization/Thaven/hair.rsi/mulletsideshave.png new file mode 100644 index 00000000000..03120066552 Binary files /dev/null and b/Resources/Textures/_MACRO/Mobs/Customization/Thaven/hair.rsi/mulletsideshave.png differ diff --git a/Resources/Textures/_MACRO/Mobs/Customization/Thaven/hair.rsi/niqab.png b/Resources/Textures/_MACRO/Mobs/Customization/Thaven/hair.rsi/niqab.png new file mode 100644 index 00000000000..211b0611ce3 Binary files /dev/null and b/Resources/Textures/_MACRO/Mobs/Customization/Thaven/hair.rsi/niqab.png differ diff --git a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/nitori.png b/Resources/Textures/_MACRO/Mobs/Customization/Thaven/hair.rsi/nitori.png similarity index 100% rename from Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/nitori.png rename to Resources/Textures/_MACRO/Mobs/Customization/Thaven/hair.rsi/nitori.png diff --git a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/nofade.png b/Resources/Textures/_MACRO/Mobs/Customization/Thaven/hair.rsi/nofade.png similarity index 100% rename from Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/nofade.png rename to Resources/Textures/_MACRO/Mobs/Customization/Thaven/hair.rsi/nofade.png diff --git a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/odango.png b/Resources/Textures/_MACRO/Mobs/Customization/Thaven/hair.rsi/odango.png similarity index 100% rename from Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/odango.png rename to Resources/Textures/_MACRO/Mobs/Customization/Thaven/hair.rsi/odango.png diff --git a/Resources/Textures/_MACRO/Mobs/Customization/Thaven/hair.rsi/ombre.png b/Resources/Textures/_MACRO/Mobs/Customization/Thaven/hair.rsi/ombre.png new file mode 100644 index 00000000000..b2ef0b7340d Binary files /dev/null and b/Resources/Textures/_MACRO/Mobs/Customization/Thaven/hair.rsi/ombre.png differ diff --git a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/oneshoulder.png b/Resources/Textures/_MACRO/Mobs/Customization/Thaven/hair.rsi/oneshoulder.png similarity index 100% rename from Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/oneshoulder.png rename to Resources/Textures/_MACRO/Mobs/Customization/Thaven/hair.rsi/oneshoulder.png diff --git a/Resources/Textures/_MACRO/Mobs/Customization/Thaven/hair.rsi/oxton.png b/Resources/Textures/_MACRO/Mobs/Customization/Thaven/hair.rsi/oxton.png new file mode 100644 index 00000000000..f891798d1fd Binary files /dev/null and b/Resources/Textures/_MACRO/Mobs/Customization/Thaven/hair.rsi/oxton.png differ diff --git a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/part.png b/Resources/Textures/_MACRO/Mobs/Customization/Thaven/hair.rsi/part.png similarity index 100% rename from Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/part.png rename to Resources/Textures/_MACRO/Mobs/Customization/Thaven/hair.rsi/part.png diff --git a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/parted.png b/Resources/Textures/_MACRO/Mobs/Customization/Thaven/hair.rsi/parted.png similarity index 100% rename from Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/parted.png rename to Resources/Textures/_MACRO/Mobs/Customization/Thaven/hair.rsi/parted.png diff --git a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/pigtails.png b/Resources/Textures/_MACRO/Mobs/Customization/Thaven/hair.rsi/pigtails.png similarity index 100% rename from Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/pigtails.png rename to Resources/Textures/_MACRO/Mobs/Customization/Thaven/hair.rsi/pigtails.png diff --git a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/pigtails2.png b/Resources/Textures/_MACRO/Mobs/Customization/Thaven/hair.rsi/pigtails2.png similarity index 100% rename from Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/pigtails2.png rename to Resources/Textures/_MACRO/Mobs/Customization/Thaven/hair.rsi/pigtails2.png diff --git a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/pixie.png b/Resources/Textures/_MACRO/Mobs/Customization/Thaven/hair.rsi/pixie.png similarity index 100% rename from Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/pixie.png rename to Resources/Textures/_MACRO/Mobs/Customization/Thaven/hair.rsi/pixie.png diff --git a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/pompadour.png b/Resources/Textures/_MACRO/Mobs/Customization/Thaven/hair.rsi/pompadour.png similarity index 100% rename from Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/pompadour.png rename to Resources/Textures/_MACRO/Mobs/Customization/Thaven/hair.rsi/pompadour.png diff --git a/Resources/Textures/_MACRO/Mobs/Customization/Thaven/hair.rsi/ponytail.png b/Resources/Textures/_MACRO/Mobs/Customization/Thaven/hair.rsi/ponytail.png new file mode 100644 index 00000000000..14594472e31 Binary files /dev/null and b/Resources/Textures/_MACRO/Mobs/Customization/Thaven/hair.rsi/ponytail.png differ diff --git a/Resources/Textures/_MACRO/Mobs/Customization/Thaven/hair.rsi/ponytail2.png b/Resources/Textures/_MACRO/Mobs/Customization/Thaven/hair.rsi/ponytail2.png new file mode 100644 index 00000000000..ba099cd1ba2 Binary files /dev/null and b/Resources/Textures/_MACRO/Mobs/Customization/Thaven/hair.rsi/ponytail2.png differ diff --git a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/ponytail3.png b/Resources/Textures/_MACRO/Mobs/Customization/Thaven/hair.rsi/ponytail3.png similarity index 100% rename from Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/ponytail3.png rename to Resources/Textures/_MACRO/Mobs/Customization/Thaven/hair.rsi/ponytail3.png diff --git a/Resources/Textures/_MACRO/Mobs/Customization/Thaven/hair.rsi/ponytail4.png b/Resources/Textures/_MACRO/Mobs/Customization/Thaven/hair.rsi/ponytail4.png new file mode 100644 index 00000000000..1be1a05f2de Binary files /dev/null and b/Resources/Textures/_MACRO/Mobs/Customization/Thaven/hair.rsi/ponytail4.png differ diff --git a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/ponytail5.png b/Resources/Textures/_MACRO/Mobs/Customization/Thaven/hair.rsi/ponytail5.png similarity index 100% rename from Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/ponytail5.png rename to Resources/Textures/_MACRO/Mobs/Customization/Thaven/hair.rsi/ponytail5.png diff --git a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/ponytail6.png b/Resources/Textures/_MACRO/Mobs/Customization/Thaven/hair.rsi/ponytail6.png similarity index 100% rename from Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/ponytail6.png rename to Resources/Textures/_MACRO/Mobs/Customization/Thaven/hair.rsi/ponytail6.png diff --git a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/ponytail7.png b/Resources/Textures/_MACRO/Mobs/Customization/Thaven/hair.rsi/ponytail7.png similarity index 100% rename from Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/ponytail7.png rename to Resources/Textures/_MACRO/Mobs/Customization/Thaven/hair.rsi/ponytail7.png diff --git a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/poofy.png b/Resources/Textures/_MACRO/Mobs/Customization/Thaven/hair.rsi/poofy.png similarity index 100% rename from Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/poofy.png rename to Resources/Textures/_MACRO/Mobs/Customization/Thaven/hair.rsi/poofy.png diff --git a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/protagonist.png b/Resources/Textures/_MACRO/Mobs/Customization/Thaven/hair.rsi/protagonist.png similarity index 100% rename from Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/protagonist.png rename to Resources/Textures/_MACRO/Mobs/Customization/Thaven/hair.rsi/protagonist.png diff --git a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/quiff.png b/Resources/Textures/_MACRO/Mobs/Customization/Thaven/hair.rsi/quiff.png similarity index 100% rename from Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/quiff.png rename to Resources/Textures/_MACRO/Mobs/Customization/Thaven/hair.rsi/quiff.png diff --git a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/reversemohawk.png b/Resources/Textures/_MACRO/Mobs/Customization/Thaven/hair.rsi/reversemohawk.png similarity index 100% rename from Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/reversemohawk.png rename to Resources/Textures/_MACRO/Mobs/Customization/Thaven/hair.rsi/reversemohawk.png diff --git a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/ronin.png b/Resources/Textures/_MACRO/Mobs/Customization/Thaven/hair.rsi/ronin.png similarity index 100% rename from Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/ronin.png rename to Resources/Textures/_MACRO/Mobs/Customization/Thaven/hair.rsi/ronin.png diff --git a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/rosa.png b/Resources/Textures/_MACRO/Mobs/Customization/Thaven/hair.rsi/rosa.png similarity index 100% rename from Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/rosa.png rename to Resources/Textures/_MACRO/Mobs/Customization/Thaven/hair.rsi/rosa.png diff --git a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/sargeant.png b/Resources/Textures/_MACRO/Mobs/Customization/Thaven/hair.rsi/sargeant.png similarity index 100% rename from Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/sargeant.png rename to Resources/Textures/_MACRO/Mobs/Customization/Thaven/hair.rsi/sargeant.png diff --git a/Resources/Textures/_MACRO/Mobs/Customization/Thaven/hair.rsi/shaggylongerthaven.png b/Resources/Textures/_MACRO/Mobs/Customization/Thaven/hair.rsi/shaggylongerthaven.png new file mode 100644 index 00000000000..0f5fa6a9ea0 Binary files /dev/null and b/Resources/Textures/_MACRO/Mobs/Customization/Thaven/hair.rsi/shaggylongerthaven.png differ diff --git a/Resources/Textures/_MACRO/Mobs/Customization/Thaven/hair.rsi/shaggythaven.png b/Resources/Textures/_MACRO/Mobs/Customization/Thaven/hair.rsi/shaggythaven.png new file mode 100644 index 00000000000..103fe680cec Binary files /dev/null and b/Resources/Textures/_MACRO/Mobs/Customization/Thaven/hair.rsi/shaggythaven.png differ diff --git a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/shaved.png b/Resources/Textures/_MACRO/Mobs/Customization/Thaven/hair.rsi/shaved.png similarity index 100% rename from Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/shaved.png rename to Resources/Textures/_MACRO/Mobs/Customization/Thaven/hair.rsi/shaved.png diff --git a/Resources/Textures/_MACRO/Mobs/Customization/Thaven/hair.rsi/shavedmohawk.png b/Resources/Textures/_MACRO/Mobs/Customization/Thaven/hair.rsi/shavedmohawk.png new file mode 100644 index 00000000000..a4e3eda7908 Binary files /dev/null and b/Resources/Textures/_MACRO/Mobs/Customization/Thaven/hair.rsi/shavedmohawk.png differ diff --git a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/shavedpart.png b/Resources/Textures/_MACRO/Mobs/Customization/Thaven/hair.rsi/shavedpart.png similarity index 100% rename from Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/shavedpart.png rename to Resources/Textures/_MACRO/Mobs/Customization/Thaven/hair.rsi/shavedpart.png diff --git a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/shortbangs.png b/Resources/Textures/_MACRO/Mobs/Customization/Thaven/hair.rsi/shortbangs.png similarity index 100% rename from Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/shortbangs.png rename to Resources/Textures/_MACRO/Mobs/Customization/Thaven/hair.rsi/shortbangs.png diff --git a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/shortbraid.png b/Resources/Textures/_MACRO/Mobs/Customization/Thaven/hair.rsi/shortbraid.png similarity index 100% rename from Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/shortbraid.png rename to Resources/Textures/_MACRO/Mobs/Customization/Thaven/hair.rsi/shortbraid.png diff --git a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/shorthair2.png b/Resources/Textures/_MACRO/Mobs/Customization/Thaven/hair.rsi/shorthair2.png similarity index 100% rename from Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/shorthair2.png rename to Resources/Textures/_MACRO/Mobs/Customization/Thaven/hair.rsi/shorthair2.png diff --git a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/shorthair3.png b/Resources/Textures/_MACRO/Mobs/Customization/Thaven/hair.rsi/shorthair3.png similarity index 100% rename from Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/shorthair3.png rename to Resources/Textures/_MACRO/Mobs/Customization/Thaven/hair.rsi/shorthair3.png diff --git a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/shorthair9.png b/Resources/Textures/_MACRO/Mobs/Customization/Thaven/hair.rsi/shorthair9.png similarity index 100% rename from Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/shorthair9.png rename to Resources/Textures/_MACRO/Mobs/Customization/Thaven/hair.rsi/shorthair9.png diff --git a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/shorthime.png b/Resources/Textures/_MACRO/Mobs/Customization/Thaven/hair.rsi/shorthime.png similarity index 100% rename from Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/shorthime.png rename to Resources/Textures/_MACRO/Mobs/Customization/Thaven/hair.rsi/shorthime.png diff --git a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/shortovereye.png b/Resources/Textures/_MACRO/Mobs/Customization/Thaven/hair.rsi/shortovereye.png similarity index 100% rename from Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/shortovereye.png rename to Resources/Textures/_MACRO/Mobs/Customization/Thaven/hair.rsi/shortovereye.png diff --git a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/shoulderlengthovereye.png b/Resources/Textures/_MACRO/Mobs/Customization/Thaven/hair.rsi/shoulderlengthovereye.png similarity index 100% rename from Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/shoulderlengthovereye.png rename to Resources/Textures/_MACRO/Mobs/Customization/Thaven/hair.rsi/shoulderlengthovereye.png diff --git a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/sidecut.png b/Resources/Textures/_MACRO/Mobs/Customization/Thaven/hair.rsi/sidecut.png similarity index 100% rename from Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/sidecut.png rename to Resources/Textures/_MACRO/Mobs/Customization/Thaven/hair.rsi/sidecut.png diff --git a/Resources/Textures/_MACRO/Mobs/Customization/Thaven/hair.rsi/sideshavecurly.png b/Resources/Textures/_MACRO/Mobs/Customization/Thaven/hair.rsi/sideshavecurly.png new file mode 100644 index 00000000000..1608ad3b91e Binary files /dev/null and b/Resources/Textures/_MACRO/Mobs/Customization/Thaven/hair.rsi/sideshavecurly.png differ diff --git a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/sidetail.png b/Resources/Textures/_MACRO/Mobs/Customization/Thaven/hair.rsi/sidetail.png similarity index 100% rename from Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/sidetail.png rename to Resources/Textures/_MACRO/Mobs/Customization/Thaven/hair.rsi/sidetail.png diff --git a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/sidetail2.png b/Resources/Textures/_MACRO/Mobs/Customization/Thaven/hair.rsi/sidetail2.png similarity index 100% rename from Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/sidetail2.png rename to Resources/Textures/_MACRO/Mobs/Customization/Thaven/hair.rsi/sidetail2.png diff --git a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/sidetail3.png b/Resources/Textures/_MACRO/Mobs/Customization/Thaven/hair.rsi/sidetail3.png similarity index 100% rename from Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/sidetail3.png rename to Resources/Textures/_MACRO/Mobs/Customization/Thaven/hair.rsi/sidetail3.png diff --git a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/sidetail4.png b/Resources/Textures/_MACRO/Mobs/Customization/Thaven/hair.rsi/sidetail4.png similarity index 100% rename from Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/sidetail4.png rename to Resources/Textures/_MACRO/Mobs/Customization/Thaven/hair.rsi/sidetail4.png diff --git a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/skinhead.png b/Resources/Textures/_MACRO/Mobs/Customization/Thaven/hair.rsi/skinhead.png similarity index 100% rename from Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/skinhead.png rename to Resources/Textures/_MACRO/Mobs/Customization/Thaven/hair.rsi/skinhead.png diff --git a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/spiky.png b/Resources/Textures/_MACRO/Mobs/Customization/Thaven/hair.rsi/spiky.png similarity index 100% rename from Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/spiky.png rename to Resources/Textures/_MACRO/Mobs/Customization/Thaven/hair.rsi/spiky.png diff --git a/Resources/Textures/_MACRO/Mobs/Customization/Thaven/hair.rsi/spikyponytail.png b/Resources/Textures/_MACRO/Mobs/Customization/Thaven/hair.rsi/spikyponytail.png new file mode 100644 index 00000000000..8b39a5a9a3e Binary files /dev/null and b/Resources/Textures/_MACRO/Mobs/Customization/Thaven/hair.rsi/spikyponytail.png differ diff --git a/Resources/Textures/_MACRO/Mobs/Customization/Thaven/hair.rsi/spikyponytaillong.png b/Resources/Textures/_MACRO/Mobs/Customization/Thaven/hair.rsi/spikyponytaillong.png new file mode 100644 index 00000000000..6862f0f51e3 Binary files /dev/null and b/Resources/Textures/_MACRO/Mobs/Customization/Thaven/hair.rsi/spikyponytaillong.png differ diff --git a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/spookylong.png b/Resources/Textures/_MACRO/Mobs/Customization/Thaven/hair.rsi/spookylong.png similarity index 100% rename from Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/spookylong.png rename to Resources/Textures/_MACRO/Mobs/Customization/Thaven/hair.rsi/spookylong.png diff --git a/Resources/Textures/_MACRO/Mobs/Customization/Thaven/hair.rsi/stail.png b/Resources/Textures/_MACRO/Mobs/Customization/Thaven/hair.rsi/stail.png new file mode 100644 index 00000000000..94dbfc954f1 Binary files /dev/null and b/Resources/Textures/_MACRO/Mobs/Customization/Thaven/hair.rsi/stail.png differ diff --git a/Resources/Textures/_MACRO/Mobs/Customization/Thaven/hair.rsi/susienobangsthaven.png b/Resources/Textures/_MACRO/Mobs/Customization/Thaven/hair.rsi/susienobangsthaven.png new file mode 100644 index 00000000000..ccaba6b5bef Binary files /dev/null and b/Resources/Textures/_MACRO/Mobs/Customization/Thaven/hair.rsi/susienobangsthaven.png differ diff --git a/Resources/Textures/_MACRO/Mobs/Customization/Thaven/hair.rsi/susiethaven.png b/Resources/Textures/_MACRO/Mobs/Customization/Thaven/hair.rsi/susiethaven.png new file mode 100644 index 00000000000..d315a8fe0be Binary files /dev/null and b/Resources/Textures/_MACRO/Mobs/Customization/Thaven/hair.rsi/susiethaven.png differ diff --git a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/swept.png b/Resources/Textures/_MACRO/Mobs/Customization/Thaven/hair.rsi/swept.png similarity index 100% rename from Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/swept.png rename to Resources/Textures/_MACRO/Mobs/Customization/Thaven/hair.rsi/swept.png diff --git a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/swept2.png b/Resources/Textures/_MACRO/Mobs/Customization/Thaven/hair.rsi/swept2.png similarity index 100% rename from Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/swept2.png rename to Resources/Textures/_MACRO/Mobs/Customization/Thaven/hair.rsi/swept2.png diff --git a/Resources/Textures/_MACRO/Mobs/Customization/Thaven/hair.rsi/tailed.png b/Resources/Textures/_MACRO/Mobs/Customization/Thaven/hair.rsi/tailed.png new file mode 100644 index 00000000000..f44e77901f7 Binary files /dev/null and b/Resources/Textures/_MACRO/Mobs/Customization/Thaven/hair.rsi/tailed.png differ diff --git a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/thinning.png b/Resources/Textures/_MACRO/Mobs/Customization/Thaven/hair.rsi/thinning.png similarity index 100% rename from Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/thinning.png rename to Resources/Textures/_MACRO/Mobs/Customization/Thaven/hair.rsi/thinning.png diff --git a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/thinningfront.png b/Resources/Textures/_MACRO/Mobs/Customization/Thaven/hair.rsi/thinningfront.png similarity index 100% rename from Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/thinningfront.png rename to Resources/Textures/_MACRO/Mobs/Customization/Thaven/hair.rsi/thinningfront.png diff --git a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/thinningrear.png b/Resources/Textures/_MACRO/Mobs/Customization/Thaven/hair.rsi/thinningrear.png similarity index 100% rename from Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/thinningrear.png rename to Resources/Textures/_MACRO/Mobs/Customization/Thaven/hair.rsi/thinningrear.png diff --git a/Resources/Textures/_MACRO/Mobs/Customization/Thaven/hair.rsi/tichelfashionable.png b/Resources/Textures/_MACRO/Mobs/Customization/Thaven/hair.rsi/tichelfashionable.png new file mode 100644 index 00000000000..d50085c715a Binary files /dev/null and b/Resources/Textures/_MACRO/Mobs/Customization/Thaven/hair.rsi/tichelfashionable.png differ diff --git a/Resources/Textures/_MACRO/Mobs/Customization/Thaven/hair.rsi/tichelsimple.png b/Resources/Textures/_MACRO/Mobs/Customization/Thaven/hair.rsi/tichelsimple.png new file mode 100644 index 00000000000..198e9a2591a Binary files /dev/null and b/Resources/Textures/_MACRO/Mobs/Customization/Thaven/hair.rsi/tichelsimple.png differ diff --git a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/tightbun.png b/Resources/Textures/_MACRO/Mobs/Customization/Thaven/hair.rsi/tightbun.png similarity index 100% rename from Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/tightbun.png rename to Resources/Textures/_MACRO/Mobs/Customization/Thaven/hair.rsi/tightbun.png diff --git a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/topknot.png b/Resources/Textures/_MACRO/Mobs/Customization/Thaven/hair.rsi/topknot.png similarity index 100% rename from Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/topknot.png rename to Resources/Textures/_MACRO/Mobs/Customization/Thaven/hair.rsi/topknot.png diff --git a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/tressshoulder.png b/Resources/Textures/_MACRO/Mobs/Customization/Thaven/hair.rsi/tressshoulder.png similarity index 100% rename from Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/tressshoulder.png rename to Resources/Textures/_MACRO/Mobs/Customization/Thaven/hair.rsi/tressshoulder.png diff --git a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/trimflat.png b/Resources/Textures/_MACRO/Mobs/Customization/Thaven/hair.rsi/trimflat.png similarity index 100% rename from Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/trimflat.png rename to Resources/Textures/_MACRO/Mobs/Customization/Thaven/hair.rsi/trimflat.png diff --git a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/trimmed.png b/Resources/Textures/_MACRO/Mobs/Customization/Thaven/hair.rsi/trimmed.png similarity index 100% rename from Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/trimmed.png rename to Resources/Textures/_MACRO/Mobs/Customization/Thaven/hair.rsi/trimmed.png diff --git a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/twintail.png b/Resources/Textures/_MACRO/Mobs/Customization/Thaven/hair.rsi/twintail.png similarity index 100% rename from Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/twintail.png rename to Resources/Textures/_MACRO/Mobs/Customization/Thaven/hair.rsi/twintail.png diff --git a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/twostrands.png b/Resources/Textures/_MACRO/Mobs/Customization/Thaven/hair.rsi/twostrands.png similarity index 100% rename from Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/twostrands.png rename to Resources/Textures/_MACRO/Mobs/Customization/Thaven/hair.rsi/twostrands.png diff --git a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/undercut.png b/Resources/Textures/_MACRO/Mobs/Customization/Thaven/hair.rsi/undercut.png similarity index 100% rename from Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/undercut.png rename to Resources/Textures/_MACRO/Mobs/Customization/Thaven/hair.rsi/undercut.png diff --git a/Resources/Textures/_MACRO/Mobs/Customization/Thaven/hair.rsi/undercutcurly.png b/Resources/Textures/_MACRO/Mobs/Customization/Thaven/hair.rsi/undercutcurly.png new file mode 100644 index 00000000000..24e003122f1 Binary files /dev/null and b/Resources/Textures/_MACRO/Mobs/Customization/Thaven/hair.rsi/undercutcurly.png differ diff --git a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/undercutleft.png b/Resources/Textures/_MACRO/Mobs/Customization/Thaven/hair.rsi/undercutleft.png similarity index 100% rename from Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/undercutleft.png rename to Resources/Textures/_MACRO/Mobs/Customization/Thaven/hair.rsi/undercutleft.png diff --git a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/undercutright.png b/Resources/Textures/_MACRO/Mobs/Customization/Thaven/hair.rsi/undercutright.png similarity index 100% rename from Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/undercutright.png rename to Resources/Textures/_MACRO/Mobs/Customization/Thaven/hair.rsi/undercutright.png diff --git a/Resources/Textures/_MACRO/Mobs/Customization/Thaven/hair.rsi/uneven.png b/Resources/Textures/_MACRO/Mobs/Customization/Thaven/hair.rsi/uneven.png new file mode 100644 index 00000000000..6c84602139e Binary files /dev/null and b/Resources/Textures/_MACRO/Mobs/Customization/Thaven/hair.rsi/uneven.png differ diff --git a/Resources/Textures/_MACRO/Mobs/Customization/Thaven/hair.rsi/unkept.png b/Resources/Textures/_MACRO/Mobs/Customization/Thaven/hair.rsi/unkept.png new file mode 100644 index 00000000000..1fdf21b79c2 Binary files /dev/null and b/Resources/Textures/_MACRO/Mobs/Customization/Thaven/hair.rsi/unkept.png differ diff --git a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/veryshortovereyealternate.png b/Resources/Textures/_MACRO/Mobs/Customization/Thaven/hair.rsi/veryshortovereyealternate.png similarity index 100% rename from Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/veryshortovereyealternate.png rename to Resources/Textures/_MACRO/Mobs/Customization/Thaven/hair.rsi/veryshortovereyealternate.png diff --git a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/vlong.png b/Resources/Textures/_MACRO/Mobs/Customization/Thaven/hair.rsi/vlong.png similarity index 100% rename from Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/vlong.png rename to Resources/Textures/_MACRO/Mobs/Customization/Thaven/hair.rsi/vlong.png diff --git a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/vlongfringe.png b/Resources/Textures/_MACRO/Mobs/Customization/Thaven/hair.rsi/vlongfringe.png similarity index 100% rename from Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/vlongfringe.png rename to Resources/Textures/_MACRO/Mobs/Customization/Thaven/hair.rsi/vlongfringe.png diff --git a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/volaju.png b/Resources/Textures/_MACRO/Mobs/Customization/Thaven/hair.rsi/volaju.png similarity index 100% rename from Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/volaju.png rename to Resources/Textures/_MACRO/Mobs/Customization/Thaven/hair.rsi/volaju.png diff --git a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/wisp.png b/Resources/Textures/_MACRO/Mobs/Customization/Thaven/hair.rsi/wisp.png similarity index 100% rename from Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/wisp.png rename to Resources/Textures/_MACRO/Mobs/Customization/Thaven/hair.rsi/wisp.png diff --git a/Resources/Textures/_Impstation/Mobs/Customization/markingsbundle1.rsi/thavenheadcap1.png b/Resources/Textures/_MACRO/Mobs/Customization/Thaven/head.rsi/cap1.png similarity index 100% rename from Resources/Textures/_Impstation/Mobs/Customization/markingsbundle1.rsi/thavenheadcap1.png rename to Resources/Textures/_MACRO/Mobs/Customization/Thaven/head.rsi/cap1.png diff --git a/Resources/Textures/_Impstation/Mobs/Customization/markingsbundle1.rsi/thavenheadcap2.png b/Resources/Textures/_MACRO/Mobs/Customization/Thaven/head.rsi/cap2.png similarity index 100% rename from Resources/Textures/_Impstation/Mobs/Customization/markingsbundle1.rsi/thavenheadcap2.png rename to Resources/Textures/_MACRO/Mobs/Customization/Thaven/head.rsi/cap2.png diff --git a/Resources/Textures/_MACRO/Mobs/Customization/Thaven/head.rsi/meta.json b/Resources/Textures/_MACRO/Mobs/Customization/Thaven/head.rsi/meta.json new file mode 100644 index 00000000000..802beb63d60 --- /dev/null +++ b/Resources/Textures/_MACRO/Mobs/Customization/Thaven/head.rsi/meta.json @@ -0,0 +1,32 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "sprites by crocodilecarousel (github) for impstation. shadowthaven by maelines (Git)", + + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "cap1", + "directions": 4 + }, + { + "name": "cap2", + "directions": 4 + }, + { + "name": "scales", + "directions": 4 + }, + { + "name": "stripes", + "directions": 4 + }, + { + "name": "shadowthaven", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/_Impstation/Mobs/Customization/markingsbundle1.rsi/thavenheadscales.png b/Resources/Textures/_MACRO/Mobs/Customization/Thaven/head.rsi/scales.png similarity index 100% rename from Resources/Textures/_Impstation/Mobs/Customization/markingsbundle1.rsi/thavenheadscales.png rename to Resources/Textures/_MACRO/Mobs/Customization/Thaven/head.rsi/scales.png diff --git a/Resources/Textures/_MACRO/Mobs/Customization/Thaven/head.rsi/shadowthaven.png b/Resources/Textures/_MACRO/Mobs/Customization/Thaven/head.rsi/shadowthaven.png new file mode 100644 index 00000000000..6681cb666ea Binary files /dev/null and b/Resources/Textures/_MACRO/Mobs/Customization/Thaven/head.rsi/shadowthaven.png differ diff --git a/Resources/Textures/_Impstation/Mobs/Customization/markingsbundle1.rsi/thavenheadstripes.png b/Resources/Textures/_MACRO/Mobs/Customization/Thaven/head.rsi/stripes.png similarity index 100% rename from Resources/Textures/_Impstation/Mobs/Customization/markingsbundle1.rsi/thavenheadstripes.png rename to Resources/Textures/_MACRO/Mobs/Customization/Thaven/head.rsi/stripes.png diff --git a/Resources/Textures/_Impstation/Mobs/Customization/markingsbundle1.rsi/thavenearsbigfins.png b/Resources/Textures/_MACRO/Mobs/Customization/Thaven/headside.rsi/bigfins.png similarity index 100% rename from Resources/Textures/_Impstation/Mobs/Customization/markingsbundle1.rsi/thavenearsbigfins.png rename to Resources/Textures/_MACRO/Mobs/Customization/Thaven/headside.rsi/bigfins.png diff --git a/Resources/Textures/_Impstation/Mobs/Customization/markingsbundle1.rsi/thavenearsbigfins2.png b/Resources/Textures/_MACRO/Mobs/Customization/Thaven/headside.rsi/bigfins2.png similarity index 100% rename from Resources/Textures/_Impstation/Mobs/Customization/markingsbundle1.rsi/thavenearsbigfins2.png rename to Resources/Textures/_MACRO/Mobs/Customization/Thaven/headside.rsi/bigfins2.png diff --git a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven.rsi/ears1.png b/Resources/Textures/_MACRO/Mobs/Customization/Thaven/headside.rsi/ears1.png similarity index 100% rename from Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven.rsi/ears1.png rename to Resources/Textures/_MACRO/Mobs/Customization/Thaven/headside.rsi/ears1.png diff --git a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven.rsi/ears2.png b/Resources/Textures/_MACRO/Mobs/Customization/Thaven/headside.rsi/ears2.png similarity index 100% rename from Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven.rsi/ears2.png rename to Resources/Textures/_MACRO/Mobs/Customization/Thaven/headside.rsi/ears2.png diff --git a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven.rsi/ears3.png b/Resources/Textures/_MACRO/Mobs/Customization/Thaven/headside.rsi/ears3.png similarity index 100% rename from Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven.rsi/ears3.png rename to Resources/Textures/_MACRO/Mobs/Customization/Thaven/headside.rsi/ears3.png diff --git a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven.rsi/ears4.png b/Resources/Textures/_MACRO/Mobs/Customization/Thaven/headside.rsi/ears4.png similarity index 100% rename from Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven.rsi/ears4.png rename to Resources/Textures/_MACRO/Mobs/Customization/Thaven/headside.rsi/ears4.png diff --git a/Resources/Textures/_Impstation/Mobs/Customization/markingsbundle1.rsi/thavenfishears.png b/Resources/Textures/_MACRO/Mobs/Customization/Thaven/headside.rsi/fishears.png similarity index 100% rename from Resources/Textures/_Impstation/Mobs/Customization/markingsbundle1.rsi/thavenfishears.png rename to Resources/Textures/_MACRO/Mobs/Customization/Thaven/headside.rsi/fishears.png diff --git a/Resources/Textures/_MACRO/Mobs/Customization/Thaven/headside.rsi/meta.json b/Resources/Textures/_MACRO/Mobs/Customization/Thaven/headside.rsi/meta.json new file mode 100644 index 00000000000..3b4fd8c4119 --- /dev/null +++ b/Resources/Textures/_MACRO/Mobs/Customization/Thaven/headside.rsi/meta.json @@ -0,0 +1,47 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "ears 1-4 by widgetbeck, fins, fishears and noears by crocodilecarousel (github), twinfin by Faeling", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "bigfins", + "directions": 4 + }, + { + "name": "bigfins2", + "directions": 4 + }, + { + "name": "ears1", + "directions": 4 + }, + { + "name": "ears2", + "directions": 4 + }, + { + "name": "ears3", + "directions": 4 + }, + { + "name": "ears4", + "directions": 4 + }, + { + "name": "fishears", + "directions": 4 + }, + { + "name": "noears", + "directions": 4 + }, + { + "name": "twinfin", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/_MACRO/Mobs/Customization/Thaven/headside.rsi/noears.png b/Resources/Textures/_MACRO/Mobs/Customization/Thaven/headside.rsi/noears.png new file mode 100644 index 00000000000..ce5669605d1 Binary files /dev/null and b/Resources/Textures/_MACRO/Mobs/Customization/Thaven/headside.rsi/noears.png differ diff --git a/Resources/Textures/_MACRO/Mobs/Customization/Thaven/headside.rsi/twinfin.png b/Resources/Textures/_MACRO/Mobs/Customization/Thaven/headside.rsi/twinfin.png new file mode 100644 index 00000000000..4da3c0bb5af Binary files /dev/null and b/Resources/Textures/_MACRO/Mobs/Customization/Thaven/headside.rsi/twinfin.png differ diff --git a/Resources/Textures/_MACRO/Mobs/Customization/Thaven/headtop.rsi/hibiscus1.png b/Resources/Textures/_MACRO/Mobs/Customization/Thaven/headtop.rsi/hibiscus1.png new file mode 100644 index 00000000000..d7634727084 Binary files /dev/null and b/Resources/Textures/_MACRO/Mobs/Customization/Thaven/headtop.rsi/hibiscus1.png differ diff --git a/Resources/Textures/_MACRO/Mobs/Customization/Thaven/headtop.rsi/hibiscus2.png b/Resources/Textures/_MACRO/Mobs/Customization/Thaven/headtop.rsi/hibiscus2.png new file mode 100644 index 00000000000..294ae84d3a5 Binary files /dev/null and b/Resources/Textures/_MACRO/Mobs/Customization/Thaven/headtop.rsi/hibiscus2.png differ diff --git a/Resources/Textures/_MACRO/Mobs/Customization/Thaven/headtop.rsi/meta.json b/Resources/Textures/_MACRO/Mobs/Customization/Thaven/headtop.rsi/meta.json new file mode 100644 index 00000000000..4528eee274f --- /dev/null +++ b/Resources/Textures/_MACRO/Mobs/Customization/Thaven/headtop.rsi/meta.json @@ -0,0 +1,27 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "piercings sprited by Widgetbeck for Impstation, hibiscus by Faeling", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "piercings", + "directions": 4 + }, + { + "name": "piercings2", + "directions": 4 + }, + { + "name": "hibiscus1", + "directions": 4 + }, + { + "name": "hibiscus2", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/_MACRO/Mobs/Customization/Thaven/headtop.rsi/piercings.png b/Resources/Textures/_MACRO/Mobs/Customization/Thaven/headtop.rsi/piercings.png new file mode 100644 index 00000000000..a9bad042621 Binary files /dev/null and b/Resources/Textures/_MACRO/Mobs/Customization/Thaven/headtop.rsi/piercings.png differ diff --git a/Resources/Textures/_MACRO/Mobs/Customization/Thaven/headtop.rsi/piercings2.png b/Resources/Textures/_MACRO/Mobs/Customization/Thaven/headtop.rsi/piercings2.png new file mode 100644 index 00000000000..6235beaddb4 Binary files /dev/null and b/Resources/Textures/_MACRO/Mobs/Customization/Thaven/headtop.rsi/piercings2.png differ diff --git a/Resources/Textures/_MACRO/Mobs/Customization/Thaven/larm.rsi/meta.json b/Resources/Textures/_MACRO/Mobs/Customization/Thaven/larm.rsi/meta.json new file mode 100644 index 00000000000..4129fa8390b --- /dev/null +++ b/Resources/Textures/_MACRO/Mobs/Customization/Thaven/larm.rsi/meta.json @@ -0,0 +1,23 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "tat1 by widgetbeck, scales and tiger by crocodilecarousel (github)", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "scales", + "directions": 4 + }, + { + "name": "tat1", + "directions": 4 + }, + { + "name": "tiger", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/_Impstation/Mobs/Customization/markingsbundle1.rsi/thavenleftarmscales.png b/Resources/Textures/_MACRO/Mobs/Customization/Thaven/larm.rsi/scales.png similarity index 100% rename from Resources/Textures/_Impstation/Mobs/Customization/markingsbundle1.rsi/thavenleftarmscales.png rename to Resources/Textures/_MACRO/Mobs/Customization/Thaven/larm.rsi/scales.png diff --git a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven.rsi/larmtat1.png b/Resources/Textures/_MACRO/Mobs/Customization/Thaven/larm.rsi/tat1.png similarity index 100% rename from Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven.rsi/larmtat1.png rename to Resources/Textures/_MACRO/Mobs/Customization/Thaven/larm.rsi/tat1.png diff --git a/Resources/Textures/_Impstation/Mobs/Customization/markingsbundle1.rsi/thaventigerarmsl.png b/Resources/Textures/_MACRO/Mobs/Customization/Thaven/larm.rsi/tiger.png similarity index 100% rename from Resources/Textures/_Impstation/Mobs/Customization/markingsbundle1.rsi/thaventigerarmsl.png rename to Resources/Textures/_MACRO/Mobs/Customization/Thaven/larm.rsi/tiger.png diff --git a/Resources/Textures/_MACRO/Mobs/Customization/Thaven/lleg.rsi/meta.json b/Resources/Textures/_MACRO/Mobs/Customization/Thaven/lleg.rsi/meta.json new file mode 100644 index 00000000000..d5c5d3089d1 --- /dev/null +++ b/Resources/Textures/_MACRO/Mobs/Customization/Thaven/lleg.rsi/meta.json @@ -0,0 +1,15 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "drawn by crocodilecarousel (github)", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "scales", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/_Impstation/Mobs/Customization/markingsbundle1.rsi/thavenleftlegscales.png b/Resources/Textures/_MACRO/Mobs/Customization/Thaven/lleg.rsi/scales.png similarity index 100% rename from Resources/Textures/_Impstation/Mobs/Customization/markingsbundle1.rsi/thavenleftlegscales.png rename to Resources/Textures/_MACRO/Mobs/Customization/Thaven/lleg.rsi/scales.png diff --git a/Resources/Textures/_MACRO/Mobs/Customization/Thaven/rarm.rsi/meta.json b/Resources/Textures/_MACRO/Mobs/Customization/Thaven/rarm.rsi/meta.json new file mode 100644 index 00000000000..4129fa8390b --- /dev/null +++ b/Resources/Textures/_MACRO/Mobs/Customization/Thaven/rarm.rsi/meta.json @@ -0,0 +1,23 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "tat1 by widgetbeck, scales and tiger by crocodilecarousel (github)", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "scales", + "directions": 4 + }, + { + "name": "tat1", + "directions": 4 + }, + { + "name": "tiger", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/_Impstation/Mobs/Customization/markingsbundle1.rsi/thavenrightarmscales.png b/Resources/Textures/_MACRO/Mobs/Customization/Thaven/rarm.rsi/scales.png similarity index 100% rename from Resources/Textures/_Impstation/Mobs/Customization/markingsbundle1.rsi/thavenrightarmscales.png rename to Resources/Textures/_MACRO/Mobs/Customization/Thaven/rarm.rsi/scales.png diff --git a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven.rsi/rarmtat1.png b/Resources/Textures/_MACRO/Mobs/Customization/Thaven/rarm.rsi/tat1.png similarity index 100% rename from Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven.rsi/rarmtat1.png rename to Resources/Textures/_MACRO/Mobs/Customization/Thaven/rarm.rsi/tat1.png diff --git a/Resources/Textures/_Impstation/Mobs/Customization/markingsbundle1.rsi/thaventigerarmsr.png b/Resources/Textures/_MACRO/Mobs/Customization/Thaven/rarm.rsi/tiger.png similarity index 100% rename from Resources/Textures/_Impstation/Mobs/Customization/markingsbundle1.rsi/thaventigerarmsr.png rename to Resources/Textures/_MACRO/Mobs/Customization/Thaven/rarm.rsi/tiger.png diff --git a/Resources/Textures/_MACRO/Mobs/Customization/Thaven/rleg.rsi/meta.json b/Resources/Textures/_MACRO/Mobs/Customization/Thaven/rleg.rsi/meta.json new file mode 100644 index 00000000000..6a82eebf3f8 --- /dev/null +++ b/Resources/Textures/_MACRO/Mobs/Customization/Thaven/rleg.rsi/meta.json @@ -0,0 +1,15 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "sprited by crocodilecarousel (github)", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "scales", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/_Impstation/Mobs/Customization/markingsbundle1.rsi/thavenrightlegscales.png b/Resources/Textures/_MACRO/Mobs/Customization/Thaven/rleg.rsi/scales.png similarity index 100% rename from Resources/Textures/_Impstation/Mobs/Customization/markingsbundle1.rsi/thavenrightlegscales.png rename to Resources/Textures/_MACRO/Mobs/Customization/Thaven/rleg.rsi/scales.png diff --git a/Resources/Textures/_MACRO/Mobs/Customization/Thaven/tail.rsi/basic.png b/Resources/Textures/_MACRO/Mobs/Customization/Thaven/tail.rsi/basic.png new file mode 100644 index 00000000000..740dd6bd71a Binary files /dev/null and b/Resources/Textures/_MACRO/Mobs/Customization/Thaven/tail.rsi/basic.png differ diff --git a/Resources/Textures/_MACRO/Mobs/Customization/Thaven/tail.rsi/big1.png b/Resources/Textures/_MACRO/Mobs/Customization/Thaven/tail.rsi/big1.png new file mode 100644 index 00000000000..05d507acafa Binary files /dev/null and b/Resources/Textures/_MACRO/Mobs/Customization/Thaven/tail.rsi/big1.png differ diff --git a/Resources/Textures/_MACRO/Mobs/Customization/Thaven/tail.rsi/big2.png b/Resources/Textures/_MACRO/Mobs/Customization/Thaven/tail.rsi/big2.png new file mode 100644 index 00000000000..6aa8c16b604 Binary files /dev/null and b/Resources/Textures/_MACRO/Mobs/Customization/Thaven/tail.rsi/big2.png differ diff --git a/Resources/Textures/_MACRO/Mobs/Customization/Thaven/tail.rsi/eel1.png b/Resources/Textures/_MACRO/Mobs/Customization/Thaven/tail.rsi/eel1.png new file mode 100644 index 00000000000..6dd6942348f Binary files /dev/null and b/Resources/Textures/_MACRO/Mobs/Customization/Thaven/tail.rsi/eel1.png differ diff --git a/Resources/Textures/_MACRO/Mobs/Customization/Thaven/tail.rsi/eel2.png b/Resources/Textures/_MACRO/Mobs/Customization/Thaven/tail.rsi/eel2.png new file mode 100644 index 00000000000..028f8bf0b4c Binary files /dev/null and b/Resources/Textures/_MACRO/Mobs/Customization/Thaven/tail.rsi/eel2.png differ diff --git a/Resources/Textures/_MACRO/Mobs/Customization/Thaven/tail.rsi/eel3.png b/Resources/Textures/_MACRO/Mobs/Customization/Thaven/tail.rsi/eel3.png new file mode 100644 index 00000000000..b7040f8c636 Binary files /dev/null and b/Resources/Textures/_MACRO/Mobs/Customization/Thaven/tail.rsi/eel3.png differ diff --git a/Resources/Textures/_MACRO/Mobs/Customization/Thaven/tail.rsi/eel4.png b/Resources/Textures/_MACRO/Mobs/Customization/Thaven/tail.rsi/eel4.png new file mode 100644 index 00000000000..1b3647bfd3c Binary files /dev/null and b/Resources/Textures/_MACRO/Mobs/Customization/Thaven/tail.rsi/eel4.png differ diff --git a/Resources/Textures/_MACRO/Mobs/Customization/Thaven/tail.rsi/meta.json b/Resources/Textures/_MACRO/Mobs/Customization/Thaven/tail.rsi/meta.json new file mode 100644 index 00000000000..5843a6b7001 --- /dev/null +++ b/Resources/Textures/_MACRO/Mobs/Customization/Thaven/tail.rsi/meta.json @@ -0,0 +1,105 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "basic/big/tadpole by crocodilecarousel (github), stub/nurse/eel made by Sha-Seng (github), eel modified by crocodilecarousel (GitHub) and yesteryrui (GitHub), thresher by Faeling (discord),", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "basic", + "directions": 4 + }, + { + "name": "big1", + "directions": 4 + }, + { + "name": "big2", + "directions": 4 + }, + { + "name": "eel1", + "directions": 4 + }, + { + "name": "eel2", + "directions": 4 + }, + { + "name": "eel3", + "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 + ], + [ + 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": "eel4", + "directions": 4 + }, + { + "name": "nurse1", + "directions": 4 + }, + { + "name": "nurse2", + "directions": 4 + }, + { + "name": "stub1", + "directions": 4 + }, + { + "name": "stub2", + "directions": 4 + }, + { + "name": "tadpole1", + "directions": 4 + }, + { + "name": "tadpole2", + "directions": 4 + }, + { + "name": "thresher1", + "directions": 4 + }, + { + "name": "thresher2", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/_MACRO/Mobs/Customization/Thaven/tail.rsi/nurse1.png b/Resources/Textures/_MACRO/Mobs/Customization/Thaven/tail.rsi/nurse1.png new file mode 100644 index 00000000000..9d5b34c7946 Binary files /dev/null and b/Resources/Textures/_MACRO/Mobs/Customization/Thaven/tail.rsi/nurse1.png differ diff --git a/Resources/Textures/_MACRO/Mobs/Customization/Thaven/tail.rsi/nurse2.png b/Resources/Textures/_MACRO/Mobs/Customization/Thaven/tail.rsi/nurse2.png new file mode 100644 index 00000000000..dee8facce32 Binary files /dev/null and b/Resources/Textures/_MACRO/Mobs/Customization/Thaven/tail.rsi/nurse2.png differ diff --git a/Resources/Textures/_MACRO/Mobs/Customization/Thaven/tail.rsi/stub1.png b/Resources/Textures/_MACRO/Mobs/Customization/Thaven/tail.rsi/stub1.png new file mode 100644 index 00000000000..84e66f5b41c Binary files /dev/null and b/Resources/Textures/_MACRO/Mobs/Customization/Thaven/tail.rsi/stub1.png differ diff --git a/Resources/Textures/_MACRO/Mobs/Customization/Thaven/tail.rsi/stub2.png b/Resources/Textures/_MACRO/Mobs/Customization/Thaven/tail.rsi/stub2.png new file mode 100644 index 00000000000..cc629587507 Binary files /dev/null and b/Resources/Textures/_MACRO/Mobs/Customization/Thaven/tail.rsi/stub2.png differ diff --git a/Resources/Textures/_MACRO/Mobs/Customization/Thaven/tail.rsi/tadpole1.png b/Resources/Textures/_MACRO/Mobs/Customization/Thaven/tail.rsi/tadpole1.png new file mode 100644 index 00000000000..13fd8de2ed3 Binary files /dev/null and b/Resources/Textures/_MACRO/Mobs/Customization/Thaven/tail.rsi/tadpole1.png differ diff --git a/Resources/Textures/_MACRO/Mobs/Customization/Thaven/tail.rsi/tadpole2.png b/Resources/Textures/_MACRO/Mobs/Customization/Thaven/tail.rsi/tadpole2.png new file mode 100644 index 00000000000..e063f3d18f1 Binary files /dev/null and b/Resources/Textures/_MACRO/Mobs/Customization/Thaven/tail.rsi/tadpole2.png differ diff --git a/Resources/Textures/_MACRO/Mobs/Customization/Thaven/tail.rsi/thresher1.png b/Resources/Textures/_MACRO/Mobs/Customization/Thaven/tail.rsi/thresher1.png new file mode 100644 index 00000000000..d6f9d050e5c Binary files /dev/null and b/Resources/Textures/_MACRO/Mobs/Customization/Thaven/tail.rsi/thresher1.png differ diff --git a/Resources/Textures/_MACRO/Mobs/Customization/Thaven/tail.rsi/thresher2.png b/Resources/Textures/_MACRO/Mobs/Customization/Thaven/tail.rsi/thresher2.png new file mode 100644 index 00000000000..f6776e04164 Binary files /dev/null and b/Resources/Textures/_MACRO/Mobs/Customization/Thaven/tail.rsi/thresher2.png differ diff --git a/Resources/Textures/_MACRO/Mobs/Customization/Thaven/undergarmentbottom.rsi/boxers.png b/Resources/Textures/_MACRO/Mobs/Customization/Thaven/undergarmentbottom.rsi/boxers.png new file mode 100644 index 00000000000..a440772cccd Binary files /dev/null and b/Resources/Textures/_MACRO/Mobs/Customization/Thaven/undergarmentbottom.rsi/boxers.png differ diff --git a/Resources/Textures/_MACRO/Mobs/Customization/Thaven/undergarmentbottom.rsi/briefs.png b/Resources/Textures/_MACRO/Mobs/Customization/Thaven/undergarmentbottom.rsi/briefs.png new file mode 100644 index 00000000000..85399c38755 Binary files /dev/null and b/Resources/Textures/_MACRO/Mobs/Customization/Thaven/undergarmentbottom.rsi/briefs.png differ diff --git a/Resources/Textures/_MACRO/Mobs/Customization/Thaven/undergarmentbottom.rsi/lowriders.png b/Resources/Textures/_MACRO/Mobs/Customization/Thaven/undergarmentbottom.rsi/lowriders.png new file mode 100644 index 00000000000..a28adffdba2 Binary files /dev/null and b/Resources/Textures/_MACRO/Mobs/Customization/Thaven/undergarmentbottom.rsi/lowriders.png differ diff --git a/Resources/Textures/_MACRO/Mobs/Customization/Thaven/undergarmentbottom.rsi/meta.json b/Resources/Textures/_MACRO/Mobs/Customization/Thaven/undergarmentbottom.rsi/meta.json new file mode 100644 index 00000000000..985dec4bb22 --- /dev/null +++ b/Resources/Textures/_MACRO/Mobs/Customization/Thaven/undergarmentbottom.rsi/meta.json @@ -0,0 +1,31 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from cmss13 at https://github.com/cmss13-devs/cmss13/blob/884ab172389b6fc54ef063f5fbea5e8b0a0a2235/icons/mob/humans/undershirt.dmi, fitted to thaven by Sha-Seng (Github)", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "boxers", + "directions": 4 + }, + { + "name": "briefs", + "directions": 4 + }, + { + "name": "lowriders", + "directions": 4 + }, + { + "name": "satin", + "directions": 4 + }, + { + "name": "tanga", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/_MACRO/Mobs/Customization/Thaven/undergarmentbottom.rsi/satin.png b/Resources/Textures/_MACRO/Mobs/Customization/Thaven/undergarmentbottom.rsi/satin.png new file mode 100644 index 00000000000..4061df6cb60 Binary files /dev/null and b/Resources/Textures/_MACRO/Mobs/Customization/Thaven/undergarmentbottom.rsi/satin.png differ diff --git a/Resources/Textures/_MACRO/Mobs/Customization/Thaven/undergarmentbottom.rsi/tanga.png b/Resources/Textures/_MACRO/Mobs/Customization/Thaven/undergarmentbottom.rsi/tanga.png new file mode 100644 index 00000000000..dfecb824ae1 Binary files /dev/null and b/Resources/Textures/_MACRO/Mobs/Customization/Thaven/undergarmentbottom.rsi/tanga.png differ diff --git a/Resources/Textures/_MACRO/Mobs/Customization/Thaven/undergarmenttop.rsi/binder.png b/Resources/Textures/_MACRO/Mobs/Customization/Thaven/undergarmenttop.rsi/binder.png new file mode 100644 index 00000000000..484d864ff57 Binary files /dev/null and b/Resources/Textures/_MACRO/Mobs/Customization/Thaven/undergarmenttop.rsi/binder.png differ diff --git a/Resources/Textures/_MACRO/Mobs/Customization/Thaven/undergarmenttop.rsi/classic.png b/Resources/Textures/_MACRO/Mobs/Customization/Thaven/undergarmenttop.rsi/classic.png new file mode 100644 index 00000000000..5fb2b501faa Binary files /dev/null and b/Resources/Textures/_MACRO/Mobs/Customization/Thaven/undergarmenttop.rsi/classic.png differ diff --git a/Resources/Textures/_MACRO/Mobs/Customization/Thaven/undergarmenttop.rsi/grosssleeveless.png b/Resources/Textures/_MACRO/Mobs/Customization/Thaven/undergarmenttop.rsi/grosssleeveless.png new file mode 100644 index 00000000000..8c5431b8c55 Binary files /dev/null and b/Resources/Textures/_MACRO/Mobs/Customization/Thaven/undergarmenttop.rsi/grosssleeveless.png differ diff --git a/Resources/Textures/_MACRO/Mobs/Customization/Thaven/undergarmenttop.rsi/meta.json b/Resources/Textures/_MACRO/Mobs/Customization/Thaven/undergarmenttop.rsi/meta.json new file mode 100644 index 00000000000..2ddfaf58161 --- /dev/null +++ b/Resources/Textures/_MACRO/Mobs/Customization/Thaven/undergarmenttop.rsi/meta.json @@ -0,0 +1,43 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from cmss13 at https://github.com/cmss13-devs/cmss13/blob/884ab172389b6fc54ef063f5fbea5e8b0a0a2235/icons/mob/humans/undershirt.dmi, nanotrasen taken from https://github.com/tgstation/tgstation/commit/c14e98740794eb107bfa40aad19bd4c4d307184f, undershirts modified by Pinkbat5(github), binder by Pinkbat5(github), fitted to thaven by Sha-Seng (Github)", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "binder", + "directions": 4 + }, + { + "name": "classic", + "directions": 4 + }, + { + "name": "grosssleeveless", + "directions": 4 + }, + { + "name": "nanotrasen", + "directions": 4 + }, + { + "name": "rolledundershirt", + "directions": 4 + }, + { + "name": "sports", + "directions": 4 + }, + { + "name": "strapless", + "directions": 4 + }, + { + "name": "undershirt", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/_MACRO/Mobs/Customization/Thaven/undergarmenttop.rsi/nanotrasen.png b/Resources/Textures/_MACRO/Mobs/Customization/Thaven/undergarmenttop.rsi/nanotrasen.png new file mode 100644 index 00000000000..b15b3dec042 Binary files /dev/null and b/Resources/Textures/_MACRO/Mobs/Customization/Thaven/undergarmenttop.rsi/nanotrasen.png differ diff --git a/Resources/Textures/_MACRO/Mobs/Customization/Thaven/undergarmenttop.rsi/rolledundershirt.png b/Resources/Textures/_MACRO/Mobs/Customization/Thaven/undergarmenttop.rsi/rolledundershirt.png new file mode 100644 index 00000000000..e504de643cb Binary files /dev/null and b/Resources/Textures/_MACRO/Mobs/Customization/Thaven/undergarmenttop.rsi/rolledundershirt.png differ diff --git a/Resources/Textures/_MACRO/Mobs/Customization/Thaven/undergarmenttop.rsi/sports.png b/Resources/Textures/_MACRO/Mobs/Customization/Thaven/undergarmenttop.rsi/sports.png new file mode 100644 index 00000000000..b239b4520a0 Binary files /dev/null and b/Resources/Textures/_MACRO/Mobs/Customization/Thaven/undergarmenttop.rsi/sports.png differ diff --git a/Resources/Textures/_MACRO/Mobs/Customization/Thaven/undergarmenttop.rsi/strapless.png b/Resources/Textures/_MACRO/Mobs/Customization/Thaven/undergarmenttop.rsi/strapless.png new file mode 100644 index 00000000000..18546a1c415 Binary files /dev/null and b/Resources/Textures/_MACRO/Mobs/Customization/Thaven/undergarmenttop.rsi/strapless.png differ diff --git a/Resources/Textures/_MACRO/Mobs/Customization/Thaven/undergarmenttop.rsi/undershirt.png b/Resources/Textures/_MACRO/Mobs/Customization/Thaven/undergarmenttop.rsi/undershirt.png new file mode 100644 index 00000000000..799c959003c Binary files /dev/null and b/Resources/Textures/_MACRO/Mobs/Customization/Thaven/undergarmenttop.rsi/undershirt.png differ diff --git a/Resources/Textures/_Impstation/Mobs/Species/Thaven/displacement.rsi/hands.png b/Resources/Textures/_MACRO/Mobs/Species/Thaven/displacement.rsi/hands.png similarity index 100% rename from Resources/Textures/_Impstation/Mobs/Species/Thaven/displacement.rsi/hands.png rename to Resources/Textures/_MACRO/Mobs/Species/Thaven/displacement.rsi/hands.png diff --git a/Resources/Textures/_MACRO/Mobs/Species/Thaven/displacement.rsi/head.png b/Resources/Textures/_MACRO/Mobs/Species/Thaven/displacement.rsi/head.png new file mode 100644 index 00000000000..ff6fcc7684e Binary files /dev/null and b/Resources/Textures/_MACRO/Mobs/Species/Thaven/displacement.rsi/head.png differ diff --git a/Resources/Textures/_Impstation/Mobs/Species/Thaven/displacement.rsi/jumpsuit.png b/Resources/Textures/_MACRO/Mobs/Species/Thaven/displacement.rsi/jumpsuit.png similarity index 100% rename from Resources/Textures/_Impstation/Mobs/Species/Thaven/displacement.rsi/jumpsuit.png rename to Resources/Textures/_MACRO/Mobs/Species/Thaven/displacement.rsi/jumpsuit.png diff --git a/Resources/Textures/_Impstation/Mobs/Species/Thaven/displacement.rsi/meta.json b/Resources/Textures/_MACRO/Mobs/Species/Thaven/displacement.rsi/meta.json similarity index 70% rename from Resources/Textures/_Impstation/Mobs/Species/Thaven/displacement.rsi/meta.json rename to Resources/Textures/_MACRO/Mobs/Species/Thaven/displacement.rsi/meta.json index 2a302428171..714d5d81488 100644 --- a/Resources/Textures/_Impstation/Mobs/Species/Thaven/displacement.rsi/meta.json +++ b/Resources/Textures/_MACRO/Mobs/Species/Thaven/displacement.rsi/meta.json @@ -18,18 +18,6 @@ "name": "outerclothing_hardsuit", "directions": 4 }, - { - "name": "eyes", - "directions": 4 - }, - { - "name": "neck", - "directions": 4 - }, - { - "name": "mask", - "directions": 4 - }, { "name": "head", "directions": 4 diff --git a/Resources/Textures/_Impstation/Mobs/Species/Thaven/displacement.rsi/outerclothing_hardsuit.png b/Resources/Textures/_MACRO/Mobs/Species/Thaven/displacement.rsi/outerclothing_hardsuit.png similarity index 100% rename from Resources/Textures/_Impstation/Mobs/Species/Thaven/displacement.rsi/outerclothing_hardsuit.png rename to Resources/Textures/_MACRO/Mobs/Species/Thaven/displacement.rsi/outerclothing_hardsuit.png diff --git a/Resources/Textures/_MACRO/Mobs/Species/Thaven/organs.rsi/brain-inhand-left.png b/Resources/Textures/_MACRO/Mobs/Species/Thaven/organs.rsi/brain-inhand-left.png new file mode 100644 index 00000000000..dfeef0d599b Binary files /dev/null and b/Resources/Textures/_MACRO/Mobs/Species/Thaven/organs.rsi/brain-inhand-left.png differ diff --git a/Resources/Textures/_MACRO/Mobs/Species/Thaven/organs.rsi/brain-inhand-right.png b/Resources/Textures/_MACRO/Mobs/Species/Thaven/organs.rsi/brain-inhand-right.png new file mode 100644 index 00000000000..a05b6a6d72d Binary files /dev/null and b/Resources/Textures/_MACRO/Mobs/Species/Thaven/organs.rsi/brain-inhand-right.png differ diff --git a/Resources/Textures/_MACRO/Mobs/Species/Thaven/organs.rsi/brain.png b/Resources/Textures/_MACRO/Mobs/Species/Thaven/organs.rsi/brain.png new file mode 100644 index 00000000000..641b6f63554 Binary files /dev/null and b/Resources/Textures/_MACRO/Mobs/Species/Thaven/organs.rsi/brain.png differ diff --git a/Resources/Textures/_MACRO/Mobs/Species/Thaven/organs.rsi/eyeball-l.png b/Resources/Textures/_MACRO/Mobs/Species/Thaven/organs.rsi/eyeball-l.png new file mode 100644 index 00000000000..d53eeb01ee3 Binary files /dev/null and b/Resources/Textures/_MACRO/Mobs/Species/Thaven/organs.rsi/eyeball-l.png differ diff --git a/Resources/Textures/_MACRO/Mobs/Species/Thaven/organs.rsi/eyeball-r.png b/Resources/Textures/_MACRO/Mobs/Species/Thaven/organs.rsi/eyeball-r.png new file mode 100644 index 00000000000..b528ad7c6a3 Binary files /dev/null and b/Resources/Textures/_MACRO/Mobs/Species/Thaven/organs.rsi/eyeball-r.png differ diff --git a/Resources/Textures/_MACRO/Mobs/Species/Thaven/organs.rsi/eyeballs-inhand-left.png b/Resources/Textures/_MACRO/Mobs/Species/Thaven/organs.rsi/eyeballs-inhand-left.png new file mode 100644 index 00000000000..a292dfc10fa Binary files /dev/null and b/Resources/Textures/_MACRO/Mobs/Species/Thaven/organs.rsi/eyeballs-inhand-left.png differ diff --git a/Resources/Textures/_MACRO/Mobs/Species/Thaven/organs.rsi/eyeballs-inhand-right.png b/Resources/Textures/_MACRO/Mobs/Species/Thaven/organs.rsi/eyeballs-inhand-right.png new file mode 100644 index 00000000000..e9d94736a7f Binary files /dev/null and b/Resources/Textures/_MACRO/Mobs/Species/Thaven/organs.rsi/eyeballs-inhand-right.png differ diff --git a/Resources/Textures/_MACRO/Mobs/Species/Thaven/organs.rsi/heart-inhand-left.png b/Resources/Textures/_MACRO/Mobs/Species/Thaven/organs.rsi/heart-inhand-left.png new file mode 100644 index 00000000000..0b3b794fb71 Binary files /dev/null and b/Resources/Textures/_MACRO/Mobs/Species/Thaven/organs.rsi/heart-inhand-left.png differ diff --git a/Resources/Textures/_MACRO/Mobs/Species/Thaven/organs.rsi/heart-inhand-right.png b/Resources/Textures/_MACRO/Mobs/Species/Thaven/organs.rsi/heart-inhand-right.png new file mode 100644 index 00000000000..f338eadcdaa Binary files /dev/null and b/Resources/Textures/_MACRO/Mobs/Species/Thaven/organs.rsi/heart-inhand-right.png differ diff --git a/Resources/Textures/_MACRO/Mobs/Species/Thaven/organs.rsi/heart-off.png b/Resources/Textures/_MACRO/Mobs/Species/Thaven/organs.rsi/heart-off.png new file mode 100644 index 00000000000..eca19d785bd Binary files /dev/null and b/Resources/Textures/_MACRO/Mobs/Species/Thaven/organs.rsi/heart-off.png differ diff --git a/Resources/Textures/_MACRO/Mobs/Species/Thaven/organs.rsi/heart-on.png b/Resources/Textures/_MACRO/Mobs/Species/Thaven/organs.rsi/heart-on.png new file mode 100644 index 00000000000..bf51d8c3f92 Binary files /dev/null and b/Resources/Textures/_MACRO/Mobs/Species/Thaven/organs.rsi/heart-on.png differ diff --git a/Resources/Textures/_MACRO/Mobs/Species/Thaven/organs.rsi/kidney-l.png b/Resources/Textures/_MACRO/Mobs/Species/Thaven/organs.rsi/kidney-l.png new file mode 100644 index 00000000000..e70878c8ffe Binary files /dev/null and b/Resources/Textures/_MACRO/Mobs/Species/Thaven/organs.rsi/kidney-l.png differ diff --git a/Resources/Textures/_MACRO/Mobs/Species/Thaven/organs.rsi/kidney-r.png b/Resources/Textures/_MACRO/Mobs/Species/Thaven/organs.rsi/kidney-r.png new file mode 100644 index 00000000000..e6dce7b99ee Binary files /dev/null and b/Resources/Textures/_MACRO/Mobs/Species/Thaven/organs.rsi/kidney-r.png differ diff --git a/Resources/Textures/_MACRO/Mobs/Species/Thaven/organs.rsi/kidneys-inhand-left.png b/Resources/Textures/_MACRO/Mobs/Species/Thaven/organs.rsi/kidneys-inhand-left.png new file mode 100644 index 00000000000..1ed66dd0c7f Binary files /dev/null and b/Resources/Textures/_MACRO/Mobs/Species/Thaven/organs.rsi/kidneys-inhand-left.png differ diff --git a/Resources/Textures/_MACRO/Mobs/Species/Thaven/organs.rsi/kidneys-inhand-right.png b/Resources/Textures/_MACRO/Mobs/Species/Thaven/organs.rsi/kidneys-inhand-right.png new file mode 100644 index 00000000000..0a04d2ace0f Binary files /dev/null and b/Resources/Textures/_MACRO/Mobs/Species/Thaven/organs.rsi/kidneys-inhand-right.png differ diff --git a/Resources/Textures/_MACRO/Mobs/Species/Thaven/organs.rsi/liver-inhand-left.png b/Resources/Textures/_MACRO/Mobs/Species/Thaven/organs.rsi/liver-inhand-left.png new file mode 100644 index 00000000000..3257f1dc467 Binary files /dev/null and b/Resources/Textures/_MACRO/Mobs/Species/Thaven/organs.rsi/liver-inhand-left.png differ diff --git a/Resources/Textures/_MACRO/Mobs/Species/Thaven/organs.rsi/liver-inhand-right.png b/Resources/Textures/_MACRO/Mobs/Species/Thaven/organs.rsi/liver-inhand-right.png new file mode 100644 index 00000000000..1e3f12ed5fa Binary files /dev/null and b/Resources/Textures/_MACRO/Mobs/Species/Thaven/organs.rsi/liver-inhand-right.png differ diff --git a/Resources/Textures/_MACRO/Mobs/Species/Thaven/organs.rsi/liver.png b/Resources/Textures/_MACRO/Mobs/Species/Thaven/organs.rsi/liver.png new file mode 100644 index 00000000000..28f3e86bd2e Binary files /dev/null and b/Resources/Textures/_MACRO/Mobs/Species/Thaven/organs.rsi/liver.png differ diff --git a/Resources/Textures/_MACRO/Mobs/Species/Thaven/organs.rsi/lung-l.png b/Resources/Textures/_MACRO/Mobs/Species/Thaven/organs.rsi/lung-l.png new file mode 100644 index 00000000000..f6813ea9d29 Binary files /dev/null and b/Resources/Textures/_MACRO/Mobs/Species/Thaven/organs.rsi/lung-l.png differ diff --git a/Resources/Textures/_MACRO/Mobs/Species/Thaven/organs.rsi/lung-r.png b/Resources/Textures/_MACRO/Mobs/Species/Thaven/organs.rsi/lung-r.png new file mode 100644 index 00000000000..b38e6e13d4a Binary files /dev/null and b/Resources/Textures/_MACRO/Mobs/Species/Thaven/organs.rsi/lung-r.png differ diff --git a/Resources/Textures/_MACRO/Mobs/Species/Thaven/organs.rsi/lungs-inhand-left.png b/Resources/Textures/_MACRO/Mobs/Species/Thaven/organs.rsi/lungs-inhand-left.png new file mode 100644 index 00000000000..2f1f814313b Binary files /dev/null and b/Resources/Textures/_MACRO/Mobs/Species/Thaven/organs.rsi/lungs-inhand-left.png differ diff --git a/Resources/Textures/_MACRO/Mobs/Species/Thaven/organs.rsi/lungs-inhand-right.png b/Resources/Textures/_MACRO/Mobs/Species/Thaven/organs.rsi/lungs-inhand-right.png new file mode 100644 index 00000000000..4f7e0b1c4da Binary files /dev/null and b/Resources/Textures/_MACRO/Mobs/Species/Thaven/organs.rsi/lungs-inhand-right.png differ diff --git a/Resources/Textures/_MACRO/Mobs/Species/Thaven/organs.rsi/meta.json b/Resources/Textures/_MACRO/Mobs/Species/Thaven/organs.rsi/meta.json new file mode 100644 index 00000000000..75ad3160083 --- /dev/null +++ b/Resources/Textures/_MACRO/Mobs/Species/Thaven/organs.rsi/meta.json @@ -0,0 +1,107 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Sprited by Nimfar11 (Github) for Space Station 14, brain made by Widgetbeck, all modified by Sha-Seng (github)", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "brain" + }, + { + "name": "brain-inhand-left", + "directions": 4 + }, + { + "name": "brain-inhand-right", + "directions": 4 + }, + { + "name": "eyeballs-inhand-left", + "directions": 4 + }, + { + "name": "eyeballs-inhand-right", + "directions": 4 + }, + { + "name": "eyeball-l" + }, + { + "name": "eyeball-r" + }, + { + "name": "heart-inhand-left", + "directions": 4 + }, + { + "name": "heart-inhand-right", + "directions": 4 + }, + { + "name": "heart-off" + }, + { + "name": "heart-on", + "delays": [ + [ + 0.6, + 0.1, + 0.1 + ] + ] + }, + { + "name": "kidneys-inhand-left", + "directions": 4 + }, + { + "name": "kidneys-inhand-right", + "directions": 4 + }, + { + "name": "kidney-l" + }, + { + "name": "kidney-r" + }, + { + "name": "liver" + }, + { + "name": "liver-inhand-left", + "directions": 4 + }, + { + "name": "liver-inhand-right", + "directions": 4 + }, + { + "name": "lungs-inhand-left", + "directions": 4 + }, + { + "name": "lungs-inhand-right", + "directions": 4 + }, + { + "name": "lung-l" + }, + { + "name": "lung-r" + }, + { + "name": "stomach" + }, + { + "name": "stomach-inhand-left", + "directions": 4 + }, + { + "name": "stomach-inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/_MACRO/Mobs/Species/Thaven/organs.rsi/stomach-inhand-left.png b/Resources/Textures/_MACRO/Mobs/Species/Thaven/organs.rsi/stomach-inhand-left.png new file mode 100644 index 00000000000..5242d1c001b Binary files /dev/null and b/Resources/Textures/_MACRO/Mobs/Species/Thaven/organs.rsi/stomach-inhand-left.png differ diff --git a/Resources/Textures/_MACRO/Mobs/Species/Thaven/organs.rsi/stomach-inhand-right.png b/Resources/Textures/_MACRO/Mobs/Species/Thaven/organs.rsi/stomach-inhand-right.png new file mode 100644 index 00000000000..004aebba077 Binary files /dev/null and b/Resources/Textures/_MACRO/Mobs/Species/Thaven/organs.rsi/stomach-inhand-right.png differ diff --git a/Resources/Textures/_MACRO/Mobs/Species/Thaven/organs.rsi/stomach.png b/Resources/Textures/_MACRO/Mobs/Species/Thaven/organs.rsi/stomach.png new file mode 100644 index 00000000000..579cb79867e Binary files /dev/null and b/Resources/Textures/_MACRO/Mobs/Species/Thaven/organs.rsi/stomach.png differ diff --git a/Resources/Textures/_Impstation/Mobs/Species/Thaven/parts.rsi/eyes.png b/Resources/Textures/_MACRO/Mobs/Species/Thaven/parts.rsi/eyes.png similarity index 100% rename from Resources/Textures/_Impstation/Mobs/Species/Thaven/parts.rsi/eyes.png rename to Resources/Textures/_MACRO/Mobs/Species/Thaven/parts.rsi/eyes.png diff --git a/Resources/Textures/_MACRO/Mobs/Species/Thaven/parts.rsi/full.png b/Resources/Textures/_MACRO/Mobs/Species/Thaven/parts.rsi/full.png new file mode 100644 index 00000000000..197bc89cb67 Binary files /dev/null and b/Resources/Textures/_MACRO/Mobs/Species/Thaven/parts.rsi/full.png differ diff --git a/Resources/Textures/_MACRO/Mobs/Species/Thaven/parts.rsi/head.png b/Resources/Textures/_MACRO/Mobs/Species/Thaven/parts.rsi/head.png new file mode 100644 index 00000000000..1eb9c032c2d Binary files /dev/null and b/Resources/Textures/_MACRO/Mobs/Species/Thaven/parts.rsi/head.png differ diff --git a/Resources/Textures/_MACRO/Mobs/Species/Thaven/parts.rsi/l_arm.png b/Resources/Textures/_MACRO/Mobs/Species/Thaven/parts.rsi/l_arm.png new file mode 100644 index 00000000000..aacc60bc685 Binary files /dev/null and b/Resources/Textures/_MACRO/Mobs/Species/Thaven/parts.rsi/l_arm.png differ diff --git a/Resources/Textures/_MACRO/Mobs/Species/Thaven/parts.rsi/l_foot.png b/Resources/Textures/_MACRO/Mobs/Species/Thaven/parts.rsi/l_foot.png new file mode 100644 index 00000000000..876876c585f Binary files /dev/null and b/Resources/Textures/_MACRO/Mobs/Species/Thaven/parts.rsi/l_foot.png differ diff --git a/Resources/Textures/_MACRO/Mobs/Species/Thaven/parts.rsi/l_hand.png b/Resources/Textures/_MACRO/Mobs/Species/Thaven/parts.rsi/l_hand.png new file mode 100644 index 00000000000..d183b6d98c5 Binary files /dev/null and b/Resources/Textures/_MACRO/Mobs/Species/Thaven/parts.rsi/l_hand.png differ diff --git a/Resources/Textures/_MACRO/Mobs/Species/Thaven/parts.rsi/l_leg.png b/Resources/Textures/_MACRO/Mobs/Species/Thaven/parts.rsi/l_leg.png new file mode 100644 index 00000000000..14f806dbefc Binary files /dev/null and b/Resources/Textures/_MACRO/Mobs/Species/Thaven/parts.rsi/l_leg.png differ diff --git a/Resources/Textures/_Impstation/Mobs/Species/Thaven/parts.rsi/meta.json b/Resources/Textures/_MACRO/Mobs/Species/Thaven/parts.rsi/meta.json similarity index 89% rename from Resources/Textures/_Impstation/Mobs/Species/Thaven/parts.rsi/meta.json rename to Resources/Textures/_MACRO/Mobs/Species/Thaven/parts.rsi/meta.json index 9df9664826a..dbcfb790f52 100644 --- a/Resources/Textures/_Impstation/Mobs/Species/Thaven/parts.rsi/meta.json +++ b/Resources/Textures/_MACRO/Mobs/Species/Thaven/parts.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Art by Widgetbeck", + "copyright": "Art by Widgetbeck, modified by honeyed-lemons (github), modified by carousel", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/_MACRO/Mobs/Species/Thaven/parts.rsi/r_arm.png b/Resources/Textures/_MACRO/Mobs/Species/Thaven/parts.rsi/r_arm.png new file mode 100644 index 00000000000..4a3c75abb42 Binary files /dev/null and b/Resources/Textures/_MACRO/Mobs/Species/Thaven/parts.rsi/r_arm.png differ diff --git a/Resources/Textures/_MACRO/Mobs/Species/Thaven/parts.rsi/r_foot.png b/Resources/Textures/_MACRO/Mobs/Species/Thaven/parts.rsi/r_foot.png new file mode 100644 index 00000000000..3f8deed7556 Binary files /dev/null and b/Resources/Textures/_MACRO/Mobs/Species/Thaven/parts.rsi/r_foot.png differ diff --git a/Resources/Textures/_MACRO/Mobs/Species/Thaven/parts.rsi/r_hand.png b/Resources/Textures/_MACRO/Mobs/Species/Thaven/parts.rsi/r_hand.png new file mode 100644 index 00000000000..f5012b695d7 Binary files /dev/null and b/Resources/Textures/_MACRO/Mobs/Species/Thaven/parts.rsi/r_hand.png differ diff --git a/Resources/Textures/_MACRO/Mobs/Species/Thaven/parts.rsi/r_leg.png b/Resources/Textures/_MACRO/Mobs/Species/Thaven/parts.rsi/r_leg.png new file mode 100644 index 00000000000..3e129b56d66 Binary files /dev/null and b/Resources/Textures/_MACRO/Mobs/Species/Thaven/parts.rsi/r_leg.png differ diff --git a/Resources/Textures/_MACRO/Mobs/Species/Thaven/parts.rsi/torso.png b/Resources/Textures/_MACRO/Mobs/Species/Thaven/parts.rsi/torso.png new file mode 100644 index 00000000000..0238e74d957 Binary files /dev/null and b/Resources/Textures/_MACRO/Mobs/Species/Thaven/parts.rsi/torso.png differ