From 33d04ef35ba69ba4587f9bbf92f78f3ab59d5ef5 Mon Sep 17 00:00:00 2001 From: Ed <96445749+TheShuEd@users.noreply.github.com> Date: Sun, 28 Apr 2024 01:44:43 +0300 Subject: [PATCH] Dwarf species (#119) * add dworf sprites * dwarf prototypes * add shoes displacement. FUCK! its doesnt work * spaces * footfix * final dwarf! * fixes --- .../Clothing/ClientClothingSystem.cs | 5 +- .../Inventory/InventoryComponent.cs | 4 +- .../en-US/_CP14/species/species-names.ftl | 237 +++++++++++++---- .../Locale/en-US/_CP14/species/species.ftl | 1 + .../ru-RU/_CP14/species/species-names.ftl | 239 ++++++++++++++---- .../Locale/ru-RU/_CP14/species/species.ftl | 3 +- .../Prototypes/Entities/Mobs/Species/vox.yml | 1 - .../_CP14/Body/Prototypes/dwarf.yml | 49 ++++ .../Prototypes/_CP14/Datasets/Names/dwarf.yml | 139 ++++++++++ .../_CP14/Entities/Mobs/Player/dwarf.yml | 4 + .../_CP14/Entities/Mobs/Species/dwarf.yml | 47 ++++ .../_CP14/Entities/Mobs/Species/human.yml | 1 - .../_CP14/Entities/Mobs/Species/tiefling.yml | 31 ++- Resources/Prototypes/_CP14/Species/dwarf.yml | 129 ++++++++++ Resources/Prototypes/_CP14/Species/human.yml | 2 +- .../redguardarmor.rsi/equipped-CLOAK.png | Bin 1826 -> 1812 bytes .../Species/Dwarf/displacement.rsi/meta.json | 22 ++ .../Species/Dwarf/displacement.rsi/pants.png | Bin 0 -> 353 bytes .../Species/Dwarf/displacement.rsi/shoes.png | Bin 0 -> 260 bytes .../Mobs/Species/Dwarf/parts.rsi/full.png | Bin 0 -> 702 bytes .../Mobs/Species/Dwarf/parts.rsi/head_f.png | Bin 0 -> 511 bytes .../Mobs/Species/Dwarf/parts.rsi/head_m.png | Bin 0 -> 508 bytes .../Mobs/Species/Dwarf/parts.rsi/l_arm.png | Bin 0 -> 337 bytes .../Mobs/Species/Dwarf/parts.rsi/l_foot.png | Bin 0 -> 380 bytes .../Mobs/Species/Dwarf/parts.rsi/l_hand.png | Bin 0 -> 321 bytes .../Mobs/Species/Dwarf/parts.rsi/l_leg.png | Bin 0 -> 356 bytes .../Mobs/Species/Dwarf/parts.rsi/meta.json | 62 +++++ .../Mobs/Species/Dwarf/parts.rsi/r_arm.png | Bin 0 -> 362 bytes .../Mobs/Species/Dwarf/parts.rsi/r_foot.png | Bin 0 -> 356 bytes .../Mobs/Species/Dwarf/parts.rsi/r_hand.png | Bin 0 -> 346 bytes .../Mobs/Species/Dwarf/parts.rsi/r_leg.png | Bin 0 -> 379 bytes .../Mobs/Species/Dwarf/parts.rsi/torso_f.png | Bin 0 -> 829 bytes .../Mobs/Species/Dwarf/parts.rsi/torso_m.png | Bin 0 -> 706 bytes .../Mobs/Species/Human/parts.rsi/l_arm.png | Bin 468 -> 337 bytes .../Mobs/Species/Human/parts.rsi/r_arm.png | Bin 366 -> 362 bytes .../Mobs/Species/Tiefling/parts.rsi/l_arm.png | Bin 468 -> 337 bytes .../Species/Tiefling/parts.rsi/l_foot.png | Bin 404 -> 389 bytes .../Mobs/Species/Tiefling/parts.rsi/r_arm.png | Bin 366 -> 362 bytes .../Species/Tiefling/parts.rsi/r_foot.png | Bin 365 -> 355 bytes 39 files changed, 851 insertions(+), 125 deletions(-) create mode 100644 Resources/Prototypes/_CP14/Body/Prototypes/dwarf.yml create mode 100644 Resources/Prototypes/_CP14/Datasets/Names/dwarf.yml create mode 100644 Resources/Prototypes/_CP14/Entities/Mobs/Player/dwarf.yml create mode 100644 Resources/Prototypes/_CP14/Entities/Mobs/Species/dwarf.yml create mode 100644 Resources/Prototypes/_CP14/Species/dwarf.yml create mode 100644 Resources/Textures/_CP14/Mobs/Species/Dwarf/displacement.rsi/meta.json create mode 100644 Resources/Textures/_CP14/Mobs/Species/Dwarf/displacement.rsi/pants.png create mode 100644 Resources/Textures/_CP14/Mobs/Species/Dwarf/displacement.rsi/shoes.png create mode 100644 Resources/Textures/_CP14/Mobs/Species/Dwarf/parts.rsi/full.png create mode 100644 Resources/Textures/_CP14/Mobs/Species/Dwarf/parts.rsi/head_f.png create mode 100644 Resources/Textures/_CP14/Mobs/Species/Dwarf/parts.rsi/head_m.png create mode 100644 Resources/Textures/_CP14/Mobs/Species/Dwarf/parts.rsi/l_arm.png create mode 100644 Resources/Textures/_CP14/Mobs/Species/Dwarf/parts.rsi/l_foot.png create mode 100644 Resources/Textures/_CP14/Mobs/Species/Dwarf/parts.rsi/l_hand.png create mode 100644 Resources/Textures/_CP14/Mobs/Species/Dwarf/parts.rsi/l_leg.png create mode 100644 Resources/Textures/_CP14/Mobs/Species/Dwarf/parts.rsi/meta.json create mode 100644 Resources/Textures/_CP14/Mobs/Species/Dwarf/parts.rsi/r_arm.png create mode 100644 Resources/Textures/_CP14/Mobs/Species/Dwarf/parts.rsi/r_foot.png create mode 100644 Resources/Textures/_CP14/Mobs/Species/Dwarf/parts.rsi/r_hand.png create mode 100644 Resources/Textures/_CP14/Mobs/Species/Dwarf/parts.rsi/r_leg.png create mode 100644 Resources/Textures/_CP14/Mobs/Species/Dwarf/parts.rsi/torso_f.png create mode 100644 Resources/Textures/_CP14/Mobs/Species/Dwarf/parts.rsi/torso_m.png diff --git a/Content.Client/Clothing/ClientClothingSystem.cs b/Content.Client/Clothing/ClientClothingSystem.cs index 438902c97b..da80a3a71b 100644 --- a/Content.Client/Clothing/ClientClothingSystem.cs +++ b/Content.Client/Clothing/ClientClothingSystem.cs @@ -314,13 +314,16 @@ public sealed class ClientClothingSystem : ClothingSystem // Sprite layer redactor when // Sprite "redactor" just a week away. if (slot == Jumpsuit) - layerData.Shader ??= inventory.JumpsuitShader; + layerData.Shader ??= "StencilDraw"; sprite.LayerSetData(index, layerData); layer.Offset += slotDef.Offset; if (displacementData != null) { + if (displacementData.ShaderOverride != null) + sprite.LayerSetShader(index, displacementData.ShaderOverride); + var displacementKey = $"{key}-displacement"; if (!revealedLayers.Add(displacementKey)) { diff --git a/Content.Shared/Inventory/InventoryComponent.cs b/Content.Shared/Inventory/InventoryComponent.cs index dde48a62aa..02b3a5b258 100644 --- a/Content.Shared/Inventory/InventoryComponent.cs +++ b/Content.Shared/Inventory/InventoryComponent.cs @@ -13,7 +13,6 @@ public sealed partial class InventoryComponent : Component [DataField("speciesId")] public string? SpeciesId { get; set; } - [DataField] public string JumpsuitShader = "StencilDraw"; [DataField] public Dictionary Displacements = []; public SlotDefinition[] Slots = Array.Empty(); @@ -24,5 +23,8 @@ public sealed partial class InventoryComponent : Component { [DataField(required: true)] public PrototypeLayerData Layer = default!; + + [DataField] + public string? ShaderOverride = "DisplacedStencilDraw"; } } diff --git a/Resources/Locale/en-US/_CP14/species/species-names.ftl b/Resources/Locale/en-US/_CP14/species/species-names.ftl index 4650f9371f..133694ecc8 100644 --- a/Resources/Locale/en-US/_CP14/species/species-names.ftl +++ b/Resources/Locale/en-US/_CP14/species/species-names.ftl @@ -1,55 +1,55 @@ -cp14-species-name-tiefling-male-first-1 = Леонард -cp14-species-name-tiefling-male-first-2 = Даниэль -cp14-species-name-tiefling-male-first-3 = Мэррик -cp14-species-name-tiefling-male-first-4 = Хортон -cp14-species-name-tiefling-male-first-5 = Герман -cp14-species-name-tiefling-male-first-6 = Ричард -cp14-species-name-tiefling-male-first-7 = Лэнден -cp14-species-name-tiefling-male-first-8 = Джуанито -cp14-species-name-tiefling-male-first-9 = Фредди -cp14-species-name-tiefling-male-first-10 = Лион -cp14-species-name-tiefling-male-first-11 = Джозэф -cp14-species-name-tiefling-male-first-12 = Тор -cp14-species-name-tiefling-male-first-13 = Джулион -cp14-species-name-tiefling-male-first-14 = Ансель -cp14-species-name-tiefling-male-first-15 = Айвор -cp14-species-name-tiefling-male-first-16 = Бор -cp14-species-name-tiefling-male-first-17 = Глэр -cp14-species-name-tiefling-male-first-18 = Григор -cp14-species-name-tiefling-male-first-19 = Иган -cp14-species-name-tiefling-male-first-20 = Козеф -cp14-species-name-tiefling-male-first-21 = Миваль -cp14-species-name-tiefling-male-first-22 = Орел -cp14-species-name-tiefling-male-first-23 = Павел -cp14-species-name-tiefling-male-first-24 = Сергор -cp14-species-name-tiefling-male-first-25 = Фодель -cp14-species-name-tiefling-male-first-26 = Блас -cp14-species-name-tiefling-male-first-27 = Бран -cp14-species-name-tiefling-male-first-28 = Гет -cp14-species-name-tiefling-male-first-29 = Ландер -cp14-species-name-tiefling-male-first-30 = Лют -cp14-species-name-tiefling-male-first-31 = Малсер -cp14-species-name-tiefling-male-first-32 = Стор -cp14-species-name-tiefling-male-first-33 = Таман -cp14-species-name-tiefling-male-first-34 = Урт -cp14-species-name-tiefling-male-first-35 = Фрат -cp14-species-name-tiefling-male-first-36 = Эндер -cp14-species-name-tiefling-male-first-37 = Крис -cp14-species-name-tiefling-male-first-38 = Асеир -cp14-species-name-tiefling-male-first-39 = Бардеид -cp14-species-name-tiefling-male-first-40 = Зашеир -cp14-species-name-tiefling-male-first-41 = Кхемед -cp14-species-name-tiefling-male-first-42 = Мехмен -cp14-species-name-tiefling-male-first-43 = Судейман -cp14-species-name-tiefling-male-first-44 = Хасеид -cp14-species-name-tiefling-male-first-45 = Антон -cp14-species-name-tiefling-male-first-46 = Диеро -cp14-species-name-tiefling-male-first-47 = Маркон -cp14-species-name-tiefling-male-first-48 = Пьерон -cp14-species-name-tiefling-male-first-49 = Римардо -cp14-species-name-tiefling-male-first-50 = Ромеро -cp14-species-name-tiefling-male-first-51 = Салазар -cp14-species-name-tiefling-male-first-52 = Умберо +cp14-species-name-human-male-first-1 = Леонард +cp14-species-name-human-male-first-2 = Даниэль +cp14-species-name-human-male-first-3 = Мэррик +cp14-species-name-human-male-first-4 = Хортон +cp14-species-name-human-male-first-5 = Герман +cp14-species-name-human-male-first-6 = Ричард +cp14-species-name-human-male-first-7 = Лэнден +cp14-species-name-human-male-first-8 = Джуанито +cp14-species-name-human-male-first-9 = Фредди +cp14-species-name-human-male-first-10 = Лион +cp14-species-name-human-male-first-11 = Джозэф +cp14-species-name-human-male-first-12 = Тор +cp14-species-name-human-male-first-13 = Джулион +cp14-species-name-human-male-first-14 = Ансель +cp14-species-name-human-male-first-15 = Айвор +cp14-species-name-human-male-first-16 = Бор +cp14-species-name-human-male-first-17 = Глэр +cp14-species-name-human-male-first-18 = Григор +cp14-species-name-human-male-first-19 = Иган +cp14-species-name-human-male-first-20 = Козеф +cp14-species-name-human-male-first-21 = Миваль +cp14-species-name-human-male-first-22 = Орел +cp14-species-name-human-male-first-23 = Павел +cp14-species-name-human-male-first-24 = Сергор +cp14-species-name-human-male-first-25 = Фодель +cp14-species-name-human-male-first-26 = Блас +cp14-species-name-human-male-first-27 = Бран +cp14-species-name-human-male-first-28 = Гет +cp14-species-name-human-male-first-29 = Ландер +cp14-species-name-human-male-first-30 = Лют +cp14-species-name-human-male-first-31 = Малсер +cp14-species-name-human-male-first-32 = Стор +cp14-species-name-human-male-first-33 = Таман +cp14-species-name-human-male-first-34 = Урт +cp14-species-name-human-male-first-35 = Фрат +cp14-species-name-human-male-first-36 = Эндер +cp14-species-name-human-male-first-37 = Крис +cp14-species-name-human-male-first-38 = Асеир +cp14-species-name-human-male-first-39 = Бардеид +cp14-species-name-human-male-first-40 = Зашеир +cp14-species-name-human-male-first-41 = Кхемед +cp14-species-name-human-male-first-42 = Мехмен +cp14-species-name-human-male-first-43 = Судейман +cp14-species-name-human-male-first-44 = Хасеид +cp14-species-name-human-male-first-45 = Антон +cp14-species-name-human-male-first-46 = Диеро +cp14-species-name-human-male-first-47 = Маркон +cp14-species-name-human-male-first-48 = Пьерон +cp14-species-name-human-male-first-49 = Римардо +cp14-species-name-human-male-first-50 = Ромеро +cp14-species-name-human-male-first-51 = Салазар +cp14-species-name-human-male-first-52 = Умберо cp14-species-name-human-female-first-1 = Элис cp14-species-name-human-female-first-2 = Алетра @@ -265,4 +265,135 @@ cp14-species-name-tiefling-last-20 = Тетенбри cp14-species-name-tiefling-last-21 = Хлещехвост cp14-species-name-tiefling-last-22 = Цезбулан cp14-species-name-tiefling-last-23 = Чеммидон -cp14-species-name-tiefling-last-24 = Черногонь \ No newline at end of file +cp14-species-name-tiefling-last-24 = Черногонь + +# DWARF + +cp14-species-name-dwarf-male-first-1 = Адрик +cp14-species-name-dwarf-male-first-2 = Альберих +cp14-species-name-dwarf-male-first-3 = Баренд +cp14-species-name-dwarf-male-first-4 = Баэрн +cp14-species-name-dwarf-male-first-5 = Броттор +cp14-species-name-dwarf-male-first-6 = Бруенор +cp14-species-name-dwarf-male-first-7 = Вондал +cp14-species-name-dwarf-male-first-8 = Вэйт +cp14-species-name-dwarf-male-first-9 = Гардаин +cp14-species-name-dwarf-male-first-10 = Даин +cp14-species-name-dwarf-male-first-11 = Даррак +cp14-species-name-dwarf-male-first-12 = Делг +cp14-species-name-dwarf-male-first-13 = Килдрак +cp14-species-name-dwarf-male-first-14 = Моргран +cp14-species-name-dwarf-male-first-15 = Орсик +cp14-species-name-dwarf-male-first-16 = Оскар +cp14-species-name-dwarf-male-first-17 = Рангрим +cp14-species-name-dwarf-male-first-18 = Рюрик +cp14-species-name-dwarf-male-first-19 = Таклинн +cp14-species-name-dwarf-male-first-20 = Торадин +cp14-species-name-dwarf-male-first-21 = Тордек +cp14-species-name-dwarf-male-first-22 = Торин +cp14-species-name-dwarf-male-first-23 = Травок +cp14-species-name-dwarf-male-first-24 = Траубон +cp14-species-name-dwarf-male-first-25 = Ульфгар +cp14-species-name-dwarf-male-first-26 = Фаргрим +cp14-species-name-dwarf-male-first-27 = Флинт +cp14-species-name-dwarf-male-first-28 = Харбек +cp14-species-name-dwarf-male-first-29 = Эберк +cp14-species-name-dwarf-male-first-30 = Эйнкиль +cp14-species-name-dwarf-male-first-31 = Зрадал +cp14-species-name-dwarf-male-first-32 = Малкар +cp14-species-name-dwarf-male-first-33 = Дольмен +cp14-species-name-dwarf-male-first-34 = Сваргар +cp14-species-name-dwarf-male-first-35 = Зорин +cp14-species-name-dwarf-male-first-36 = Арнар +cp14-species-name-dwarf-male-first-37 = Эльдкин +cp14-species-name-dwarf-male-first-38 = Бальфам +cp14-species-name-dwarf-male-first-39 = Эзеган +cp14-species-name-dwarf-male-first-40 = Эридрэд +cp14-species-name-dwarf-male-first-41 = Нордак +cp14-species-name-dwarf-male-first-42 = Крим +cp14-species-name-dwarf-male-first-43 = Земк +cp14-species-name-dwarf-male-first-44 = Орсик +cp14-species-name-dwarf-male-first-45 = Пвент +cp14-species-name-dwarf-male-first-46 = Белорил +cp14-species-name-dwarf-male-first-47 = Рэйрак +cp14-species-name-dwarf-male-first-48 = Вурбин +cp14-species-name-dwarf-male-first-49 = Артин +cp14-species-name-dwarf-male-first-50 = Ардар +cp14-species-name-dwarf-male-first-51 = Бульдагар +cp14-species-name-dwarf-male-first-52 = Вальдрог + +cp14-species-name-dwarf-female-first-1 = Артин +cp14-species-name-dwarf-female-first-2 = Бардрин +cp14-species-name-dwarf-female-first-3 = Вистра +cp14-species-name-dwarf-female-first-4 = Гуннлода +cp14-species-name-dwarf-female-first-5 = Гурдис +cp14-species-name-dwarf-female-first-6 = Дагнал +cp14-species-name-dwarf-female-first-7 = Диеза +cp14-species-name-dwarf-female-first-8 = Илде +cp14-species-name-dwarf-female-first-9 = Катра +cp14-species-name-dwarf-female-first-10 = Кристид +cp14-species-name-dwarf-female-first-11 = Лифтраса +cp14-species-name-dwarf-female-first-12 = Мардред +cp14-species-name-dwarf-female-first-13 = Одхильд +cp14-species-name-dwarf-female-first-14 = Рисвин +cp14-species-name-dwarf-female-first-15 = Саннл +cp14-species-name-dwarf-female-first-16 = Торбера +cp14-species-name-dwarf-female-first-17 = Торгга +cp14-species-name-dwarf-female-first-18 = Фалрунн +cp14-species-name-dwarf-female-first-19 = Финеллен +cp14-species-name-dwarf-female-first-20 = Хельджа +cp14-species-name-dwarf-female-first-21 = Хлин +cp14-species-name-dwarf-female-first-22 = Эльдет +cp14-species-name-dwarf-female-first-23 = Эмбер +cp14-species-name-dwarf-female-first-24 = Дэлре +cp14-species-name-dwarf-female-first-25 = Рокель +cp14-species-name-dwarf-female-first-26 = Тодрис +cp14-species-name-dwarf-female-first-27 = Хельга +cp14-species-name-dwarf-female-first-28 = Ярана +cp14-species-name-dwarf-female-first-29 = Фалтра +cp14-species-name-dwarf-female-first-30 = Нуркана +cp14-species-name-dwarf-female-first-31 = Вьерида +cp14-species-name-dwarf-female-first-32 = Элайм +cp14-species-name-dwarf-female-first-33 = Барбена +cp14-species-name-dwarf-female-first-34 = Гренензель +cp14-species-name-dwarf-female-first-35 = Локара +cp14-species-name-dwarf-female-first-36 = Барбара +cp14-species-name-dwarf-female-first-37 = Зебель +cp14-species-name-dwarf-female-first-38 = Морана +cp14-species-name-dwarf-female-first-39 = Вильгерда +cp14-species-name-dwarf-female-first-40 = Кристина +cp14-species-name-dwarf-female-first-41 = Овина +cp14-species-name-dwarf-female-first-42 = Хлина +cp14-species-name-dwarf-female-first-43 = Ярмада +cp14-species-name-dwarf-female-first-44 = Никель + +cp14-species-name-dwarf-last-1 = из клана Балдерк +cp14-species-name-dwarf-last-2 = из клана Боевого молота +cp14-species-name-dwarf-last-3 = из клана Горунн +cp14-species-name-dwarf-last-4 = из клана Данкил +cp14-species-name-dwarf-last-5 = из клана Железный кулак +cp14-species-name-dwarf-last-6 = из клана Крепкой наковальни +cp14-species-name-dwarf-last-7 = из клана Ляденой бороды +cp14-species-name-dwarf-last-8 = из клана Лодерр +cp14-species-name-dwarf-last-9 = из клана Лютгер +cp14-species-name-dwarf-last-10 = из клана Огненной кузни +cp14-species-name-dwarf-last-11 = из клана Рамнахейм +cp14-species-name-dwarf-last-12 = из клана Стракелн +cp14-species-name-dwarf-last-13 = из клана Торунн +cp14-species-name-dwarf-last-14 = из клана Унгарт +cp14-species-name-dwarf-last-15 = из клана Холдерхек +cp14-species-name-dwarf-last-16 = из клана Золотого кубка +cp14-species-name-dwarf-last-17 = из клана Раскаленной стали +cp14-species-name-dwarf-last-18 = из клана Вечного камня +cp14-species-name-dwarf-last-19 = из клана Непоколебимой скалы +cp14-species-name-dwarf-last-20 = из клана Камнеплеч +cp14-species-name-dwarf-last-21 = из клана Змиегуб +cp14-species-name-dwarf-last-22 = из клана Вайнкаттер +cp14-species-name-dwarf-last-23 = из клана Кулачных братьев +cp14-species-name-dwarf-last-24 = из клана Драстгар +cp14-species-name-dwarf-last-25 = из клана Ковальщиков +cp14-species-name-dwarf-last-26 = из клана Торэвир +cp14-species-name-dwarf-last-27 = из клана Баклбар +cp14-species-name-dwarf-last-28 = из клана Барабаногромов +cp14-species-name-dwarf-last-29 = из клана Огнеязыких +cp14-species-name-dwarf-last-30 = из клана Вечного мёда \ No newline at end of file diff --git a/Resources/Locale/en-US/_CP14/species/species.ftl b/Resources/Locale/en-US/_CP14/species/species.ftl index 604af6f1fc..82580940ce 100644 --- a/Resources/Locale/en-US/_CP14/species/species.ftl +++ b/Resources/Locale/en-US/_CP14/species/species.ftl @@ -1 +1,2 @@ species-name-tiefling = Tiefling +species-name-dwarf = Dwarf \ No newline at end of file diff --git a/Resources/Locale/ru-RU/_CP14/species/species-names.ftl b/Resources/Locale/ru-RU/_CP14/species/species-names.ftl index 4650f9371f..bbbe84c0f8 100644 --- a/Resources/Locale/ru-RU/_CP14/species/species-names.ftl +++ b/Resources/Locale/ru-RU/_CP14/species/species-names.ftl @@ -1,55 +1,57 @@ -cp14-species-name-tiefling-male-first-1 = Леонард -cp14-species-name-tiefling-male-first-2 = Даниэль -cp14-species-name-tiefling-male-first-3 = Мэррик -cp14-species-name-tiefling-male-first-4 = Хортон -cp14-species-name-tiefling-male-first-5 = Герман -cp14-species-name-tiefling-male-first-6 = Ричард -cp14-species-name-tiefling-male-first-7 = Лэнден -cp14-species-name-tiefling-male-first-8 = Джуанито -cp14-species-name-tiefling-male-first-9 = Фредди -cp14-species-name-tiefling-male-first-10 = Лион -cp14-species-name-tiefling-male-first-11 = Джозэф -cp14-species-name-tiefling-male-first-12 = Тор -cp14-species-name-tiefling-male-first-13 = Джулион -cp14-species-name-tiefling-male-first-14 = Ансель -cp14-species-name-tiefling-male-first-15 = Айвор -cp14-species-name-tiefling-male-first-16 = Бор -cp14-species-name-tiefling-male-first-17 = Глэр -cp14-species-name-tiefling-male-first-18 = Григор -cp14-species-name-tiefling-male-first-19 = Иган -cp14-species-name-tiefling-male-first-20 = Козеф -cp14-species-name-tiefling-male-first-21 = Миваль -cp14-species-name-tiefling-male-first-22 = Орел -cp14-species-name-tiefling-male-first-23 = Павел -cp14-species-name-tiefling-male-first-24 = Сергор -cp14-species-name-tiefling-male-first-25 = Фодель -cp14-species-name-tiefling-male-first-26 = Блас -cp14-species-name-tiefling-male-first-27 = Бран -cp14-species-name-tiefling-male-first-28 = Гет -cp14-species-name-tiefling-male-first-29 = Ландер -cp14-species-name-tiefling-male-first-30 = Лют -cp14-species-name-tiefling-male-first-31 = Малсер -cp14-species-name-tiefling-male-first-32 = Стор -cp14-species-name-tiefling-male-first-33 = Таман -cp14-species-name-tiefling-male-first-34 = Урт -cp14-species-name-tiefling-male-first-35 = Фрат -cp14-species-name-tiefling-male-first-36 = Эндер -cp14-species-name-tiefling-male-first-37 = Крис -cp14-species-name-tiefling-male-first-38 = Асеир -cp14-species-name-tiefling-male-first-39 = Бардеид -cp14-species-name-tiefling-male-first-40 = Зашеир -cp14-species-name-tiefling-male-first-41 = Кхемед -cp14-species-name-tiefling-male-first-42 = Мехмен -cp14-species-name-tiefling-male-first-43 = Судейман -cp14-species-name-tiefling-male-first-44 = Хасеид -cp14-species-name-tiefling-male-first-45 = Антон -cp14-species-name-tiefling-male-first-46 = Диеро -cp14-species-name-tiefling-male-first-47 = Маркон -cp14-species-name-tiefling-male-first-48 = Пьерон -cp14-species-name-tiefling-male-first-49 = Римардо -cp14-species-name-tiefling-male-first-50 = Ромеро -cp14-species-name-tiefling-male-first-51 = Салазар -cp14-species-name-tiefling-male-first-52 = Умберо +# HUMAN + +cp14-species-name-human-male-first-1 = Леонард +cp14-species-name-human-male-first-2 = Даниэль +cp14-species-name-human-male-first-3 = Мэррик +cp14-species-name-human-male-first-4 = Хортон +cp14-species-name-human-male-first-5 = Герман +cp14-species-name-human-male-first-6 = Ричард +cp14-species-name-human-male-first-7 = Лэнден +cp14-species-name-human-male-first-8 = Джуанито +cp14-species-name-human-male-first-9 = Фредди +cp14-species-name-human-male-first-10 = Лион +cp14-species-name-human-male-first-11 = Джозэф +cp14-species-name-human-male-first-12 = Тор +cp14-species-name-human-male-first-13 = Джулион +cp14-species-name-human-male-first-14 = Ансель +cp14-species-name-human-male-first-15 = Айвор +cp14-species-name-human-male-first-16 = Бор +cp14-species-name-human-male-first-17 = Глэр +cp14-species-name-human-male-first-18 = Григор +cp14-species-name-human-male-first-19 = Иган +cp14-species-name-human-male-first-20 = Козеф +cp14-species-name-human-male-first-21 = Миваль +cp14-species-name-human-male-first-22 = Орел +cp14-species-name-human-male-first-23 = Павел +cp14-species-name-human-male-first-24 = Сергор +cp14-species-name-human-male-first-25 = Фодель +cp14-species-name-human-male-first-26 = Блас +cp14-species-name-human-male-first-27 = Бран +cp14-species-name-human-male-first-28 = Гет +cp14-species-name-human-male-first-29 = Ландер +cp14-species-name-human-male-first-30 = Лют +cp14-species-name-human-male-first-31 = Малсер +cp14-species-name-human-male-first-32 = Стор +cp14-species-name-human-male-first-33 = Таман +cp14-species-name-human-male-first-34 = Урт +cp14-species-name-human-male-first-35 = Фрат +cp14-species-name-human-male-first-36 = Эндер +cp14-species-name-human-male-first-37 = Крис +cp14-species-name-human-male-first-38 = Асеир +cp14-species-name-human-male-first-39 = Бардеид +cp14-species-name-human-male-first-40 = Зашеир +cp14-species-name-human-male-first-41 = Кхемед +cp14-species-name-human-male-first-42 = Мехмен +cp14-species-name-human-male-first-43 = Судейман +cp14-species-name-human-male-first-44 = Хасеид +cp14-species-name-human-male-first-45 = Антон +cp14-species-name-human-male-first-46 = Диеро +cp14-species-name-human-male-first-47 = Маркон +cp14-species-name-human-male-first-48 = Пьерон +cp14-species-name-human-male-first-49 = Римардо +cp14-species-name-human-male-first-50 = Ромеро +cp14-species-name-human-male-first-51 = Салазар +cp14-species-name-human-male-first-52 = Умберо cp14-species-name-human-female-first-1 = Элис cp14-species-name-human-female-first-2 = Алетра @@ -265,4 +267,135 @@ cp14-species-name-tiefling-last-20 = Тетенбри cp14-species-name-tiefling-last-21 = Хлещехвост cp14-species-name-tiefling-last-22 = Цезбулан cp14-species-name-tiefling-last-23 = Чеммидон -cp14-species-name-tiefling-last-24 = Черногонь \ No newline at end of file +cp14-species-name-tiefling-last-24 = Черногонь + +# DWARF + +cp14-species-name-dwarf-male-first-1 = Адрик +cp14-species-name-dwarf-male-first-2 = Альберих +cp14-species-name-dwarf-male-first-3 = Баренд +cp14-species-name-dwarf-male-first-4 = Баэрн +cp14-species-name-dwarf-male-first-5 = Броттор +cp14-species-name-dwarf-male-first-6 = Бруенор +cp14-species-name-dwarf-male-first-7 = Вондал +cp14-species-name-dwarf-male-first-8 = Вэйт +cp14-species-name-dwarf-male-first-9 = Гардаин +cp14-species-name-dwarf-male-first-10 = Даин +cp14-species-name-dwarf-male-first-11 = Даррак +cp14-species-name-dwarf-male-first-12 = Делг +cp14-species-name-dwarf-male-first-13 = Килдрак +cp14-species-name-dwarf-male-first-14 = Моргран +cp14-species-name-dwarf-male-first-15 = Орсик +cp14-species-name-dwarf-male-first-16 = Оскар +cp14-species-name-dwarf-male-first-17 = Рангрим +cp14-species-name-dwarf-male-first-18 = Рюрик +cp14-species-name-dwarf-male-first-19 = Таклинн +cp14-species-name-dwarf-male-first-20 = Торадин +cp14-species-name-dwarf-male-first-21 = Тордек +cp14-species-name-dwarf-male-first-22 = Торин +cp14-species-name-dwarf-male-first-23 = Травок +cp14-species-name-dwarf-male-first-24 = Траубон +cp14-species-name-dwarf-male-first-25 = Ульфгар +cp14-species-name-dwarf-male-first-26 = Фаргрим +cp14-species-name-dwarf-male-first-27 = Флинт +cp14-species-name-dwarf-male-first-28 = Харбек +cp14-species-name-dwarf-male-first-29 = Эберк +cp14-species-name-dwarf-male-first-30 = Эйнкиль +cp14-species-name-dwarf-male-first-31 = Зрадал +cp14-species-name-dwarf-male-first-32 = Малкар +cp14-species-name-dwarf-male-first-33 = Дольмен +cp14-species-name-dwarf-male-first-34 = Сваргар +cp14-species-name-dwarf-male-first-35 = Зорин +cp14-species-name-dwarf-male-first-36 = Арнар +cp14-species-name-dwarf-male-first-37 = Эльдкин +cp14-species-name-dwarf-male-first-38 = Бальфам +cp14-species-name-dwarf-male-first-39 = Эзеган +cp14-species-name-dwarf-male-first-40 = Эридрэд +cp14-species-name-dwarf-male-first-41 = Нордак +cp14-species-name-dwarf-male-first-42 = Крим +cp14-species-name-dwarf-male-first-43 = Земк +cp14-species-name-dwarf-male-first-44 = Орсик +cp14-species-name-dwarf-male-first-45 = Пвент +cp14-species-name-dwarf-male-first-46 = Белорил +cp14-species-name-dwarf-male-first-47 = Рэйрак +cp14-species-name-dwarf-male-first-48 = Вурбин +cp14-species-name-dwarf-male-first-49 = Артин +cp14-species-name-dwarf-male-first-50 = Ардар +cp14-species-name-dwarf-male-first-51 = Бульдагар +cp14-species-name-dwarf-male-first-52 = Вальдрог + +cp14-species-name-dwarf-female-first-1 = Артин +cp14-species-name-dwarf-female-first-2 = Бардрин +cp14-species-name-dwarf-female-first-3 = Вистра +cp14-species-name-dwarf-female-first-4 = Гуннлода +cp14-species-name-dwarf-female-first-5 = Гурдис +cp14-species-name-dwarf-female-first-6 = Дагнал +cp14-species-name-dwarf-female-first-7 = Диеза +cp14-species-name-dwarf-female-first-8 = Илде +cp14-species-name-dwarf-female-first-9 = Катра +cp14-species-name-dwarf-female-first-10 = Кристид +cp14-species-name-dwarf-female-first-11 = Лифтраса +cp14-species-name-dwarf-female-first-12 = Мардред +cp14-species-name-dwarf-female-first-13 = Одхильд +cp14-species-name-dwarf-female-first-14 = Рисвин +cp14-species-name-dwarf-female-first-15 = Саннл +cp14-species-name-dwarf-female-first-16 = Торбера +cp14-species-name-dwarf-female-first-17 = Торгга +cp14-species-name-dwarf-female-first-18 = Фалрунн +cp14-species-name-dwarf-female-first-19 = Финеллен +cp14-species-name-dwarf-female-first-20 = Хельджа +cp14-species-name-dwarf-female-first-21 = Хлин +cp14-species-name-dwarf-female-first-22 = Эльдет +cp14-species-name-dwarf-female-first-23 = Эмбер +cp14-species-name-dwarf-female-first-24 = Дэлре +cp14-species-name-dwarf-female-first-25 = Рокель +cp14-species-name-dwarf-female-first-26 = Тодрис +cp14-species-name-dwarf-female-first-27 = Хельга +cp14-species-name-dwarf-female-first-28 = Ярана +cp14-species-name-dwarf-female-first-29 = Фалтра +cp14-species-name-dwarf-female-first-30 = Нуркана +cp14-species-name-dwarf-female-first-31 = Вьерида +cp14-species-name-dwarf-female-first-32 = Элайм +cp14-species-name-dwarf-female-first-33 = Барбена +cp14-species-name-dwarf-female-first-34 = Гренензель +cp14-species-name-dwarf-female-first-35 = Локара +cp14-species-name-dwarf-female-first-36 = Барбара +cp14-species-name-dwarf-female-first-37 = Зебель +cp14-species-name-dwarf-female-first-38 = Морана +cp14-species-name-dwarf-female-first-39 = Вильгерда +cp14-species-name-dwarf-female-first-40 = Кристина +cp14-species-name-dwarf-female-first-41 = Овина +cp14-species-name-dwarf-female-first-42 = Хлина +cp14-species-name-dwarf-female-first-43 = Ярмада +cp14-species-name-dwarf-female-first-44 = Никель + +cp14-species-name-dwarf-last-1 = из клана Балдерк +cp14-species-name-dwarf-last-2 = из клана Боевого молота +cp14-species-name-dwarf-last-3 = из клана Горунн +cp14-species-name-dwarf-last-4 = из клана Данкил +cp14-species-name-dwarf-last-5 = из клана Железный кулак +cp14-species-name-dwarf-last-6 = из клана Крепкой наковальни +cp14-species-name-dwarf-last-7 = из клана Ляденой бороды +cp14-species-name-dwarf-last-8 = из клана Лодерр +cp14-species-name-dwarf-last-9 = из клана Лютгер +cp14-species-name-dwarf-last-10 = из клана Огненной кузни +cp14-species-name-dwarf-last-11 = из клана Рамнахейм +cp14-species-name-dwarf-last-12 = из клана Стракелн +cp14-species-name-dwarf-last-13 = из клана Торунн +cp14-species-name-dwarf-last-14 = из клана Унгарт +cp14-species-name-dwarf-last-15 = из клана Холдерхек +cp14-species-name-dwarf-last-16 = из клана Золотого кубка +cp14-species-name-dwarf-last-17 = из клана Раскаленной стали +cp14-species-name-dwarf-last-18 = из клана Вечного камня +cp14-species-name-dwarf-last-19 = из клана Непоколебимой скалы +cp14-species-name-dwarf-last-20 = из клана Камнеплеч +cp14-species-name-dwarf-last-21 = из клана Змиегуб +cp14-species-name-dwarf-last-22 = из клана Вайнкаттер +cp14-species-name-dwarf-last-23 = из клана Кулачных братьев +cp14-species-name-dwarf-last-24 = из клана Драстгар +cp14-species-name-dwarf-last-25 = из клана Ковальщиков +cp14-species-name-dwarf-last-26 = из клана Торэвир +cp14-species-name-dwarf-last-27 = из клана Баклбар +cp14-species-name-dwarf-last-28 = из клана Барабаногромов +cp14-species-name-dwarf-last-29 = из клана Огнеязыких +cp14-species-name-dwarf-last-30 = из клана Вечного мёда \ No newline at end of file diff --git a/Resources/Locale/ru-RU/_CP14/species/species.ftl b/Resources/Locale/ru-RU/_CP14/species/species.ftl index 9a00c08cee..576dc32161 100644 --- a/Resources/Locale/ru-RU/_CP14/species/species.ftl +++ b/Resources/Locale/ru-RU/_CP14/species/species.ftl @@ -1 +1,2 @@ -species-name-tiefling = Тифлинг \ No newline at end of file +species-name-tiefling = Тифлинг +species-name-dwarf = Дварф \ No newline at end of file diff --git a/Resources/Prototypes/Entities/Mobs/Species/vox.yml b/Resources/Prototypes/Entities/Mobs/Species/vox.yml index c79947f15c..ec8035563b 100644 --- a/Resources/Prototypes/Entities/Mobs/Species/vox.yml +++ b/Resources/Prototypes/Entities/Mobs/Species/vox.yml @@ -16,7 +16,6 @@ #- type: VoxAccent # Not yet coded - type: Inventory speciesId: vox - jumpsuitShader: DisplacedStencilDraw displacements: jumpsuit: layer: diff --git a/Resources/Prototypes/_CP14/Body/Prototypes/dwarf.yml b/Resources/Prototypes/_CP14/Body/Prototypes/dwarf.yml new file mode 100644 index 0000000000..001747dfba --- /dev/null +++ b/Resources/Prototypes/_CP14/Body/Prototypes/dwarf.yml @@ -0,0 +1,49 @@ +- type: body + id: CP14Dwarf + name: dwarf + root: torso + slots: + head: + part: CP14HeadHuman + connections: + - torso + organs: + brain: OrganHumanBrain + eyes: OrganHumanEyes + torso: + part: TorsoHuman + connections: + - right_arm + - left_arm + - right_leg + - left_leg + organs: + heart: OrganHumanHeart + lungs: OrganHumanLungs + stomach: OrganHumanStomach + liver: OrganHumanLiver + kidneys: OrganHumanKidneys + right_arm: + part: CP14RightArmHuman + connections: + - right_hand + left_arm: + part: CP14LeftArmHuman + connections: + - left_hand + right_hand: + part: CP14RightHandHuman + left_hand: + part: CP14LeftHandHuman + right_leg: + part: CP14RightLegHuman + connections: + - right_foot + left_leg: + part: CP14LeftLegHuman + connections: + - left_foot + right_foot: + part: CP14RightFootHuman + left_foot: + part: CP14LeftFootHuman diff --git a/Resources/Prototypes/_CP14/Datasets/Names/dwarf.yml b/Resources/Prototypes/_CP14/Datasets/Names/dwarf.yml new file mode 100644 index 0000000000..89b0312b00 --- /dev/null +++ b/Resources/Prototypes/_CP14/Datasets/Names/dwarf.yml @@ -0,0 +1,139 @@ +- type: dataset + id: CP14_Names_Dwarf_Male_First + values: + - cp14-species-name-dwarf-male-first-1 + - cp14-species-name-dwarf-male-first-2 + - cp14-species-name-dwarf-male-first-3 + - cp14-species-name-dwarf-male-first-4 + - cp14-species-name-dwarf-male-first-5 + - cp14-species-name-dwarf-male-first-6 + - cp14-species-name-dwarf-male-first-7 + - cp14-species-name-dwarf-male-first-8 + - cp14-species-name-dwarf-male-first-9 + - cp14-species-name-dwarf-male-first-10 + - cp14-species-name-dwarf-male-first-11 + - cp14-species-name-dwarf-male-first-12 + - cp14-species-name-dwarf-male-first-13 + - cp14-species-name-dwarf-male-first-14 + - cp14-species-name-dwarf-male-first-15 + - cp14-species-name-dwarf-male-first-16 + - cp14-species-name-dwarf-male-first-17 + - cp14-species-name-dwarf-male-first-18 + - cp14-species-name-dwarf-male-first-19 + - cp14-species-name-dwarf-male-first-20 + - cp14-species-name-dwarf-male-first-21 + - cp14-species-name-dwarf-male-first-22 + - cp14-species-name-dwarf-male-first-23 + - cp14-species-name-dwarf-male-first-24 + - cp14-species-name-dwarf-male-first-25 + - cp14-species-name-dwarf-male-first-26 + - cp14-species-name-dwarf-male-first-27 + - cp14-species-name-dwarf-male-first-28 + - cp14-species-name-dwarf-male-first-29 + - cp14-species-name-dwarf-male-first-30 + - cp14-species-name-dwarf-male-first-31 + - cp14-species-name-dwarf-male-first-32 + - cp14-species-name-dwarf-male-first-33 + - cp14-species-name-dwarf-male-first-34 + - cp14-species-name-dwarf-male-first-35 + - cp14-species-name-dwarf-male-first-36 + - cp14-species-name-dwarf-male-first-37 + - cp14-species-name-dwarf-male-first-38 + - cp14-species-name-dwarf-male-first-39 + - cp14-species-name-dwarf-male-first-40 + - cp14-species-name-dwarf-male-first-41 + - cp14-species-name-dwarf-male-first-42 + - cp14-species-name-dwarf-male-first-43 + - cp14-species-name-dwarf-male-first-44 + - cp14-species-name-dwarf-male-first-45 + - cp14-species-name-dwarf-male-first-46 + - cp14-species-name-dwarf-male-first-47 + - cp14-species-name-dwarf-male-first-48 + - cp14-species-name-dwarf-male-first-49 + - cp14-species-name-dwarf-male-first-50 + - cp14-species-name-dwarf-male-first-51 + - cp14-species-name-dwarf-male-first-52 + + +- type: dataset + id: CP14_Names_Dwarf_Female_First + values: + - cp14-species-name-dwarf-female-first-1 + - cp14-species-name-dwarf-female-first-2 + - cp14-species-name-dwarf-female-first-3 + - cp14-species-name-dwarf-female-first-4 + - cp14-species-name-dwarf-female-first-5 + - cp14-species-name-dwarf-female-first-6 + - cp14-species-name-dwarf-female-first-7 + - cp14-species-name-dwarf-female-first-8 + - cp14-species-name-dwarf-female-first-9 + - cp14-species-name-dwarf-female-first-10 + - cp14-species-name-dwarf-female-first-11 + - cp14-species-name-dwarf-female-first-12 + - cp14-species-name-dwarf-female-first-13 + - cp14-species-name-dwarf-female-first-14 + - cp14-species-name-dwarf-female-first-15 + - cp14-species-name-dwarf-female-first-16 + - cp14-species-name-dwarf-female-first-17 + - cp14-species-name-dwarf-female-first-18 + - cp14-species-name-dwarf-female-first-19 + - cp14-species-name-dwarf-female-first-20 + - cp14-species-name-dwarf-female-first-21 + - cp14-species-name-dwarf-female-first-22 + - cp14-species-name-dwarf-female-first-23 + - cp14-species-name-dwarf-female-first-24 + - cp14-species-name-dwarf-female-first-25 + - cp14-species-name-dwarf-female-first-26 + - cp14-species-name-dwarf-female-first-27 + - cp14-species-name-dwarf-female-first-28 + - cp14-species-name-dwarf-female-first-29 + - cp14-species-name-dwarf-female-first-30 + - cp14-species-name-dwarf-female-first-31 + - cp14-species-name-dwarf-female-first-32 + - cp14-species-name-dwarf-female-first-33 + - cp14-species-name-dwarf-female-first-34 + - cp14-species-name-dwarf-female-first-35 + - cp14-species-name-dwarf-female-first-36 + - cp14-species-name-dwarf-female-first-37 + - cp14-species-name-dwarf-female-first-38 + - cp14-species-name-dwarf-female-first-39 + - cp14-species-name-dwarf-female-first-40 + - cp14-species-name-dwarf-female-first-41 + - cp14-species-name-dwarf-female-first-42 + - cp14-species-name-dwarf-female-first-43 + - cp14-species-name-dwarf-female-first-44 + + +- type: dataset + id: CP14_Names_Dwarf_Last + values: + - cp14-species-name-dwarf-last-1 + - cp14-species-name-dwarf-last-2 + - cp14-species-name-dwarf-last-3 + - cp14-species-name-dwarf-last-4 + - cp14-species-name-dwarf-last-5 + - cp14-species-name-dwarf-last-6 + - cp14-species-name-dwarf-last-7 + - cp14-species-name-dwarf-last-8 + - cp14-species-name-dwarf-last-9 + - cp14-species-name-dwarf-last-10 + - cp14-species-name-dwarf-last-11 + - cp14-species-name-dwarf-last-12 + - cp14-species-name-dwarf-last-13 + - cp14-species-name-dwarf-last-14 + - cp14-species-name-dwarf-last-15 + - cp14-species-name-dwarf-last-16 + - cp14-species-name-dwarf-last-17 + - cp14-species-name-dwarf-last-18 + - cp14-species-name-dwarf-last-19 + - cp14-species-name-dwarf-last-20 + - cp14-species-name-dwarf-last-21 + - cp14-species-name-dwarf-last-22 + - cp14-species-name-dwarf-last-23 + - cp14-species-name-dwarf-last-24 + - cp14-species-name-dwarf-last-25 + - cp14-species-name-dwarf-last-26 + - cp14-species-name-dwarf-last-27 + - cp14-species-name-dwarf-last-28 + - cp14-species-name-dwarf-last-29 + - cp14-species-name-dwarf-last-30 diff --git a/Resources/Prototypes/_CP14/Entities/Mobs/Player/dwarf.yml b/Resources/Prototypes/_CP14/Entities/Mobs/Player/dwarf.yml new file mode 100644 index 0000000000..6308626786 --- /dev/null +++ b/Resources/Prototypes/_CP14/Entities/Mobs/Player/dwarf.yml @@ -0,0 +1,4 @@ +- type: entity + save: false + parent: CP14BaseMobDwarf + id: CP14MobDwarf diff --git a/Resources/Prototypes/_CP14/Entities/Mobs/Species/dwarf.yml b/Resources/Prototypes/_CP14/Entities/Mobs/Species/dwarf.yml new file mode 100644 index 0000000000..d3a7cfa03b --- /dev/null +++ b/Resources/Prototypes/_CP14/Entities/Mobs/Species/dwarf.yml @@ -0,0 +1,47 @@ +- type: entity + parent: CP14BaseMobSpeciesOrganic + id: CP14BaseMobDwarf + name: Mr. Dwarf + abstract: true + components: + - type: HumanoidAppearance + species: CP14Dwarf + - type: Hunger + - type: Icon + sprite: _CP14/Mobs/Species/Dwarf/parts.rsi + state: full + - type: Thirst + - type: Butcherable + butcheringType: Spike + spawned: + - id: FoodMeatHuman + amount: 5 + - type: Body + prototype: CP14Dwarf + requiredLegs: 2 + - type: Inventory + templateId: CP14Human + displacements: + shoes: + layer: + sprite: _CP14/Mobs/Species/Dwarf/displacement.rsi + state: shoes + copyToShaderParameters: + layerKey: dummy + parameterTexture: displacementMap + parameterUV: displacementUV + pants: + layer: + sprite: _CP14/Mobs/Species/Dwarf/displacement.rsi + state: pants + copyToShaderParameters: + layerKey: dummy + parameterTexture: displacementMap + parameterUV: displacementUV +- type: entity + parent: CP14BaseSpeciesDummy + id: CP14MobDwarfDummy + noSpawn: true + components: + - type: HumanoidAppearance + species: CP14Dwarf \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Entities/Mobs/Species/human.yml b/Resources/Prototypes/_CP14/Entities/Mobs/Species/human.yml index d9e18a15e5..e5957b49fe 100644 --- a/Resources/Prototypes/_CP14/Entities/Mobs/Species/human.yml +++ b/Resources/Prototypes/_CP14/Entities/Mobs/Species/human.yml @@ -1,4 +1,3 @@ -# Anything human specific (e.g. UI, input) goes under MobHuman - type: entity parent: CP14BaseMobSpeciesOrganic id: CP14BaseMobHuman diff --git a/Resources/Prototypes/_CP14/Entities/Mobs/Species/tiefling.yml b/Resources/Prototypes/_CP14/Entities/Mobs/Species/tiefling.yml index a71c6a8039..c3afa89b28 100644 --- a/Resources/Prototypes/_CP14/Entities/Mobs/Species/tiefling.yml +++ b/Resources/Prototypes/_CP14/Entities/Mobs/Species/tiefling.yml @@ -4,19 +4,24 @@ name: Mr. Tiefling abstract: true components: - - type: HumanoidAppearance - species: CP14Tiefling - - type: Body - prototype: CP14Tiefling - requiredLegs: 2 - - type: Hunger - - type: Icon - sprite: _CP14/Mobs/Species/Tiefling/parts.rsi - state: full - - type: Thirst - - type: Wagging - - type: Inventory - templateId: CP14Human + - type: HumanoidAppearance + species: CP14Tiefling + - type: Hunger + - type: Icon + sprite: _CP14/Mobs/Species/Tiefling/parts.rsi + state: full + - type: Thirst + - type: Butcherable + butcheringType: Spike + spawned: + - id: FoodMeatHuman + amount: 5 + - type: Body + prototype: CP14Tiefling + requiredLegs: 2 + - type: Inventory + templateId: CP14Human + - type: Wagging - type: entity parent: CP14BaseSpeciesDummy diff --git a/Resources/Prototypes/_CP14/Species/dwarf.yml b/Resources/Prototypes/_CP14/Species/dwarf.yml new file mode 100644 index 0000000000..d797b692fb --- /dev/null +++ b/Resources/Prototypes/_CP14/Species/dwarf.yml @@ -0,0 +1,129 @@ +- type: species + id: CP14Dwarf + name: species-name-dwarf + roundStart: true + prototype: CP14MobDwarf + sprites: CP14MobDwarfSprites + markingLimits: MobHumanMarkingLimits + dollPrototype: CP14MobDwarfDummy + skinColoration: HumanToned + maleFirstNames: CP14_Names_Dwarf_Male_First #TODO + femaleFirstNames: CP14_Names_Dwarf_Female_First #TODO + lastNames: CP14_Names_Dwarf_Last #TODO + +- type: speciesBaseSprites + id: CP14MobDwarfSprites + sprites: + Head: CP14MobDwarfHead + HeadTop: CP14MobDwarfMarkingMatchSkin + Hair: CP14MobDwarfAnyMarking + FacialHair: CP14MobDwarfAnyMarking + Snout: CP14MobDwarfMarkingMatchSkin + Tail: CP14MobDwarfMarkingMatchSkin + Chest: CP14MobDwarfTorso + Eyes: CP14MobDwarfEyes + LArm: CP14MobDwarfLArm + RArm: CP14MobDwarfRArm + LHand: CP14MobDwarfLHand + RHand: CP14MobDwarfRHand + LLeg: CP14MobDwarfLLeg + RLeg: CP14MobDwarfRLeg + LFoot: CP14MobDwarfLFoot + RFoot: CP14MobDwarfRFoot + +- type: humanoidBaseSprite + id: CP14MobDwarfEyes + baseSprite: + sprite: _CP14/Mobs/Customization/eyes.rsi + state: eyes + +- type: humanoidBaseSprite + id: CP14MobDwarfAnyMarking + +- type: humanoidBaseSprite + id: CP14MobDwarfMarkingMatchSkin + markingsMatchSkin: true + +- type: humanoidBaseSprite + id: CP14MobDwarfHead + baseSprite: + sprite: _CP14/Mobs/Species/Dwarf/parts.rsi + state: head_m + +- type: humanoidBaseSprite + id: CP14MobDwarfHeadMale + baseSprite: + sprite: _CP14/Mobs/Species/Dwarf/parts.rsi + state: head_m + +- type: humanoidBaseSprite + id: CP14MobDwarfHeadFemale + baseSprite: + sprite: _CP14/Mobs/Species/Dwarf/parts.rsi + state: head_f + +- type: humanoidBaseSprite + id: CP14MobDwarfTorso + baseSprite: + sprite: _CP14/Mobs/Species/Dwarf/parts.rsi + state: torso_m + +- type: humanoidBaseSprite + id: CP14MobDwarfTorsoMale + baseSprite: + sprite: _CP14/Mobs/Species/Dwarf/parts.rsi + state: torso_m + +- type: humanoidBaseSprite + id: CP14MobDwarfTorsoFemale + baseSprite: + sprite: _CP14/Mobs/Species/Dwarf/parts.rsi + state: torso_f + +- type: humanoidBaseSprite + id: CP14MobDwarfLLeg + baseSprite: + sprite: _CP14/Mobs/Species/Dwarf/parts.rsi + state: l_leg + +- type: humanoidBaseSprite + id: CP14MobDwarfLArm + baseSprite: + sprite: _CP14/Mobs/Species/Dwarf/parts.rsi + state: l_arm + +- type: humanoidBaseSprite + id: CP14MobDwarfLHand + baseSprite: + sprite: _CP14/Mobs/Species/Dwarf/parts.rsi + state: l_hand + +- type: humanoidBaseSprite + id: CP14MobDwarfLFoot + baseSprite: + sprite: _CP14/Mobs/Species/Dwarf/parts.rsi + state: l_foot + +- type: humanoidBaseSprite + id: CP14MobDwarfRLeg + baseSprite: + sprite: _CP14/Mobs/Species/Dwarf/parts.rsi + state: r_leg + +- type: humanoidBaseSprite + id: CP14MobDwarfRArm + baseSprite: + sprite: _CP14/Mobs/Species/Dwarf/parts.rsi + state: r_arm + +- type: humanoidBaseSprite + id: CP14MobDwarfRHand + baseSprite: + sprite: _CP14/Mobs/Species/Dwarf/parts.rsi + state: r_hand + +- type: humanoidBaseSprite + id: CP14MobDwarfRFoot + baseSprite: + sprite: _CP14/Mobs/Species/Dwarf/parts.rsi + state: r_foot diff --git a/Resources/Prototypes/_CP14/Species/human.yml b/Resources/Prototypes/_CP14/Species/human.yml index db64ec6954..77f1b5a97f 100644 --- a/Resources/Prototypes/_CP14/Species/human.yml +++ b/Resources/Prototypes/_CP14/Species/human.yml @@ -5,7 +5,7 @@ prototype: CP14MobHuman sprites: CP14MobHumanSprites markingLimits: MobHumanMarkingLimits - dollPrototype: MobHumanDummy + dollPrototype: CP14MobHumanDummy skinColoration: HumanToned maleFirstNames: CP14_Names_Human_Male_First femaleFirstNames: CP14_Names_Human_Female_First diff --git a/Resources/Textures/_CP14/Clothing/Cloak/redguardarmor.rsi/equipped-CLOAK.png b/Resources/Textures/_CP14/Clothing/Cloak/redguardarmor.rsi/equipped-CLOAK.png index 87b7740520d3e91565c8bd6e15b35cb891549fd4..01c39d7740a804ff276cd310fcad7279c28887e6 100644 GIT binary patch delta 1783 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 diff --git a/Resources/Textures/_CP14/Mobs/Species/Dwarf/displacement.rsi/meta.json b/Resources/Textures/_CP14/Mobs/Species/Dwarf/displacement.rsi/meta.json new file mode 100644 index 0000000000..63e5e20eeb --- /dev/null +++ b/Resources/Textures/_CP14/Mobs/Species/Dwarf/displacement.rsi/meta.json @@ -0,0 +1,22 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Created by TheShuEd (Github) for CrystallPunk14", + "size": { + "x": 32, + "y": 32 + }, + "load": { + "srgb": false + }, + "states": [ + { + "name": "shoes", + "directions": 4 + }, + { + "name": "pants", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/_CP14/Mobs/Species/Dwarf/displacement.rsi/pants.png b/Resources/Textures/_CP14/Mobs/Species/Dwarf/displacement.rsi/pants.png new file mode 100644 index 0000000000000000000000000000000000000000..d20c20749ba4a90eae7a68938ff10555f8ceb9f3 GIT binary patch literal 353 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D%zr9E97Ln`LH zopq3}$v}X0_Y(Pa_UEbsg!$KI-pqA-;_LK?)k;>2E9-mo$0C9HT)}Mz_I>$L-^g@< z$%M;+`+^38uES!6EeyR_1*Y={_|Hwye;8cx?B((s^Q|42F!Wq)w%-t~c~tjks$6}a z{KHS$4vZO$QmhMDGejE176dXxHMqe9jxkpxXD3uQg|^%Ny8eO9^#25gwFb@KPgZfa ze2d$lvYgXu$$EzP9m}?{`p-L7y7G9O?7lbw^_b-6r;%L!EtZ*0q*CIkgf&|AOn^k*xyRUCF?3RceCr20vC{m@#;|`njxgN@xNA+bDnW literal 0 HcmV?d00001 diff --git a/Resources/Textures/_CP14/Mobs/Species/Dwarf/displacement.rsi/shoes.png b/Resources/Textures/_CP14/Mobs/Species/Dwarf/displacement.rsi/shoes.png new file mode 100644 index 0000000000000000000000000000000000000000..ac527d95628e6c0f6320f6197f989da74bfcb3fc GIT binary patch literal 260 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|_IbKEhE&XX zd()BYkbwxp#gMAPj}Ho!+P!+4?6VIg7lfVv&&{=f)r9o| z(=4V8MqkD)4a*p!9D*5i7icz!T@Z2L&cGu*=kourk9Wr=o7DHat>0S3$f`kD53-S; o)wlcnzpk*oo)KjKZT1T0z++r3r|%Rk2l|A;)78&qol`;+0R5y{Gynhq literal 0 HcmV?d00001 diff --git a/Resources/Textures/_CP14/Mobs/Species/Dwarf/parts.rsi/full.png b/Resources/Textures/_CP14/Mobs/Species/Dwarf/parts.rsi/full.png new file mode 100644 index 0000000000000000000000000000000000000000..d486797953b7319818f9ecdba16ed4f727cddc35 GIT binary patch literal 702 zcmV;v0zv(WP)Px%cu7P-R9J=WRxya1U=;qYbS$Z-f1&s=@3i@sUd^coH?a8+u@?8iNs%Xr9=BI;``tG-{=3o?>&LP zjJ+yBrzgE=-S+Iot4e#74mv&QMQXDFk*y`RnIFQMI+aM23dl>oD~Wq$oB`w}-)6s4 z0&26d)B4T?(ij+{%(E&=5irIkW_}0&=pQ}FJZF9gV{HCe0)uz&w-#8@dLF0)V(r_m zhoi^(h766d2_gvq%Jl>)$5?&)MZNAP;FDS`znZSf-Dg zM(-k9gGIA33W_j&^ktzo8@V&16anD&i-)F#nIB?cj5e+zZ6BIeCawrnS1>d!*sh0V z@C!r|uvi93l9?Z3u?#>Y0Uy77!$oinz(QMBsR&T@0iI(302jeE+PVtuKuo?+WNXk4 zM6`8vmHgI!X9BU@bVWu>BOB{^ifCyBx*})dD-%d3(iIs*5;95Gn-P%&=!(2ms_WQV z0~2SSBpMhav@`;1>R_I8#EZ)-@En7IF-qn`9ABBh+4<+aV;};6!$uvtBEwuIvt17p zXO6>09Yhkqa}0Dv#;30~j$gh_;&&pD-sI_{UKAg#?Rv@JIXegX-A=@FOmYonh7$EO zv|SG(TSJ}O&t0!``w-b0RpC`45aX_Y$*3ApzuSpg8rfRi@!E}CI}zV!Z07*qoM6N<$g128W#{d8T literal 0 HcmV?d00001 diff --git a/Resources/Textures/_CP14/Mobs/Species/Dwarf/parts.rsi/head_f.png b/Resources/Textures/_CP14/Mobs/Species/Dwarf/parts.rsi/head_f.png new file mode 100644 index 0000000000000000000000000000000000000000..2a8798ce1b0ad0f6de8e152e913c1dc76df56b9c GIT binary patch literal 511 zcmVPx$xk*GpRCt{2+D%HsKoke?R}UdVQMwWQ+z5J(E}Bj0CEN%?aUli4jdv(%H|fF) z6xwYI-S`!7Go*}^dV%i7)rW<&PUPe0Jqr+f7h=r7xv5NZRmG< zG?sFuv&CdeV=1ZM?P<5E{kr}%3~ayttnGEw+4;r7)7~u>X*3)dO@-P+z-_i7pMdSB z&#F$PFd7c%^FxN4>CF=vE`;j0cPrCP4hFW zHk)ud~M{3uk=+k83QOzMQ_` zdSiveccyz&JkPn`WzpOeyZpbrM04-od8wS7UpoHnoOI4PcDeer^;g%LLvS;-eu z=P7voix6vZaXIyIYIVbvnwlt!^n=f97XS8~BDLV|t0TI1ckGO_*sQRmZ1v(f4PA-# z4tCEA`GmNgK3OhLtY7fQ@9Dc=w+%dY|MmvDMNeUoffBx3w;$g=)F zn_&1{_35_0Am%G;qck(C|L9MM{<71zHBh8;RqAp(?hxJEFL;*RjWSvwGkLv!{+Bmf vj3aqMb))CZoiB7T$0KF005i-b3>r%`=Z0@O5x$}K4@k_@)z4*}Q$iB}(JA1G literal 0 HcmV?d00001 diff --git a/Resources/Textures/_CP14/Mobs/Species/Dwarf/parts.rsi/l_arm.png b/Resources/Textures/_CP14/Mobs/Species/Dwarf/parts.rsi/l_arm.png new file mode 100644 index 0000000000000000000000000000000000000000..b78dd49a7fdd451bbbf70895f01009f2f2aff890 GIT binary patch literal 337 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D%zxjkJRLn`LH zy=9ws$U&g(q2eh~2aSmnPJ5`7FFe3|>gSysUcz|}>|7;Bf@V$CKEk;ynrlPKCC1HV z)Asnk_kVnIep(m{&`h&Udp;OGouwW7bZz(9Plu+j>srjX>Xq*7fd6||v1J}`?zoU* z@#Au((1lO;4(!t-g|FR@|h( f3Cm4DW)_6=^@>hROL)HLDv0ap>gTe~DWM4f&W@8X literal 0 HcmV?d00001 diff --git a/Resources/Textures/_CP14/Mobs/Species/Dwarf/parts.rsi/l_foot.png b/Resources/Textures/_CP14/Mobs/Species/Dwarf/parts.rsi/l_foot.png new file mode 100644 index 0000000000000000000000000000000000000000..29d717c5ac75f2afadba2ca604eaac1f93c66975 GIT binary patch literal 380 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D%z%{*NkLn`LH zy=CallqhrjCq(!b?ycfn_&~Z~V_Qt@oS5dt4>{iXZV~0Z^+3;&S4m?>$b$-r zwyM1h+m|o2$+-Mua!ieVL4nQT{@wRK-uYCo0<;4R8hC#=zIb=*`?}k&cRww9`A4DT zcHJ`j(3RIFO^=VArW&%!G(6vA@+95O<+@H*Z*TXglou7R&DeI~cFC%rIeCI}Eo|+B z4}LD0aR2({!;2&Hj_G*D$7hxPkL}9*cJbpvm6xwR9Ws%IS(cD{H|~D#Vo$B~CTlUp zkH13}KXf=+zopr089a?WdHyG literal 0 HcmV?d00001 diff --git a/Resources/Textures/_CP14/Mobs/Species/Dwarf/parts.rsi/l_hand.png b/Resources/Textures/_CP14/Mobs/Species/Dwarf/parts.rsi/l_hand.png new file mode 100644 index 0000000000000000000000000000000000000000..1c015eaba72961f1748e6f96a07ad068db37145a GIT binary patch literal 321 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|etWt&hE&XX zduw6dp#YI%AC2#^8YVRPyqC>dm9fmwI76g~>&(1FMizxv%Q^EId<}f3t8x1m+?lCx zCU?n8&6W@Uf7b2%`>ynP2hc1aSTO7S*JB}9L$0~!tm(AWEUbvPD#Mb>9l zusfK&18M|E{$^Kk_`TX+8yj4-VIKDGYdiv#{_2)S+wyMXw zDk>dUI#u&J?!eYLV#dqlH)qQ~{nTWz$>g-|*-yXkdM9Wy1Fd-ahr#(m^83UuXQzWK N^mO%eS?83{1OUSthOz(v literal 0 HcmV?d00001 diff --git a/Resources/Textures/_CP14/Mobs/Species/Dwarf/parts.rsi/l_leg.png b/Resources/Textures/_CP14/Mobs/Species/Dwarf/parts.rsi/l_leg.png new file mode 100644 index 0000000000000000000000000000000000000000..119ec49fe6c5e5ba887892a459abd7e76897ed74 GIT binary patch literal 356 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D%znyET(Ps^&q=$(r{*Bvy>3ykapnca|?Y~kGtAOPGO>fVBIQ%&HVe6V4Q?veQ(ed5> z>D*F0RT=)<23*TYu6B9%KxE;vc0Px$BuPX;RCt{2+OcZFP!z`Tt8~Z$96@(}O-wwtxFr?a>V zL|0(3T$w@GZ`_pZK?Y&JvE8i2&x;E1{L(2Ms0#bTvFZo_000000001>4nD)7iW#Al zXfl-b{_$qC>UClldpS)QgP$#iljGs^q+e;(`^<(FHnw zYritSE0ev|l2>Ku8~o?Lg7=P{HP2P%JauCNS^)+#glAlc%#NM2@MY51W&)%ir!Z2rZe{}K;Xvwf*suqL`EToR=v^~2ySB1P!k{&-*`@o4(%!8VjQ@0R=x8&3 zAZgO#>OFg zviXa0@oy^fwf(UMUBdm3Qq<n;b(KU o$ba*n|L=G<7%(z0H2nO)x%5nIyq?a}=OBALUHx3vIVCg!0B1swwEzGB literal 0 HcmV?d00001 diff --git a/Resources/Textures/_CP14/Mobs/Species/Dwarf/parts.rsi/r_leg.png b/Resources/Textures/_CP14/Mobs/Species/Dwarf/parts.rsi/r_leg.png new file mode 100644 index 0000000000000000000000000000000000000000..1ef7bf28e73c9a967df62ee839ea485502df4ae3 GIT binary patch literal 379 zcmV->0fhdEP)Px$HAzH4RCt{2+ObN*P!z`T6LH7`G^JRCE)KehlZd15;^N{K2pK{kZ_-8IpmXUP zv_h9)iKLAWaJK6p-4t>{nuhZK&G+UUPHwV%R|Eh600000z+a*ybI0!C5Y8-%Rn^Vr zi(U`n`Q_ErU+n?hTwh6E?nI=Yr(rfDzm!Ibqwmq&XVfQ&s2tzPDVh+w7;7CL!p5%mav$%&Dpq`AuZoYQ&<=2&~Zw*vI76 zSNB<58i(G~!@bwm^UMR-mfN;!_kwuPx%_en%SRCt{2+P_O1VHgMSucd>3K%+qymkdc;S{1vAf@=kl>QFD~!Yk(BI$hyI)Ft`QB(WTaJ&!2b}km_@o4M3ho_5)CrJ`M)StRB})9qejCbQ z?E-q+MWNGVgT{a4x8d2zaj5O6+V$HmA=LQ36HuwvU^JS@Zf&<@*}cC~t&s*mjqi=? z-Hs|g0AOc#PvrExC?6h)3*%DQwkN5;;9Dc6Rq7`38^_RTH*tJ1;o~`BGGk z9N+gE007t4FT8)3xv@{K3llG2AiK3qjUR}gHQ_G4Z-KdmblX+fPrEQIudIo5X6e>8 z>C6(ASJp`JeJ20_Qpv=PNxRR0(P$!-Oi;Qb^PX|<3FzjEAl(A7p<$ez9OG(exaF8t zHxX;IKTPG*b4-qp0{AoeE7JtH{DEU~zE{m1+&&zx}|o=TDJJ zCa}MM;BFTQt8Sv~+Wz|a3#MkKokUo5liX)ygN?%S%9?l*i{ZL)jluXJvYQ)yimC~@ z{nN7Wap%K>niFG;F~%5Uj4{R-W9*(&R4uZHAcDy0`RGeyimC}^ebou*K31vLklozq z$v?7+stIoqW`6cH=4Sx_f-(+L0=xm;#wMEN;N4JEO{6nRq0|KdVrlF)Bk=)D%}j^Y zT}M+h)1gfsASA$j`Mb$-RCa5-tI7eHPp;$sHnTYn` zgug1)8dAvw3dNFBCk&$NHNZ`-2bF4Xo)7S@KS7YLfI_hpTHvTq$LRYCkcCK~)KUhQ zw?VHIiY3g?zHV6qth(9LuVcsm_+fM(e~dB47-Nhv#vYE}hC6zyX}>4S00000NkvXX Hu0mjfjIfb< literal 0 HcmV?d00001 diff --git a/Resources/Textures/_CP14/Mobs/Species/Dwarf/parts.rsi/torso_m.png b/Resources/Textures/_CP14/Mobs/Species/Dwarf/parts.rsi/torso_m.png new file mode 100644 index 0000000000000000000000000000000000000000..f2c6884c7f65db8e82a5890c38aeb347862f5f8f GIT binary patch literal 706 zcmV;z0zLhSP)Px%d`Uz>RCt{2+COXCKo|z_$EAZmK%JO~K$Z^emV|W6H;AE_HbYyw6-uGdbO;ng z2UGA?3WZYWT0BG|1d=_2JITZulGp(+CPl*W`2%>n4&{t|md(A9KtapE2#&@AqZ9(?z}J;l=Z3BcH1{ zuH4vqg0=h-ve~Thb}9L4x!viGw6Eot2FsLuQUS(=>w`$U07|>l9olh)l7HW{qY8@( z)cd7j+|I_$zh~O9Uh^gfsP(E}(xSE-RS;^vaRD05*4WVSdetv!jb>}4_)+hv`Njo^ z3Z%BrBT@lo?XT|-z1L@>-fqIU0GAh6Bi}Fmh}UZ#E-$XggD}w(0;`ravCpbyp(g}s zyW|-V-s$iWn8x(ikGP&`@++Yu6(F}_p z2OK%SGXNw2?Cw5A6~Ol9I;v;q5P^?_gQIZ2REWSwHMD$s`UfKL2Za{_{Tz_mVAJsS z{YUvAm&0x6769<;$G6OzcON7GEa#We69PZKe_g13VvI4y7-Nhv#u#Ia%{jYNPVFIx zI4X`S?NXUMF5|z&f&V*i@9zx)!)=Xb3tv8en#w=2cBw2MKYBQ{u2|SXu>b&&lyQ&> zpa+I+Y<0=ucVU;x^405?ce)D{C9#{MNeyV)S;hqjPk-GkZi|o0wD59YQd7k-<(y#N3J07*qoM6N<$f`z74hyVZp literal 0 HcmV?d00001 diff --git a/Resources/Textures/_CP14/Mobs/Species/Human/parts.rsi/l_arm.png b/Resources/Textures/_CP14/Mobs/Species/Human/parts.rsi/l_arm.png index 3e367da72ba63af4f00e91b78bc611c6d4e33641..b78dd49a7fdd451bbbf70895f01009f2f2aff890 100644 GIT binary patch delta 297 zcmV+^0oMN11JMGIF@Fn5L_t(|obB2@Zo)tihT$Q~6+kGFkjqFUccH)y%K6;bN)v8C z2MTn=Qks=3#0jQb3b16-0kd|Nyie~>@+6B$k4|N30cfiNzTz^FDRxKG0#O?O7UM)@X zelu^tES>i1CRkaomNHAHJ=4&WAa_9j>De@I`~72@2LJ#70000001&-N`hM~JFvw)6 zZS@fK^=;gBDeWs=bv8l1bRzv2s<5`)I)#q@2rRxfU6;_kEHC`E4>O|Q0V2oox!dip v`t~jwfQEm01R|PVl2MSSGynhq0B~0hjTMn*VCTHm00000NkvXXu0mjfn2L=Z delta 429 zcmV;e0aE_a0@MSLF@KIpL_t(|obB4ZY63wN1>iB{6(W)}HYxH~h_&yqh1-}V?-7s` z60}H@X9#8scL_q$r3@jU#B{n~vls-?Jiv65CIgy6a6L1dCFkosjCW>d#e0PyA|fIp zjC!M`Oyv4OXe1XdiYE$P1V0E>6i>2I04b$H7D0b`DW#DD?0=XDEf(^BI?pI6r9z#8 z<=r>+2*6Lk!{d_>0=H|$LSDqPxft|&ki6gE1*o~zoGt>&px+ZUx0-{7{xEU}?Cl>w z^M<1_G;bNa0MD;)s!}dNGrtxK;kaHl?tn_UB;wf|lBIY4_NEERv!dQ;Dg7ou?3&|x zkQ}Qrxo9FHB7Y(xA|fIpqO3{sN34;~kZrn&dU|$}_EPMN;>k(}dDD*cuBnCDvTYYS z^N+yG`$yVKSd~Uc$PYr5bT9*c0@ApMhNE%fhAg}Q$47_gNTc8d=yba1$hEeeLxLBe z8?=p#vaI7>oQu!tG|^`>{}#~nU`G4yUR+;YTHl0JIVP^B^bewcJD0$r3?d>TBHGM1 XU5(F6hrpuj00000NkvXXu0mjfp#I70 diff --git a/Resources/Textures/_CP14/Mobs/Species/Human/parts.rsi/r_arm.png b/Resources/Textures/_CP14/Mobs/Species/Human/parts.rsi/r_arm.png index 2d853ca9d145eb3a9f898b5342900fef375b8273..3bd7fe32285ba8775860fdd2d432a8a4182eecc2 100644 GIT binary patch delta 322 zcmV-I0loh20_p;gF@GdUL_t(|obB4NYQj(y#__9k$O}}Yf;bl1zDozQh%e&eUa zF8T)Dl z5byrBo3*j0v$zXHS75PRnL*fZ+?4D=24TOk-K@pWiwf}k(kUIN3j4#c>IeV;00000 z005v4KEt7k8KIPDGL-fH@n*E_3V4^D7DqN#vovwdQ`r}_?F{^;@D<4V`ri4<@%Q~) zme8^^m8Vn(*gMm?HY4cLS70(8saTlEQ}`zs1VJqho+{J_M$ORPH1+f%X?_yyZ@gfUiA%Zut zak0@G*eUCF8n78si6@vYTLr>``VvRu#Q(2O;G35>Y2H%`0001&4MvkF?+g;t*|+_i zgV7`kbm&9@0v$$Hix3~)7~@0%j4@G~B9tW$HEPw{QazZpyno5B?@9;6d8J)&wFBa6 z&KFAy@$PTCSu1@!iMv2_1?G#T>iON$P01dl=XXon&074tr~sAskIaGcu-hNz>% diff --git a/Resources/Textures/_CP14/Mobs/Species/Tiefling/parts.rsi/l_arm.png b/Resources/Textures/_CP14/Mobs/Species/Tiefling/parts.rsi/l_arm.png index 3e367da72ba63af4f00e91b78bc611c6d4e33641..b78dd49a7fdd451bbbf70895f01009f2f2aff890 100644 GIT binary patch delta 297 zcmV+^0oMN11JMGIF@Fn5L_t(|obB2@Zo)tihT$Q~6+kGFkjqFUccH)y%K6;bN)v8C z2MTn=Qks=3#0jQb3b16-0kd|Nyie~>@+6B$k4|N30cfiNzTz^FDRxKG0#O?O7UM)@X zelu^tES>i1CRkaomNHAHJ=4&WAa_9j>De@I`~72@2LJ#70000001&-N`hM~JFvw)6 zZS@fK^=;gBDeWs=bv8l1bRzv2s<5`)I)#q@2rRxfU6;_kEHC`E4>O|Q0V2oox!dip v`t~jwfQEm01R|PVl2MSSGynhq0B~0hjTMn*VCTHm00000NkvXXu0mjfn2L=Z delta 429 zcmV;e0aE_a0@MSLF@KIpL_t(|obB4ZY63wN1>iB{6(W)}HYxH~h_&yqh1-}V?-7s` z60}H@X9#8scL_q$r3@jU#B{n~vls-?Jiv65CIgy6a6L1dCFkosjCW>d#e0PyA|fIp zjC!M`Oyv4OXe1XdiYE$P1V0E>6i>2I04b$H7D0b`DW#DD?0=XDEf(^BI?pI6r9z#8 z<=r>+2*6Lk!{d_>0=H|$LSDqPxft|&ki6gE1*o~zoGt>&px+ZUx0-{7{xEU}?Cl>w z^M<1_G;bNa0MD;)s!}dNGrtxK;kaHl?tn_UB;wf|lBIY4_NEERv!dQ;Dg7ou?3&|x zkQ}Qrxo9FHB7Y(xA|fIpqO3{sN34;~kZrn&dU|$}_EPMN;>k(}dDD*cuBnCDvTYYS z^N+yG`$yVKSd~Uc$PYr5bT9*c0@ApMhNE%fhAg}Q$47_gNTc8d=yba1$hEeeLxLBe z8?=p#vaI7>oQu!tG|^`>{}#~nU`G4yUR+;YTHl0JIVP^B^bewcJD0$r3?d>TBHGM1 XU5(F6hrpuj00000NkvXXu0mjfp#I70 diff --git a/Resources/Textures/_CP14/Mobs/Species/Tiefling/parts.rsi/l_foot.png b/Resources/Textures/_CP14/Mobs/Species/Tiefling/parts.rsi/l_foot.png index de5511c6a465d23e9783a8616b28a9180e459a41..045448afd6e6c11824ecbd46b3809bf001424e02 100644 GIT binary patch delta 349 zcmbQj+{!$`u-@L&#WAE}&f8lDy_g(jj(?ngQ8|UH`@-I;mVghe-;!iMy*fJidcw;M zEWd^BcJbXhxSOR^!116rtDN}ZfbHxb%w$isayS+HnC+8~h3vwzZbq!g({y)&);G zbMflZLmxx*7f)1s+}XOcw!Efl(VWK_`ny-R@2=LKsj02`>xa|l@8=gqJfC*z*@J@k zNhO7K+ooB$l9q-JNZ*dM@d2O0qZCG8S?}tAJo^-Q5l~I@befFhy4x`G^a#o;wfQI<@ tpZ88z*>*f`IHR|$iOUd z#y$%Ow0K_^V5w`L7^XVTiW{S{dTwd?Pg^tsxOZYocQvRgy{cA;v|qf5GOjI6sI89eUY7x*E!t6A<;8Hd-l!;?>nq#n5L zw;^o(%8n(z63bM#J@%TlOvr5`kNe|0mzO^gzQJ~Q%M$As3s=65d~1I>{1!7q!?JbB z`}ehH>~wliJ>$ICPGhg#$?|>2CaK8RXWjoV5Fj^yTXCxJTZh@F8Gyjk)z4*}Q$iB} D=|!tn diff --git a/Resources/Textures/_CP14/Mobs/Species/Tiefling/parts.rsi/r_arm.png b/Resources/Textures/_CP14/Mobs/Species/Tiefling/parts.rsi/r_arm.png index 2d853ca9d145eb3a9f898b5342900fef375b8273..3bd7fe32285ba8775860fdd2d432a8a4182eecc2 100644 GIT binary patch delta 322 zcmV-I0loh20_p;gF@GdUL_t(|obB4NYQj(y#__9k$O}}Yf;bl1zDozQh%e&eUa zF8T)Dl z5byrBo3*j0v$zXHS75PRnL*fZ+?4D=24TOk-K@pWiwf}k(kUIN3j4#c>IeV;00000 z005v4KEt7k8KIPDGL-fH@n*E_3V4^D7DqN#vovwdQ`r}_?F{^;@D<4V`ri4<@%Q~) zme8^^m8Vn(*gMm?HY4cLS70(8saTlEQ}`zs1VJqho+{J_M$ORPH1+f%X?_yyZ@gfUiA%Zut zak0@G*eUCF8n78si6@vYTLr>``VvRu#Q(2O;G35>Y2H%`0001&4MvkF?+g;t*|+_i zgV7`kbm&9@0v$$Hix3~)7~@0%j4@G~B9tW$HEPw{QazZpyno5B?@9;6d8J)&wFBa6 z&KFAy@$PTCSu1@!iMv2_1?G#T>iON$P01dl=XXon&074tr~sAskIaGcu-hNz>% diff --git a/Resources/Textures/_CP14/Mobs/Species/Tiefling/parts.rsi/r_foot.png b/Resources/Textures/_CP14/Mobs/Species/Tiefling/parts.rsi/r_foot.png index 947a8d91f8f4c0e0715a590151b4fe4ff9454bdc..e0737637b82f086c9670bff798db2a1f44c94805 100644 GIT binary patch delta 315 zcmaFM^q6UaVZE%Ui(^Q|oVT|&dL0fBIrh>2qu`p7FQOs0d_`&)#Y-<-J$jP;M9K8s zyT0&-WW2gyySSxc5nt}XjTT$4vG2HDx`I=7_M~N+|LP~G-ig^)JjwX32Ll|Wu^y{> zKBxcD5&N=vH3@6tOP5_*a&&pPi2A=TZ&nHMa`c>yt3UPiZ0@_5*`IZ!`j1uB{k~A} zMb|Uy?$#@B@8s)DDA(lU|F-3R#;ZS{l)i5+7B{?oQ%h9ecR!QotM6=6PqV>nYH(#e z_Urt^>HUwEOxS#Kt&*9hcfuNbE6Z!YUwbE3uM1^X(X7eHHu@P^+EcGH*YSCbS@-Kd zn_b=szA*XDc3CpVWNY;ONVjD{PxB7k|GAt0a9-K^u-ke@!l%A)-_EX@nK|L61;{E- LS3j3^P6ZMlk0M#A5xbV`=ki{4GUMg94 zFt>i~i{D=ti9fz>?isZH?xd}oS0CW77u+tlx6J$Z+;x5a{$BfaO;&FH%sqM8=lt~4 zWii`pWSQ+_R>i>VX86HWCb|K%+PL*mt^sG z&!2p0c9Gj|91Z;!x#$ZQOWlu+&2!g%+qV7Hi7P8EG5>gTzxO$>So*ZBk*R7XFJ()< V<^EKV**za*iKnZd%Q~loCIBITm-_$!