Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add Back Old Markings and Wings Layer #25

Merged
merged 17 commits into from
Jan 18, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions Content.Shared/Body/Part/BodyPartType.cs
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ public enum BodyPartType
Hand,
Leg,
Foot,
Wings, // Parkstation-Wings
Tail
}
}
1 change: 1 addition & 0 deletions Content.Shared/Humanoid/HumanoidVisualLayers.cs
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ namespace Content.Shared.Humanoid
[Serializable, NetSerializable]
public enum HumanoidVisualLayers : byte
{
Wings, // Parkstation-Wings
Tail,
Hair,
FacialHair,
Expand Down
3 changes: 3 additions & 0 deletions Content.Shared/Humanoid/HumanoidVisualLayersExtension.cs
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,7 @@ public static IEnumerable<HumanoidVisualLayers> Sublayers(HumanoidVisualLayers l
break;
case HumanoidVisualLayers.Chest:
yield return HumanoidVisualLayers.Chest;
yield return HumanoidVisualLayers.Wings; // Parkstation-Wings
yield return HumanoidVisualLayers.Tail;
break;
default:
Expand All @@ -78,6 +79,8 @@ public static IEnumerable<HumanoidVisualLayers> Sublayers(HumanoidVisualLayers l
return HumanoidVisualLayers.Chest;
case BodyPartType.Tail:
return HumanoidVisualLayers.Tail;
case BodyPartType.Wings: // Parkstation-Wings
return HumanoidVisualLayers.Wings;
case BodyPartType.Head:
// use the Sublayers method to hide the rest of the parts,
// if that's what you're looking for
Expand Down
2 changes: 2 additions & 0 deletions Content.Shared/Humanoid/Markings/MarkingCategories.cs
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ public enum MarkingCategories : byte
Chest,
Arms,
Legs,
Wings, // Parkstation-Wings
Tail,
Overlay
}
Expand All @@ -39,6 +40,7 @@ public static MarkingCategories FromHumanoidVisualLayers(HumanoidVisualLayers la
HumanoidVisualLayers.RLeg => MarkingCategories.Legs,
HumanoidVisualLayers.LFoot => MarkingCategories.Legs,
HumanoidVisualLayers.RFoot => MarkingCategories.Legs,
HumanoidVisualLayers.Wings => MarkingCategories.Wings, // Parkstation-Wings
HumanoidVisualLayers.Tail => MarkingCategories.Tail,
_ => MarkingCategories.Overlay
};
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
marking-HumanFacialHairHandlebar = Mustache (Bicycle Handlebar)
marking-HumanFacialHairHandlebarAlt = Mustache (Bicycle handlebar alt.)
71 changes: 71 additions & 0 deletions Resources/Locale/en-US/corvax/accessories/human-hair.ftl
Original file line number Diff line number Diff line change
@@ -0,0 +1,71 @@
marking-HumanHairAfricanPigtails = African Pigtails
marking-HumanHairAfropuffdouble = Afro puff, Double
marking-HumanHairAfropuffleft = Afro Pouf, Left
marking-HumanHairAfropuffright = Afro Pouf, Right
marking-HumanHairAmazon = Amazon
marking-HumanHairAstolfo = Astolfo
marking-HumanHairBaum = Baum
marking-HumanHairBeachwave = Beachwave
marking-HumanHairBluntbangs = Straight bangs
marking-HumanHairBluntbangsAlt = Straight Bangs (Alt)
marking-HumanHairBobcutAlt = Bobcut (Alt)
marking-HumanHairBunhead4 = Bunhead 4
marking-HumanHairCombed = Combed
marking-HumanHairCombedbob = Combedbob
marking-HumanHairCotton = Cotton
marking-HumanHairCurly = Curly
marking-HumanHairDave = Dave
marking-HumanHairDiagonalBangs = Diagonal bangs
marking-HumanHairEmolong = Emo (Long)
marking-HumanHairEmoshort = Emo (Short)
marking-HumanHairFingerwave = Fingerwave
marking-HumanHairFluffyShort = Fluffy Short
marking-HumanHairFortuneteller = Fortuneteller
marking-HumanHairFortunetellerAlt = Fortuneteller (Alt)
marking-HumanHairFroofylong = Froofy (Long)
marking-HumanHairGeisha = Geisha
marking-HumanHairGentle21 = Gentle
marking-HumanHairGlammetal = Glammetal
marking-HumanHairGloomyLong = Long dark bangs
marking-HumanHairGloomyMedium = Medium Gloomy Bangs
marking-HumanHairGrande = Grande
marking-HumanHairHalfshave = Half Shaved 2
marking-HumanHairHalfshaveglamorous = Half Shaved (Glamorous)
marking-HumanHairHalfshaveLong = Half Shaved (Long)
marking-HumanHairHalfshaveMessy = Half Shaved (Messy)
marking-HumanHairHalfshaveMessyLong = Half Shaved (Long Messy)
marking-HumanHairHalfshaveSnout = Half Shaved 2 (Snout)
marking-HumanHairHightight = Hightight
marking-HumanHairHyenamane = Hyena's mane
marking-HumanHairJessica = Jessica
marking-HumanHairLong4 = Long 4
marking-HumanHairLongdtails = Long tails
marking-HumanHairLongerAlt = Longer (Alt)
marking-HumanHairLongovereyeAlt = Long (Over eye alt)
marking-HumanHairLongsidepartstraight = Long sidepart straight
marking-HumanHairLooseSlicked = Slicked Loose
marking-HumanHairMediumbraid = Braid (Medium)
marking-HumanHairNewyou = New you
marking-HumanHairPonytailAlt = Ponytail (Alt)
marking-HumanHairPonytailF = Ponytail (Feminine)
marking-HumanHairPoofy2 = Poofy 2
marking-HumanHairQuadcurls = Curls (Quad)
marking-HumanHairSabitsuki = Sabitsuki
marking-HumanHairScully = Scully
marking-HumanHairShorthair4 = Shorthair 4
marking-HumanHairShy = Modest
marking-HumanHairSimplePonytail = Ponytail (Simple)
marking-HumanHairSleaze = Cheap
marking-HumanHairSlightlyMessy = Slightly messy
marking-HumanHairSlimedroplet = Slime (Droplet)
marking-HumanHairSlimedropletAlt = Slime (Alt Droplet)
marking-HumanHairSlimespikes = Slime (Spikes)
marking-HumanHairSlimetendrils = Slime (Tendrils)
marking-HumanHairSlimetendrilsAlt = Slime
marking-HumanHairSpicy = Spicy
marking-HumanHairTwintailFloor = Two Tails (Floorlength)
marking-HumanHairVeryshortovereye = Very short (Over eye)
marking-HumanHairVictory = Victory
marking-HumanHairViper = Viper
marking-HumanHairWife = Wife
marking-HumanHairZiegler = Ziegler
2 changes: 2 additions & 0 deletions Resources/Locale/en-US/preferences/ui/markings-picker.ftl
Original file line number Diff line number Diff line change
Expand Up @@ -22,5 +22,7 @@ markings-category-Snout = Snout
markings-category-Chest = Chest
markings-category-Arms = Arms
markings-category-Legs = Legs
## Parkstation-Wings
markings-category-Wings = Wings
markings-category-Tail = Tail
markings-category-Overlay = Overlay
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
marking-EarsAvali=Avali
marking-EarsBunny=Bunny
marking-EarsBunny2=Bunny 2
marking-EarsChemlight=Chemlight
marking-EarsDragonLong=Dragon Horns
marking-EarsEasternD=Eastern Dragon
marking-EarsJackal=Jackal
marking-EarsMagus=Pointy
marking-EarsMouse=Mouse
marking-EarsShadowkin=Shadowkin
marking-EarsShadowkinStriped=Shadowkin (Striped)
marking-EarsSylveon=Ribbons
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
marking-EyesShadowkin=Shadowkin
Original file line number Diff line number Diff line change
@@ -0,0 +1,70 @@
marking-HumanHairAfricanPigtails = African Pigtails
marking-HumanHairAfropuffdouble = Afro Puff Double
marking-HumanHairAfropuffleft = Afro Puff Left
marking-HumanHairAfropuffright = Afro Puff Right
marking-HumanHairAmazon = Amazon
marking-HumanHairAstolfo = French Knots
marking-HumanHairBaum = Baum
marking-HumanHairBeachwave = Beachwave
marking-HumanHairBluntbangs = Blunt Bangs
marking-HumanHairBluntbangsAlt = Blunt Bangs Alt
marking-HumanHairBobcutAlt = Bob Cut Alt
marking-HumanHairBunhead4 = Bun Head 4
marking-HumanHairCombed = Combed
marking-HumanHairCombedbob = Combed Bob
marking-HumanHairCotton = Cotton
marking-HumanHairCurly = Curly
marking-HumanHairDave = Dave
marking-HumanHairDiagonalBangs = Diagonal Bangs
marking-HumanHairEmoshort = Emo Short
marking-HumanHairFingerwave = Fingerwave
marking-HumanHairFluffyShort = Short Fluffy
marking-HumanHairFortuneteller = Fortune Teller
marking-HumanHairFortunetellerAlt = Fortune Teller Alt
marking-HumanHairFroofylong = Long Froofy
marking-HumanHairGeisha = Geisha
marking-HumanHairGentle21 = Gentle 21
marking-HumanHairGlammetal = Glam Metal
marking-HumanHairGloomyLong = Gloomy Long
marking-HumanHairGloomyMedium = Gloomy Medium
marking-HumanHairGrande = Grande
marking-HumanHairHalfshave = Half-shaved Alt
marking-HumanHairHalfshaveglamorous = Half-shaved Glamorous
marking-HumanHairHalfshaveLong = Half-shaved Long
marking-HumanHairHalfshaveMessy = Half-shaved Messy
marking-HumanHairHalfshaveMessyLong = Half-shaved Messy Long
marking-HumanHairHalfshaveSnout = Half-shaved Snout
marking-HumanHairHightight = High Tight
marking-HumanHairHyenamane = Mohawk Hyena
marking-HumanHairJessica = Jessica
marking-HumanHairLong4 = Long 4
marking-HumanHairLongdtails = Pigtails Huge
marking-HumanHairLongerAlt = Longer Alt
marking-HumanHairLongovereyeAlt = Over Eye Long Alt
marking-HumanHairLongsidepartstraight = Sidepart Straight Long
marking-HumanHairLooseSlicked = Slicked Loose
marking-HumanHairMediumbraid = Braid Medium
marking-HumanHairNewyou = New You
marking-HumanHairPonytailAlt = Ponytail Alt
marking-HumanHairPonytailF = Ponytail Side 5
marking-HumanHairPoofy2 = Poofy 2
marking-HumanHairQuadcurls = Quadcurls
marking-HumanHairSabitsuki = Sabitsuki
marking-HumanHairScully = Scully
marking-HumanHairShorthair4 = Short Hair 4
marking-HumanHairShy = Shy
marking-HumanHairSimplePonytail = Ponytail Simple
marking-HumanHairSleaze = Sleaze
marking-HumanHairSlightlyMessy = Slightly Messy
marking-HumanHairSlimedroplet = Slime Droplet
marking-HumanHairSlimedropletAlt = Slime Droplet Alt
marking-HumanHairSlimespikes = Slime Spikes
marking-HumanHairSlimetendrils = Slime Tendrils
marking-HumanHairSlimetendrilsAlt = Slime Tendrils Alt
marking-HumanHairSpicy = Spicy
marking-HumanHairTwintailFloor = Floorlength Twintail
marking-HumanHairVeryshortovereye = Over Eye Short
marking-HumanHairVictory = Victory
marking-HumanHairViper = Viper
marking-HumanHairWife = Wife
marking-HumanHairZiegler = Ziegler
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
marking-RobotAntennaTv = Tv
marking-RobotAntennaTesla = Tesla
marking-RobotAntennaLightb = Light (alt)
marking-RobotAntennaLight = Light
marking-RobotAntennaCyberhead = Cyberhead
marking-RobotAntennaSidelights = Sidelights
marking-RobotAntennaAntlers = Antlers
marking-RobotAntennaDroneeyes = Drone Eyes
marking-RobotAntennaCrowned = Crowned
marking-RobotAntennaTowers = Towers
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
marking-ScreenStatic = Static
marking-ScreenBlue = Blue
marking-ScreenBreakout = Breakout
marking-ScreenEight = Eight
marking-ScreenGoggles = Goggles
marking-ScreenExclaim = Exclaim
marking-ScreenHeart = Heart
marking-ScreenMonoeye = Cyclops
marking-ScreenNature = Naturalist
marking-ScreenOrange = Orange
marking-ScreenPink = Pink
marking-ScreenQuestion = Question
marking-ScreenShower = Shower
marking-ScreenYellow = Yellow
marking-ScreenScroll = Scroll
marking-ScreenConsole = Console
marking-ScreenRgb = RGB
marking-ScreenGlider = Glider
marking-ScreenRainbowhoriz = Horizontal Rainbow
marking-ScreenBsod = BSOD
marking-ScreenRedtext = Red Text
marking-ScreenSinewave = Sinewave
marking-ScreenSquarewave = Squarewave
marking-ScreenEcgwave = ECG wave
marking-ScreenEyes = Eyes
marking-ScreenEyestall = Tall Eyes
marking-ScreenEyesangry = Angry Eyes
marking-ScreenLoading = Loading...
marking-ScreenWindowsxp = Experience
marking-ScreenTetris = NT Block Game
marking-ScreenTv = Tv
marking-ScreenTextdrop = Textdrop
marking-ScreenStars = Stars
marking-ScreenRainbowdiag = Diagonal Rainbow
marking-ScreenBlank = Dead Pixel
marking-ScreenSmile = Smiley
marking-ScreenFrown = Frowny
marking-ScreenRing = Ring
marking-ScreenL = L
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
marking-SpinesAqua = Lizard Spine (Aquatic)
marking-SpinesWagAqua = Lizard Spine (Aquatic Wag)
marking-SpinesLong = Lizard Spine (Long)
marking-SpinesWagLong = Lizard Spine (Long Wag)
marking-SpinesLongmeme = Lizard Spine (Long Membrane)
marking-SpinesWagLongmeme = Lizard Spine (Long Membrane Wag)
marking-SpinesShort = Lizard Spine (Short)
marking-SpinesWagShort = Lizard Spine (Short Wag)
marking-SpinesShortmeme = Lizard Spine (Short Membrane)
marking-SpinesWagShortmeme = Lizard Spine (Short Membrane Wag)

marking-TailWagdTiger = Lizard Tail (Dark Tiger Wag)
marking-TailWaglTiger = Lizard Tail (Light Tiger Wag)
marking-TailWagSmooth = Lizard Tail (Smooth Wag)
marking-TailWagSpike = Lizard Tail (Spike Wag)
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
marking-SnoutBirdSkull=Bird Skull
marking-SnoutEasternDNW=Eastern Dragon
marking-SnoutEasternDW=Eastern Dragon (Whiskers)
marking-SnoutMagusSkull=Magus Skull
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
marking-TailAxolotl=Axolotl
marking-TailDatashark=Datashark
marking-TailEasternDragon=Eastern Dragon
marking-TailFennec=Fennec
marking-TailFish=Fish
marking-TailFluffy=Fluffy
marking-TailFox=Fox
marking-TailGecko=Gecko
marking-TailKitsune=Kitsune
marking-TailMaw=Maw
marking-TailShark=Shark
marking-TailSnake=Snake
marking-TailSuccubus=Pointy
marking-TailTentacle=Tentacles
marking-TailShadowkin=Shadowkin
marking-TailShadowkinBig=Shadowkin (Big)
marking-TailShadowkinShorter=Shadowkin (Short)
marking-TailShadowkinMedium=Shadowkin (Medium)
marking-TailShadowkinBigFluff=Shadowkin (Big and Fluffy)
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
marking-WingsDragonOpen=Dragon (Open)
marking-WingsDragon=Dragon
marking-WingsFlyOpen=Fly (Open)
marking-WingsFly=Fly
marking-WingsMegamothOpen=Megamoth (Open)
marking-WingsMegamoth=Megamoth
marking-WingsMothraOpen=Mothra (Open)
marking-WingsMothra=Mothra
marking-WingsRobotic=Robotic
marking-WingsSkeletonOpen=Skeleton (Open)
marking-WingsSkeleton=Skeleton
marking-WingsHarpy=Harpy
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
- type: marking
id: HumanFacialHairHandlebar
bodyPart: FacialHair
markingCategory: FacialHair
sprites:
- sprite: Corvax/Mobs/Customization/human_facial_hair.rsi
state: handlebar

- type: marking
id: HumanFacialHairHandlebarAlt
bodyPart: FacialHair
markingCategory: FacialHair
sprites:
- sprite: Corvax/Mobs/Customization/human_facial_hair.rsi
state: handlebar2
Loading
Loading