From 70df945fe1214c474162f1abc8be6e40a4e74f5a Mon Sep 17 00:00:00 2001 From: Ed <96445749+TheShuEd@users.noreply.github.com> Date: Mon, 3 Jun 2024 23:50:05 +0300 Subject: [PATCH] Elf species (#205) * add elves names * fix * fix dwarf clothing preview * elf! * add marking locales * fuck ss14 species * Update SpeciesPrototype.cs --- Content.Shared/Humanoid/NamingSystem.cs | 10 +- .../Humanoid/Prototypes/SpeciesPrototype.cs | 6 +- .../ContentLocalizationManager.cs | 6 +- .../Locale/en-US/_CP14/markings/elf-ears.ftl | 4 + .../en-US/_CP14/species/species-names.ftl | 135 +++++++++++--- .../Locale/en-US/_CP14/species/species.ftl | 6 +- .../Locale/ru-RU/_CP14/markings/elf-ears.ftl | 4 + .../ru-RU/_CP14/species/species-names.ftl | 135 +++++++++++--- .../Locale/ru-RU/_CP14/species/species.ftl | 6 +- Resources/Prototypes/Species/arachnid.yml | 6 +- Resources/Prototypes/Species/diona.yml | 6 +- Resources/Prototypes/Species/moth.yml | 6 +- Resources/Prototypes/Species/reptilian.yml | 4 +- Resources/Prototypes/Species/skeleton.yml | 4 +- Resources/Prototypes/Species/vox.yml | 4 +- .../Prototypes/_CP14/Body/Prototypes/elf.yml | 49 +++++ .../Prototypes/_CP14/Datasets/Names/dwarf.yml | 139 -------------- .../Prototypes/_CP14/Datasets/Names/human.yml | 139 -------------- .../_CP14/Datasets/Names/species-names.yml | 80 ++++++++ .../_CP14/Datasets/Names/tiefling.yml | 173 ------------------ .../Mobs/Customization/Markings/elf_ears.yml | 35 ++++ .../Customization/Markings/tiefling_horns.yml | 1 - .../_CP14/Entities/Mobs/Player/elf.yml | 4 + .../_CP14/Entities/Mobs/Species/dwarf.yml | 24 ++- .../_CP14/Entities/Mobs/Species/elf.yml | 32 ++++ Resources/Prototypes/_CP14/Species/dwarf.yml | 2 +- Resources/Prototypes/_CP14/Species/elf.yml | 155 ++++++++++++++++ Resources/Prototypes/_CP14/Species/human.yml | 2 +- .../Prototypes/_CP14/Species/tiefling.yml | 2 +- .../elf_ears.rsi/ears3_broken.png | Bin 183 -> 187 bytes .../_CP14/Mobs/Species/Elf/parts.rsi/full.png | Bin 0 -> 639 bytes .../Mobs/Species/Elf/parts.rsi/head_f.png | Bin 0 -> 511 bytes .../Mobs/Species/Elf/parts.rsi/head_m.png | Bin 0 -> 508 bytes .../Mobs/Species/Elf/parts.rsi/l_arm.png | Bin 0 -> 337 bytes .../Mobs/Species/Elf/parts.rsi/l_foot.png | Bin 0 -> 389 bytes .../Mobs/Species/Elf/parts.rsi/l_hand.png | Bin 0 -> 321 bytes .../Mobs/Species/Elf/parts.rsi/l_leg.png | Bin 0 -> 382 bytes .../Mobs/Species/Elf/parts.rsi/meta.json | 62 +++++++ .../Mobs/Species/Elf/parts.rsi/r_arm.png | Bin 0 -> 362 bytes .../Mobs/Species/Elf/parts.rsi/r_foot.png | Bin 0 -> 355 bytes .../Mobs/Species/Elf/parts.rsi/r_hand.png | Bin 0 -> 346 bytes .../Mobs/Species/Elf/parts.rsi/r_leg.png | Bin 0 -> 396 bytes .../Mobs/Species/Elf/parts.rsi/torso_f.png | Bin 0 -> 769 bytes .../Mobs/Species/Elf/parts.rsi/torso_m.png | Bin 0 -> 660 bytes 44 files changed, 702 insertions(+), 539 deletions(-) create mode 100644 Resources/Locale/en-US/_CP14/markings/elf-ears.ftl create mode 100644 Resources/Locale/ru-RU/_CP14/markings/elf-ears.ftl create mode 100644 Resources/Prototypes/_CP14/Body/Prototypes/elf.yml delete mode 100644 Resources/Prototypes/_CP14/Datasets/Names/dwarf.yml delete mode 100644 Resources/Prototypes/_CP14/Datasets/Names/human.yml create mode 100644 Resources/Prototypes/_CP14/Datasets/Names/species-names.yml delete mode 100644 Resources/Prototypes/_CP14/Datasets/Names/tiefling.yml create mode 100644 Resources/Prototypes/_CP14/Entities/Mobs/Customization/Markings/elf_ears.yml create mode 100644 Resources/Prototypes/_CP14/Entities/Mobs/Player/elf.yml create mode 100644 Resources/Prototypes/_CP14/Entities/Mobs/Species/elf.yml create mode 100644 Resources/Prototypes/_CP14/Species/elf.yml create mode 100644 Resources/Textures/_CP14/Mobs/Species/Elf/parts.rsi/full.png create mode 100644 Resources/Textures/_CP14/Mobs/Species/Elf/parts.rsi/head_f.png create mode 100644 Resources/Textures/_CP14/Mobs/Species/Elf/parts.rsi/head_m.png create mode 100644 Resources/Textures/_CP14/Mobs/Species/Elf/parts.rsi/l_arm.png create mode 100644 Resources/Textures/_CP14/Mobs/Species/Elf/parts.rsi/l_foot.png create mode 100644 Resources/Textures/_CP14/Mobs/Species/Elf/parts.rsi/l_hand.png create mode 100644 Resources/Textures/_CP14/Mobs/Species/Elf/parts.rsi/l_leg.png create mode 100644 Resources/Textures/_CP14/Mobs/Species/Elf/parts.rsi/meta.json create mode 100644 Resources/Textures/_CP14/Mobs/Species/Elf/parts.rsi/r_arm.png create mode 100644 Resources/Textures/_CP14/Mobs/Species/Elf/parts.rsi/r_foot.png create mode 100644 Resources/Textures/_CP14/Mobs/Species/Elf/parts.rsi/r_hand.png create mode 100644 Resources/Textures/_CP14/Mobs/Species/Elf/parts.rsi/r_leg.png create mode 100644 Resources/Textures/_CP14/Mobs/Species/Elf/parts.rsi/torso_f.png create mode 100644 Resources/Textures/_CP14/Mobs/Species/Elf/parts.rsi/torso_m.png diff --git a/Content.Shared/Humanoid/NamingSystem.cs b/Content.Shared/Humanoid/NamingSystem.cs index 3d879172a9..f35379e80d 100644 --- a/Content.Shared/Humanoid/NamingSystem.cs +++ b/Content.Shared/Humanoid/NamingSystem.cs @@ -47,20 +47,20 @@ namespace Content.Shared.Humanoid switch (gender) { case Gender.Male: - return Loc.GetString(_random.Pick(_prototypeManager.Index(speciesProto.MaleFirstNames).Values)); //CrystallPunk name localization + return Loc.GetString(_random.Pick(_prototypeManager.Index(speciesProto.MaleFirstNames).Values)); //CrystallPunk name localization case Gender.Female: - return Loc.GetString(_random.Pick(_prototypeManager.Index(speciesProto.FemaleFirstNames).Values)); //CrystallPunk name localization + return Loc.GetString(_random.Pick(_prototypeManager.Index(speciesProto.FemaleFirstNames).Values)); //CrystallPunk name localization default: if (_random.Prob(0.5f)) - return Loc.GetString(_random.Pick(_prototypeManager.Index(speciesProto.MaleFirstNames).Values)); //CrystallPunk name localization + return Loc.GetString(_random.Pick(_prototypeManager.Index(speciesProto.MaleFirstNames).Values)); //CrystallPunk name localization else - return Loc.GetString(_random.Pick(_prototypeManager.Index(speciesProto.FemaleFirstNames).Values)); //CrystallPunk name localization + return Loc.GetString(_random.Pick(_prototypeManager.Index(speciesProto.FemaleFirstNames).Values)); //CrystallPunk name localization } } public string GetLastName(SpeciesPrototype speciesProto) { - return Loc.GetString(_random.Pick(_prototypeManager.Index(speciesProto.LastNames).Values)); //CrystallPunk name localization + return Loc.GetString(_random.Pick(_prototypeManager.Index(speciesProto.LastNames).Values)); //CrystallPunk name localization } } } diff --git a/Content.Shared/Humanoid/Prototypes/SpeciesPrototype.cs b/Content.Shared/Humanoid/Prototypes/SpeciesPrototype.cs index 4c1483ac48..08bf4cfccd 100644 --- a/Content.Shared/Humanoid/Prototypes/SpeciesPrototype.cs +++ b/Content.Shared/Humanoid/Prototypes/SpeciesPrototype.cs @@ -82,13 +82,13 @@ public sealed partial class SpeciesPrototype : IPrototype public HumanoidSkinColor SkinColoration { get; private set; } [DataField] - public string MaleFirstNames { get; private set; } = "names_first_male"; + public string MaleFirstNames { get; private set; } = "CP14_Names_Human_Male_First"; [DataField] - public string FemaleFirstNames { get; private set; } = "names_first_female"; + public string FemaleFirstNames { get; private set; } = "CP14_Names_Human_Female_First"; [DataField] - public string LastNames { get; private set; } = "names_last"; + public string LastNames { get; private set; } = "CP14_Names_Human_Last"; [DataField] public SpeciesNaming Naming { get; private set; } = SpeciesNaming.FirstLast; diff --git a/Content.Shared/Localizations/ContentLocalizationManager.cs b/Content.Shared/Localizations/ContentLocalizationManager.cs index 8e664c9980..4318f2bb68 100644 --- a/Content.Shared/Localizations/ContentLocalizationManager.cs +++ b/Content.Shared/Localizations/ContentLocalizationManager.cs @@ -10,7 +10,8 @@ namespace Content.Shared.Localizations [Dependency] private readonly ILocalizationManager _loc = default!; // If you want to change your codebase's language, do it here. - private const string Culture = "en-US"; // CrystallPunk-Localization + private const string Culture = "ru-RU"; // CrystallPunk-Localization + private const string FallbackCulture = "en-US"; // CrystallPunk-Localization //Creating an English CrystallPunk server? Set Culture to "en-US" /// @@ -27,8 +28,11 @@ namespace Content.Shared.Localizations public void Initialize() { var culture = new CultureInfo(Culture); + var fallbackCulture = new CultureInfo(FallbackCulture); _loc.LoadCulture(culture); + _loc.LoadCulture(fallbackCulture); // CrystallPunk-Localization + _loc.SetFallbackCluture(fallbackCulture); // CrystallPunk-Localization _loc.AddFunction(culture, "PRESSURE", FormatPressure); _loc.AddFunction(culture, "POWERWATTS", FormatPowerWatts); _loc.AddFunction(culture, "POWERJOULES", FormatPowerJoules); diff --git a/Resources/Locale/en-US/_CP14/markings/elf-ears.ftl b/Resources/Locale/en-US/_CP14/markings/elf-ears.ftl new file mode 100644 index 0000000000..79c0378ee3 --- /dev/null +++ b/Resources/Locale/en-US/_CP14/markings/elf-ears.ftl @@ -0,0 +1,4 @@ +marking-CP14ElfEars = Elf benchmark +marking-CP14ElfEars2 = Lop-eared +marking-CP14ElfEars3 = Low landing +marking-CP14ElfEars3Broken = Lobes \ No newline at end of file diff --git a/Resources/Locale/en-US/_CP14/species/species-names.ftl b/Resources/Locale/en-US/_CP14/species/species-names.ftl index 9d5cf65259..8d07562971 100644 --- a/Resources/Locale/en-US/_CP14/species/species-names.ftl +++ b/Resources/Locale/en-US/_CP14/species/species-names.ftl @@ -128,32 +128,6 @@ cp14-species-name-human-last-29 = Ramondo cp14-species-name-human-last-30 = Falone # TIEFLINGS -cp14-species-name-tiefling-idea-first-1 = Recklessness -cp14-species-name-tiefling-idea-first-2 = Faith -cp14-species-name-tiefling-idea-first-3 = Ideal -cp14-species-name-tiefling-idea-first-4 = Art -cp14-species-name-tiefling-idea-first-5 = Music -cp14-species-name-tiefling-idea-first-6 = Flour -cp14-species-name-tiefling-idea-first-7 = Hope -cp14-species-name-tiefling-idea-first-8 = Tune -cp14-species-name-tiefling-idea-first-9 = Nowhere -cp14-species-name-tiefling-idea-first-10 = Openness -cp14-species-name-tiefling-idea-first-11 = Desperation -cp14-species-name-tiefling-idea-first-12 = Scavenger -cp14-species-name-tiefling-idea-first-13 = Searching -cp14-species-name-tiefling-idea-first-14 = Reverence -cp14-species-name-tiefling-idea-first-15 = Poetry -cp14-species-name-tiefling-idea-first-16 = Excellence -cp14-species-name-tiefling-idea-first-17 = Grief -cp14-species-name-tiefling-idea-first-18 = Glory -cp14-species-name-tiefling-idea-first-19 = Randomness -cp14-species-name-tiefling-idea-first-20 = Fear -cp14-species-name-tiefling-idea-first-21 = Fatigue -cp14-species-name-tiefling-idea-first-22 = Luck -cp14-species-name-tiefling-idea-first-23 = Pain -cp14-species-name-tiefling-idea-first-24 = Silence -cp14-species-name-tiefling-idea-first-25 = Darkness -cp14-species-name-tiefling-idea-first-26 = Virtue cp14-species-name-tiefling-male-first-1 = Akmenos cp14-species-name-tiefling-male-first-2 = Amnon @@ -200,6 +174,19 @@ cp14-species-name-tiefling-male-first-42 = Hortos cp14-species-name-tiefling-male-first-43 = Edelandross cp14-species-name-tiefling-male-first-44 = Ekemon cp14-species-name-tiefling-male-first-45 = Emokesse +cp14-species-name-tiefling-male-first-46 = Recklessness +cp14-species-name-tiefling-male-first-47 = Tune +cp14-species-name-tiefling-male-first-48 = Nowhere +cp14-species-name-tiefling-male-first-49 = Desperation +cp14-species-name-tiefling-male-first-50 = Scavengers +cp14-species-name-tiefling-male-first-51 = Excellence +cp14-species-name-tiefling-male-first-52 = Mourning +cp14-species-name-tiefling-male-first-52 = Glory +cp14-species-name-tiefling-male-first-53 = Luck +cp14-species-name-tiefling-male-first-54 = Pain +cp14-species-name-tiefling-male-first-55 = Silence +cp14-species-name-tiefling-male-first-56 = Randomness +cp14-species-name-tiefling-male-first-57 = Fear cp14-species-name-tiefling-female-first-1 = Acta cp14-species-name-tiefling-female-first-2 = Anakis @@ -241,6 +228,19 @@ cp14-species-name-tiefling-female-first-37 = Traja cp14-species-name-tiefling-female-first-38 = Velavia cp14-species-name-tiefling-female-first-39 = Xelestri cp14-species-name-tiefling-female-first-40 = Zaidi +cp14-species-name-tiefling-female-first-41 = Faith +cp14-species-name-tiefling-female-first-42 = The Ideal +cp14-species-name-tiefling-female-first-43 = Art +cp14-species-name-tiefling-female-first-44 = Music +cp14-species-name-tiefling-female-first-45 = Flour +cp14-species-name-tiefling-female-first-46 = Hope +cp14-species-name-tiefling-female-first-47 = Openness +cp14-species-name-tiefling-female-first-48 = Searching +cp14-species-name-tiefling-female-first-49 = Reverence +cp14-species-name-tiefling-female-first-50 = Poetry +cp14-species-name-tiefling-female-first-51 = Fatigue +cp14-species-name-tiefling-female-first-52 = Darkness +cp14-species-name-tiefling-female-first-53 = Virtue cp14-species-name-tiefling-last-1 = Agganor cp14-species-name-tiefling-last-2 = Al Khem @@ -396,4 +396,85 @@ cp14-species-name-dwarf-last-26 = of Clan Torevir cp14-species-name-dwarf-last-27 = of Clan Bucklebar cp14-species-name-dwarf-last-28 = of the Drummer clan cp14-species-name-dwarf-last-29 = of the Fire-Tongued Clan -cp14-species-name-dwarf-last-30 = of the Eternal Honey Clan \ No newline at end of file +cp14-species-name-dwarf-last-30 = of the Eternal Honey Clan + +# ELVES + +cp14-species-name-elf-male-first-1 = Adran +cp14-species-name-elf-male-first-2 = Aramil +cp14-species-name-elf-male-first-3 = Arannis +cp14-species-name-elf-male-first-4 = Aust +cp14-species-name-elf-male-first-5 = Aelar +cp14-species-name-elf-male-first-6 = Beiro +cp14-species-name-elf-male-first-7 = Berrian +cp14-species-name-elf-male-first-8 = Varys +cp14-species-name-elf-male-first-9 = Galindan +cp14-species-name-elf-male-first-10 = Yvelios +cp14-species-name-elf-male-first-11 = Imerral +cp14-species-name-elf-male-first-12 = Carrick +cp14-species-name-elf-male-first-13 = Quarion +cp14-species-name-elf-male-first-14 = Lausian +cp14-species-name-elf-male-first-15 = Mindartis +cp14-species-name-elf-male-first-16 = Paelias +cp14-species-name-elf-male-first-17 = Peren +cp14-species-name-elf-male-first-18 = Reardon +cp14-species-name-elf-male-first-19 = Rolen +cp14-species-name-elf-male-first-20 = Sovelisse +cp14-species-name-elf-male-first-21 = Tarivolus +cp14-species-name-elf-male-first-22 = Theren +cp14-species-name-elf-male-first-23 = Hadaray +cp14-species-name-elf-male-first-24 = Himo +cp14-species-name-elf-male-first-25 = Heian +cp14-species-name-elf-male-first-26 = Enyalis +cp14-species-name-elf-male-first-27 = Erdan +cp14-species-name-elf-male-first-28 = Erevan + +cp14-species-name-elf-female-first-1 = Adrieu +cp14-species-name-elf-female-first-2 = Altea +cp14-species-name-elf-female-first-3 = Anastrianna +cp14-species-name-elf-female-first-4 = Andraste +cp14-species-name-elf-female-first-5 = Antinua +cp14-species-name-elf-female-first-6 = Betrinna +cp14-species-name-elf-female-first-7 = Birelle +cp14-species-name-elf-female-first-8 = Vadania +cp14-species-name-elf-female-first-9 = Valante +cp14-species-name-elf-female-first-10 = Jalenette +cp14-species-name-elf-female-first-11 = Drusilia +cp14-species-name-elf-female-first-12 = Yelenia +cp14-species-name-elf-female-first-13 = Kaelinne +cp14-species-name-elf-female-first-14 = Quelenna +cp14-species-name-elf-female-first-15 = Quilasi +cp14-species-name-elf-female-first-16 = Caillet +cp14-species-name-elf-female-first-17 = Xanaphia +cp14-species-name-elf-female-first-18 = Leshanna +cp14-species-name-elf-female-first-19 = Leah +cp14-species-name-elf-female-first-20 = Miali +cp14-species-name-elf-female-first-21 = Marielle +cp14-species-name-elf-female-first-22 = Naivara +cp14-species-name-elf-female-first-23 = Sariel +cp14-species-name-elf-female-first-24 = Sylaqui +cp14-species-name-elf-female-first-25 = Theirastra +cp14-species-name-elf-female-first-26 = Tia +cp14-species-name-elf-female-first-27 = Felosial +cp14-species-name-elf-female-first-28 = Shava +cp14-species-name-elf-female-first-29 = Shanairah +cp14-species-name-elf-female-first-30 = Enna + +cp14-species-name-elf-last-1 = Amakiir +cp14-species-name-elf-last-2 = Amastasia +cp14-species-name-elf-last-3 = Galanodel +cp14-species-name-elf-last-4 = Ilfelkiir +cp14-species-name-elf-last-5 = Xylocente +cp14-species-name-elf-last-6 = Liadon +cp14-species-name-elf-last-7 = Nilo +cp14-species-name-elf-last-8 = Cyanodel +cp14-species-name-elf-last-9 = Holimion +cp14-species-name-elf-last-10 = Mossdream +cp14-species-name-elf-last-11 = Silverglame +cp14-species-name-elf-last-12 = Fallman +cp14-species-name-elf-last-13 = Alderpride +cp14-species-name-elf-last-14 = Shastrim +cp14-species-name-elf-last-15 = Frostrister +cp14-species-name-elf-last-16 = Felestra +cp14-species-name-elf-last-17 = Hustiar +cp14-species-name-elf-last-18 = Galfre \ 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 82580940ce..39c356bd26 100644 --- a/Resources/Locale/en-US/_CP14/species/species.ftl +++ b/Resources/Locale/en-US/_CP14/species/species.ftl @@ -1,2 +1,4 @@ -species-name-tiefling = Tiefling -species-name-dwarf = Dwarf \ No newline at end of file +cp14-species-name-human = Human +cp14-species-name-tiefling = Tiefling +cp14-species-name-dwarf = Dwarf +cp14-species-name-elf = Elf \ No newline at end of file diff --git a/Resources/Locale/ru-RU/_CP14/markings/elf-ears.ftl b/Resources/Locale/ru-RU/_CP14/markings/elf-ears.ftl new file mode 100644 index 0000000000..784f2ef149 --- /dev/null +++ b/Resources/Locale/ru-RU/_CP14/markings/elf-ears.ftl @@ -0,0 +1,4 @@ +marking-CP14ElfEars = Эльфийский эталон +marking-CP14ElfEars2 = Вислоухий +marking-CP14ElfEars3 = Низкая посадка +marking-CP14ElfEars3Broken = Огрызок \ 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 bbbe84c0f8..c56503b2c5 100644 --- a/Resources/Locale/ru-RU/_CP14/species/species-names.ftl +++ b/Resources/Locale/ru-RU/_CP14/species/species-names.ftl @@ -130,32 +130,6 @@ cp14-species-name-human-last-29 = Рамондо cp14-species-name-human-last-30 = Фалоне # TIEFLINGS -cp14-species-name-tiefling-idea-first-1 = Безрассудство -cp14-species-name-tiefling-idea-first-2 = Вера -cp14-species-name-tiefling-idea-first-3 = Идеал -cp14-species-name-tiefling-idea-first-4 = Искусство -cp14-species-name-tiefling-idea-first-5 = Музыка -cp14-species-name-tiefling-idea-first-6 = Мука -cp14-species-name-tiefling-idea-first-7 = Надежда -cp14-species-name-tiefling-idea-first-8 = Напев -cp14-species-name-tiefling-idea-first-9 = Нигде -cp14-species-name-tiefling-idea-first-10 = Открытость -cp14-species-name-tiefling-idea-first-11 = Отчаяние -cp14-species-name-tiefling-idea-first-12 = Падаль -cp14-species-name-tiefling-idea-first-13 = Поиск -cp14-species-name-tiefling-idea-first-14 = Почтение -cp14-species-name-tiefling-idea-first-15 = Поэзия -cp14-species-name-tiefling-idea-first-16 = Превосходство -cp14-species-name-tiefling-idea-first-17 = Скорбь -cp14-species-name-tiefling-idea-first-18 = Слава -cp14-species-name-tiefling-idea-first-19 = Случайность -cp14-species-name-tiefling-idea-first-20 = Страх -cp14-species-name-tiefling-idea-first-21 = Усталость -cp14-species-name-tiefling-idea-first-22 = Везение -cp14-species-name-tiefling-idea-first-23 = Боль -cp14-species-name-tiefling-idea-first-24 = Тишина -cp14-species-name-tiefling-idea-first-25 = Темнота -cp14-species-name-tiefling-idea-first-26 = Добродетель cp14-species-name-tiefling-male-first-1 = Акменос cp14-species-name-tiefling-male-first-2 = Амнон @@ -202,6 +176,19 @@ 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-tiefling-male-first-52 = Слава +cp14-species-name-tiefling-male-first-53 = Везение +cp14-species-name-tiefling-male-first-54 = Боль +cp14-species-name-tiefling-male-first-55 = Тишина +cp14-species-name-tiefling-male-first-56 = Случайность +cp14-species-name-tiefling-male-first-57 = Страх cp14-species-name-tiefling-female-first-1 = Акта cp14-species-name-tiefling-female-first-2 = Анакис @@ -243,6 +230,19 @@ cp14-species-name-tiefling-female-first-37 = Трая cp14-species-name-tiefling-female-first-38 = Велавиа cp14-species-name-tiefling-female-first-39 = Кселестри cp14-species-name-tiefling-female-first-40 = Заиди +cp14-species-name-tiefling-female-first-41 = Вера +cp14-species-name-tiefling-female-first-42 = Идеал +cp14-species-name-tiefling-female-first-43 = Искусство +cp14-species-name-tiefling-female-first-44 = Музыка +cp14-species-name-tiefling-female-first-45 = Мука +cp14-species-name-tiefling-female-first-46 = Надежда +cp14-species-name-tiefling-female-first-47 = Открытость +cp14-species-name-tiefling-female-first-48 = Поиск +cp14-species-name-tiefling-female-first-49 = Почтение +cp14-species-name-tiefling-female-first-50 = Поэзия +cp14-species-name-tiefling-female-first-51 = Усталость +cp14-species-name-tiefling-female-first-52 = Темнота +cp14-species-name-tiefling-female-first-53 = Добродетель cp14-species-name-tiefling-last-1 = Агганор cp14-species-name-tiefling-last-2 = Аль-Кхем @@ -398,4 +398,85 @@ 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 +cp14-species-name-dwarf-last-30 = из клана Вечного мёда + +# ELVES + +cp14-species-name-elf-male-first-1 = Адран +cp14-species-name-elf-male-first-2 = Арамиль +cp14-species-name-elf-male-first-3 = Араннис +cp14-species-name-elf-male-first-4 = Ауст +cp14-species-name-elf-male-first-5 = Аэлар +cp14-species-name-elf-male-first-6 = Бейро +cp14-species-name-elf-male-first-7 = Берриан +cp14-species-name-elf-male-first-8 = Варис +cp14-species-name-elf-male-first-9 = Галинндан +cp14-species-name-elf-male-first-10 = Ивеллиос +cp14-species-name-elf-male-first-11 = Имерраль +cp14-species-name-elf-male-first-12 = Каррик +cp14-species-name-elf-male-first-13 = Куарион +cp14-species-name-elf-male-first-14 = Лаусиан +cp14-species-name-elf-male-first-15 = Миндартис +cp14-species-name-elf-male-first-16 = Паэлиас +cp14-species-name-elf-male-first-17 = Перен +cp14-species-name-elf-male-first-18 = Риардон +cp14-species-name-elf-male-first-19 = Ролен +cp14-species-name-elf-male-first-20 = Совелисс +cp14-species-name-elf-male-first-21 = Таривол +cp14-species-name-elf-male-first-22 = Терен +cp14-species-name-elf-male-first-23 = Хадарай +cp14-species-name-elf-male-first-24 = Химо +cp14-species-name-elf-male-first-25 = Хэйян +cp14-species-name-elf-male-first-26 = Эниалис +cp14-species-name-elf-male-first-27 = Эрдан +cp14-species-name-elf-male-first-28 = Эреван + +cp14-species-name-elf-female-first-1 = Адрие +cp14-species-name-elf-female-first-2 = Альтеа +cp14-species-name-elf-female-first-3 = Анастрианна +cp14-species-name-elf-female-first-4 = Андрасте +cp14-species-name-elf-female-first-5 = Антинуа +cp14-species-name-elf-female-first-6 = Бетринна +cp14-species-name-elf-female-first-7 = Бирель +cp14-species-name-elf-female-first-8 = Вадания +cp14-species-name-elf-female-first-9 = Валанте +cp14-species-name-elf-female-first-10 = Джеленетт +cp14-species-name-elf-female-first-11 = Друсилиа +cp14-species-name-elf-female-first-12 = Йелениа +cp14-species-name-elf-female-first-13 = Каэлинн +cp14-species-name-elf-female-first-14 = Квеленна +cp14-species-name-elf-female-first-15 = Квиласи +cp14-species-name-elf-female-first-16 = Кейлет +cp14-species-name-elf-female-first-17 = Ксанафия +cp14-species-name-elf-female-first-18 = Лешанна +cp14-species-name-elf-female-first-19 = Лиа +cp14-species-name-elf-female-first-20 = Миали +cp14-species-name-elf-female-first-21 = Мэриэль +cp14-species-name-elf-female-first-22 = Найвара +cp14-species-name-elf-female-first-23 = Сариэль +cp14-species-name-elf-female-first-24 = Силакви +cp14-species-name-elf-female-first-25 = Теирастра +cp14-species-name-elf-female-first-26 = Тиа +cp14-species-name-elf-female-first-27 = Фелосиаль +cp14-species-name-elf-female-first-28 = Шава +cp14-species-name-elf-female-first-29 = Шанайра +cp14-species-name-elf-female-first-30 = Энна + +cp14-species-name-elf-last-1 = Амакиир +cp14-species-name-elf-last-2 = Амастасия +cp14-species-name-elf-last-3 = Галанодель +cp14-species-name-elf-last-4 = Ильфелкиир +cp14-species-name-elf-last-5 = Ксилосент +cp14-species-name-elf-last-6 = Лиадон +cp14-species-name-elf-last-7 = Найло +cp14-species-name-elf-last-8 = Сианодель +cp14-species-name-elf-last-9 = Холимион +cp14-species-name-elf-last-10 = Моссдрим +cp14-species-name-elf-last-11 = Сильверглейм +cp14-species-name-elf-last-12 = Фаллман +cp14-species-name-elf-last-13 = Альдерпрайд +cp14-species-name-elf-last-14 = Шастрим +cp14-species-name-elf-last-15 = Фростристер +cp14-species-name-elf-last-16 = Фелестра +cp14-species-name-elf-last-17 = Хустиар +cp14-species-name-elf-last-18 = Гальфре \ 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 576dc32161..0a5432f86e 100644 --- a/Resources/Locale/ru-RU/_CP14/species/species.ftl +++ b/Resources/Locale/ru-RU/_CP14/species/species.ftl @@ -1,2 +1,4 @@ -species-name-tiefling = Тифлинг -species-name-dwarf = Дварф \ No newline at end of file +cp14-species-name-human = Человек +cp14-species-name-tiefling = Тифлинг +cp14-species-name-dwarf = Дварф +cp14-species-name-elf = Эльф \ No newline at end of file diff --git a/Resources/Prototypes/Species/arachnid.yml b/Resources/Prototypes/Species/arachnid.yml index d7182128ca..6c9aca8034 100644 --- a/Resources/Prototypes/Species/arachnid.yml +++ b/Resources/Prototypes/Species/arachnid.yml @@ -8,9 +8,9 @@ markingLimits: MobArachnidMarkingLimits dollPrototype: MobArachnidDummy skinColoration: Hues - maleFirstNames: names_arachnid_first - femaleFirstNames: names_arachnid_first - lastNames: names_arachnid_last + maleFirstNames: CP14_Names_Human_Male_First + femaleFirstNames: CP14_Names_Human_Female_First + lastNames: CP14_Names_Human_Last sexes: - Unsexed diff --git a/Resources/Prototypes/Species/diona.yml b/Resources/Prototypes/Species/diona.yml index 4dd2cc1143..ab87b7c8b1 100644 --- a/Resources/Prototypes/Species/diona.yml +++ b/Resources/Prototypes/Species/diona.yml @@ -8,9 +8,9 @@ markingLimits: MobDionaMarkingLimits dollPrototype: MobDionaDummy skinColoration: Hues - maleFirstNames: DionaFirst - femaleFirstNames: DionaFirst - lastNames: DionaLast + maleFirstNames: CP14_Names_Human_Male_First + femaleFirstNames: CP14_Names_Human_Female_First + lastNames: CP14_Names_Human_Last naming: TheFirstofLast - type: speciesBaseSprites diff --git a/Resources/Prototypes/Species/moth.yml b/Resources/Prototypes/Species/moth.yml index 1479420b15..7d19116400 100644 --- a/Resources/Prototypes/Species/moth.yml +++ b/Resources/Prototypes/Species/moth.yml @@ -8,9 +8,9 @@ markingLimits: MobMothMarkingLimits dollPrototype: MobMothDummy skinColoration: Hues - maleFirstNames: names_moth_first_male - femaleFirstNames: names_moth_first_female - lastNames: names_moth_last + maleFirstNames: CP14_Names_Human_Male_First + femaleFirstNames: CP14_Names_Human_Female_First + lastNames: CP14_Names_Human_Last - type: speciesBaseSprites id: MobMothSprites diff --git a/Resources/Prototypes/Species/reptilian.yml b/Resources/Prototypes/Species/reptilian.yml index 738895bcdf..3f4324958b 100644 --- a/Resources/Prototypes/Species/reptilian.yml +++ b/Resources/Prototypes/Species/reptilian.yml @@ -8,8 +8,8 @@ markingLimits: MobReptilianMarkingLimits dollPrototype: MobReptilianDummy skinColoration: Hues - maleFirstNames: names_reptilian_male - femaleFirstNames: names_reptilian_female + maleFirstNames: CP14_Names_Human_Male_First + femaleFirstNames: CP14_Names_Human_Female_First naming: FirstDashFirst - type: speciesBaseSprites diff --git a/Resources/Prototypes/Species/skeleton.yml b/Resources/Prototypes/Species/skeleton.yml index 1f2a95e991..57aeb0ee4e 100644 --- a/Resources/Prototypes/Species/skeleton.yml +++ b/Resources/Prototypes/Species/skeleton.yml @@ -6,8 +6,8 @@ sprites: MobSkeletonSprites defaultSkinTone: "#fff9e2" markingLimits: MobHumanMarkingLimits - maleFirstNames: skeletonNamesFirst - femaleFirstNames: skeletonNamesFirst + maleFirstNames: CP14_Names_Human_Male_First + femaleFirstNames: CP14_Names_Human_Female_First dollPrototype: MobSkeletonPersonDummy skinColoration: TintedHues diff --git a/Resources/Prototypes/Species/vox.yml b/Resources/Prototypes/Species/vox.yml index e3fdb2bf08..4d2ad64b6f 100644 --- a/Resources/Prototypes/Species/vox.yml +++ b/Resources/Prototypes/Species/vox.yml @@ -8,8 +8,8 @@ dollPrototype: MobVoxDummy skinColoration: VoxFeathers defaultSkinTone: "#6c741d" - maleFirstNames: names_vox - femaleFirstNames: names_vox + maleFirstNames: CP14_Names_Human_Male_First + femaleFirstNames: CP14_Names_Human_Female_First naming: First sexes: - Unsexed diff --git a/Resources/Prototypes/_CP14/Body/Prototypes/elf.yml b/Resources/Prototypes/_CP14/Body/Prototypes/elf.yml new file mode 100644 index 0000000000..d8c3621f32 --- /dev/null +++ b/Resources/Prototypes/_CP14/Body/Prototypes/elf.yml @@ -0,0 +1,49 @@ +- type: body + id: CP14Elf + name: elf + 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 deleted file mode 100644 index 89b0312b00..0000000000 --- a/Resources/Prototypes/_CP14/Datasets/Names/dwarf.yml +++ /dev/null @@ -1,139 +0,0 @@ -- 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/Datasets/Names/human.yml b/Resources/Prototypes/_CP14/Datasets/Names/human.yml deleted file mode 100644 index 6cf71f7e89..0000000000 --- a/Resources/Prototypes/_CP14/Datasets/Names/human.yml +++ /dev/null @@ -1,139 +0,0 @@ -- type: dataset - id: CP14_Names_Human_Male_First - values: - - 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 - - -- type: dataset - id: CP14_Names_Human_Female_First - values: - - cp14-species-name-human-female-first-1 - - cp14-species-name-human-female-first-2 - - cp14-species-name-human-female-first-3 - - cp14-species-name-human-female-first-4 - - cp14-species-name-human-female-first-5 - - cp14-species-name-human-female-first-6 - - cp14-species-name-human-female-first-7 - - cp14-species-name-human-female-first-8 - - cp14-species-name-human-female-first-9 - - cp14-species-name-human-female-first-10 - - cp14-species-name-human-female-first-11 - - cp14-species-name-human-female-first-12 - - cp14-species-name-human-female-first-13 - - cp14-species-name-human-female-first-14 - - cp14-species-name-human-female-first-15 - - cp14-species-name-human-female-first-16 - - cp14-species-name-human-female-first-17 - - cp14-species-name-human-female-first-18 - - cp14-species-name-human-female-first-19 - - cp14-species-name-human-female-first-20 - - cp14-species-name-human-female-first-21 - - cp14-species-name-human-female-first-22 - - cp14-species-name-human-female-first-23 - - cp14-species-name-human-female-first-24 - - cp14-species-name-human-female-first-25 - - cp14-species-name-human-female-first-26 - - cp14-species-name-human-female-first-27 - - cp14-species-name-human-female-first-28 - - cp14-species-name-human-female-first-29 - - cp14-species-name-human-female-first-30 - - cp14-species-name-human-female-first-31 - - cp14-species-name-human-female-first-32 - - cp14-species-name-human-female-first-33 - - cp14-species-name-human-female-first-34 - - cp14-species-name-human-female-first-35 - - cp14-species-name-human-female-first-36 - - cp14-species-name-human-female-first-37 - - cp14-species-name-human-female-first-38 - - cp14-species-name-human-female-first-39 - - cp14-species-name-human-female-first-40 - - cp14-species-name-human-female-first-41 - - cp14-species-name-human-female-first-42 - - cp14-species-name-human-female-first-43 - - cp14-species-name-human-female-first-44 - - -- type: dataset - id: CP14_Names_Human_Last - values: - - cp14-species-name-human-last-1 - - cp14-species-name-human-last-2 - - cp14-species-name-human-last-3 - - cp14-species-name-human-last-4 - - cp14-species-name-human-last-5 - - cp14-species-name-human-last-6 - - cp14-species-name-human-last-7 - - cp14-species-name-human-last-8 - - cp14-species-name-human-last-9 - - cp14-species-name-human-last-10 - - cp14-species-name-human-last-11 - - cp14-species-name-human-last-12 - - cp14-species-name-human-last-13 - - cp14-species-name-human-last-14 - - cp14-species-name-human-last-15 - - cp14-species-name-human-last-16 - - cp14-species-name-human-last-17 - - cp14-species-name-human-last-18 - - cp14-species-name-human-last-19 - - cp14-species-name-human-last-20 - - cp14-species-name-human-last-21 - - cp14-species-name-human-last-22 - - cp14-species-name-human-last-23 - - cp14-species-name-human-last-24 - - cp14-species-name-human-last-25 - - cp14-species-name-human-last-26 - - cp14-species-name-human-last-27 - - cp14-species-name-human-last-28 - - cp14-species-name-human-last-29 - - cp14-species-name-human-last-30 diff --git a/Resources/Prototypes/_CP14/Datasets/Names/species-names.yml b/Resources/Prototypes/_CP14/Datasets/Names/species-names.yml new file mode 100644 index 0000000000..229db255cd --- /dev/null +++ b/Resources/Prototypes/_CP14/Datasets/Names/species-names.yml @@ -0,0 +1,80 @@ + +# Dwarf + +- type: localizedDataset + id: CP14_Names_Dwarf_Male_First + values: + prefix: cp14-species-name-dwarf-male-first- + count: 52 + +- type: localizedDataset + id: CP14_Names_Dwarf_Female_First + values: + prefix: cp14-species-name-dwarf-female-first- + count: 44 + +- type: localizedDataset + id: CP14_Names_Dwarf_Last + values: + prefix: cp14-species-name-dwarf-last- + count: 30 + +# Human + +- type: localizedDataset + id: CP14_Names_Human_Male_First + values: + prefix: cp14-species-name-human-male-first- + count: 52 + +- type: localizedDataset + id: CP14_Names_Human_Female_First + values: + prefix: cp14-species-name-human-female-first- + count: 44 + +- type: localizedDataset + id: CP14_Names_Human_Last + values: + prefix: cp14-species-name-human-last- + count: 30 + +# Tiefling + +- type: localizedDataset + id: CP14_Names_Tiefling_Male_First + values: + prefix: cp14-species-name-tiefling-male-first- + count: 57 + +- type: localizedDataset + id: CP14_Names_Tiefling_Female_First + values: + prefix: cp14-species-name-tiefling-female-first- + count: 53 + +- type: localizedDataset + id: CP14_Names_Tiefling_Last + values: + prefix: cp14-species-name-tiefling-last- + count: 24 + +# Elf + +- type: localizedDataset + id: CP14_Names_Elf_Male_First + values: + prefix: cp14-species-name-elf-male-first- + count: 28 + +- type: localizedDataset + id: CP14_Names_Elf_Female_First + values: + prefix: cp14-species-name-elf-female-first- + count: 30 + +- type: localizedDataset + id: CP14_Names_Elf_Last + values: + prefix: cp14-species-name-elf-last- + count: 18 \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Datasets/Names/tiefling.yml b/Resources/Prototypes/_CP14/Datasets/Names/tiefling.yml deleted file mode 100644 index bc34f8742a..0000000000 --- a/Resources/Prototypes/_CP14/Datasets/Names/tiefling.yml +++ /dev/null @@ -1,173 +0,0 @@ -- type: dataset - id: CP14_Names_Tiefling_Male_First - values: - - 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-idea-first-1 - - cp14-species-name-tiefling-idea-first-2 - - cp14-species-name-tiefling-idea-first-3 - - cp14-species-name-tiefling-idea-first-4 - - cp14-species-name-tiefling-idea-first-5 - - cp14-species-name-tiefling-idea-first-6 - - cp14-species-name-tiefling-idea-first-7 - - cp14-species-name-tiefling-idea-first-8 - - cp14-species-name-tiefling-idea-first-9 - - cp14-species-name-tiefling-idea-first-10 - - cp14-species-name-tiefling-idea-first-11 - - cp14-species-name-tiefling-idea-first-12 - - cp14-species-name-tiefling-idea-first-13 - - cp14-species-name-tiefling-idea-first-14 - - cp14-species-name-tiefling-idea-first-15 - - cp14-species-name-tiefling-idea-first-16 - - cp14-species-name-tiefling-idea-first-17 - - cp14-species-name-tiefling-idea-first-18 - - cp14-species-name-tiefling-idea-first-19 - - cp14-species-name-tiefling-idea-first-20 - - cp14-species-name-tiefling-idea-first-21 - - cp14-species-name-tiefling-idea-first-22 - - cp14-species-name-tiefling-idea-first-23 - - cp14-species-name-tiefling-idea-first-24 - - cp14-species-name-tiefling-idea-first-25 - - cp14-species-name-tiefling-idea-first-26 - - -- type: dataset - id: CP14_Names_Tiefling_Female_First - values: - - cp14-species-name-tiefling-idea-first-1 - - cp14-species-name-tiefling-idea-first-2 - - cp14-species-name-tiefling-idea-first-3 - - cp14-species-name-tiefling-idea-first-4 - - cp14-species-name-tiefling-idea-first-5 - - cp14-species-name-tiefling-female-first-6 - - cp14-species-name-tiefling-female-first-7 - - cp14-species-name-tiefling-female-first-8 - - cp14-species-name-tiefling-female-first-9 - - cp14-species-name-tiefling-female-first-10 - - cp14-species-name-tiefling-female-first-11 - - cp14-species-name-tiefling-female-first-12 - - cp14-species-name-tiefling-female-first-13 - - cp14-species-name-tiefling-female-first-14 - - cp14-species-name-tiefling-female-first-15 - - cp14-species-name-tiefling-female-first-16 - - cp14-species-name-tiefling-female-first-17 - - cp14-species-name-tiefling-female-first-18 - - cp14-species-name-tiefling-female-first-19 - - cp14-species-name-tiefling-female-first-20 - - cp14-species-name-tiefling-female-first-21 - - cp14-species-name-tiefling-female-first-22 - - cp14-species-name-tiefling-female-first-23 - - cp14-species-name-tiefling-female-first-24 - - cp14-species-name-tiefling-female-first-25 - - cp14-species-name-tiefling-female-first-26 - - cp14-species-name-tiefling-female-first-27 - - cp14-species-name-tiefling-female-first-28 - - cp14-species-name-tiefling-female-first-29 - - cp14-species-name-tiefling-female-first-30 - - cp14-species-name-tiefling-female-first-31 - - cp14-species-name-tiefling-female-first-32 - - cp14-species-name-tiefling-female-first-33 - - cp14-species-name-tiefling-female-first-34 - - cp14-species-name-tiefling-female-first-35 - - cp14-species-name-tiefling-female-first-36 - - cp14-species-name-tiefling-female-first-37 - - cp14-species-name-tiefling-female-first-38 - - cp14-species-name-tiefling-female-first-39 - - cp14-species-name-tiefling-female-first-40 - - cp14-species-name-tiefling-idea-first-1 - - cp14-species-name-tiefling-idea-first-2 - - cp14-species-name-tiefling-idea-first-3 - - cp14-species-name-tiefling-idea-first-4 - - cp14-species-name-tiefling-idea-first-5 - - cp14-species-name-tiefling-idea-first-6 - - cp14-species-name-tiefling-idea-first-7 - - cp14-species-name-tiefling-idea-first-8 - - cp14-species-name-tiefling-idea-first-9 - - cp14-species-name-tiefling-idea-first-10 - - cp14-species-name-tiefling-idea-first-11 - - cp14-species-name-tiefling-idea-first-12 - - cp14-species-name-tiefling-idea-first-13 - - cp14-species-name-tiefling-idea-first-14 - - cp14-species-name-tiefling-idea-first-15 - - cp14-species-name-tiefling-idea-first-16 - - cp14-species-name-tiefling-idea-first-17 - - cp14-species-name-tiefling-idea-first-18 - - cp14-species-name-tiefling-idea-first-19 - - cp14-species-name-tiefling-idea-first-20 - - cp14-species-name-tiefling-idea-first-21 - - cp14-species-name-tiefling-idea-first-22 - - cp14-species-name-tiefling-idea-first-23 - - cp14-species-name-tiefling-idea-first-24 - - cp14-species-name-tiefling-idea-first-25 - - cp14-species-name-tiefling-idea-first-26 - -- type: dataset - id: CP14_Names_Tiefling_Last - values: - - cp14-species-name-tiefling-last-1 - - cp14-species-name-tiefling-last-2 - - cp14-species-name-tiefling-last-3 - - cp14-species-name-tiefling-last-4 - - cp14-species-name-tiefling-last-5 - - cp14-species-name-tiefling-last-6 - - cp14-species-name-tiefling-last-7 - - cp14-species-name-tiefling-last-8 - - cp14-species-name-tiefling-last-9 - - cp14-species-name-tiefling-last-10 - - cp14-species-name-tiefling-last-11 - - cp14-species-name-tiefling-last-12 - - cp14-species-name-tiefling-last-13 - - cp14-species-name-tiefling-last-14 - - cp14-species-name-tiefling-last-15 - - cp14-species-name-tiefling-last-16 - - cp14-species-name-tiefling-last-17 - - cp14-species-name-tiefling-last-18 - - cp14-species-name-tiefling-last-19 - - 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 diff --git a/Resources/Prototypes/_CP14/Entities/Mobs/Customization/Markings/elf_ears.yml b/Resources/Prototypes/_CP14/Entities/Mobs/Customization/Markings/elf_ears.yml new file mode 100644 index 0000000000..c8ae75123b --- /dev/null +++ b/Resources/Prototypes/_CP14/Entities/Mobs/Customization/Markings/elf_ears.yml @@ -0,0 +1,35 @@ +- type: marking + id: CP14ElfEars + bodyPart: HeadTop + markingCategory: HeadTop + speciesRestriction: [ CP14Elf ] + sprites: + - sprite: _CP14/Mobs/Customization/elf_ears.rsi + state: ears1 + +- type: marking + id: CP14ElfEars2 + bodyPart: HeadTop + markingCategory: HeadTop + speciesRestriction: [ CP14Elf ] + sprites: + - sprite: _CP14/Mobs/Customization/elf_ears.rsi + state: ears2 + +- type: marking + id: CP14ElfEars3 + bodyPart: HeadTop + markingCategory: HeadTop + speciesRestriction: [ CP14Elf ] + sprites: + - sprite: _CP14/Mobs/Customization/elf_ears.rsi + state: ears3 + +- type: marking + id: CP14ElfEars3Broken + bodyPart: HeadTop + markingCategory: HeadTop + speciesRestriction: [ CP14Elf ] + sprites: + - sprite: _CP14/Mobs/Customization/elf_ears.rsi + state: ears3_broken \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Entities/Mobs/Customization/Markings/tiefling_horns.yml b/Resources/Prototypes/_CP14/Entities/Mobs/Customization/Markings/tiefling_horns.yml index 092bfa4c78..bf1c4a7b26 100644 --- a/Resources/Prototypes/_CP14/Entities/Mobs/Customization/Markings/tiefling_horns.yml +++ b/Resources/Prototypes/_CP14/Entities/Mobs/Customization/Markings/tiefling_horns.yml @@ -1,4 +1,3 @@ - - type: marking id: CP14TieflingHorns bodyPart: HeadTop diff --git a/Resources/Prototypes/_CP14/Entities/Mobs/Player/elf.yml b/Resources/Prototypes/_CP14/Entities/Mobs/Player/elf.yml new file mode 100644 index 0000000000..2c9e77fd8c --- /dev/null +++ b/Resources/Prototypes/_CP14/Entities/Mobs/Player/elf.yml @@ -0,0 +1,4 @@ +- type: entity + save: false + parent: CP14BaseMobElf + id: CP14MobElf diff --git a/Resources/Prototypes/_CP14/Entities/Mobs/Species/dwarf.yml b/Resources/Prototypes/_CP14/Entities/Mobs/Species/dwarf.yml index d3a7cfa03b..3aaaea689d 100644 --- a/Resources/Prototypes/_CP14/Entities/Mobs/Species/dwarf.yml +++ b/Resources/Prototypes/_CP14/Entities/Mobs/Species/dwarf.yml @@ -38,10 +38,30 @@ 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 + - type: HumanoidAppearance + species: CP14Dwarf + - 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 \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Entities/Mobs/Species/elf.yml b/Resources/Prototypes/_CP14/Entities/Mobs/Species/elf.yml new file mode 100644 index 0000000000..cc9937e0af --- /dev/null +++ b/Resources/Prototypes/_CP14/Entities/Mobs/Species/elf.yml @@ -0,0 +1,32 @@ +- type: entity + parent: CP14BaseMobSpeciesOrganic + id: CP14BaseMobElf + name: Mr. Elf + abstract: true + components: + - type: HumanoidAppearance + species: CP14Elf + - type: Hunger + - type: Icon + sprite: _CP14/Mobs/Species/Elf/parts.rsi + state: full + - type: Thirst + - type: Butcherable + butcheringType: Spike + spawned: + - id: FoodMeatHuman + amount: 5 + - type: Body + prototype: CP14Elf + requiredLegs: 2 + - type: Inventory + templateId: CP14Human + - type: Wagging + +- type: entity + parent: CP14BaseSpeciesDummy + id: CP14MobElfDummy + noSpawn: true + components: + - type: HumanoidAppearance + species: CP14Elf diff --git a/Resources/Prototypes/_CP14/Species/dwarf.yml b/Resources/Prototypes/_CP14/Species/dwarf.yml index d797b692fb..eb4975f54c 100644 --- a/Resources/Prototypes/_CP14/Species/dwarf.yml +++ b/Resources/Prototypes/_CP14/Species/dwarf.yml @@ -1,6 +1,6 @@ - type: species id: CP14Dwarf - name: species-name-dwarf + name: cp14-species-name-dwarf roundStart: true prototype: CP14MobDwarf sprites: CP14MobDwarfSprites diff --git a/Resources/Prototypes/_CP14/Species/elf.yml b/Resources/Prototypes/_CP14/Species/elf.yml new file mode 100644 index 0000000000..429e1a5655 --- /dev/null +++ b/Resources/Prototypes/_CP14/Species/elf.yml @@ -0,0 +1,155 @@ +- type: species + id: CP14Elf + name: cp14-species-name-elf + roundStart: true + prototype: CP14MobElf + sprites: CP14MobElfSprites + markingLimits: CP14MobElfMarkingLimits + dollPrototype: CP14MobElfDummy + skinColoration: HumanToned + maleFirstNames: CP14_Names_Elf_Male_First + femaleFirstNames: CP14_Names_Elf_Female_First + lastNames: CP14_Names_Elf_Last + +- type: speciesBaseSprites + id: CP14MobElfSprites + sprites: + Head: CP14MobElfHead + HeadTop: CP14MobElfMarkingMatchSkin + Hair: CP14MobElfAnyMarking + FacialHair: CP14MobElfAnyMarking + Snout: CP14MobElfMarkingMatchSkin + Tail: CP14MobElfMarkingMatchSkin + Chest: CP14MobElfTorso + Eyes: CP14MobElfEyes + LArm: CP14MobElfLArm + RArm: CP14MobElfRArm + LHand: CP14MobElfLHand + RHand: CP14MobElfRHand + LLeg: CP14MobElfLLeg + RLeg: CP14MobElfRLeg + LFoot: CP14MobElfLFoot + RFoot: CP14MobElfRFoot + +- type: markingPoints + id: CP14MobElfMarkingLimits + points: + Hair: + points: 1 + required: false + FacialHair: + points: 1 + required: false + Snout: + points: 1 + required: false + HeadTop: + points: 1 + required: true + defaultMarkings: [ CP14ElfEars ] + Chest: + points: 1 + required: false + Legs: + points: 2 + required: false + Arms: + points: 2 + required: false + +- type: humanoidBaseSprite + id: CP14MobElfEyes + baseSprite: + sprite: _CP14/Mobs/Customization/eyes.rsi + state: eyes + +- type: humanoidBaseSprite + id: CP14MobElfAnyMarking + +- type: humanoidBaseSprite + id: CP14MobElfMarkingMatchSkin + markingsMatchSkin: true + +- type: humanoidBaseSprite + id: CP14MobElfHead + baseSprite: + sprite: _CP14/Mobs/Species/Elf/parts.rsi + state: head_m + +- type: humanoidBaseSprite + id: CP14MobElfHeadMale + baseSprite: + sprite: _CP14/Mobs/Species/Elf/parts.rsi + state: head_m + +- type: humanoidBaseSprite + id: CP14MobElfHeadFemale + baseSprite: + sprite: _CP14/Mobs/Species/Elf/parts.rsi + state: head_f + +- type: humanoidBaseSprite + id: CP14MobElfTorso + baseSprite: + sprite: _CP14/Mobs/Species/Elf/parts.rsi + state: torso_m + +- type: humanoidBaseSprite + id: CP14MobElfTorsoMale + baseSprite: + sprite: _CP14/Mobs/Species/Elf/parts.rsi + state: torso_m + +- type: humanoidBaseSprite + id: CP14MobElfTorsoFemale + baseSprite: + sprite: _CP14/Mobs/Species/Elf/parts.rsi + state: torso_f + +- type: humanoidBaseSprite + id: CP14MobElfLLeg + baseSprite: + sprite: _CP14/Mobs/Species/Elf/parts.rsi + state: l_leg + +- type: humanoidBaseSprite + id: CP14MobElfLArm + baseSprite: + sprite: _CP14/Mobs/Species/Elf/parts.rsi + state: l_arm + +- type: humanoidBaseSprite + id: CP14MobElfLHand + baseSprite: + sprite: _CP14/Mobs/Species/Elf/parts.rsi + state: l_hand + +- type: humanoidBaseSprite + id: CP14MobElfLFoot + baseSprite: + sprite: _CP14/Mobs/Species/Elf/parts.rsi + state: l_foot + +- type: humanoidBaseSprite + id: CP14MobElfRLeg + baseSprite: + sprite: _CP14/Mobs/Species/Elf/parts.rsi + state: r_leg + +- type: humanoidBaseSprite + id: CP14MobElfRArm + baseSprite: + sprite: _CP14/Mobs/Species/Elf/parts.rsi + state: r_arm + +- type: humanoidBaseSprite + id: CP14MobElfRHand + baseSprite: + sprite: _CP14/Mobs/Species/Elf/parts.rsi + state: r_hand + +- type: humanoidBaseSprite + id: CP14MobElfRFoot + baseSprite: + sprite: _CP14/Mobs/Species/Elf/parts.rsi + state: r_foot diff --git a/Resources/Prototypes/_CP14/Species/human.yml b/Resources/Prototypes/_CP14/Species/human.yml index 77f1b5a97f..9533b25374 100644 --- a/Resources/Prototypes/_CP14/Species/human.yml +++ b/Resources/Prototypes/_CP14/Species/human.yml @@ -1,6 +1,6 @@ - type: species id: CP14Human - name: species-name-human + name: cp14-species-name-human roundStart: true prototype: CP14MobHuman sprites: CP14MobHumanSprites diff --git a/Resources/Prototypes/_CP14/Species/tiefling.yml b/Resources/Prototypes/_CP14/Species/tiefling.yml index c677574f8e..c73691156b 100644 --- a/Resources/Prototypes/_CP14/Species/tiefling.yml +++ b/Resources/Prototypes/_CP14/Species/tiefling.yml @@ -1,6 +1,6 @@ - type: species id: CP14Tiefling - name: species-name-tiefling + name: cp14-species-name-tiefling roundStart: true prototype: CP14MobTiefling sprites: CP14MobTieflingSprites diff --git a/Resources/Textures/_CP14/Mobs/Customization/elf_ears.rsi/ears3_broken.png b/Resources/Textures/_CP14/Mobs/Customization/elf_ears.rsi/ears3_broken.png index bb1a9b8f4ae10d06ba8b7959bf0311af8e5be6bc..c83bcfec9e5ce35793b51f0c34b1a9b86295e286 100644 GIT binary patch delta 146 zcmdnaxSMf;VSTBmi(^Q|oVT|&@-{p0uwDrMHouuojj{9Bsms0(&q*qB$_RPhTb*0~ zy-br~kC>pOVCA-F(VtJ7=;!m!d#0NG`mk7M$C|az)qg4%F*1O`kLs;o*Q~w&jHfnj v{_%;+YNPwN#Ae;UX7ouPqTs=E8^%{wAy+;2*mE&(1GRX%`njxgN@xNAN}fGP delta 142 zcmdnZxSer=VSS;ei(^Q|oVT|&@-{p0uwDrMHouuojj{9Bsms0(&)rl|Q1B9Xe|6jb z>fIs?+gx4TT;{FanO!G&Ec5z<#5tR`)!kGQoVfMtpHMpn2Px%IY~r8R9J=0S21YYKoosW1Emx}D8+4-NI`?a?qq186gp(hpwP*fu9>nG51XK&YW5qXm`7r z8!XQ*gYp2^aagrd#=wv8^~?LIV|d!R2HAClEUS_eX?;SLhG+-CR7K=EiR6TEOp<^s zBPt@4GC-4uK@7__W}f*xy9}9|kfJB_`a@2XCKm0$cu8ExnYuHy1OWHZcg{Tw{3y|v z_8IsQI_I9$r?3Dbry4I?f3d%Lcv2z}3ll(*t3t9ew^~NK+bwych>w{|K-MHgCOhjY#Dv1{fki=EKwceq zZ~>3{CY(i9lpIhjL?UFVE}DKoBLiZE6K_57+uhwzx&gHXh~$=Spk6b1k?}?m#6K&# zB9xY(S}7w8V!T*h!W;7?TE`dstWR3@^G5@JhyQSM`ybUxS(RV?QM&cvBacc}X!7h& Z7I)sn5#@p7R9pZ6002ovPDHLkV1gc`B-a1{ literal 0 HcmV?d00001 diff --git a/Resources/Textures/_CP14/Mobs/Species/Elf/parts.rsi/head_f.png b/Resources/Textures/_CP14/Mobs/Species/Elf/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/Elf/parts.rsi/l_arm.png b/Resources/Textures/_CP14/Mobs/Species/Elf/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/Elf/parts.rsi/l_foot.png b/Resources/Textures/_CP14/Mobs/Species/Elf/parts.rsi/l_foot.png new file mode 100644 index 0000000000000000000000000000000000000000..045448afd6e6c11824ecbd46b3809bf001424e02 GIT binary patch literal 389 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D%z?LA!_Ln`LH zy>-xw$x-I`$N3kPQ@FY>?5%1E_`v!tN%qsLqm!>EyxhR@Tj*{V->rkYSxN;Q4|=o8 zi60Kw&i=tn_Eal}Q?ZZPKKY1!#n&ExaIajdG2ifoG>gTe~DWM4fkbkP7 literal 0 HcmV?d00001 diff --git a/Resources/Textures/_CP14/Mobs/Species/Elf/parts.rsi/l_hand.png b/Resources/Textures/_CP14/Mobs/Species/Elf/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/Elf/parts.rsi/l_leg.png b/Resources/Textures/_CP14/Mobs/Species/Elf/parts.rsi/l_leg.png new file mode 100644 index 0000000000000000000000000000000000000000..7e045922af8422e63d72bda74cc6411694d9ff5a GIT binary patch literal 382 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D%zEj(QuLn`LH zy|vNnaDd3MkHLi}n7?dWxbVVJNAp6V!Y_d_b7HtJIda*BJfCoJt?Vw2htsZoVLT_s z&MvO&`Oa|Rum5jjeNKy)H{71HR^YaOcP1#qhHdBoiDDLW``dG#AtTiw1jPuL({>;hRINhu0eRMQ8!~qNp zHS4=C{!lvGblqeo&&n+I_e@>A{BhP5Mk=37H{{$d+A3yVB^s)`SmTxHNsCn%MF)V_wSdI0lA) ZQ~BQ%CPxUmy7PnV^mO%eS?83{1OV*Px$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>#?fmbNU}0u`iofldvYfblIgP zN0*0-sQ>%&W|a^xN6*=~Q(w>KzKfatSx2h>SXJHc3k6?vJ+tm^z4G=>zRrYlO+Nl_ zTkdDP`twQY`{rVC!`nBtMD>05GkL!H&NlTl$V*_*;L3XJ*ZGIj`yVZtu=(U#B{NO$ zgf;e7me+p2_D-x`7s{-nS(A}%^fR)wr(S2S`dySx*8@ty6mWRA(!==+gw t%YvTf9k~BsuqL`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/Elf/parts.rsi/r_leg.png b/Resources/Textures/_CP14/Mobs/Species/Elf/parts.rsi/r_leg.png new file mode 100644 index 0000000000000000000000000000000000000000..1414e70d15e09a0b2019854fb90e2b7d54a16e7d GIT binary patch literal 396 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D%z-8@|!Ln`LH zy|vNnaDd3MkHQ}Xi*6?f?y`8H=BLzW*VR2aTOmcG)h5JUbMBF~vb#jQRC0eYl<)S7 zY~lOhVEFbF`U&W`jU_%H~6n*>{t67S)~?IyH6Mhrf@D3lxEZ)oP^- zk5ks@@@mZ%&D$7bnZ5Q^;|gYpMZvMv*DF{*6x6Hle)Zz+67RFV+0Q?5CG5R<%0%+y z+muCF*II8#RMu8asg3l?=_%j)O5ecOZPq5gO!-q=&-XvClsfx4Y}q^Kjws;4$NM=y8d^hN5=Mp|5q|^xVCHkd-=%xZHmu6h-G=cmUSrh zQt|lC7_gVo_gC%Se@a3*;xA+mEVN?DymQRPfARL|&oz#0-NU@%^<~%Gr081KGiM9< lyfP};6MSq|2rDsMI41v7ATw6i_0K1e-JY&~F6*2UngIP?sapU5 literal 0 HcmV?d00001 diff --git a/Resources/Textures/_CP14/Mobs/Species/Elf/parts.rsi/torso_f.png b/Resources/Textures/_CP14/Mobs/Species/Elf/parts.rsi/torso_f.png new file mode 100644 index 0000000000000000000000000000000000000000..d252de33c8f6e0c41aa4dd37cbbb0165f03ea932 GIT binary patch literal 769 zcmV+c1OEJpP)Px%yGcYrRCt{2+COU|K^O+`C&v}}0NF$mIBbN|Cdq}AA%V0CL6Q^~Nu9%%l|z<%@JQ7(Rbxc61> zm$!ZIWXR-`CZN%5!{`r@KQB15?Y`e=w#glk$+vmSVdnz?E-tS`u~ZiI+dE-dmZ;y} ziDIcNE-tS^{RFV7nl3EM5|(9&meFy_s-{cjlU4u#49sVwQ%P*DtpWfx*H)2EB{49c zW%7M_X+M}2X#(~RG9$b2OZ7oJ$>v1n_-Jfh=J*IF*&I2ayaE#Om@{zu6)^fkB;qk@ zQ&J|q>aweW^f3qk%JK>xAMWvcdBu6m>~*2I?uV)V^B1-@*2k7*kS5@!^kWWy0D!~8 zJzQVkIJd6)P?^0h>J!Q`Lho?UPO>?%pePvh2QbYiD9QqsB1?EOO?s@uYj$MbyTV~B;v7|{6V47Y$Fkmp;E0m z=YoDn?*VT1e$Z$Zf@p5)ydaQPK&4s>EI2IGK2E&??A^UsDhuyXxcxSml}fdSbSgQr z2bjGsJ|FDQ{($smqEhwr00000NkvXXu0mjfn4@SC literal 0 HcmV?d00001 diff --git a/Resources/Textures/_CP14/Mobs/Species/Elf/parts.rsi/torso_m.png b/Resources/Textures/_CP14/Mobs/Species/Elf/parts.rsi/torso_m.png new file mode 100644 index 0000000000000000000000000000000000000000..da0175612629f7db05f7c67b6cf331b61bad2de7 GIT binary patch literal 660 zcmV;F0&D$=P)Px%PDw;TRCt{2+OclhKo|$`f2s~VK%5|~R4kR+ZfVppZxEykwHex~bC(Y35UG;Y z0afzWrAr^6VhAXTl)OPUP|1)4kXS4tBf{|jY}e`B<6=_2i)}#qehY`s_<#P+V8j71 z#u#IavHz>q>hdA|N#u8fer!fJ=u4aYHOkJD$wUUj5uO#F+<9F$=*wb$1G!v|bWCc# zY6rtnw7r<$h}zVAaskY6a}Ze-K#fB`d7J#ll$}+e8LIcEDeiBR=C=c+#~?M`p1_-5NCpHu)dbe`?Yj$D96y9vXntzU`yb_!Af zt}d^q-e>x(x0(%HU0z!aVqRk*u;se3eOs=Ju@K~AT3rF^#MKOBdHK(}3*2{ixDV+z z2mnsOMXTAsP2t~6h(QRa5I-|XJO6Wm-JR{&whdANPHMl`07wAX-+zsxqm$@S>ra&! zggBqkwvqaPllJNJ7rE{@xEz9h>=0jD^6jpFdXad>CVlF~%5Uj4{R-V@uAf z_*Q>JNL#g5mtMsukBjuPxL5I|cX$v5>V54_58uCi&E!{Euj0!W&!0|hE0^|AE&%`} zWgO&%5j{}%^3{kOZo{ki^25jX)+<4##1==B8c^0*a~D9r{7s8k8lRQv9Ug%4S&+yT zkmc+row;)V4@erR0LQ0iX^kT>)G^L|7f_$>)mmMeOX0ga+nE;U`1B0r(%zjVaWM$- u?(LiG7f2WJ#b_D7j4{R-V~jDzR>xmbVFZW9&$KK60000