From 6cfedfa34ff827677988d0c6af5ef8b8705a54e6 Mon Sep 17 00:00:00 2001
From: pathetic meowmeow <uhhadd@gmail.com>
Date: Wed, 21 Jan 2026 21:27:56 -0500
Subject: [PATCH] Ensure cat ears & tails cannot be selected by players
 (#42579)

Ensure cat ears & tails cannot be selected.
---
 Content.Client/Humanoid/MarkingsViewModel.cs              | 2 +-
 Resources/Locale/en-US/preferences/ui/markings-picker.ftl | 6 ++++--
 Resources/Prototypes/Body/Species/human.yml               | 6 ++++++
 Resources/Prototypes/Body/base_organs.yml                 | 1 +
 4 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/Content.Client/Humanoid/MarkingsViewModel.cs b/Content.Client/Humanoid/MarkingsViewModel.cs
index 8fe9208afd..86ad319562 100644
--- a/Content.Client/Humanoid/MarkingsViewModel.cs
+++ b/Content.Client/Humanoid/MarkingsViewModel.cs
@@ -325,7 +325,7 @@ public sealed class MarkingsViewModel
     public void GetMarkingCounts(ProtoId<OrganCategoryPrototype> organ, HumanoidVisualLayers layer, out bool isRequired, out int count, out int selected)
     {
         isRequired = false;
-        count = 0;
+        count = -1;
         selected = 0;
 
         if (!_organData.TryGetValue(organ, out var organData))
diff --git a/Resources/Locale/en-US/preferences/ui/markings-picker.ftl b/Resources/Locale/en-US/preferences/ui/markings-picker.ftl
index 8982988be4..676c17a908 100644
--- a/Resources/Locale/en-US/preferences/ui/markings-picker.ftl
+++ b/Resources/Locale/en-US/preferences/ui/markings-picker.ftl
@@ -6,12 +6,14 @@ markings-search = Search
 }
 markings-limits = { $required ->
     [true] { $count ->
-        [0] Select at least one marking.
+        [-1] Select at least one marking.
+        [0] You cannot select any markings, but somehow, you have to? This is a bug.
         [one] Select one marking.
        *[other] Select at least one marking and up to {$count} markings. { -markings-selection(selectable: $selectable) }
     }
    *[false] { $count ->
-        [0] Select any number of markings.
+        [-1] Select any number of markings.
+        [0] You cannot select any markings.
         [one] Select up to one marking.
        *[other] Select up to {$count} markings. { -markings-selection(selectable: $selectable) }
     }
diff --git a/Resources/Prototypes/Body/Species/human.yml b/Resources/Prototypes/Body/Species/human.yml
index fd9dd1fbbe..b569527a61 100644
--- a/Resources/Prototypes/Body/Species/human.yml
+++ b/Resources/Prototypes/Body/Species/human.yml
@@ -38,6 +38,12 @@
     enum.HumanoidVisualLayers.RFoot:
       limit: 1
       required: false
+    enum.HumanoidVisualLayers.Tail:
+      limit: 0
+      required: false
+    enum.HumanoidVisualLayers.Special:
+      limit: 0
+      required: false
 
 - type: entity
   parent: BaseSpeciesAppearance
diff --git a/Resources/Prototypes/Body/base_organs.yml b/Resources/Prototypes/Body/base_organs.yml
index 5c16184a78..5205297eca 100644
--- a/Resources/Prototypes/Body/base_organs.yml
+++ b/Resources/Prototypes/Body/base_organs.yml
@@ -44,6 +44,7 @@
       - Overlay
       - UndergarmentTop
       - UndergarmentBottom
+      - Special
 
 - type: entity
   parent: OrganBase
-- 
2.52.0