Simple-Station · sleepyyapril · Jan 26, 2025 · Jan 17, 2025 · Dec 31, 2024 · Sep 14, 2024
@@ -1,4 +1,4 @@
-using Content.Shared.Humanoid.Markings;
+using Content.Shared.Humanoid.Markings;
 using Robust.Shared.Serialization;
 
 namespace Content.Shared.Humanoid
@@ -8,6 +8,7 @@ public enum HumanoidVisualLayers : byte
     {
         Face,
         Tail,
+        Wings,
         Hair,
         FacialHair,
         Chest,

@@ -73,6 +73,7 @@ public static IEnumerable<HumanoidVisualLayers> Sublayers(HumanoidVisualLayers l
                     break;
                 case HumanoidVisualLayers.Chest:
                     yield return HumanoidVisualLayers.Chest;
+                    yield return HumanoidVisualLayers.Wings;
                     yield return HumanoidVisualLayers.Tail;
                     break;
                 default:

@@ -21,6 +21,7 @@ public enum MarkingCategories : byte
         RightFoot,
         LeftLeg,
         LeftFoot,
+        Wings,
         Tail,
         Overlay
     }
@@ -47,6 +48,7 @@ public static MarkingCategories FromHumanoidVisualLayers(HumanoidVisualLayers la
                 HumanoidVisualLayers.RLeg => MarkingCategories.RightLeg,
                 HumanoidVisualLayers.LFoot => MarkingCategories.LeftFoot,
                 HumanoidVisualLayers.RFoot => MarkingCategories.RightFoot,
+                HumanoidVisualLayers.Wings => MarkingCategories.Wings,
                 HumanoidVisualLayers.Tail => MarkingCategories.Tail,
                 _ => MarkingCategories.Overlay
             };

@@ -0,0 +1,10 @@
+marking-HumanFacialHairChin2 = Beard (Chinstrap 2)
+marking-HumanFacialHairSuperLong = Beard (Super Long)
+marking-HumanFacialHairShort = Beard (Short)
+marking-HumanFacialHairThick = Beard (Thick)
+marking-HumanFacialHairViking = Beard (Viking)
+marking-HumanFacialHairBristle = Beard (Bristle)
+marking-HumanFacialHairMoustacheWithStubble = Moustache (Stubble)
+marking-HumanFacialHairThickBristle = Beard (Thick Bristle)
+marking-HumanFacialHairHandlebar = Moustache (Handlebar 1)
+marking-HumanFacialHairHandlebar2 = Moustache (Handlebar 2)
@@ -0,0 +1,13 @@
+marking-HumanHairArabicGathered = Arabic Gathered
+marking-HumanHairClassicHair = Classic Hair
+marking-HumanHairSideComb = Side Comb
+marking-HumanHairLong4 = Long Four
+marking-HumanHairManbun2 = Bun (Manbun 2)
+marking-HumanHairPigtailTajaran = Tajaran Pigtails
+marking-HumanHairShavedSide = Shaved Side
+marking-HumanHairShorthair8 = Short Hair 8
+marking-HumanFembun = Fembun
+marking-HumanHairAfricanPigtails = African Pigtails
+marking-HumanHairAfropuffDouble = Afropuff (Double)
+marking-HumanHairAfropuffLeft = Afropuff (Left)
+marking-HumanHairAfropuffRight = Afropuff (Right)
@@ -0,0 +1,33 @@
+marking-HumanHairBraidedExtension = Braided Extension
+marking-HumanHairCometTail = Comet Tail
+marking-HumanHairFantasyHair = Fantasy Hair
+marking-HumanHairFlatTwistsUpdo = Flat Twists Updo
+marking-HumanHairFloorlengthBraid = Floorlength Braid
+marking-HumanHairFloorlengthWavy = Floorlength Wavy
+marking-HumanHairFrizzyBraid = Frizzy Braid
+marking-HumanHairFrontBraidsLong = Front Braids Long
+marking-HumanHairFrontBraidsMedium = Front Braids Medium
+marking-HumanHairFrontBraidsShort = Front Braids Short
+marking-HumanHairHairnet = Hairnet
+marking-HumanHairJellyfish = Jellyfish
+marking-HumanHairKazuyaMishima = Kazuya Mishima
+marking-HumanHairLongBraids = Long Braids
+marking-HumanHairLongCurvy = Long Curvy
+marking-HumanHairLongPompadour = Long Pompadour
+marking-HumanHairMediumCurls = Medium Curls
+marking-HumanHairMullet = Mullet
+marking-HumanHairPelvicLengthBraid = Pelvic Length Braid
+marking-HumanHairPlateau = Plateau
+marking-HumanHairQueenBee = Queen Bee
+marking-HumanHairSaggedMohawk = Sagged Mohawk
+marking-HumanHairSharpMohawk = Sharp Mohawk
+marking-HumanHairShortAndPoofy = Short & Poofy
+marking-HumanHairShortCurls = Short Curls
+marking-HumanHairShoulderLengthBraid = Shoulder Length Braid
+marking-HumanHairSideSpike = Side Spike
+marking-HumanHairSpaceLoops = Space Loops
+marking-HumanHairStar = Star
+marking-HumanHairStarFro = Star Fro
+marking-HumanHairStyledCurls = Styled Curls
+marking-HumanHairUnkemptScientist = Unkempt Scientist
+marking-HumanHairWispy = Wispy
@@ -0,0 +1,4 @@
+markings-category-Wings = Wings
+
+marking-WingsRobotic = Robotic Wings
+marking-WingsRobotic-robotic = Robotic Wings
@@ -1,6 +1,6 @@
 marking-HumanFacialHairAbe = Beard (Abraham Lincoln)
 marking-HumanFacialHairBrokenman = Beard (Broken Man)
-marking-HumanFacialHairChin = Beard (Chinstrap)
+marking-HumanFacialHairChin = Beard (Chinstrap 1)
 marking-HumanFacialHairDwarf = Beard (Dwarf)
 marking-HumanFacialHairFullbeard = Beard (Full)
 marking-HumanFacialHairCroppedfullbeard = Beard (Cropped Fullbeard)

@@ -31,7 +31,7 @@ marking-HumanHairBun = Bun Head
 marking-HumanHairBunhead2 = Bun Head 2
 marking-HumanHairBun3 = Bun Head 3
 marking-HumanHairLargebun = Bun (Large)
-marking-HumanHairManbun = Bun (Manbun)
+marking-HumanHairManbun = Bun (Manbun 1)
 marking-HumanHairTightbun = Bun (Tight)
 marking-HumanHairBusiness = Business Hair
 marking-HumanHairBusiness2 = Business Hair 2
@@ -45,6 +45,8 @@ marking-HumanHairClassicBusiness = Classic Business Hair
 marking-HumanHairClassicCia = Classic CIA
 marking-HumanHairClassicCornrows2 = Classic Cornrows 2
 marking-HumanHairClassicFloorlengthBedhead = Classic Floorlength Bedhead
+marking-HumanHairClassicLong2 = Classic Long Hair 2
+marking-HumanHairClassicLong3 = Classic Long Hair 3
 marking-HumanHairClassicModern = Classic Modern
 marking-HumanHairClassicMulder = Classic Mulder
 marking-HumanHairClassicWisp = Classic Wisp
@@ -95,6 +97,7 @@ marking-HumanHairJensen = Jensen Hair
 marking-HumanHairJoestar = Joestar
 marking-HumanHairKeanu = Keanu Hair
 marking-HumanHairKusanagi = Kusanagi Hair
+marking-HumanHairLongBow = Long Bow
 marking-HumanHairLong = Long Hair 1
 marking-HumanHairLong2 = Long Hair 2
 marking-HumanHairLong3 = Long Hair 3
@@ -143,8 +146,10 @@ marking-HumanHairSidetail3 = Ponytail (Side) 3
 marking-HumanHairSidetail4 = Ponytail (Side) 4
 marking-HumanHairSpikyponytail = Ponytail (Spiky)
 marking-HumanHairPoofy = Poofy
+marking-HumanHairPulato = Pulato
 marking-HumanHairQuiff = Quiff
 marking-HumanHairRonin = Ronin
+marking-HumanHairShaped = Shaped
 marking-HumanHairShaved = Shaved
 marking-HumanHairShavedpart = Shaved Part
 marking-HumanHairShortbangs = Short Bangs

@@ -7,6 +7,4 @@ marking-HumanHairClassicLowFade = Fade (Low, Classic)
 marking-HumanHairClassicMedFade = Fade (Medium, Classic)
 marking-HumanHairClassicOmbre = Ombre Classic
 marking-HumanHairClassicCrewcut = Crewcut Classic
-marking-HumanHairClassicLong = Long 1 (Classic)
-marking-HumanHairClassicLong2 = Long 2 (Classic)
-marking-HumanHairClassicLong3 = Long 3 (Classic)
+marking-HumanHairClassicLong = Classic Long Hair 1
@@ -90,3 +90,6 @@ marking-FaceNeckSlimThick-neck_thick_f = Neck Cover (Slim Thick)
 
 marking-FaceNeckWideThick = Neck Cover (Wide Thick)
 marking-FaceNeckWideThick-neck_thick_m = Neck Cover (Wide Thick)
+
+marking-IronJaw = Iron Jaw
+marking-IronJaw-iron_jaw = Iron Jaw
@@ -46,6 +46,9 @@ marking-GauzeUpperLegRight = Gauze Thigh Wrap (Right)
 marking-GauzeBlindfold-gauze_blindfold = Gauze Blindfold
 marking-GauzeBlindfold = Gauze Blindfold
 
+marking-GauzeHead-gauze_head = Gauze Head Wrap
+marking-GauzeHead = Gauze Head Wrap
+
 marking-GauzeLizardBlindfold-gauze_lizard_blindfold = Gauze Blindfold
 marking-GauzeLizardBlindfold = Gauze Blindfold
 

@@ -0,0 +1,2 @@
+marking-WingsSkeleton = Skeleton Wings
+marking-WingsSkeleton-skeleton = Skeleton Wings
@@ -77,19 +77,3 @@
   sprites:
     - sprite: DeltaV/Mobs/Customization/hair.rsi
       state: classic_long
-
-- type: marking
-  id: HumanHairClassicLong2
-  bodyPart: Hair
-  markingCategory: Hair
-  sprites:
-    - sprite: DeltaV/Mobs/Customization/hair.rsi
-      state: classic_long2
-
-- type: marking
-  id: HumanHairClassicLong3
-  bodyPart: Hair
-  markingCategory: Hair
-  sprites:
-    - sprite: DeltaV/Mobs/Customization/hair.rsi
-      state: classic_long3
@@ -418,3 +418,17 @@
   sprites:
   - sprite: Mobs/Customization/face.rsi
     state: neck_thick_m
+
+- type: marking
+  id: IronJaw
+  bodyPart: Face
+  markingCategory: Face
+  speciesRestriction: [Dwarf, Human, SlimePerson, Felinid, Oni, Harpy, Arachne, Lamia]
+  coloring:
+    default:
+      type:
+        !type:EyeColoring
+          negative: true
+  sprites:
+  - sprite: _ADT/Mobs/Customization/augments/headaugs.rsi
+    state: iron_jaw
@@ -222,6 +222,20 @@
   - sprite: Mobs/Customization/gauze.rsi
     state: gauze_boxerwrap_l
 
+- type: marking
+  id: GauzeHead
+  bodyPart: Head
+  markingCategory: Overlay
+  speciesRestriction: [Dwarf, Human, Reptilian, Arachnid, Felinid, Oni, Vulpkanin, Arachne, Lamia] # Delta V - Felinid, Oni, Vulpkanin # EE - Arachne, Lamia
+  coloring:
+    default:
+      type:
+        !type:SimpleColoring
+          color: "#FFFFFF"
+  sprites:
+  - sprite: Mobs/Customization/gauze.rsi
+    state: gauze_head
+
 # Lizard Specific Markings
 - type: marking
   id: GauzeLizardLefteyePatch

@@ -54,6 +54,13 @@
   sprites:
     - sprite: Mobs/Customization/human_hair.rsi
       state: bedheadv3
+- type: marking
+  id: HumanHairPulato
+  bodyPart: Hair
+  markingCategory: Hair
+  sprites:
+    - sprite: Mobs/Customization/human_hair.rsi
+      state: pulato
 - type: marking
   id: HumanHairLongBedhead
   bodyPart: Hair
@@ -1349,3 +1356,31 @@
   sprites:
     - sprite: Mobs/Customization/human_hair.rsi
       state: tailed
+- type: marking
+  id: HumanHairClassicLong2
+  bodyPart: Hair
+  markingCategory: Hair
+  sprites:
+    - sprite: Mobs/Customization/human_hair.rsi
+      state: classiclong2
+- type: marking
+  id: HumanHairClassicLong3
+  bodyPart: Hair
+  markingCategory: Hair
+  sprites:
+    - sprite: Mobs/Customization/human_hair.rsi
+      state: classiclong3
+- type: marking
+  id: HumanHairShaped
+  bodyPart: Hair
+  markingCategory: Hair
+  sprites:
+    - sprite: Mobs/Customization/human_hair.rsi
+      state: shaped
+- type: marking
+  id: HumanHairLongBow
+  bodyPart: Hair
+  markingCategory: Hair
+  sprites:
+    - sprite: Mobs/Customization/human_hair.rsi
+      state: longbow
@@ -0,0 +1,8 @@
+- type: marking
+  id: WingsSkeleton
+  bodyPart: Wings
+  markingCategory: Wings
+  speciesRestriction: [Plasmaman]
+  sprites:
+    - sprite: _SimpleStation/Mobs/Customization/wings64x34.rsi
+      state: skeleton
@@ -83,7 +83,7 @@
   bodyPart: HeadSide
   markingCategory: HeadSide
   forcedColoring: true
-  speciesRestriction: [Oni, Harpy, Arachne, Lamia]
+  speciesRestriction: [Oni]
   sprites:
   - sprite: Mobs/Customization/pointy_ears.rsi
     state: pointy_ears_none
@@ -50,6 +50,7 @@
     - map: [ "enum.HumanoidVisualLayers.HeadSide" ]
     - map: [ "enum.HumanoidVisualLayers.HeadTop" ]
     - map: [ "enum.HumanoidVisualLayers.Tail" ]
+    - map: [ "enum.HumanoidVisualLayers.Wings" ]
     - map: [ "mask" ]
     - map: [ "head" ]
     - map: [ "pocket1" ]

@@ -44,6 +44,7 @@
     RLeg: MobIPCRLeg
     LFoot: MobIPCLFoot
     RFoot: MobIPCRFoot
+    Wings: MobHumanoidAnyMarking
 
 - type: markingPoints
   id: MobIPCMarkingLimits
@@ -94,6 +95,9 @@
       points: 1
       required: false
       defaultMarkings: [ MobIPCLHandDefault ]
+    Wings:
+      points: 1
+      required: false
 
 - type: humanoidBaseSprite
   id: MobIPCMarkingFollowSkin

@@ -32,6 +32,7 @@
     RLeg: MobPlasmamanRLeg
     LFoot: MobPlasmamanLFoot
     RFoot: MobPlasmamanRFoot
+    Wings: MobHumanoidAnyMarking
 
 - type: markingPoints
   id: MobPlasmamanMarkingLimits

@@ -63,7 +63,7 @@
       points: 3
       required: false
     Chest:
-      points: 1
+      points: 3
       required: false
     RightLeg:
       points: 2
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		marking-WingsSkeleton = Skeleton Wings
		marking-WingsSkeleton-skeleton = Skeleton Wings