Split Arm And Leg Markings (#870)

# Description It's time to finally rip off a bandaid, and cease fucking with awful layer garbage and marking workarounds. This PR completely removes the Arms and Legs marking categories, replacing them with: 1. Right Arm 2. Right Hand 3. Left Arm 4. Left Hand 5. Right Leg 6. Right Foot 7. Left Leg 8. Left Foot Finally, removing harpy layer shitcode is within our grasp. <details><summary><h1>Media</h1></summary> <p> ![image](https://github.com/user-attachments/assets/7cb5cb2d-ec5a-4269-a29b-08eeabc5668b) ![image](https://github.com/user-attachments/assets/a5b8861d-ae25-45cb-96d7-2d4dbf17be98) </p> </details> # Changelog :cl: - add: Arm and Leg markings are now split between individual arms, hands, legs, and feet.
Simple-Station · Sep 9, 2024 · a0c225d · a0c225d
1 parent cd3c598
commit a0c225d
Show file tree

Hide file tree

Showing 31 changed files with 609 additions and 366 deletions.
diff --git a/Content.Shared/Humanoid/Markings/MarkingCategories.cs b/Content.Shared/Humanoid/Markings/MarkingCategories.cs
@@ -12,8 +12,14 @@ public enum MarkingCategories : byte
         HeadSide,
         Snout,
         Chest,
-        Arms,
-        Legs,
+        RightArm,
+        RightHand,
+        LeftArm,
+        LeftHand,
+        RightLeg,
+        RightFoot,
+        LeftLeg,
+        LeftFoot,
         Tail,
         Overlay
     }
@@ -31,14 +37,14 @@ public static MarkingCategories FromHumanoidVisualLayers(HumanoidVisualLayers la
                 HumanoidVisualLayers.HeadSide => MarkingCategories.HeadSide,
                 HumanoidVisualLayers.Snout => MarkingCategories.Snout,
                 HumanoidVisualLayers.Chest => MarkingCategories.Chest,
-                HumanoidVisualLayers.RArm => MarkingCategories.Arms,
-                HumanoidVisualLayers.LArm => MarkingCategories.Arms,
-                HumanoidVisualLayers.RHand => MarkingCategories.Arms,
-                HumanoidVisualLayers.LHand => MarkingCategories.Arms,
-                HumanoidVisualLayers.LLeg => MarkingCategories.Legs,
-                HumanoidVisualLayers.RLeg => MarkingCategories.Legs,
-                HumanoidVisualLayers.LFoot => MarkingCategories.Legs,
-                HumanoidVisualLayers.RFoot => MarkingCategories.Legs,
+                HumanoidVisualLayers.RArm => MarkingCategories.RightArm,
+                HumanoidVisualLayers.LArm => MarkingCategories.LeftArm,
+                HumanoidVisualLayers.RHand => MarkingCategories.RightHand,
+                HumanoidVisualLayers.LHand => MarkingCategories.LeftHand,
+                HumanoidVisualLayers.LLeg => MarkingCategories.LeftLeg,
+                HumanoidVisualLayers.RLeg => MarkingCategories.RightLeg,
+                HumanoidVisualLayers.LFoot => MarkingCategories.LeftFoot,
+                HumanoidVisualLayers.RFoot => MarkingCategories.RightFoot,
                 HumanoidVisualLayers.Tail => MarkingCategories.Tail,
                 _ => MarkingCategories.Overlay
             };

diff --git a/Resources/Locale/en-US/preferences/ui/markings-picker.ftl b/Resources/Locale/en-US/preferences/ui/markings-picker.ftl
@@ -20,7 +20,13 @@ markings-category-HeadTop = Head (Top)
 markings-category-HeadSide = Head (Side)
 markings-category-Snout = Snout
 markings-category-Chest = Chest
-markings-category-Arms = Arms
-markings-category-Legs = Legs
+markings-category-RightArm = Right Arm
+markings-category-RightHand = Right Hand
+markings-category-LeftArm = Left Arm
+markings-category-LeftHand = Left Hand
+markings-category-RightLeg = Right Leg
+markings-category-RightFoot = Right Foot
+markings-category-LeftLeg = Left Leg
+markings-category-LeftFoot = Left Foot
 markings-category-Tail = Tail
 markings-category-Overlay = Overlay
diff --git a/Resources/Prototypes/DeltaV/Entities/Mobs/Customization/Markings/vulpkanin.yml b/Resources/Prototypes/DeltaV/Entities/Mobs/Customization/Markings/vulpkanin.yml
@@ -588,7 +588,7 @@
 # Leg Markings
 - type: marking
   id: VulpPointsFeet
-  markingCategory: Overlay
+  markingCategory: RightFoot
   bodyPart: RFoot
   speciesRestriction: [Vulpkanin]
   sprites:
@@ -597,7 +597,7 @@
 
 - type: marking
   id: VulpPointsCrestLegs
-  markingCategory: Legs
+  markingCategory: LeftLeg
   bodyPart: LLeg
   speciesRestriction: [Vulpkanin]
   sprites:
@@ -606,7 +606,7 @@
 
 - type: marking
   id: VulpPointsFadeLegs
-  markingCategory: Legs
+  markingCategory: LeftLeg
   bodyPart: LLeg
   speciesRestriction: [Vulpkanin]
   sprites:
@@ -615,7 +615,7 @@
 
 - type: marking
   id: VulpPointsSharpLegs
-  markingCategory: Legs
+  markingCategory: LeftLeg
   bodyPart: LLeg
   speciesRestriction: [Vulpkanin]
   sprites:
@@ -625,7 +625,7 @@
 # Arm Markings
 - type: marking
   id: VulpPointsHands
-  markingCategory: Overlay
+  markingCategory: RightHand
   bodyPart: RHand
   speciesRestriction: [Vulpkanin]
   sprites:
@@ -634,7 +634,7 @@
 
 - type: marking
   id: VulpPointsCrestArms
-  markingCategory: Arms
+  markingCategory: LeftArm
   bodyPart: LArm
   speciesRestriction: [Vulpkanin]
   sprites:
@@ -643,7 +643,7 @@
 
 - type: marking
   id: VulpPointsFadeArms
-  markingCategory: Arms
+  markingCategory: LeftArm
   bodyPart: LArm
   speciesRestriction: [Vulpkanin]
   sprites:
@@ -652,7 +652,7 @@
 
 - type: marking
   id: VulpPointsSharpArms
-  markingCategory: Arms
+  markingCategory: LeftArm
   bodyPart: LArm
   speciesRestriction: [Vulpkanin]
   sprites:

diff --git a/Resources/Prototypes/DeltaV/Species/vulpkanin.yml b/Resources/Prototypes/DeltaV/Species/vulpkanin.yml
@@ -49,11 +49,29 @@
     Head:
       points: 1
       required: false
-    Legs:
-      points: 6
+    RightLeg:
+      points: 2
       required: false
-    Arms:
-      points: 6
+    RightFoot:
+      points: 2
+      required: false
+    LeftLeg:
+      points: 2
+      required: false
+    LeftFoot:
+      points: 2
+      required: false
+    RightArm:
+      points: 2
+      required: false
+    RightHand:
+      points: 2
+      required: false
+    LeftArm:
+      points: 2
+      required: false
+    LeftHand:
+      points: 2
       required: false
     Snout:
       points: 1

diff --git a/Resources/Prototypes/Entities/Mobs/Customization/Markings/arachnid.yml b/Resources/Prototypes/Entities/Mobs/Customization/Markings/arachnid.yml
@@ -291,7 +291,7 @@
 - type: marking
   id: ArachnidRArmStripes
   bodyPart: RArm
-  markingCategory: Arms
+  markingCategory: RightArm
   speciesRestriction: [Arachnid]
   sprites:
   - sprite: Mobs/Customization/Arachnid/arms.rsi
@@ -304,7 +304,7 @@
 - type: marking
   id: ArachnidLArmStripes
   bodyPart: LArm
-  markingCategory: Arms
+  markingCategory: LeftArm
   speciesRestriction: [Arachnid]
   sprites:
   - sprite: Mobs/Customization/Arachnid/arms.rsi
@@ -318,7 +318,7 @@
 - type: marking
   id: ArachnidRLegStripes
   bodyPart: RLeg
-  markingCategory: Legs
+  markingCategory: RightLeg
   speciesRestriction: [Arachnid]
   sprites:
   - sprite: Mobs/Customization/Arachnid/legs.rsi
@@ -331,7 +331,7 @@
 - type: marking
   id: ArachnidLLegStripes
   bodyPart: LLeg
-  markingCategory: Legs
+  markingCategory: LeftLeg
   speciesRestriction: [Arachnid]
   sprites:
   - sprite: Mobs/Customization/Arachnid/legs.rsi

diff --git a/Resources/Prototypes/Entities/Mobs/Customization/Markings/harpy.yml b/Resources/Prototypes/Entities/Mobs/Customization/Markings/harpy.yml
@@ -4,7 +4,7 @@
 - type: marking
   id: HarpyWingDefaultHuescale
   bodyPart: RArm
-  markingCategory: Arms
+  markingCategory: RightArm
   speciesRestriction: [Harpy]
   coloring:
     default:
@@ -21,7 +21,7 @@
 - type: marking
   id: HarpyWingDefaultWhitescale
   bodyPart: RArm
-  markingCategory: Arms
+  markingCategory: RightArm
   speciesRestriction: [Harpy]
   coloring:
     default:
@@ -38,7 +38,7 @@
 - type: marking
   id: HarpyWingClassic
   bodyPart: RArm
-  markingCategory: Arms
+  markingCategory: RightArm
   speciesRestriction: [Harpy]
   coloring:
     default:
@@ -55,7 +55,7 @@
 - type: marking
   id: HarpyWingFoldedHuescale
   bodyPart: RArm
-  markingCategory: Arms
+  markingCategory: RightArm
   speciesRestriction: [Harpy]
   coloring:
     default:
@@ -72,7 +72,7 @@
 - type: marking
   id: HarpyWingFoldedWhitescale
   bodyPart: RArm
-  markingCategory: Arms
+  markingCategory: RightArm
   speciesRestriction: [Harpy]
   coloring:
     default:
@@ -89,7 +89,7 @@
 - type: marking
   id: HarpyWingOwlHuescale
   bodyPart: RArm
-  markingCategory: Arms
+  markingCategory: RightArm
   speciesRestriction: [Harpy]
   coloring:
     default:
@@ -106,7 +106,7 @@
 - type: marking
   id: HarpyWingOwlWhitescale
   bodyPart: RArm
-  markingCategory: Arms
+  markingCategory: RightArm
   speciesRestriction: [Harpy]
   coloring:
     default:
@@ -306,7 +306,7 @@
 - type: marking
   id: HarpyWing2ToneClassic
   bodyPart: RArm
-  markingCategory: Arms
+  markingCategory: RightArm
   speciesRestriction: [Harpy]
   sprites:
     - sprite: Mobs/Customization/Harpy/harpy_wings.rsi
@@ -317,7 +317,7 @@
 - type: marking
   id: HarpyWing3ToneClassic
   bodyPart: RArm
-  markingCategory: Arms
+  markingCategory: RightArm
   speciesRestriction: [Harpy]
   sprites:
     - sprite: Mobs/Customization/Harpy/harpy_wings.rsi
@@ -330,7 +330,7 @@
 - type: marking
   id: HarpyWingSpeckledClassic
   bodyPart: RArm
-  markingCategory: Arms
+  markingCategory: RightArm
   speciesRestriction: [Harpy]
   sprites:
     - sprite: Mobs/Customization/Harpy/harpy_wings.rsi
@@ -341,7 +341,7 @@
 - type: marking
   id: HarpyWingUndertoneClassic
   bodyPart: RArm
-  markingCategory: Arms
+  markingCategory: RightArm
   speciesRestriction: [Harpy]
   sprites:
     - sprite: Mobs/Customization/Harpy/harpy_wings.rsi
@@ -352,7 +352,7 @@
 - type: marking
   id: HarpyWingTipsClassic
   bodyPart: RArm
-  markingCategory: Arms
+  markingCategory: RightArm
   speciesRestriction: [Harpy]
   sprites:
     - sprite: Mobs/Customization/Harpy/harpy_wings.rsi
@@ -363,7 +363,7 @@
 - type: marking
   id: HarpyWingBat
   bodyPart: RArm
-  markingCategory: Arms
+  markingCategory: RightArm
   speciesRestriction: [Harpy]
   sprites:
     - sprite: Mobs/Customization/Harpy/harpy_wings.rsi
@@ -374,7 +374,7 @@
 - type: marking
   id: HarpyWingBionic
   bodyPart: RArm
-  markingCategory: Arms
+  markingCategory: RightArm
   speciesRestriction: [Harpy]
   sprites:
     - sprite: Mobs/Customization/Harpy/harpy_wings.rsi
@@ -405,7 +405,7 @@
 - type: marking
   id: HarpyLegsDefault
   bodyPart: LLeg
-  markingCategory: Legs
+  markingCategory: RightLeg
   speciesRestriction: [Harpy]
   coloring:
     default:
@@ -422,7 +422,7 @@
 - type: marking
   id: HarpyFeetDefault
   bodyPart: RFoot
-  markingCategory: Legs
+  markingCategory: RightLeg
   speciesRestriction: [Harpy]
   coloring:
     default: