SKREEEEEE (#3706)
* Import bird sprites and define basic mob. * SKREEEEEEEEE * Move hair styles to new sprite accessory prototypes. Basic stuff, no multi-species stuff yet. * Vox hair styles and clothes * Make HumanoidCharacterProfile.Default() a static default to fix tests. Usages that wanted the previous random behavior now call Random(). * Remove names from hair style prototypes. (They're in localization files) * Update Content.Shared/Actions/ActionType.cs (sk)reeee github Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
This commit is contained in:
committed by
GitHub
parent
5ed935f30a
commit
0ac4c0e85c
2
Resources/Locale/en-US/accessories/common.ftl
Normal file
2
Resources/Locale/en-US/accessories/common.ftl
Normal file
@@ -0,0 +1,2 @@
|
||||
accessory-HairBald = Bald
|
||||
accessory-FacialHairShaved = Shaved
|
||||
35
Resources/Locale/en-US/accessories/human-facial-hair.ftl
Normal file
35
Resources/Locale/en-US/accessories/human-facial-hair.ftl
Normal file
@@ -0,0 +1,35 @@
|
||||
accessory-HumanFacialHairAbe = Beard (Abraham Lincoln)
|
||||
accessory-HumanFacialHairBrokenman = Beard (Broken Man)
|
||||
accessory-HumanFacialHairChin = Beard (Chinstrap)
|
||||
accessory-HumanFacialHairDwarf = Beard (Dwarf)
|
||||
accessory-HumanFacialHairFullbeard = Beard (Full)
|
||||
accessory-HumanFacialHairCroppedfullbeard = Beard (Cropped Fullbeard)
|
||||
accessory-HumanFacialHairGt = Beard (Goatee)
|
||||
accessory-HumanFacialHairHip = Beard (Hipster)
|
||||
accessory-HumanFacialHairJensen = Beard (Jensen)
|
||||
accessory-HumanFacialHairNeckbeard = Beard (Neckbeard)
|
||||
accessory-HumanFacialHairWise = Beard (Very Long)
|
||||
accessory-HumanFacialHairMuttonmus = Beard (Muttonmus)
|
||||
accessory-HumanFacialHairMartialartist = Beard (Martial Artist)
|
||||
accessory-HumanFacialHairChinlessbeard = Beard (Chinless Beard)
|
||||
accessory-HumanFacialHairMoonshiner = Beard (Moonshiner)
|
||||
accessory-HumanFacialHairLongbeard = Beard (Long)
|
||||
accessory-HumanFacialHairVolaju = Beard (Volaju)
|
||||
accessory-HumanFacialHair3oclock = Beard (Three o Clock Shadow)
|
||||
accessory-HumanFacialHairFiveoclock = Beard (Five o Clock Shadow)
|
||||
accessory-HumanFacialHair5oclockmoustache = Beard (Five o Clock Moustache)
|
||||
accessory-HumanFacialHair7oclock = Beard (Seven o Clock Shadow)
|
||||
accessory-HumanFacialHair7oclockmoustache = Beard (Seven o Clock Moustache)
|
||||
accessory-HumanFacialHairMoustache = Moustache
|
||||
accessory-HumanFacialHairPencilstache = Moustache (Pencilstache)
|
||||
accessory-HumanFacialHairSmallstache = Moustache (Smallstache)
|
||||
accessory-HumanFacialHairWalrus = Moustache (Walrus)
|
||||
accessory-HumanFacialHairFumanchu = Moustache (Fu Manchu)
|
||||
accessory-HumanFacialHairHogan = Moustache (Hulk Hogan)
|
||||
accessory-HumanFacialHairSelleck = Moustache (Selleck)
|
||||
accessory-HumanFacialHairChaplin = Moustache (Square)
|
||||
accessory-HumanFacialHairVandyke = Moustache (Van Dyke)
|
||||
accessory-HumanFacialHairWatson = Moustache (Watson)
|
||||
accessory-HumanFacialHairElvis = Sideburns (Elvis)
|
||||
accessory-HumanFacialHairMutton = Sideburns (Mutton Chops)
|
||||
accessory-HumanFacialHairSideburn = Sideburns
|
||||
174
Resources/Locale/en-US/accessories/human-hair.ftl
Normal file
174
Resources/Locale/en-US/accessories/human-hair.ftl
Normal file
@@ -0,0 +1,174 @@
|
||||
accessory-HumanHairAfro = Afro
|
||||
accessory-HumanHairAfro2 = Afro 2
|
||||
accessory-HumanHairBigafro = Afro (Large)
|
||||
accessory-HumanHairAntenna = Ahoge
|
||||
accessory-HumanHairBalding = Balding Hair
|
||||
accessory-HumanHairBedhead = Bedhead
|
||||
accessory-HumanHairBedheadv2 = Bedhead 2
|
||||
accessory-HumanHairBedheadv3 = Bedhead 3
|
||||
accessory-HumanHairLongBedhead = Long Bedhead
|
||||
accessory-HumanHairFloorlengthBedhead = Floorlength Bedhead
|
||||
accessory-HumanHairBeehive = Beehive
|
||||
accessory-HumanHairBeehivev2 = Beehive 2
|
||||
accessory-HumanHairBob = Bob Hair
|
||||
accessory-HumanHairBob2 = Bob Hair 2
|
||||
accessory-HumanHairBobcut = Bob Hair 3
|
||||
accessory-HumanHairBob4 = Bob Hair 4
|
||||
accessory-HumanHairBobcurl = Bobcurl
|
||||
accessory-HumanHairBoddicker = Boddicker
|
||||
accessory-HumanHairBowlcut = Bowlcut
|
||||
accessory-HumanHairBowlcut2 = Bowlcut 2
|
||||
accessory-HumanHairBraid = Braid (Floorlength)
|
||||
accessory-HumanHairBraided = Braided
|
||||
accessory-HumanHairBraidfront = Braided Front
|
||||
accessory-HumanHairBraid2 = Braid (High)
|
||||
accessory-HumanHairHbraid = Braid (Low)
|
||||
accessory-HumanHairShortbraid = Braid (Short)
|
||||
accessory-HumanHairBraidtail = Braided Tail
|
||||
accessory-HumanHairBun = Bun Head
|
||||
accessory-HumanHairBunhead2 = Bun Head 2
|
||||
accessory-HumanHairBun3 = Bun Head 3
|
||||
accessory-HumanHairLargebun = Bun (Large)
|
||||
accessory-HumanHairManbun = Bun (Manbun)
|
||||
accessory-HumanHairTightbun = Bun (Tight)
|
||||
accessory-HumanHairBusiness = Business Hair
|
||||
accessory-HumanHairBusiness2 = Business Hair 2
|
||||
accessory-HumanHairBusiness3 = Business Hair 3
|
||||
accessory-HumanHairBusiness4 = Business Hair 4
|
||||
accessory-HumanHairBuzzcut = Buzzcut
|
||||
accessory-HumanHairCia = CIA
|
||||
accessory-HumanHairCoffeehouse = Coffee House
|
||||
accessory-HumanHairCombover = Combover
|
||||
accessory-HumanHairCornrows = Cornrows
|
||||
accessory-HumanHairCornrows2 = Cornrows 2
|
||||
accessory-HumanHairCornrowbun = Cornrow Bun
|
||||
accessory-HumanHairCornrowbraid = Cornrow Braid
|
||||
accessory-HumanHairCornrowtail = Cornrow Tail
|
||||
accessory-HumanHairCrewcut = Crewcut
|
||||
accessory-HumanHairCurls = Curls
|
||||
accessory-HumanHairC = Cut Hair
|
||||
accessory-HumanHairDandypompadour = Dandy Pompadour
|
||||
accessory-HumanHairDevilock = Devil Lock
|
||||
accessory-HumanHairDoublebun = Double Bun
|
||||
accessory-HumanHairDreads = Dreadlocks
|
||||
accessory-HumanHairDrillruru = Drillruru
|
||||
accessory-HumanHairDrillhairextended = Drill Hair (Extended)
|
||||
accessory-HumanHairEmo = Emo
|
||||
accessory-HumanHairEmofringe = Emo Fringe
|
||||
accessory-HumanHairNofade = Fade (None)
|
||||
accessory-HumanHairHighfade = Fade (High)
|
||||
accessory-HumanHairMedfade = Fade (Medium)
|
||||
accessory-HumanHairLowfade = Fade (Low)
|
||||
accessory-HumanHairBaldfade = Fade (Bald)
|
||||
accessory-HumanHairFeather = Feather
|
||||
accessory-HumanHairFather = Father
|
||||
accessory-HumanHairSargeant = Flat Top
|
||||
accessory-HumanHairFlair = Flair
|
||||
accessory-HumanHairBigflattop = Flat Top (Big)
|
||||
accessory-HumanHairFlow = Flow Hair
|
||||
accessory-HumanHairGelled = Gelled Back
|
||||
accessory-HumanHairGentle = Gentle
|
||||
accessory-HumanHairHalfbang = Half-banged Hair
|
||||
accessory-HumanHairHalfbang2 = Half-banged Hair 2
|
||||
accessory-HumanHairHalfshaved = Half-shaved
|
||||
accessory-HumanHairHedgehog = Hedgehog Hair
|
||||
accessory-HumanHairHimecut = Hime Cut
|
||||
accessory-HumanHairHimecut2 = Hime Cut 2
|
||||
accessory-HumanHairShorthime = Hime Cut (Short)
|
||||
accessory-HumanHairHimeup = Hime Updo
|
||||
accessory-HumanHairHitop = Hitop
|
||||
accessory-HumanHairJade = Jade
|
||||
accessory-HumanHairJensen = Jensen Hair
|
||||
accessory-HumanHairJoestar = Joestar
|
||||
accessory-HumanHairKeanu = Keanu Hair
|
||||
accessory-HumanHairKusanagi = Kusanagi Hair
|
||||
accessory-HumanHairLong = Long Hair 1
|
||||
accessory-HumanHairLong2 = Long Hair 2
|
||||
accessory-HumanHairLong3 = Long Hair 3
|
||||
accessory-HumanHairLongovereye = Long Over Eye
|
||||
accessory-HumanHairLbangs = Long Bangs
|
||||
accessory-HumanHairLongemo = Long Emo
|
||||
accessory-HumanHairLongfringe = Long Fringe
|
||||
accessory-HumanHairLongsidepart = Long Side Part
|
||||
accessory-HumanHairMegaeyebrows = Mega Eyebrows
|
||||
accessory-HumanHairMessy = Messy
|
||||
accessory-HumanHairModern = Modern
|
||||
accessory-HumanHairMohawk = Mohawk
|
||||
accessory-HumanHairNitori = Nitori
|
||||
accessory-HumanHairReversemohawk = Mohawk (Reverse)
|
||||
accessory-HumanHairUnshavenMohawk = Mohawk (Unshaven)
|
||||
accessory-HumanHairMulder = Mulder
|
||||
accessory-HumanHairOdango = Odango
|
||||
accessory-HumanHairOmbre = Ombre
|
||||
accessory-HumanHairOneshoulder = One Shoulder
|
||||
accessory-HumanHairShortovereye = Over Eye
|
||||
accessory-HumanHairOxton = Oxton
|
||||
accessory-HumanHairParted = Parted
|
||||
accessory-HumanHairPart = Parted (Side)
|
||||
accessory-HumanHairKagami = Pigtails
|
||||
accessory-HumanHairPigtails = Pigtails 2
|
||||
accessory-HumanHairPigtails2 = Pigtails 3
|
||||
accessory-HumanHairPixie = Pixie Cut
|
||||
accessory-HumanHairPompadour = Pompadour
|
||||
accessory-HumanHairBigpompadour = Pompadour (Big)
|
||||
accessory-HumanHairPonytail = Ponytail
|
||||
accessory-HumanHairPonytail2 = Ponytail 2
|
||||
accessory-HumanHairPonytail3 = Ponytail 3
|
||||
accessory-HumanHairPonytail4 = Ponytail 4
|
||||
accessory-HumanHairPonytail5 = Ponytail 5
|
||||
accessory-HumanHairPonytail6 = Ponytail 6
|
||||
accessory-HumanHairPonytail7 = Ponytail 7
|
||||
accessory-HumanHairHighponytail = Ponytail (High)
|
||||
accessory-HumanHairStail = Ponytail (Short)
|
||||
accessory-HumanHairLongstraightponytail = Ponytail (Long)
|
||||
accessory-HumanHairCountry = Ponytail (Country)
|
||||
accessory-HumanHairFringetail = Ponytail (Fringe)
|
||||
accessory-HumanHairSidetail = Ponytail (Side)
|
||||
accessory-HumanHairSidetail2 = Ponytail (Side) 2
|
||||
accessory-HumanHairSidetail3 = Ponytail (Side) 3
|
||||
accessory-HumanHairSidetail4 = Ponytail (Side) 4
|
||||
accessory-HumanHairSpikyponytail = Ponytail (Spiky)
|
||||
accessory-HumanHairPoofy = Poofy
|
||||
accessory-HumanHairQuiff = Quiff
|
||||
accessory-HumanHairRonin = Ronin
|
||||
accessory-HumanHairShaved = Shaved
|
||||
accessory-HumanHairShavedpart = Shaved Part
|
||||
accessory-HumanHairShortbangs = Short Bangs
|
||||
accessory-HumanHairA = Short Hair
|
||||
accessory-HumanHairShorthair2 = Short Hair 2
|
||||
accessory-HumanHairShorthair3 = Short Hair 3
|
||||
accessory-HumanHairD = Short Hair 4
|
||||
accessory-HumanHairE = Short Hair 5
|
||||
accessory-HumanHairF = Short Hair 6
|
||||
accessory-HumanHairShorthairg = Short Hair 7
|
||||
accessory-HumanHair80s = Short Hair 80s
|
||||
accessory-HumanHairRosa = Short Hair Rosa
|
||||
accessory-HumanHairB = Shoulder-length Hair
|
||||
accessory-HumanHairSidecut = Sidecut
|
||||
accessory-HumanHairSkinhead = Skinhead
|
||||
accessory-HumanHairProtagonist = Slightly Long Hair
|
||||
accessory-HumanHairSpikey = Spiky
|
||||
accessory-HumanHairSpiky = Spiky 2
|
||||
accessory-HumanHairSpiky2 = Spiky 3
|
||||
accessory-HumanHairSwept = Swept Back Hair
|
||||
accessory-HumanHairSwept2 = Swept Back Hair 2
|
||||
accessory-HumanHairThinning = Thinning
|
||||
accessory-HumanHairThinningfront = Thinning (Front)
|
||||
accessory-HumanHairThinningrear = Thinning (Rear)
|
||||
accessory-HumanHairTopknot = Topknot
|
||||
accessory-HumanHairTressshoulder = Tress Shoulder
|
||||
accessory-HumanHairTrimmed = Trimmed
|
||||
accessory-HumanHairTrimflat = Trim Flat
|
||||
accessory-HumanHairTwintail = Twintails
|
||||
accessory-HumanHairUndercut = Undercut
|
||||
accessory-HumanHairUndercutleft = Undercut Left
|
||||
accessory-HumanHairUndercutright = Undercut Right
|
||||
accessory-HumanHairUnkept = Unkept
|
||||
accessory-HumanHairUpdo = Updo
|
||||
accessory-HumanHairVlong = Very Long Hair
|
||||
accessory-HumanHairLongest = Very Long Hair 2
|
||||
accessory-HumanHairLongest2 = Very Long Over Eye
|
||||
accessory-HumanHairVeryshortovereyealternate = Very Short Over Eye
|
||||
accessory-HumanHairVlongfringe = Very Long with Fringe
|
||||
accessory-HumanHairVolaju = Volaju
|
||||
accessory-HumanHairWisp = Wisp
|
||||
5
Resources/Locale/en-US/accessories/vox-facial-hair.ftl
Normal file
5
Resources/Locale/en-US/accessories/vox-facial-hair.ftl
Normal file
@@ -0,0 +1,5 @@
|
||||
accessory-VoxFacialHairColonel = Vox Colonel
|
||||
accessory-VoxFacialHairFu = Quill Fu
|
||||
accessory-VoxFacialHairNeck = Neck Quills
|
||||
accessory-VoxFacialHairBeard = Quill Beard
|
||||
accessory-VoxFacialHairRuffBeard = Ruff Beard
|
||||
13
Resources/Locale/en-US/accessories/vox-hair.ftl
Normal file
13
Resources/Locale/en-US/accessories/vox-hair.ftl
Normal file
@@ -0,0 +1,13 @@
|
||||
accessory-VoxHairShortQuills = Short Vox Quills
|
||||
accessory-VoxHairKingly = Vox Kingly
|
||||
accessory-VoxHairAfro = Vox Afro
|
||||
accessory-VoxHairMohawk = Vox Mohawk
|
||||
accessory-VoxHairYasuhiro = Vox Yasuhiro
|
||||
accessory-VoxHairHorns = Vox Horns
|
||||
accessory-VoxHairNights = Vox Nights
|
||||
accessory-VoxHairSurf = Vox Surf
|
||||
accessory-VoxHairCropped = Vox Cropped
|
||||
accessory-VoxHairRuffhawk = Vox Ruffhawk
|
||||
accessory-VoxHairRows = Vox Rows
|
||||
accessory-VoxHairMange = Vox Mange
|
||||
accessory-VoxHairPony = Vox Pony
|
||||
Reference in New Issue
Block a user