Fix Wings sprite bug

Simple-Station · Jan 5, 2024 · fc87717 · fc87717
1 parent 024392c
commit fc87717
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 0 deletions.
diff --git a/Content.Shared/Humanoid/HumanoidVisualLayers.cs b/Content.Shared/Humanoid/HumanoidVisualLayers.cs
@@ -6,6 +6,7 @@ namespace Content.Shared.Humanoid
     [Serializable, NetSerializable]
     public enum HumanoidVisualLayers : byte
     {
+        Wings,
         Tail,
         Hair,
         FacialHair,

diff --git a/Content.Shared/Humanoid/HumanoidVisualLayersExtension.cs b/Content.Shared/Humanoid/HumanoidVisualLayersExtension.cs
@@ -61,6 +61,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:
@@ -78,6 +79,8 @@ public static IEnumerable<HumanoidVisualLayers> Sublayers(HumanoidVisualLayers l
                     return HumanoidVisualLayers.Chest;
                 case BodyPartType.Tail:
                     return HumanoidVisualLayers.Tail;
+                // case BodyPartType.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

diff --git a/Content.Shared/Humanoid/Markings/MarkingCategories.cs b/Content.Shared/Humanoid/Markings/MarkingCategories.cs
@@ -14,6 +14,7 @@ public enum MarkingCategories : byte
         Chest,
         Arms,
         Legs,
+        Wings,
         Tail,
         Overlay
     }
@@ -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,
                 HumanoidVisualLayers.Tail => MarkingCategories.Tail,
                 _ => MarkingCategories.Overlay
             };

diff --git a/Resources/Prototypes/Species/human.yml b/Resources/Prototypes/Species/human.yml
@@ -30,6 +30,7 @@
     RLeg: MobHumanRLeg
     LFoot: MobHumanLFoot
     RFoot: MobHumanRFoot
+    Wings: MobHumanoidAnyMarking
     Tail: MobHumanoidAnyMarking # Nyanotrasen - Felinid
     HeadTop: MobHumanoidAnyMarking # Nyanotrasen - Felinid & Oni
 
@@ -57,6 +58,9 @@
     Arms:
       points: 2
       required: false
+    Wings:
+      points: 1
+      required: false
 
 - type: humanoidBaseSprite
   id: MobHumanoidEyes