Long human ears (#30490)

Long human ears colour fix. Shortcut removed.

diff --git a/Content.Shared/Humanoid/HumanoidVisualLayers.cs b/Content.Shared/Humanoid/HumanoidVisualLayers.cs
index 938b789f7aefd62fabcc5fa817f5fa8b59ce36ed..cecd8a1c13e2e3045964b0dec28fb9e501e12f4e 100644 (file)
--- 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
     {
+        Special, // for the cat ears
         Tail,
         Hair,
         FacialHair,
@@ -18,6 +19,7 @@ namespace Content.Shared.Humanoid
         RArm,
         LArm,
         RHand,
+
         LHand,
         RLeg,
         LLeg,
@@ -27,5 +29,6 @@ namespace Content.Shared.Humanoid
         StencilMask,
         Ensnare,
         Fire,
+
     }
 }

diff --git a/Content.Shared/Humanoid/Markings/MarkingCategories.cs b/Content.Shared/Humanoid/Markings/MarkingCategories.cs
index 5d407063c2d426c2a42f63a3b3d37e9482adb150..db82fb1fd3d2682068e373b640d98bfc554b6d93 100644 (file)
--- 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
     {
+        Special,
         Hair,
         FacialHair,
         Head,
@@ -24,6 +25,7 @@ namespace Content.Shared.Humanoid.Markings
         {
             return layer switch
             {
+                HumanoidVisualLayers.Special => MarkingCategories.Special,
                 HumanoidVisualLayers.Hair => MarkingCategories.Hair,
                 HumanoidVisualLayers.FacialHair => MarkingCategories.FacialHair,
                 HumanoidVisualLayers.Head => MarkingCategories.Head,

diff --git a/Resources/Locale/en-US/markings/ears.ftl b/Resources/Locale/en-US/markings/ears.ftl
new file mode 100644 (file)
index 0000000..62921f5
--- /dev/null
+++ b/Resources/Locale/en-US/markings/ears.ftl
@@ -0,0 +1 @@
+marking-HumanLongEars = Long Ears

diff --git a/Resources/Locale/en-US/preferences/ui/markings-picker.ftl b/Resources/Locale/en-US/preferences/ui/markings-picker.ftl
index 0e192c1294f68409ad952d85f91984d82aa58ff1..ba274ec9cacc5c0298593a406d113ae85ed24009 100644 (file)
--- 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 = Slot {$number}
 
 # Categories
 
+markings-category-Special = Special
 markings-category-Hair = Hair
 markings-category-FacialHair = Facial Hair
 markings-category-Head = Head

diff --git a/Resources/Prototypes/Entities/Mobs/Customization/Markings/cat_parts.yml b/Resources/Prototypes/Entities/Mobs/Customization/Markings/cat_parts.yml
index de88a17fd773b6376966d4926279d2bbf9506e64..32ac26abc1aa28edbd50e1e1bb6c9511c09f78c5 100644 (file)
--- a/Resources/Prototypes/Entities/Mobs/Customization/Markings/cat_parts.yml
+++ b/Resources/Prototypes/Entities/Mobs/Customization/Markings/cat_parts.yml
@@ -1,7 +1,7 @@
 - type: marking
   id: CatEars
-  bodyPart: HeadTop
-  markingCategory: HeadTop
+  bodyPart: Special
+  markingCategory: Special
   speciesRestriction: [Human]
   coloring:
     default:

diff --git a/Resources/Prototypes/Entities/Mobs/Customization/Markings/ears.yml b/Resources/Prototypes/Entities/Mobs/Customization/Markings/ears.yml
new file mode 100644 (file)
index 0000000..6e35088
--- /dev/null
+++ b/Resources/Prototypes/Entities/Mobs/Customization/Markings/ears.yml
@@ -0,0 +1,10 @@
+- type: marking
+  id: HumanLongEars
+  bodyPart: HeadTop
+  markingCategory: HeadTop
+  speciesRestriction: [Human, Dwarf]
+  forcedColoring: true
+  followSkinColor: true
+  sprites:
+  - sprite: Mobs/Customization/ears.rsi
+    state: long_ears

diff --git a/Resources/Prototypes/Species/human.yml b/Resources/Prototypes/Species/human.yml
index 0cbd9cc03fd46787117c9b06376876f59348eab8..25495296060a7943083c8b8a34a4eb6815cf59d0 100644 (file)
--- a/Resources/Prototypes/Species/human.yml
+++ b/Resources/Prototypes/Species/human.yml
@@ -17,12 +17,14 @@
 - type: speciesBaseSprites
   id: MobHumanSprites
   sprites:
+    Special: MobHumanoidAnyMarking
     Head: MobHumanHead
     Hair: MobHumanoidAnyMarking
     FacialHair: MobHumanoidAnyMarking
     Snout: MobHumanoidAnyMarking
     Chest: MobHumanTorso
     Eyes: MobHumanoidEyes
+    HeadTop: MobHumanoidAnyMarking
     LArm: MobHumanLArm
     RArm: MobHumanRArm
     LHand: MobHumanLHand
@@ -35,6 +37,9 @@
 - type: markingPoints
   id: MobHumanMarkingLimits
   points:
+    Special: # the cat ear joke
+      points: 0
+      required: false
     Hair:
       points: 1
       required: false
@@ -47,8 +52,8 @@
     Tail: # the cat tail joke
       points: 0
       required: false
-    HeadTop: # the cat ear joke
-      points: 0
+    HeadTop:
+      points: 1
       required: false
     Chest:
       points: 1

diff --git a/Resources/Textures/Mobs/Customization/ears.rsi/long_ears.png b/Resources/Textures/Mobs/Customization/ears.rsi/long_ears.png
new file mode 100644 (file)
index 0000000..6779427
Binary files /dev/null and b/Resources/Textures/Mobs/Customization/ears.rsi/long_ears.png differ

diff --git a/Resources/Textures/Mobs/Customization/ears.rsi/meta.json b/Resources/Textures/Mobs/Customization/ears.rsi/meta.json
new file mode 100644 (file)
index 0000000..9e44373
--- /dev/null
+++ b/Resources/Textures/Mobs/Customization/ears.rsi/meta.json
@@ -0,0 +1,16 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Drawn by Rouge2t7/Sarahon",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "long_ears",
+      "directions": 4
+    }
+
+  ]
+}