Add New Marking Category: Faces (DeltaV-Station#1400)

# Description Adds a new marking category, visual layer, and face. This stops IPC screens, makeup, and other face markings from appearing above hair. Solves DeltaV-Station#1328 --- <details><summary><h1>Media</h1></summary> <p> ![image](https://github.com/user-attachments/assets/06d787a0-9e89-4513-9fb3-c53085c32595) </p> </details> --- # Changelog :cl: - add: Face markings are now in their own category - fix: IPC screens no longer show up above hair
LaryNevesPR · Jan 2, 2025 · 7f17ae2 · 7f17ae2
1 parent 7ef4ac9
commit 7f17ae2
Show file tree

Hide file tree

Showing 25 changed files with 290 additions and 241 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
     {
+        Face,
         Tail,
         Hair,
         FacialHair,

diff --git a/Content.Shared/Humanoid/Markings/MarkingCategories.cs b/Content.Shared/Humanoid/Markings/MarkingCategories.cs
@@ -5,6 +5,7 @@ namespace Content.Shared.Humanoid.Markings
     [Serializable, NetSerializable]
     public enum MarkingCategories : byte
     {
+        Face,
         Hair,
         FacialHair,
         Head,
@@ -30,6 +31,7 @@ public static MarkingCategories FromHumanoidVisualLayers(HumanoidVisualLayers la
         {
             return layer switch
             {
+                HumanoidVisualLayers.Face => MarkingCategories.Face,
                 HumanoidVisualLayers.Hair => MarkingCategories.Hair,
                 HumanoidVisualLayers.FacialHair => MarkingCategories.FacialHair,
                 HumanoidVisualLayers.Head => MarkingCategories.Head,

diff --git a/Resources/Locale/en-US/preferences/ui/markings-picker.ftl b/Resources/Locale/en-US/preferences/ui/markings-picker.ftl
@@ -14,6 +14,7 @@ marking-slot-remove = Remove
 # Categories
 
 markings-category-Hair = Hair
+markings-category-Face = Face
 markings-category-FacialHair = Facial Hair
 markings-category-Head = Head
 markings-category-HeadTop = Head (Top)

diff --git a/Resources/Prototypes/DeltaV/Entities/Mobs/Species/vulpkanin.yml b/Resources/Prototypes/DeltaV/Entities/Mobs/Species/vulpkanin.yml
@@ -64,6 +64,7 @@
       - map: [ "belt" ]
       - map: [ "neck" ]
       - map: [ "back" ]
+      - map: [ "enum.HumanoidVisualLayers.Face" ]
       - map: [ "enum.HumanoidVisualLayers.FacialHair" ]
       - map: [ "enum.HumanoidVisualLayers.Hair" ]
       - map: [ "enum.HumanoidVisualLayers.HeadSide" ]

diff --git a/Resources/Prototypes/DeltaV/Species/vulpkanin.yml b/Resources/Prototypes/DeltaV/Species/vulpkanin.yml
@@ -16,6 +16,7 @@
   id: MobVulpkaninSprites
   sprites:
     Head: MobVulpkaninHead
+    Face: MobHumanoidAnyMarking
     Hair: MobHumanoidAnyMarking
     FacialHair: MobHumanoidAnyMarking
     Snout: MobHumanoidAnyMarking
@@ -36,6 +37,9 @@
 - type: markingPoints
   id: MobVulpkaninMarkingLimits
   points:
+    Face:
+      points: 1
+      required: false
     Hair:
       points: 1
       required: false

diff --git a/Resources/Prototypes/Entities/Mobs/Customization/Markings/face.yml b/Resources/Prototypes/Entities/Mobs/Customization/Markings/face.yml
@@ -1,7 +1,7 @@
 - type: marking
   id: FaceBindi
-  bodyPart: Head
-  markingCategory: Head
+  bodyPart: Face
+  markingCategory: Face
   speciesRestriction: [Dwarf, Human, SlimePerson, Felinid, Oni, Harpy, Reptilian, Vulpkanin, Arachne]
   coloring:
     default:
@@ -14,8 +14,8 @@
 
 - type: marking
   id: FaceFullblush
-  bodyPart: Head
-  markingCategory: Head
+  bodyPart: Face
+  markingCategory: Face
   speciesRestriction: [Dwarf, Human, SlimePerson, Felinid, Oni, Harpy, Vulpkanin, Arachne]
   coloring:
     default:
@@ -28,8 +28,8 @@
 
 - type: marking
   id: FaceCheekspotRight
-  bodyPart: Head
-  markingCategory: Head
+  bodyPart: Face
+  markingCategory: Face
   speciesRestriction: [Dwarf, Human, SlimePerson, Felinid, Oni, Harpy, Reptilian, Vulpkanin, Arachne]
   coloring:
     default:
@@ -42,8 +42,8 @@
 
 - type: marking
   id: FaceCheekspotLeft
-  bodyPart: Head
-  markingCategory: Head
+  bodyPart: Face
+  markingCategory: Face
   speciesRestriction: [Dwarf, Human, SlimePerson, Felinid, Oni, Harpy, Reptilian, Vulpkanin, Arachne]
   coloring:
     default:
@@ -56,8 +56,8 @@
 
 - type: marking
   id: FaceChesireRight
-  bodyPart: Head
-  markingCategory: Head
+  bodyPart: Face
+  markingCategory: Face
   speciesRestriction: [Dwarf, Human, SlimePerson, Felinid, Oni, Harpy, Arachne]
   coloring:
     default:
@@ -70,8 +70,8 @@
 
 - type: marking
   id: FaceChesireLeft
-  bodyPart: Head
-  markingCategory: Head
+  bodyPart: Face
+  markingCategory: Face
   speciesRestriction: [Dwarf, Human, SlimePerson, Felinid, Oni, Harpy, Arachne]
   coloring:
     default:
@@ -84,8 +84,8 @@
 
 - type: marking
   id: FaceCrowRight
-  bodyPart: Head
-  markingCategory: Head
+  bodyPart: Face
+  markingCategory: Face
   speciesRestriction: [Dwarf, Human, SlimePerson, Felinid, Oni, Harpy, Reptilian, Vulpkanin, Arachne]
   coloring:
     default:
@@ -98,8 +98,8 @@
 
 - type: marking
   id: FaceCrowLeft
-  bodyPart: Head
-  markingCategory: Head
+  bodyPart: Face
+  markingCategory: Face
   speciesRestriction: [Dwarf, Human, SlimePerson, Felinid, Oni, Harpy, Reptilian, Vulpkanin, Arachne]
   coloring:
     default:
@@ -112,8 +112,8 @@
 
 - type: marking
   id: FaceEarRight
-  bodyPart: Head
-  markingCategory: Head
+  bodyPart: Face
+  markingCategory: Face
   speciesRestriction: [Dwarf, Human, SlimePerson, Felinid, Oni, Harpy, Arachne]
   coloring:
     default:
@@ -126,8 +126,8 @@
 
 - type: marking
   id: FaceEarLeft
-  bodyPart: Head
-  markingCategory: Head
+  bodyPart: Face
+  markingCategory: Face
   speciesRestriction: [Dwarf, Human, SlimePerson, Felinid, Oni, Harpy, Arachne]
   coloring:
     default:
@@ -140,8 +140,8 @@
 
 - type: marking
   id: FaceEyebrowRight
-  bodyPart: Head
-  markingCategory: Head
+  bodyPart: Face
+  markingCategory: Face
   speciesRestriction: [Dwarf, Human, SlimePerson, Felinid, Oni, Harpy, Reptilian, Vulpkanin, Arachne]
   coloring:
     default:
@@ -155,8 +155,8 @@
 
 - type: marking
   id: FaceEyebrowLeft
-  bodyPart: Head
-  markingCategory: Head
+  bodyPart: Face
+  markingCategory: Face
   speciesRestriction: [Dwarf, Human, SlimePerson, Felinid, Oni, Harpy, Reptilian, Vulpkanin, Arachne]
   coloring:
     default:
@@ -170,8 +170,8 @@
 
 - type: marking
   id: FaceEyebrows
-  bodyPart: Head
-  markingCategory: Head
+  bodyPart: Face
+  markingCategory: Face
   speciesRestriction: [Dwarf, Human, SlimePerson, Felinid, Oni, Harpy, Reptilian, Vulpkanin, Arachne]
   coloring:
     default:
@@ -184,8 +184,8 @@
 
 - type: marking
   id: FaceEyecornerRight
-  bodyPart: Head
-  markingCategory: Head
+  bodyPart: Face
+  markingCategory: Face
   speciesRestriction: [Dwarf, Human, SlimePerson, Felinid, Oni, Harpy, Reptilian, Vulpkanin, Arachne]
   coloring:
     default:
@@ -198,8 +198,8 @@
 
 - type: marking
   id: FaceEyecornerLeft
-  bodyPart: Head
-  markingCategory: Head
+  bodyPart: Face
+  markingCategory: Face
   speciesRestriction: [Dwarf, Human, SlimePerson, Felinid, Oni, Harpy, Reptilian, Vulpkanin, Arachne]
   coloring:
     default:
@@ -212,8 +212,8 @@
 
 - type: marking
   id: FaceEyelashRight
-  bodyPart: Head
-  markingCategory: Head
+  bodyPart: Face
+  markingCategory: Face
   speciesRestriction: [Dwarf, Human, SlimePerson, Felinid, Oni, Harpy, Reptilian, Vulpkanin, Arachne]
   coloring:
     default:
@@ -226,8 +226,8 @@
 
 - type: marking
   id: FaceEyelashLeft
-  bodyPart: Head
-  markingCategory: Head
+  bodyPart: Face
+  markingCategory: Face
   speciesRestriction: [Dwarf, Human, SlimePerson, Felinid, Oni, Harpy, Reptilian, Vulpkanin, Arachne]
   coloring:
     default:
@@ -240,8 +240,8 @@
 
 - type: marking
   id: FaceEyestripe
-  bodyPart: Head
-  markingCategory: Head
+  bodyPart: Face
+  markingCategory: Face
   speciesRestriction: [Dwarf, Human, SlimePerson, Felinid, Oni, Harpy, Arachne]
   coloring:
     default:
@@ -254,8 +254,8 @@
 
 - type: marking
   id: FaceLipcornerRight
-  bodyPart: Head
-  markingCategory: Head
+  bodyPart: Face
+  markingCategory: Face
   speciesRestriction: [Dwarf, Human, SlimePerson, Felinid, Oni, Harpy, Reptilian, Vulpkanin, Arachne]
   coloring:
     default:
@@ -268,8 +268,8 @@
 
 - type: marking
   id: FaceLipcornerLeft
-  bodyPart: Head
-  markingCategory: Head
+  bodyPart: Face
+  markingCategory: Face
   speciesRestriction: [Dwarf, Human, SlimePerson, Felinid, Oni, Harpy, Reptilian, Vulpkanin, Arachne]
   coloring:
     default:
@@ -282,8 +282,8 @@
 
 - type: marking
   id: FaceGlabella
-  bodyPart: Head
-  markingCategory: Head
+  bodyPart: Face
+  markingCategory: Face
   speciesRestriction: [Dwarf, Human, SlimePerson, Felinid, Oni, Harpy, Reptilian, Vulpkanin, Arachne]
   coloring:
     default:
@@ -296,8 +296,8 @@
 
 - type: marking
   id: FaceLowercheekRight
-  bodyPart: Head
-  markingCategory: Head
+  bodyPart: Face
+  markingCategory: Face
   speciesRestriction: [Dwarf, Human, SlimePerson, Felinid, Oni, Harpy, Reptilian, Vulpkanin, Arachne]
   coloring:
     default:
@@ -310,8 +310,8 @@
 
 - type: marking
   id: FaceLowercheekLeft
-  bodyPart: Head
-  markingCategory: Head
+  bodyPart: Face
+  markingCategory: Face
   speciesRestriction: [Dwarf, Human, SlimePerson, Felinid, Oni, Harpy, Reptilian, Vulpkanin, Arachne]
   coloring:
     default:
@@ -324,8 +324,8 @@
 
 - type: marking
   id: FaceNosetape
-  bodyPart: Head
-  markingCategory: Head
+  bodyPart: Face
+  markingCategory: Face
   speciesRestriction: [Dwarf, Human, SlimePerson, Felinid, Oni, Harpy, Arachne]
   coloring:
     default:
@@ -338,8 +338,8 @@
 
 - type: marking
   id: FaceNosetip
-  bodyPart: Head
-  markingCategory: Head
+  bodyPart: Face
+  markingCategory: Face
   speciesRestriction: [Dwarf, Human, SlimePerson, Felinid, Oni, Harpy, Arachne]
   coloring:
     default:
@@ -353,8 +353,8 @@
 
 - type: marking
   id: FaceNosestripe
-  bodyPart: Head
-  markingCategory: Head
+  bodyPart: Face
+  markingCategory: Face
   speciesRestriction: [Dwarf, Human, SlimePerson, Felinid, Oni, Harpy, Arachne]
   coloring:
     default:
@@ -367,8 +367,8 @@
 
 - type: marking
   id: FaceUnibrow
-  bodyPart: Head
-  markingCategory: Head
+  bodyPart: Face
+  markingCategory: Face
   speciesRestriction: [Dwarf, Human, SlimePerson, Felinid, Oni, Harpy, Reptilian, Vulpkanin, Arachne]
   coloring:
     default:
@@ -381,8 +381,8 @@
 
 - type: marking
   id: FaceNeckSlim
-  bodyPart: Head
-  markingCategory: Head
+  bodyPart: Face
+  markingCategory: Face
   speciesRestriction: [Dwarf, Human, SlimePerson, Felinid, Oni, Harpy, Reptilian, Vulpkanin, Arachne]
   followSkinColor: true
   sprites:
@@ -391,8 +391,8 @@
 
 - type: marking
   id: FaceNeckWide
-  bodyPart: Head
-  markingCategory: Head
+  bodyPart: Face
+  markingCategory: Face
   speciesRestriction: [Dwarf, Human, SlimePerson, Felinid, Oni, Harpy, Reptilian, Vulpkanin, Arachne]
   followSkinColor: true
   sprites:
@@ -401,8 +401,8 @@
 
 - type: marking
   id: FaceNeckSlimThick
-  bodyPart: Head
-  markingCategory: Head
+  bodyPart: Face
+  markingCategory: Face
   speciesRestriction: [Dwarf, Human, SlimePerson, Felinid, Oni, Harpy, Reptilian, Vulpkanin, Arachne]
   followSkinColor: true
   sprites:
@@ -411,8 +411,8 @@
 
 - type: marking
   id: FaceNeckWideThick
-  bodyPart: Head
-  markingCategory: Head
+  bodyPart: Face
+  markingCategory: Face
   speciesRestriction: [Dwarf, Human, SlimePerson, Felinid, Oni, Harpy, Reptilian, Vulpkanin, Arachne]
   followSkinColor: true
   sprites:
-Original file line number
+Diff line change
@@ Expand Up / @@ -6,6 +6,7 @@ namespace Content.Shared.Humanoid @@
         [Serializable, NetSerializable]
         public enum HumanoidVisualLayers : byte
         {
+            Face,
             Tail,
             Hair,
             FacialHair,
@@ Expand Down @@