Carcats species [Draft] (#1023)

* body parts

* proto setup

* inhand displacements

* carcat cloak

* eyes

* gloves

* pants carcat

* pants

* shirt

* markings nose + ears

* Update 5.png

* shoes + naming

* helmet adapt

* carcat sounds

* Update sewing_table.yml

* s

* Update comoss.yml

* Update factoria.yml

* s

Content.Client/Hands/Systems/HandsSystem.cs

@@ -349,7 +349,12 @@ namespace Content.Client.Hands.Systems
                 sprite.LayerSetData(index, layerData);
 
                 //Add displacement maps
-                if (handComp.HandDisplacement is not null)
+                if (hand.Location == HandLocation.Left && handComp.LeftHandDisplacement is not null)
+                    _displacement.TryAddDisplacement(handComp.LeftHandDisplacement, sprite, index, key, revealedLayers);
+                else if (hand.Location == HandLocation.Right && handComp.RightHandDisplacement is not null)
+                    _displacement.TryAddDisplacement(handComp.RightHandDisplacement, sprite, index, key, revealedLayers);
+                //Fallback to default displacement map
+                else if (handComp.HandDisplacement is not null)
                     _displacement.TryAddDisplacement(handComp.HandDisplacement, sprite, index, key, revealedLayers);
             }
 

Content.Shared/Hands/Components/HandsComponent.cs

@@ -78,9 +78,24 @@ public sealed partial class HandsComponent : Component
     [DataField, ViewVariables(VVAccess.ReadWrite)]
     public TimeSpan ThrowCooldown = TimeSpan.FromSeconds(0.5f);
 
+    /// <summary>
+    ///     Fallback displacement map applied to all sprites in the hand, unless otherwise specified
+    /// </summary>
     [DataField]
     public DisplacementData? HandDisplacement;
 
+    /// <summary>
+    ///     If defined, applies to all sprites in the left hand, ignoring <see cref="HandDisplacement"/>
+    /// </summary>
+    [DataField]
+    public DisplacementData? LeftHandDisplacement;
+
+    /// <summary>
+    ///     If defined, applies to all sprites in the right hand, ignoring <see cref="HandDisplacement"/>
+    /// </summary>
+    [DataField]
+    public DisplacementData? RightHandDisplacement;
+
     /// <summary>
     /// If false, hands cannot be stripped, and they do not show up in the stripping menu.
     /// </summary>

Resources/Audio/_CP14/Voice/Carcat/attributions.yml

@@ -0,0 +1,39 @@
+- files: ["carcat_gasp.ogg"]
+  license: "CC0-1.0"
+  copyright: "Created by 999999990 from https://freesound.org/"
+  source: "https://freesound.org/people/999999990/sounds/320345/"
+
+- files: ["carcat_scream.ogg"]
+  license: "CC0-1.0"
+  copyright: "Created by 999999990 from https://freesound.org/"
+  source: "https://freesound.org/people/999999990/sounds/320345/"
+
+- files: ["carcat_talk1.ogg"]
+  license: "CC0-1.0"
+  copyright: "Created by 999999990 from https://freesound.org/"
+  source: "https://freesound.org/people/999999990/sounds/320345/"
+
+- files: ["carcat_talk2.ogg"]
+  license: "CC0-1.0"
+  copyright: "Created by 999999990 from https://freesound.org/"
+  source: "https://freesound.org/people/999999990/sounds/320345/"
+
+- files: ["carcat_talk3.ogg"]
+  license: "CC0-1.0"
+  copyright: "Created by 999999990 from https://freesound.org/"
+  source: "https://freesound.org/people/999999990/sounds/320345/"
+
+- files: ["carcat_laugh.ogg"]
+  license: "CC-BY-3.0"
+  copyright: "Created by JuliusMabe from https://freesound.org/"
+  source: "https://freesound.org/people/JuliusMabe/sounds/445194/"
+
+- files: ["carcat_laugh2.ogg"]
+  license: "CC-BY-4.0"
+  copyright: "Created by qubodup from https://freesound.org/"
+  source: "https://freesound.org/people/qubodup/sounds/211021/"
+
+- files: ["carcat_laugh3.ogg"]
+  license: "CC-BY-4.0"
+  copyright: "Created by qubodup from https://freesound.org/"
+  source: "https://freesound.org/people/qubodup/sounds/211021/"

Resources/Locale/en-US/_CP14/species/species-names.ftl

@@ -535,44 +535,97 @@ cp14-species-name-goblin-female-first-24 = Eluun
 
 # SILVA
 
-cp14-species-name-silva-male-first-1 = Abur  
-cp14-species-name-silva-male-first-2 = Banua  
-cp14-species-name-silva-male-first-3 = Gyutai  
-cp14-species-name-silva-male-first-4 = Dampunts  
-cp14-species-name-silva-male-first-5 = Jara  
-cp14-species-name-silva-male-first-6 = Kvatcha  
-cp14-species-name-silva-male-first-7 = Magni  
-cp14-species-name-silva-male-first-8 = Targai  
-cp14-species-name-silva-male-first-9 = Tachu  
-cp14-species-name-silva-male-first-10 = Chonai  
-cp14-species-name-silva-male-first-11 = Perdran  
-cp14-species-name-silva-male-first-12 = Reival  
-cp14-species-name-silva-male-first-13 = Sandrel  
-cp14-species-name-silva-male-first-14 = Tarvel  
-cp14-species-name-silva-male-first-15 = Undoris  
-cp14-species-name-silva-male-first-16 = Firen  
-cp14-species-name-silva-male-first-17 = Horwin  
-cp14-species-name-silva-male-first-18 = Chaldor  
-cp14-species-name-silva-male-first-19 = Elindir  
-cp14-species-name-silva-male-first-20 = Yantheris  
+cp14-species-name-silva-male-first-1 = Abur
+cp14-species-name-silva-male-first-2 = Banua
+cp14-species-name-silva-male-first-3 = Gyutai
+cp14-species-name-silva-male-first-4 = Dampunts
+cp14-species-name-silva-male-first-5 = Jara
+cp14-species-name-silva-male-first-6 = Kvatcha
+cp14-species-name-silva-male-first-7 = Magni
+cp14-species-name-silva-male-first-8 = Targai
+cp14-species-name-silva-male-first-9 = Tachu
+cp14-species-name-silva-male-first-10 = Chonai
+cp14-species-name-silva-male-first-11 = Perdran
+cp14-species-name-silva-male-first-12 = Reival
+cp14-species-name-silva-male-first-13 = Sandrel
+cp14-species-name-silva-male-first-14 = Tarvel
+cp14-species-name-silva-male-first-15 = Undoris
+cp14-species-name-silva-male-first-16 = Firen
+cp14-species-name-silva-male-first-17 = Horwin
+cp14-species-name-silva-male-first-18 = Chaldor
+cp14-species-name-silva-male-first-19 = Elindir
+cp14-species-name-silva-male-first-20 = Yantheris
 
-cp14-species-name-silva-female-first-1 = Quilla  
-cp14-species-name-silva-female-first-2 = Koka  
-cp14-species-name-silva-female-first-3 = Kyura  
-cp14-species-name-silva-female-first-4 = Ollsil  
-cp14-species-name-silva-female-first-5 = Pola  
-cp14-species-name-silva-female-first-6 = Rima  
-cp14-species-name-silva-female-first-7 = Saika  
-cp14-species-name-silva-female-first-8 = Sisou  
-cp14-species-name-silva-female-first-9 = Chiaka  
-cp14-species-name-silva-female-first-10 = Chokue  
-cp14-species-name-silva-female-first-11 = Oliviana  
-cp14-species-name-silva-female-first-12 = Perelina  
-cp14-species-name-silva-female-first-13 = Rillanta  
-cp14-species-name-silva-female-first-14 = Selanis  
-cp14-species-name-silva-female-first-15 = Talenia  
-cp14-species-name-silva-female-first-16 = Felindra  
-cp14-species-name-silva-female-first-17 = Halissa  
-cp14-species-name-silva-female-first-18 = Chelana  
-cp14-species-name-silva-female-first-19 = Elirin  
-cp14-species-name-silva-female-first-20 = Yunelia  
+cp14-species-name-silva-female-first-1 = Quilla
+cp14-species-name-silva-female-first-2 = Koka
+cp14-species-name-silva-female-first-3 = Kyura
+cp14-species-name-silva-female-first-4 = Ollsil
+cp14-species-name-silva-female-first-5 = Pola
+cp14-species-name-silva-female-first-6 = Rima
+cp14-species-name-silva-female-first-7 = Saika
+cp14-species-name-silva-female-first-8 = Sisou
+cp14-species-name-silva-female-first-9 = Chiaka
+cp14-species-name-silva-female-first-10 = Chokue
+cp14-species-name-silva-female-first-11 = Oliviana
+cp14-species-name-silva-female-first-12 = Perelina
+cp14-species-name-silva-female-first-13 = Rillanta
+cp14-species-name-silva-female-first-14 = Selanis
+cp14-species-name-silva-female-first-15 = Talenia
+cp14-species-name-silva-female-first-16 = Felindra
+cp14-species-name-silva-female-first-17 = Halissa
+cp14-species-name-silva-female-first-18 = Chelana
+cp14-species-name-silva-female-first-19 = Elirin
+cp14-species-name-silva-female-first-20 = Yunelia
+
+# CARCAT
+
+cp14-species-name-carcat-first-1 = Fragrant Flower  
+cp14-species-name-carcat-first-2 = Sunset Thigh  
+cp14-species-name-carcat-first-3 = Onyx Eyes  
+cp14-species-name-carcat-first-4 = Nest of Eggs  
+cp14-species-name-carcat-first-5 = Daytime Moon  
+cp14-species-name-carcat-first-6 = Ceramic Shard  
+cp14-species-name-carcat-first-7 = Ring of Silence  
+cp14-species-name-carcat-first-8 = Left-Handed Hummingbird  
+cp14-species-name-carcat-first-9 = Dead Leaf  
+cp14-species-name-carcat-first-10 = Jade Shoe  
+cp14-species-name-carcat-first-11 = Cloud on the Mountain Peak  
+cp14-species-name-carcat-first-12 = Lost Spear  
+cp14-species-name-carcat-first-13 = Five Logs  
+cp14-species-name-carcat-first-14 = Seven Thunderclouds  
+cp14-species-name-carcat-first-15 = Rock of Ten Lightnings  
+cp14-species-name-carcat-first-16 = Sweetness of Scales  
+cp14-species-name-carcat-first-17 = Snowy Cobblestone  
+cp14-species-name-carcat-first-18 = Hundred Serene Reflections  
+cp14-species-name-carcat-first-19 = Marking’s Push  
+cp14-species-name-carcat-first-20 = Misty Mirror  
+cp14-species-name-carcat-first-21 = Four Burning Seas  
+cp14-species-name-carcat-first-22 = Snake’s Skirt  
+cp14-species-name-carcat-first-23 = Evening Whisper  
+cp14-species-name-carcat-first-24 = Shadow of Two Leaves  
+cp14-species-name-carcat-first-25 = Singing Stone  
+cp14-species-name-carcat-first-26 = Breeze Ice  
+cp14-species-name-carcat-first-27 = Echo’s Resonation  
+cp14-species-name-carcat-first-28 = Midnight Stream  
+cp14-species-name-carcat-first-29 = Ten Scattered Sparks  
+cp14-species-name-carcat-first-30 = Claw of Dawn  
+cp14-species-name-carcat-first-31 = Cracked Obsidian  
+cp14-species-name-carcat-first-32 = Smoky Wind  
+cp14-species-name-carcat-first-33 = Shard of Sunset  
+cp14-species-name-carcat-first-34 = Moon Silk  
+cp14-species-name-carcat-first-35 = Dance of Dry Leaves  
+cp14-species-name-carcat-first-36 = Taste of Bitter Root  
+cp14-species-name-carcat-first-37 = Slumbering Fire  
+cp14-species-name-carcat-first-38 = Silent Pool  
+cp14-species-name-carcat-first-39 = Pollen of a Summer Day  
+cp14-species-name-carcat-first-40 = Song of Restless Waves  
+cp14-species-name-carcat-first-41 = Crunching Frost  
+cp14-species-name-carcat-first-42 = Flickering Lantern Light  
+cp14-species-name-carcat-first-43 = Melody of Falling Rain  
+cp14-species-name-carcat-first-44 = Scale of a Faded Serpent  
+cp14-species-name-carcat-first-45 = Forest Colossus  
+cp14-species-name-carcat-first-46 = Will-o'-the-Wisp over the Swamp  
+cp14-species-name-carcat-first-47 = Roar of the Rockfall  
+cp14-species-name-carcat-first-48 = Scent of Old Paper  
+cp14-species-name-carcat-first-49 = Night Crossroads  
+cp14-species-name-carcat-first-50 = Gloom of the Primeval Forest  

Resources/Locale/en-US/_CP14/species/species.ftl

@@ -3,4 +3,5 @@ cp14-species-name-tiefling = Tiefling
 cp14-species-name-dwarf = Dwarf
 cp14-species-name-elf = Elf
 cp14-species-name-goblin = Goblin
-cp14-species-name-silva = Silva
+cp14-species-name-silva = Silva
+cp14-species-name-carcat = Carcat

Resources/Locale/ru-RU/_CP14/species/species-names.ftl

@@ -577,4 +577,57 @@ cp14-species-name-silva-female-first-16 = Фелиндра
 cp14-species-name-silva-female-first-17 = Халисса
 cp14-species-name-silva-female-first-18 = Челана
 cp14-species-name-silva-female-first-19 = Элирин
-cp14-species-name-silva-female-first-20 = Юнелия
+cp14-species-name-silva-female-first-20 = Юнелия
+
+# CARCAT
+
+cp14-species-name-carcat-first-1 = Ароматный Цветок
+cp14-species-name-carcat-first-2 = Бедро Заката
+cp14-species-name-carcat-first-3 = Глаза Оникса
+cp14-species-name-carcat-first-4 = Гнездо Яиц
+cp14-species-name-carcat-first-5 = Дневная Луна
+cp14-species-name-carcat-first-6 = Керамический Осколок
+cp14-species-name-carcat-first-7 = Кольцо Безмолвия
+cp14-species-name-carcat-first-8 = Леворукая Колибри
+cp14-species-name-carcat-first-9 = Мёртвый Лист
+cp14-species-name-carcat-first-10 = Нефритовый Башмак
+cp14-species-name-carcat-first-11 = Облако На Горной Вершине
+cp14-species-name-carcat-first-12 = Потерянное Копье
+cp14-species-name-carcat-first-13 = Пять Брёвен
+cp14-species-name-carcat-first-14 = Семь Грозовых Туч
+cp14-species-name-carcat-first-15 = Скала Десяти Молний
+cp14-species-name-carcat-first-16 = Сладость Чешуйки
+cp14-species-name-carcat-first-17 = Снежный Булыжник
+cp14-species-name-carcat-first-18 = Сто Невозмутимых Отражений
+cp14-species-name-carcat-first-19 = Толчок Клейма
+cp14-species-name-carcat-first-20 = Туманное Зеркало
+cp14-species-name-carcat-first-21 = Четыре Горящих Моря
+cp14-species-name-carcat-first-22 = Юбка Змеи
+cp14-species-name-carcat-first-23 = Вечерний Шёпот
+cp14-species-name-carcat-first-24 = Тень Двух Листьев
+cp14-species-name-carcat-first-25 = Поющий Камень
+cp14-species-name-carcat-first-26 = Лёд Ветерка
+cp14-species-name-carcat-first-27 = Отзвук Эха
+cp14-species-name-carcat-first-28 = Ручей Полуночи
+cp14-species-name-carcat-first-29 = Десять Рассыпанных Искр
+cp14-species-name-carcat-first-30 = Коготь Рассвета
+cp14-species-name-carcat-first-31 = Треснувший Обсидиан
+cp14-species-name-carcat-first-32 = Дымчатый Ветер
+cp14-species-name-carcat-first-33 = Осколок Заката
+cp14-species-name-carcat-first-34 = Лунный Шёлк
+cp14-species-name-carcat-first-35 = Танец Сухих Листьев
+cp14-species-name-carcat-first-36 = Вкус Горького Корня
+cp14-species-name-carcat-first-37 = Дремлющий Огонь
+cp14-species-name-carcat-first-38 = Тихий Омут
+cp14-species-name-carcat-first-39 = Пыльца Летнего Дня
+cp14-species-name-carcat-first-40 = Песня Беспокойных Волн
+cp14-species-name-carcat-first-41 = Хрустящий Иней
+cp14-species-name-carcat-first-42 = Дрожащий Свет Фонаря
+cp14-species-name-carcat-first-43 = Мелодия Падающего Дождя
+cp14-species-name-carcat-first-44 = Чешуя Угасшего Змея
+cp14-species-name-carcat-first-45 = Лесная Громада
+cp14-species-name-carcat-first-46 = Огонёк Над Трясиной
+cp14-species-name-carcat-first-47 = Грохот Камнепада
+cp14-species-name-carcat-first-48 = Запах Старой Бумаги
+cp14-species-name-carcat-first-49 = Ночной Перекрёсток
+cp14-species-name-carcat-first-50 = Мгла Дремучего Леса

Resources/Locale/ru-RU/_CP14/species/species.ftl

@@ -3,4 +3,5 @@ cp14-species-name-tiefling = Тифлинг
 cp14-species-name-dwarf = Дварф
 cp14-species-name-elf = Эльф
 cp14-species-name-goblin = Гоблин
-cp14-species-name-silva = Сильва
+cp14-species-name-silva = Сильва
+cp14-species-name-carcat = Каркат

Resources/Maps/_CP14/comoss.yml

@@ -42363,13 +42363,6 @@ entities:
       parent: 12897
     - type: Physics
       canCollide: False
-- proto: CP14ClothingHeadBeretBlack
-  entities:
-  - uid: 11622
-    components:
-    - type: Transform
-      pos: -74.24762,-71.93574
-      parent: 2
 - proto: CP14ClothingHeadBowler
   entities:
   - uid: 2009

Resources/Maps/_CP14/factoria.yml

@@ -63009,14 +63009,6 @@ entities:
     - type: Transform
       pos: -112.660484,46.248337
       parent: 2
-- proto: CP14ClothingHeadCaptainCap
-  entities:
-  - uid: 471
-    components:
-    - type: Transform
-      parent: 307
-    - type: Physics
-      canCollide: False
 - proto: CP14ClothingHeadWreath
   entities:
   - uid: 10073
@@ -69054,7 +69046,7 @@ entities:
         head: !type:ContainerSlot
           showEnts: False
           occludes: False
-          ent: 471
+          ent: null
         keys: !type:ContainerSlot
           showEnts: False
           occludes: False

Resources/Prototypes/_CP14/Datasets/Names/species-names.yml

@@ -106,3 +106,11 @@
   values:
     prefix: cp14-species-name-silva-female-first-
     count: 20
+
+# Carcat
+
+- type: localizedDataset
+  id: CP14_Names_Carcat_First
+  values:
+    prefix: cp14-species-name-carcat-first-
+    count: 50

Resources/Prototypes/_CP14/Entities/Clothing/Head/Roles/captain.yml

@@ -1,10 +0,0 @@
-- type: entity
-  parent: CP14ClothingHeadBase
-  id: CP14ClothingHeadCaptainCap
-  name: captain's cap
-  description: No, look how handsome he is!
-  components:
-  - type: Sprite
-    sprite: _CP14/Clothing/Head/Roles/Captain/cap.rsi
-  - type: Clothing
-    sprite: _CP14/Clothing/Head/Roles/Captain/cap.rsi

Resources/Prototypes/_CP14/Entities/Clothing/Head/Roles/general.yml

@@ -1,98 +1,3 @@
-# Berets
-
-- type: entity
-  parent: CP14ClothingHeadBase
-  id: CP14ClothingHeadBeretBase
-  abstract: true
-  description: this is beret.
-
-- type: entity
-  parent: CP14ClothingHeadBeretBase
-  id: CP14ClothingHeadBeretRed
-  name: red beret
-  components:
-  - type: Sprite
-    sprite: _CP14/Clothing/Head/Roles/General/beret_red.rsi
-  - type: Clothing
-    sprite: _CP14/Clothing/Head/Roles/General/beret_red.rsi
-
-- type: entity
-  parent: CP14ClothingHeadBeretBase
-  id: CP14ClothingHeadBeretPurple
-  name: purple beret
-  components:
-  - type: Sprite
-    sprite: _CP14/Clothing/Head/Roles/General/beret_purple.rsi
-  - type: Clothing
-    sprite: _CP14/Clothing/Head/Roles/General/beret_purple.rsi
-
-- type: entity
-  parent: CP14ClothingHeadBeretBase
-  id: CP14ClothingHeadBeretYellow
-  name: yellow beret
-  components:
-  - type: Sprite
-    sprite: _CP14/Clothing/Head/Roles/General/beret_yellow.rsi
-  - type: Clothing
-    sprite: _CP14/Clothing/Head/Roles/General/beret_yellow.rsi
-
-- type: entity
-  parent: CP14ClothingHeadBeretBase
-  id: CP14ClothingHeadBeretBlue
-  name: blue beret
-  components:
-  - type: Sprite
-    sprite: _CP14/Clothing/Head/Roles/General/beret_blue.rsi
-  - type: Clothing
-    sprite: _CP14/Clothing/Head/Roles/General/beret_blue.rsi
-
-- type: entity
-  parent: CP14ClothingHeadBeretBase
-  id: CP14ClothingHeadBeretBlack
-  name: black beret
-  components:
-  - type: Sprite
-    sprite: _CP14/Clothing/Head/Roles/General/beret_black.rsi
-  - type: Clothing
-    sprite: _CP14/Clothing/Head/Roles/General/beret_black.rsi
-
-# Bandanas
-
-- type: entity
-  parent: CP14ClothingHeadBase
-  id: CP14ClothingHeadBandanaBase
-  abstract: true
-  description: Favorite mage headdress
-  components:
-  - type: HideLayerClothing
-    slots:
-    - Hair
-    - Snout
-    - HeadTop
-    - HeadSide
-
-- type: entity
-  parent: CP14ClothingHeadBandanaBase
-  id: CP14ClothingHeadBandanaWhite
-  name: white bandana
-  components:
-  - type: Sprite
-    sprite: _CP14/Clothing/Head/Roles/General/bandana_white.rsi
-  - type: Clothing
-    sprite: _CP14/Clothing/Head/Roles/General/bandana_white.rsi
-
-- type: entity
-  parent: CP14ClothingHeadBandanaBase
-  id: CP14ClothingHeadBandanaYellow
-  name: yellow bandana
-  components:
-  - type: Sprite
-    sprite: _CP14/Clothing/Head/Roles/General/bandana_yellow.rsi
-  - type: Clothing
-    sprite: _CP14/Clothing/Head/Roles/General/bandana_yellow.rsi
-
-#
-
 - type: entity
   parent: CP14ClothingHeadBase
   id: CP14ClothingHeadBeretMercenary

Resources/Prototypes/_CP14/Entities/Mobs/Customization/Markings/carcat_ears.yml

@@ -0,0 +1,54 @@
+- type: marking
+  id: CP14CarcatEars
+  bodyPart: HeadTop
+  markingCategory: HeadTop
+  followSkinColor: true
+  forcedColoring: true
+  speciesRestriction: [ CP14Carcat ]
+  sprites:
+    - sprite: _CP14/Mobs/Customization/carcat_ears.rsi
+      state: 1
+
+- type: marking
+  id: CP14CarcatEars2
+  bodyPart: HeadTop
+  markingCategory: HeadTop
+  followSkinColor: true
+  forcedColoring: true
+  speciesRestriction: [ CP14Carcat ]
+  sprites:
+    - sprite: _CP14/Mobs/Customization/carcat_ears.rsi
+      state: 2
+
+- type: marking
+  id: CP14CarcatEars3
+  bodyPart: HeadTop
+  markingCategory: HeadTop
+  followSkinColor: true
+  forcedColoring: true
+  speciesRestriction: [ CP14Carcat ]
+  sprites:
+    - sprite: _CP14/Mobs/Customization/carcat_ears.rsi
+      state: 3
+
+- type: marking
+  id: CP14CarcatEars4
+  bodyPart: HeadTop
+  markingCategory: HeadTop
+  followSkinColor: true
+  forcedColoring: true
+  speciesRestriction: [ CP14Carcat ]
+  sprites:
+    - sprite: _CP14/Mobs/Customization/carcat_ears.rsi
+      state: 4
+
+- type: marking
+  id: CP14CarcatEars5
+  bodyPart: HeadTop
+  markingCategory: HeadTop
+  followSkinColor: true
+  forcedColoring: true
+  speciesRestriction: [ CP14Carcat ]
+  sprites:
+    - sprite: _CP14/Mobs/Customization/carcat_ears.rsi
+      state: 5

Resources/Prototypes/_CP14/Entities/Mobs/Customization/Markings/carcat_nose.yml

@@ -0,0 +1,65 @@
+- type: marking
+  id: CP14CarcatNose
+  bodyPart: Snout
+  markingCategory: Snout
+  followSkinColor: true
+  forcedColoring: true
+  speciesRestriction: [ CP14Carcat ]
+  sprites:
+    - sprite: _CP14/Mobs/Customization/carcat_nose.rsi
+      state: 1
+
+- type: marking
+  id: CP14CarcatNose2
+  bodyPart: Snout
+  markingCategory: Snout
+  followSkinColor: true
+  forcedColoring: true
+  speciesRestriction: [ CP14Carcat ]
+  sprites:
+    - sprite: _CP14/Mobs/Customization/carcat_nose.rsi
+      state: 2
+
+- type: marking
+  id: CP14CarcatNose3
+  bodyPart: Snout
+  markingCategory: Snout
+  followSkinColor: true
+  forcedColoring: true
+  speciesRestriction: [ CP14Carcat ]
+  sprites:
+    - sprite: _CP14/Mobs/Customization/carcat_nose.rsi
+      state: 3
+
+- type: marking
+  id: CP14CarcatNose4
+  bodyPart: Snout
+  markingCategory: Snout
+  followSkinColor: true
+  forcedColoring: true
+  speciesRestriction: [ CP14Carcat ]
+  sprites:
+    - sprite: _CP14/Mobs/Customization/carcat_nose.rsi
+      state: 4
+
+- type: marking
+  id: CP14CarcatNose5
+  bodyPart: Snout
+  markingCategory: Snout
+  followSkinColor: true
+  forcedColoring: true
+  speciesRestriction: [ CP14Carcat ]
+  sprites:
+    - sprite: _CP14/Mobs/Customization/carcat_nose.rsi
+      state: 5
+
+- type: marking
+  id: CP14CarcatNose6
+  bodyPart: Snout
+  markingCategory: Snout
+  followSkinColor: true
+  forcedColoring: true
+  speciesRestriction: [ CP14Carcat ]
+  sprites:
+    - sprite: _CP14/Mobs/Customization/carcat_nose.rsi
+      state: 6

Resources/Prototypes/_CP14/Entities/Mobs/Player/carcat.yml

@@ -0,0 +1,4 @@
+- type: entity
+  save: false
+  parent: CP14BaseMobCarcat
+  id: CP14MobCarcat

Resources/Prototypes/_CP14/Entities/Mobs/Species/carcat.yml

@@ -0,0 +1,174 @@
+- type: entity
+  parent: CP14BaseMobSpeciesOrganic
+  id: CP14BaseMobCarcat
+  name: Mr. Cat
+  abstract: true
+  components:
+  - type: HumanoidAppearance
+    species: CP14Carcat
+  - type: Hunger
+    starvationDamage:
+      types:
+        Cold: 0.25
+        Bloodloss: 0.25
+  - type: Icon
+    sprite: _CP14/Mobs/Species/Carcat/parts.rsi
+    state: full
+  - type: Vocal
+    sounds:
+      Male: CP14UnisexCarcat
+      Female: CP14UnisexCarcat
+      Unsexed: CP14UnisexCarcat
+  - type: Speech
+    speechSounds: CP14Carcat
+  - type: Thirst
+  - type: Butcherable
+    butcheringType: Spike
+    spawned:
+      - id: CP14FoodMeatHuman
+        amount: 3
+  - type: Body
+    prototype: CP14Human
+    requiredLegs: 2
+  - type: MeleeWeapon
+    soundHit:
+      collection: AlienClaw
+    angle: 30
+    animation: WeaponArcClaw
+    damage:
+      types:
+        Slash: 5 # 5 slash
+  - type: FootstepModifier
+    footstepSoundCollection: null # Silent footstep
+  - type: Inventory
+    templateId: CP14Carcat # Cant wear shoes
+    displacements:
+      belt:
+        sizeMaps:
+          32:
+            sprite: _CP14/Mobs/Species/Carcat/displacement.rsi
+            state: cloak
+      cloak:
+        sizeMaps:
+          32:
+            sprite: _CP14/Mobs/Species/Carcat/displacement.rsi
+            state: cloak
+      back:
+        sizeMaps:
+          32:
+            sprite: _CP14/Mobs/Species/Carcat/displacement.rsi
+            state: cloak
+      eyes:
+        sizeMaps:
+          32:
+            sprite: _CP14/Mobs/Species/Carcat/displacement.rsi
+            state: eyes
+      head:
+        sizeMaps:
+          32:
+            sprite: _CP14/Mobs/Species/Carcat/displacement48.rsi
+            state: head
+          48:
+            sprite: _CP14/Mobs/Species/Carcat/displacement48.rsi
+            state: head
+      mask:
+        sizeMaps:
+          32:
+            sprite: _CP14/Mobs/Species/Carcat/displacement.rsi
+            state: mask
+      pants:
+        sizeMaps:
+          32:
+            sprite: _CP14/Mobs/Species/Carcat/displacement.rsi
+            state: pants
+      shirt:
+        sizeMaps:
+          32:
+            sprite: _CP14/Mobs/Species/Carcat/displacement.rsi
+            state: shirt
+      outerClothing:
+        sizeMaps:
+          32:
+            sprite: _CP14/Mobs/Species/Carcat/displacement.rsi
+            state: shirt
+  - type: Hands
+    leftHandDisplacement:
+      sizeMaps:
+        32:
+          sprite: _CP14/Mobs/Species/Carcat/displacement.rsi
+          state: hands_left
+    rightHandDisplacement:
+      sizeMaps:
+        32:
+          sprite: _CP14/Mobs/Species/Carcat/displacement.rsi
+          state: hands_right
+
+- type: entity
+  parent: CP14BaseSpeciesDummy
+  id: CP14MobCarcatDummy
+  categories: [ HideSpawnMenu ]
+  components:
+  - type: HumanoidAppearance
+    species: CP14Carcat
+  - type: Inventory
+    templateId: CP14Carcat
+    displacements:
+      belt:
+        sizeMaps:
+          32:
+            sprite: _CP14/Mobs/Species/Carcat/displacement.rsi
+            state: cloak
+      cloak:
+        sizeMaps:
+          32:
+            sprite: _CP14/Mobs/Species/Carcat/displacement.rsi
+            state: cloak
+      back:
+        sizeMaps:
+          32:
+            sprite: _CP14/Mobs/Species/Carcat/displacement.rsi
+            state: cloak
+      eyes:
+        sizeMaps:
+          32:
+            sprite: _CP14/Mobs/Species/Carcat/displacement.rsi
+            state: eyes
+      head:
+        sizeMaps:
+          32:
+            sprite: _CP14/Mobs/Species/Carcat/displacement48.rsi
+            state: head
+          48:
+            sprite: _CP14/Mobs/Species/Carcat/displacement48.rsi
+            state: head
+      mask:
+        sizeMaps:
+          32:
+            sprite: _CP14/Mobs/Species/Carcat/displacement.rsi
+            state: mask
+      pants:
+        sizeMaps:
+          32:
+            sprite: _CP14/Mobs/Species/Carcat/displacement.rsi
+            state: pants
+      shirt:
+        sizeMaps:
+          32:
+            sprite: _CP14/Mobs/Species/Carcat/displacement.rsi
+            state: shirt
+      outerClothing:
+        sizeMaps:
+          32:
+            sprite: _CP14/Mobs/Species/Carcat/displacement.rsi
+            state: shirt
+  - type: Hands
+    leftHandDisplacement:
+      sizeMaps:
+        32:
+          sprite: _CP14/Mobs/Species/Carcat/displacement.rsi
+          state: hands_left
+    rightHandDisplacement:
+      sizeMaps:
+        32:
+          sprite: _CP14/Mobs/Species/Carcat/displacement.rsi
+          state: hands_right

Resources/Prototypes/_CP14/InventoryTemplates/carcat_inventory_template.yml

@@ -0,0 +1,134 @@
+- type: inventoryTemplate
+  id: CP14Carcat #Copy of CP14Human, but without shoes
+  slots:
+    # Left hotbar
+    # 0, y
+    - name: ring1
+      slotTexture: ring
+      slotFlags: RING
+      uiWindowPos: 0,1
+      strippingWindowPos: 0,3
+      displayName: Ring
+    - name: mask
+      slotTexture: mask
+      slotFlags: MASK
+      uiWindowPos: 0,2
+      strippingWindowPos: 2,0
+      displayName: Mask
+    - name: eyes
+      slotTexture: eyes
+      slotFlags: EYES
+      uiWindowPos: 0,3
+      strippingWindowPos: 0,1
+      displayName: Eyes
+    # 1, y
+    #- name: shoes
+    #  slotTexture: shoes
+    #  slotFlags: FEET
+    #  uiWindowPos: 1,0
+    #  strippingWindowPos: 1,5
+    #  displayName: Shoes
+    - name: pants
+      slotTexture: pants
+      slotFlags: PANTS
+      uiWindowPos: 1,1
+      strippingWindowPos: 1,4
+      displayName: Pants
+    - name: shirt
+      slotTexture: shirt
+      slotFlags: SHIRT
+      uiWindowPos: 1,2
+      strippingWindowPos: 1,3
+      displayName: Shirt
+    - name: head
+      slotTexture: head
+      slotFlags: HEAD
+      uiWindowPos: 1,3
+      strippingWindowPos: 1,1
+      displayName: Head
+    # 2, y
+    - name: gloves
+      slotTexture: gloves
+      slotFlags: GLOVES
+      uiWindowPos: 2,0
+      strippingWindowPos: 0,2
+      displayName: Gloves
+    - name: ring2
+      slotTexture: ring
+      slotFlags: RING
+      uiWindowPos: 2,1
+      strippingWindowPos: 2,3
+      displayName: Ring
+    - name: outerClothing
+      slotTexture: suit
+      slotFlags: OUTERCLOTHING
+      uiWindowPos: 2,2
+      strippingWindowPos: 2,1
+      displayName: Armor
+    - name: cloak
+      slotTexture: cloak
+      slotFlags: CLOAK
+      uiWindowPos: 2,3
+      strippingWindowPos: 2,2
+      displayName: Cloak
+    # Main hotbar
+    - name: belt1
+      slotTexture: belt
+      slotFlags: BELT
+      slotGroup: SecondHotbar
+      uiWindowPos: 0,0
+      strippingWindowPos: 0,4
+      dependsOn: pants
+      displayName: Belt
+    - name: keys
+      slotTexture: keys
+      slotFlags: KEYS
+      slotGroup: SecondHotbar
+      uiWindowPos: 0,0
+      strippingWindowPos: 2,5
+      dependsOn: pants
+      displayName: Keys
+      stripHidden: true
+    - name: back
+      slotTexture: back
+      slotFlags: BACK
+      slotGroup: SecondHotbar
+      uiWindowPos: 0,0
+      strippingWindowPos: 0,5
+      displayName: Back
+    - name: neck
+      slotTexture: neck
+      slotFlags: NECK
+      slotGroup: SecondHotbar
+      uiWindowPos: 0,0
+      strippingWindowPos: 1,2
+      displayName: Neck
+      dependsOn: shirt
+    # Right hand
+    # Left hand
+    - name: pocket1
+      slotTexture: pocket
+      slotFlags: POCKET
+      slotGroup: MainHotbar
+      uiWindowPos: 0,0
+      strippingWindowPos: 0,0
+      dependsOn: pants
+      displayName: Pocket
+      stripHidden: true
+    - name: pocket2
+      slotTexture: pocket
+      slotFlags: POCKET
+      slotGroup: MainHotbar
+      uiWindowPos: 1,0
+      strippingWindowPos: 1,0
+      dependsOn: pants
+      displayName: Pocket
+      stripHidden: true
+    - name: belt2
+      slotTexture: belt
+      slotFlags: BELT
+      slotGroup: MainHotbar
+      uiWindowPos: 2,0
+      strippingWindowPos: 2,4
+      dependsOn: pants
+      displayName: Belt

Resources/Prototypes/_CP14/Loadouts/Jobs/general.yml

@@ -162,15 +162,8 @@
   - CP14ClothingHeadMetalHeadband
   - CP14ClothingHeadTriangularHat
   - CP14ClothingHeadTriangularHatGolden
-  - CP14ClothingHeadBeretRed
   - CP14ClothingHeadJestersCap
-  - CP14ClothingHeadBeretPurple
-  - CP14ClothingHeadBeretYellow
-  - CP14ClothingHeadBeretBlue
-  - CP14ClothingHeadBeretBlack
   - CP14ClothingHeadHuntersHat
-  - CP14ClothingHeadBandanaWhite
-  - CP14ClothingHeadBandanaYellow
 
 - type: loadout
   id: CP14ClothingHeadMetalHeadband
@@ -187,51 +180,16 @@
   equipment:
     head: CP14ClothingHeadTriangularHatGolden
 
-- type: loadout
-  id: CP14ClothingHeadBeretRed
-  equipment:
-    head: CP14ClothingHeadBeretRed
-
 - type: loadout
   id: CP14ClothingHeadJestersCap
   equipment:
     head: CP14ClothingHeadJestersCap
 
-- type: loadout
-  id: CP14ClothingHeadBeretPurple
-  equipment:
-    head: CP14ClothingHeadBeretPurple
-
-- type: loadout
-  id: CP14ClothingHeadBeretYellow
-  equipment:
-    head: CP14ClothingHeadBeretYellow
-
-- type: loadout
-  id: CP14ClothingHeadBeretBlue
-  equipment:
-    head: CP14ClothingHeadBeretBlue
-
-- type: loadout
-  id: CP14ClothingHeadBeretBlack
-  equipment:
-    head: CP14ClothingHeadBeretBlack
-
 - type: loadout
   id: CP14ClothingHeadHuntersHat
   equipment:
     head: CP14ClothingHeadHuntersHat
 
-- type: loadout
-  id: CP14ClothingHeadBandanaWhite
-  equipment:
-    head: CP14ClothingHeadBandanaWhite
-
-- type: loadout
-  id: CP14ClothingHeadBandanaYellow
-  equipment:
-    head: CP14ClothingHeadBandanaYellow
-
 # Pants
 
 - type: loadoutGroup

Resources/Prototypes/_CP14/Recipes/Workbench/sewing_table.yml

@@ -138,86 +138,6 @@
     knowledge: ClothingSewing
   result: CP14ClothingPantsTrouserDarkBlue
 
-- type: CP14Recipe
-  id: CP14ClothingHeadBeretRed
-  tag: CP14RecipeSewing
-  craftTime: 2
-  requirements:
-  - !type:ProtoIdResource
-    protoId: CP14String
-  - !type:ProtoIdResource
-    protoId: CP14DyeRed
-  - !type:StackResource
-    stack: CP14Cloth
-    count: 1
-  - !type:KnowledgeRequired
-    knowledge: ClothingSewing
-  result: CP14ClothingHeadBeretRed
-
-- type: CP14Recipe
-  id: CP14ClothingHeadBeretPurple
-  tag: CP14RecipeSewing
-  craftTime: 2
-  requirements:
-  - !type:ProtoIdResource
-    protoId: CP14String
-  - !type:ProtoIdResource
-    protoId: CP14DyePurple
-  - !type:StackResource
-    stack: CP14Cloth
-    count: 1
-  - !type:KnowledgeRequired
-    knowledge: ClothingSewing
-  result: CP14ClothingHeadBeretPurple
-
-- type: CP14Recipe
-  id: CP14ClothingHeadBeretYellow
-  tag: CP14RecipeSewing
-  craftTime: 2
-  requirements:
-  - !type:ProtoIdResource
-    protoId: CP14String
-  - !type:ProtoIdResource
-    protoId: CP14DyeYellow
-  - !type:StackResource
-    stack: CP14Cloth
-    count: 1
-  - !type:KnowledgeRequired
-    knowledge: ClothingSewing
-  result: CP14ClothingHeadBeretYellow
-
-- type: CP14Recipe
-  id: CP14ClothingHeadBeretBlue
-  tag: CP14RecipeSewing
-  craftTime: 2
-  requirements:
-  - !type:ProtoIdResource
-    protoId: CP14String
-  - !type:ProtoIdResource
-    protoId: CP14DyeBlue
-  - !type:StackResource
-    stack: CP14Cloth
-    count: 1
-  - !type:KnowledgeRequired
-    knowledge: ClothingSewing
-  result: CP14ClothingHeadBeretBlue
-
-- type: CP14Recipe
-  id: CP14ClothingHeadBeretBlack
-  tag: CP14RecipeSewing
-  craftTime: 2
-  requirements:
-  - !type:ProtoIdResource
-    protoId: CP14String
-  - !type:ProtoIdResource
-    protoId: CP14DyeBlack
-  - !type:StackResource
-    stack: CP14Cloth
-    count: 1
-  - !type:KnowledgeRequired
-    knowledge: ClothingSewing
-  result: CP14ClothingHeadBeretBlack
-
 - type: CP14Recipe
   id: CP14ClothingHeadHuntersHat
   tag: CP14RecipeSewing
@@ -234,36 +154,6 @@
     knowledge: ClothingSewing
   result: CP14ClothingHeadHuntersHat
 
-- type: CP14Recipe
-  id: CP14ClothingHeadBandanaWhite
-  tag: CP14RecipeSewing
-  craftTime: 2
-  requirements:
-  - !type:ProtoIdResource
-    protoId: CP14String
-  - !type:StackResource
-    stack: CP14Cloth
-    count: 2
-  - !type:KnowledgeRequired
-    knowledge: ClothingSewing
-  result: CP14ClothingHeadBandanaWhite
-
-- type: CP14Recipe
-  id: CP14ClothingHeadBandanaYellow
-  tag: CP14RecipeSewing
-  craftTime: 2
-  requirements:
-  - !type:ProtoIdResource
-    protoId: CP14String
-  - !type:ProtoIdResource
-    protoId: CP14DyeYellow
-  - !type:StackResource
-    stack: CP14Cloth
-    count: 2
-  - !type:KnowledgeRequired
-    knowledge: ClothingSewing
-  result: CP14ClothingHeadBandanaYellow
-
 - type: CP14Recipe
   id: CP14ClothingShirtMercenary
   tag: CP14RecipeSewing

Resources/Prototypes/_CP14/SoundCollections/emote.yml

@@ -0,0 +1,6 @@
+- type: soundCollection
+  id: CP14CarcatLaugh
+  files:
+  - /Audio/_CP14/Voice/Carcat/carcat_laugh.ogg
+  - /Audio/_CP14/Voice/Carcat/carcat_laugh2.ogg
+  - /Audio/_CP14/Voice/Carcat/carcat_laugh3.ogg

Resources/Prototypes/_CP14/Species/carcat.yml

@@ -0,0 +1,157 @@
+- type: species
+  id: CP14Carcat
+  name: cp14-species-name-carcat
+  roundStart: true
+  prototype: CP14MobCarcat
+  sprites: CP14MobCarcatSprites
+  markingLimits: CP14MobCarcatMarkingLimits
+  dollPrototype: CP14MobCarcatDummy
+  skinColoration: VoxFeathers
+  defaultSkinTone: "#4a382f"
+  maleFirstNames: CP14_Names_Carcat_First
+  femaleFirstNames: CP14_Names_Carcat_First
+  naming: First
+
+- type: speciesBaseSprites
+  id: CP14MobCarcatSprites
+  sprites:
+    Head: CP14MobCarcatHead
+    HeadTop: CP14MobCarcatMarkingMatchSkin
+    #Hair: CP14MobCarcatAnyMarking
+    #FacialHair: CP14MobCarcatAnyMarking
+    Snout: CP14MobCarcatMarkingMatchSkin
+    Chest: CP14MobCarcatTorso
+    Eyes: CP14MobCarcatEyes
+    LArm: CP14MobCarcatLArm
+    RArm: CP14MobCarcatRArm
+    LHand: CP14MobCarcatLHand
+    RHand: CP14MobCarcatRHand
+    LLeg: CP14MobCarcatLLeg
+    RLeg: CP14MobCarcatRLeg
+    LFoot: CP14MobCarcatLFoot
+    RFoot: CP14MobCarcatRFoot
+
+- type: markingPoints
+  id: CP14MobCarcatMarkingLimits
+  onlyWhitelisted: true
+  points:
+    Hair:
+      points: 1
+      required: false
+    #FacialHair:
+    #  points: 1
+    #  required: false
+    Snout:
+      points: 1
+      required: true
+      defaultMarkings: [ CP14CarcatNose ]
+    HeadTop:
+      points: 1
+      required: true
+      defaultMarkings: [ CP14CarcatEars ]
+    #Chest:
+    #  points: 1
+    #  required: false
+    #Legs:
+    #  points: 2
+    #  required: false
+    #Arms:
+    #  points: 2
+    #  required: false
+
+- type: humanoidBaseSprite
+  id: CP14MobCarcatEyes
+  baseSprite:
+    sprite: _CP14/Mobs/Species/Carcat/parts.rsi
+    state: eyes
+
+- type: humanoidBaseSprite
+  id: CP14MobCarcatAnyMarking
+
+- type: humanoidBaseSprite
+  id: CP14MobCarcatMarkingMatchSkin
+  markingsMatchSkin: true
+
+- type: humanoidBaseSprite
+  id: CP14MobCarcatHead
+  baseSprite:
+    sprite: _CP14/Mobs/Species/Carcat/parts.rsi
+    state: head
+
+- type: humanoidBaseSprite
+  id: CP14MobCarcatHeadMale
+  baseSprite:
+    sprite: _CP14/Mobs/Species/Carcat/parts.rsi
+    state: head
+
+- type: humanoidBaseSprite
+  id: CP14MobCarcatHeadFemale
+  baseSprite:
+    sprite: _CP14/Mobs/Species/Carcat/parts.rsi
+    state: head
+
+- type: humanoidBaseSprite
+  id: CP14MobCarcatTorso
+  baseSprite:
+    sprite: _CP14/Mobs/Species/Carcat/parts.rsi
+    state: torso
+
+- type: humanoidBaseSprite
+  id: CP14MobCarcatTorsoMale
+  baseSprite:
+    sprite: _CP14/Mobs/Species/Carcat/parts.rsi
+    state: torso
+
+- type: humanoidBaseSprite
+  id: CP14MobCarcatTorsoFemale
+  baseSprite:
+    sprite: _CP14/Mobs/Species/Carcat/parts.rsi
+    state: torso
+
+- type: humanoidBaseSprite
+  id: CP14MobCarcatLLeg
+  baseSprite:
+    sprite: _CP14/Mobs/Species/Carcat/parts.rsi
+    state: l_leg
+
+- type: humanoidBaseSprite
+  id: CP14MobCarcatLArm
+  baseSprite:
+    sprite: _CP14/Mobs/Species/Carcat/parts.rsi
+    state: l_arm
+
+- type: humanoidBaseSprite
+  id: CP14MobCarcatLHand
+  baseSprite:
+    sprite: _CP14/Mobs/Species/Carcat/parts.rsi
+    state: l_hand
+
+- type: humanoidBaseSprite
+  id: CP14MobCarcatLFoot
+  baseSprite:
+    sprite: _CP14/Mobs/Species/Carcat/parts.rsi
+    state: l_foot
+
+- type: humanoidBaseSprite
+  id: CP14MobCarcatRLeg
+  baseSprite:
+    sprite: _CP14/Mobs/Species/Carcat/parts.rsi
+    state: r_leg
+
+- type: humanoidBaseSprite
+  id: CP14MobCarcatRArm
+  baseSprite:
+    sprite: _CP14/Mobs/Species/Carcat/parts.rsi
+    state: r_arm
+
+- type: humanoidBaseSprite
+  id: CP14MobCarcatRHand
+  baseSprite:
+    sprite: _CP14/Mobs/Species/Carcat/parts.rsi
+    state: r_hand
+
+- type: humanoidBaseSprite
+  id: CP14MobCarcatRFoot
+  baseSprite:
+    sprite: _CP14/Mobs/Species/Carcat/parts.rsi
+    state: r_foot

Resources/Prototypes/_CP14/Species/goblin.yml

@@ -10,6 +10,7 @@
   defaultSkinTone: "#74964d"
   maleFirstNames: CP14_Names_Goblin_Male_First
   femaleFirstNames: CP14_Names_Goblin_Female_First
+  naming: First
 
 - type: speciesBaseSprites
   id: CP14MobGoblinSprites

Resources/Prototypes/_CP14/Voice/speech_emote_sounds.yml

@@ -12,3 +12,21 @@
       path: /Audio/_CP14/Voice/Goblin/goblin_sleep.ogg
     DefaultDeathgasp:
       path: /Audio/_CP14/Voice/Goblin/goblin_death.ogg
+    Whistle:
+      collection: Whistles
+
+- type: emoteSounds
+  id: CP14UnisexCarcat
+  params:
+    variation: 0.125
+  sounds:
+    Scream:
+      path: /Audio/_CP14/Voice/Carcat/carcat_scream.ogg
+    Laugh:
+      collection: CP14CarcatLaugh
+    Gasp:
+      path: /Audio/_CP14/Voice/Carcat/carcat_gasp.ogg
+    DefaultDeathgasp:
+      path: /Audio/_CP14/Voice/Carcat/carcat_gasp.ogg
+    Whistle:
+      collection: Whistles

Resources/Prototypes/_CP14/Voice/speech_sounds.yml

@@ -0,0 +1,8 @@
+- type: speechSounds
+  id: CP14Carcat
+  saySound:
+    path: /Audio/_CP14/Voice/Carcat/carcat_talk3.ogg
+  askSound:
+    path: /Audio/_CP14/Voice/Carcat/carcat_talk2.ogg
+  exclaimSound:
+    path: /Audio/_CP14/Voice/Carcat/carcat_talk1.ogg

Resources/Textures/_CP14/Clothing/Head/Produced/Armor/capellina.rsi/meta.json

@@ -3,8 +3,8 @@
     "license": "CC-BY-SA-4.0",
     "copyright": "Created by Prazat",
     "size": {
-        "x": 32,
-        "y": 32
+        "x": 48,
+        "y": 48
     },
     "states": [
         {
@@ -13,14 +13,6 @@
         {
             "name": "equipped-HELMET",
             "directions": 4
-        },
-        {
-            "name": "inhand-left",
-            "directions": 4
-        },
-        {
-            "name": "inhand-right",
-            "directions": 4
         }
     ]
 }

Resources/Textures/_CP14/Clothing/Head/Produced/wreath.rsi/meta.json

@@ -13,14 +13,6 @@
     {
       "name": "equipped-HELMET",
       "directions": 4
-    },
-    {
-      "name": "inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "inhand-right",
-      "directions": 4
     }
   ]
 }

Resources/Textures/_CP14/Clothing/Head/Roles/Alchemist/bandana.rsi/meta.json

@@ -3,8 +3,8 @@
     "license": "CC-BY-SA-4.0",
     "copyright": "Created by Prazat, recolored by TheShuEd",
     "size": {
-        "x": 32,
-        "y": 32
+        "x": 48,
+        "y": 48
     },
     "states": [
         {

Resources/Textures/_CP14/Clothing/Head/Roles/Alchemist/beret.rsi/meta.json

@@ -3,8 +3,8 @@
     "license": "CC-BY-SA-4.0",
     "copyright": "Created by Prazat, recolored by TheShuEd",
     "size": {
-        "x": 32,
-        "y": 32
+        "x": 48,
+        "y": 48
     },
     "states": [
         {

Resources/Textures/_CP14/Clothing/Head/Roles/Captain/cap.rsi/meta.json

@@ -1,18 +0,0 @@
-{
-    "version": 1,
-    "license": "All right reserved",
-    "copyright": "Created by Jaraten",
-    "size": {
-        "x": 32,
-        "y": 32
-    },
-    "states": [
-        {
-            "name": "icon"
-        },
-        {
-            "name": "equipped-HELMET",
-            "directions": 4
-        }
-    ]
-}

Resources/Textures/_CP14/Clothing/Head/Roles/General/bandana_white.rsi/meta.json

@@ -1,18 +0,0 @@
-{
-    "version": 1,
-    "license": "CC-BY-SA-4.0",
-    "copyright": "Created by Prazat, recolored by TheShuEd",
-    "size": {
-        "x": 32,
-        "y": 32
-    },
-    "states": [
-        {
-            "name": "icon"
-        },
-        {
-            "name": "equipped-HELMET",
-            "directions": 4
-        }
-    ]
-}

Resources/Textures/_CP14/Clothing/Head/Roles/General/bandana_yellow.rsi/meta.json

@@ -1,18 +0,0 @@
-{
-    "version": 1,
-    "license": "CC-BY-SA-4.0",
-    "copyright": "Created by Prazat",
-    "size": {
-        "x": 32,
-        "y": 32
-    },
-    "states": [
-        {
-            "name": "icon"
-        },
-        {
-            "name": "equipped-HELMET",
-            "directions": 4
-        }
-    ]
-}

Resources/Textures/_CP14/Clothing/Head/Roles/General/beret_black.rsi/meta.json

@@ -1,18 +0,0 @@
-{
-    "version": 1,
-    "license": "CC-BY-SA-4.0",
-    "copyright": "Created by Prazat",
-    "size": {
-        "x": 32,
-        "y": 32
-    },
-    "states": [
-        {
-            "name": "icon"
-        },
-        {
-            "name": "equipped-HELMET",
-            "directions": 4
-        }
-    ]
-}

Resources/Textures/_CP14/Clothing/Head/Roles/General/beret_blue.rsi/meta.json

@@ -1,18 +0,0 @@
-{
-    "version": 1,
-    "license": "CC-BY-SA-4.0",
-    "copyright": "Created by Prazat",
-    "size": {
-        "x": 32,
-        "y": 32
-    },
-    "states": [
-        {
-            "name": "icon"
-        },
-        {
-            "name": "equipped-HELMET",
-            "directions": 4
-        }
-    ]
-}

Resources/Textures/_CP14/Clothing/Head/Roles/General/beret_purple.rsi/meta.json

@@ -1,18 +0,0 @@
-{
-    "version": 1,
-    "license": "CC-BY-SA-4.0",
-    "copyright": "Created by Prazat",
-    "size": {
-        "x": 32,
-        "y": 32
-    },
-    "states": [
-        {
-            "name": "icon"
-        },
-        {
-            "name": "equipped-HELMET",
-            "directions": 4
-        }
-    ]
-}

Resources/Textures/_CP14/Clothing/Head/Roles/General/beret_red.rsi/meta.json

@@ -1,18 +0,0 @@
-{
-    "version": 1,
-    "license": "CC-BY-SA-4.0",
-    "copyright": "Created by Prazat",
-    "size": {
-        "x": 32,
-        "y": 32
-    },
-    "states": [
-        {
-            "name": "icon"
-        },
-        {
-            "name": "equipped-HELMET",
-            "directions": 4
-        }
-    ]
-}

Resources/Textures/_CP14/Clothing/Head/Roles/General/beret_yellow.rsi/meta.json

@@ -1,18 +0,0 @@
-{
-    "version": 1,
-    "license": "CC-BY-SA-4.0",
-    "copyright": "Created by Prazat",
-    "size": {
-        "x": 32,
-        "y": 32
-    },
-    "states": [
-        {
-            "name": "icon"
-        },
-        {
-            "name": "equipped-HELMET",
-            "directions": 4
-        }
-    ]
-}

Resources/Textures/_CP14/Clothing/Head/Roles/General/jesters_cap.rsi/meta.json

@@ -3,8 +3,8 @@
     "license": "All right reserved",
     "copyright": "Created by creamy",
     "size": {
-        "x": 32,
-        "y": 32
+        "x": 48,
+        "y": 48
     },
     "states": [
         {

Resources/Textures/_CP14/Clothing/Head/Roles/General/metalheadband.rsi/meta.json

@@ -3,8 +3,8 @@
     "license": "CC-BY-SA-4.0",
     "copyright": "Created by KBAS5, edited by TheShuEd",
     "size": {
-        "x": 32,
-        "y": 32
+        "x": 48,
+        "y": 48
     },
     "states": [
         {

Resources/Textures/_CP14/Mobs/Customization/carcat_ears.rsi/meta.json

@@ -0,0 +1,31 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-4.0",
+  "copyright": "Created by TheShuEd (Github)",
+  "size": {
+    "x": 48,
+    "y": 48
+  },
+  "states": [
+    {
+      "name": "1",
+      "directions": 4
+    },
+    {
+      "name": "2",
+      "directions": 4
+    },
+    {
+      "name": "3",
+      "directions": 4
+    },
+    {
+      "name": "4",
+      "directions": 4
+    },
+    {
+      "name": "5",
+      "directions": 4
+    }
+  ]
+}