Ensure cat ears & tails cannot be selected by players (#42579)

Ensure cat ears & tails cannot be selected.

diff --git a/Content.Client/Humanoid/MarkingsViewModel.cs b/Content.Client/Humanoid/MarkingsViewModel.cs
index 8fe9208afd9f087df8d071fcaf6d82bbe17b7306..86ad3195627daf674d20f9dd978e10e9b111164e 100644 (file)
--- 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 8982988be4c2a2edd5053d5876fab22e08e1a2b3..676c17a908c9688bd0cde22a7a67335540bf2874 100644 (file)
--- 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 fd9dd1fbbeae9960370059e35c997c096c8abaeb..b569527a610ca7cbb64718a895c8a10f022582f5 100644 (file)
--- 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 5c16184a7865907977a27a109f1364d8f6dcc069..5205297eca90cf11e1766709b51aae42d8e10861 100644 (file)
--- 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