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 87b7740520..01c39d7740 100644 Binary files a/Resources/Textures/_CP14/Clothing/Cloak/redguardarmor.rsi/equipped-CLOAK.png and b/Resources/Textures/_CP14/Clothing/Cloak/redguardarmor.rsi/equipped-CLOAK.png differ 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 0000000000..d20c20749b Binary files /dev/null and b/Resources/Textures/_CP14/Mobs/Species/Dwarf/displacement.rsi/pants.png differ 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 0000000000..ac527d9562 Binary files /dev/null and b/Resources/Textures/_CP14/Mobs/Species/Dwarf/displacement.rsi/shoes.png differ 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 0000000000..d486797953 Binary files /dev/null and b/Resources/Textures/_CP14/Mobs/Species/Dwarf/parts.rsi/full.png differ 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 0000000000..2a8798ce1b Binary files /dev/null and b/Resources/Textures/_CP14/Mobs/Species/Dwarf/parts.rsi/head_f.png differ diff --git a/Resources/Textures/_CP14/Mobs/Species/Dwarf/parts.rsi/head_m.png b/Resources/Textures/_CP14/Mobs/Species/Dwarf/parts.rsi/head_m.png new file mode 100644 index 0000000000..a577a1b925 Binary files /dev/null and b/Resources/Textures/_CP14/Mobs/Species/Dwarf/parts.rsi/head_m.png differ 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 0000000000..b78dd49a7f Binary files /dev/null and b/Resources/Textures/_CP14/Mobs/Species/Dwarf/parts.rsi/l_arm.png differ 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 0000000000..29d717c5ac Binary files /dev/null and b/Resources/Textures/_CP14/Mobs/Species/Dwarf/parts.rsi/l_foot.png differ 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 0000000000..1c015eaba7 Binary files /dev/null and b/Resources/Textures/_CP14/Mobs/Species/Dwarf/parts.rsi/l_hand.png differ 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 0000000000..119ec49fe6 Binary files /dev/null and b/Resources/Textures/_CP14/Mobs/Species/Dwarf/parts.rsi/l_leg.png differ diff --git a/Resources/Textures/_CP14/Mobs/Species/Dwarf/parts.rsi/meta.json b/Resources/Textures/_CP14/Mobs/Species/Dwarf/parts.rsi/meta.json new file mode 100644 index 0000000000..63fffd5f56 --- /dev/null +++ b/Resources/Textures/_CP14/Mobs/Species/Dwarf/parts.rsi/meta.json @@ -0,0 +1,62 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Created by TheShuEd (Github) for CrystallPunk14", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "full" + }, + { + "name": "head_f", + "directions": 4 + }, + { + "name": "head_m", + "directions": 4 + }, + { + "name": "l_arm", + "directions": 4 + }, + { + "name": "l_foot", + "directions": 4 + }, + { + "name": "l_hand", + "directions": 4 + }, + { + "name": "l_leg", + "directions": 4 + }, + { + "name": "r_arm", + "directions": 4 + }, + { + "name": "r_foot", + "directions": 4 + }, + { + "name": "r_hand", + "directions": 4 + }, + { + "name": "r_leg", + "directions": 4 + }, + { + "name": "torso_f", + "directions": 4 + }, + { + "name": "torso_m", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/_CP14/Mobs/Species/Dwarf/parts.rsi/r_arm.png b/Resources/Textures/_CP14/Mobs/Species/Dwarf/parts.rsi/r_arm.png new file mode 100644 index 0000000000..3bd7fe3228 Binary files /dev/null and b/Resources/Textures/_CP14/Mobs/Species/Dwarf/parts.rsi/r_arm.png differ diff --git a/Resources/Textures/_CP14/Mobs/Species/Dwarf/parts.rsi/r_foot.png b/Resources/Textures/_CP14/Mobs/Species/Dwarf/parts.rsi/r_foot.png new file mode 100644 index 0000000000..ffd8d6de88 Binary files /dev/null and b/Resources/Textures/_CP14/Mobs/Species/Dwarf/parts.rsi/r_foot.png differ diff --git a/Resources/Textures/_CP14/Mobs/Species/Dwarf/parts.rsi/r_hand.png b/Resources/Textures/_CP14/Mobs/Species/Dwarf/parts.rsi/r_hand.png new file mode 100644 index 0000000000..192a4b09e5 Binary files /dev/null and b/Resources/Textures/_CP14/Mobs/Species/Dwarf/parts.rsi/r_hand.png differ 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 0000000000..1ef7bf28e7 Binary files /dev/null and b/Resources/Textures/_CP14/Mobs/Species/Dwarf/parts.rsi/r_leg.png differ diff --git a/Resources/Textures/_CP14/Mobs/Species/Dwarf/parts.rsi/torso_f.png b/Resources/Textures/_CP14/Mobs/Species/Dwarf/parts.rsi/torso_f.png new file mode 100644 index 0000000000..273995c241 Binary files /dev/null and b/Resources/Textures/_CP14/Mobs/Species/Dwarf/parts.rsi/torso_f.png differ 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 0000000000..f2c6884c7f Binary files /dev/null and b/Resources/Textures/_CP14/Mobs/Species/Dwarf/parts.rsi/torso_m.png differ 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 3e367da72b..b78dd49a7f 100644 Binary files a/Resources/Textures/_CP14/Mobs/Species/Human/parts.rsi/l_arm.png and b/Resources/Textures/_CP14/Mobs/Species/Human/parts.rsi/l_arm.png differ 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 2d853ca9d1..3bd7fe3228 100644 Binary files a/Resources/Textures/_CP14/Mobs/Species/Human/parts.rsi/r_arm.png and b/Resources/Textures/_CP14/Mobs/Species/Human/parts.rsi/r_arm.png differ 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 3e367da72b..b78dd49a7f 100644 Binary files a/Resources/Textures/_CP14/Mobs/Species/Tiefling/parts.rsi/l_arm.png and b/Resources/Textures/_CP14/Mobs/Species/Tiefling/parts.rsi/l_arm.png differ 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 de5511c6a4..045448afd6 100644 Binary files a/Resources/Textures/_CP14/Mobs/Species/Tiefling/parts.rsi/l_foot.png and b/Resources/Textures/_CP14/Mobs/Species/Tiefling/parts.rsi/l_foot.png differ 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 2d853ca9d1..3bd7fe3228 100644 Binary files a/Resources/Textures/_CP14/Mobs/Species/Tiefling/parts.rsi/r_arm.png and b/Resources/Textures/_CP14/Mobs/Species/Tiefling/parts.rsi/r_arm.png differ 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 947a8d91f8..e0737637b8 100644 Binary files a/Resources/Textures/_CP14/Mobs/Species/Tiefling/parts.rsi/r_foot.png and b/Resources/Textures/_CP14/Mobs/Species/Tiefling/parts.rsi/r_foot.png differ