diff --git a/Content.Client/Clothing/ClientClothingSystem.cs b/Content.Client/Clothing/ClientClothingSystem.cs index cad0984233..7e657198af 100644 --- a/Content.Client/Clothing/ClientClothingSystem.cs +++ b/Content.Client/Clothing/ClientClothingSystem.cs @@ -331,7 +331,19 @@ public sealed class ClientClothingSystem : ClothingSystem continue; } - var displacementLayer = _serialization.CreateCopy(displacementData.Layer, notNullableOverride: true); + //CP14 48*48 displacement maps support + var displacementDataLayer = displacementData.Layer; + var actualRSI = sprite.LayerGetActualRSI(index); + if (actualRSI != null) + { + var layerSize = actualRSI.Size; + if (layerSize.X == 48 && displacementData.Layer48 != null) + displacementDataLayer = displacementData.Layer48; + } + + var displacementLayer = _serialization.CreateCopy(displacementDataLayer, notNullableOverride: true); + //CP14 48*48 displacement maps support end + displacementLayer.CopyToShaderParameters!.LayerKey = key; // Add before main layer for this item. diff --git a/Content.Client/Hands/Systems/HandsSystem.cs b/Content.Client/Hands/Systems/HandsSystem.cs index 7319b97b42..f039385c4a 100644 --- a/Content.Client/Hands/Systems/HandsSystem.cs +++ b/Content.Client/Hands/Systems/HandsSystem.cs @@ -15,6 +15,7 @@ using Robust.Client.UserInterface; using Robust.Shared.Containers; using Robust.Shared.GameStates; using Robust.Shared.Player; +using Robust.Shared.Serialization.Manager; using Robust.Shared.Timing; namespace Content.Client.Hands.Systems @@ -28,6 +29,7 @@ namespace Content.Client.Hands.Systems [Dependency] private readonly SharedContainerSystem _containerSystem = default!; [Dependency] private readonly StrippableSystem _stripSys = default!; [Dependency] private readonly ExamineSystem _examine = default!; + [Dependency] private readonly ISerializationManager _serialization = default!; //CP14 public event Action? OnPlayerAddHand; public event Action? OnPlayerRemoveHand; @@ -322,6 +324,8 @@ namespace Content.Client.Hands.Systems return; } + var displacementData = handComp.Displacements.GetValueOrDefault("Hands"); //CP14 hands displacements + // add the new layers foreach (var (key, layerData) in ev.Layers) { @@ -345,6 +349,39 @@ namespace Content.Client.Hands.Systems } sprite.LayerSetData(index, layerData); + + //CP14 Hands displacement maps + if (displacementData != null) + { + if (displacementData.ShaderOverride != null) + sprite.LayerSetShader(index, displacementData.ShaderOverride); + + var displacementKey = $"{key}-displacement"; + if (!revealedLayers.Add(displacementKey)) + { + Log.Warning($"Duplicate key for inhand layers DISPLACEMENT: {displacementKey}."); + continue; + } + + var displacementDataLayer = displacementData.Layer; + var actualRSI = sprite.LayerGetActualRSI(index); + if (actualRSI != null) + { + var layerSize = actualRSI.Size; + if (layerSize.X == 48 && displacementData.Layer48 != null) + displacementDataLayer = displacementData.Layer48; + } + + var displacementLayer = _serialization.CreateCopy(displacementDataLayer, notNullableOverride: true); + displacementLayer.CopyToShaderParameters!.LayerKey = key; + + // Add before main layer for this item. + sprite.AddLayer(displacementLayer, index); + sprite.LayerMapSet(displacementKey, index); + + revealedLayers.Add(displacementKey); + } + //CP14 Hands displacement maps - end } RaiseLocalEvent(held, new HeldVisualsUpdatedEvent(uid, revealedLayers), true); diff --git a/Content.Shared/Hands/Components/HandsComponent.cs b/Content.Shared/Hands/Components/HandsComponent.cs index 919d55f294..e65d2de5a1 100644 --- a/Content.Shared/Hands/Components/HandsComponent.cs +++ b/Content.Shared/Hands/Components/HandsComponent.cs @@ -1,4 +1,5 @@ using Content.Shared.Hands.EntitySystems; +using Content.Shared.Inventory; using Robust.Shared.Containers; using Robust.Shared.GameStates; using Robust.Shared.Serialization; @@ -76,6 +77,12 @@ public sealed partial class HandsComponent : Component /// [DataField, ViewVariables(VVAccess.ReadWrite)] public TimeSpan ThrowCooldown = TimeSpan.FromSeconds(0.5f); + + /// + /// CP14 Hands displacements + /// + [DataField] + public Dictionary Displacements = []; } [Serializable, NetSerializable] diff --git a/Content.Shared/Inventory/InventoryComponent.cs b/Content.Shared/Inventory/InventoryComponent.cs index 02b3a5b258..fc2becedd9 100644 --- a/Content.Shared/Inventory/InventoryComponent.cs +++ b/Content.Shared/Inventory/InventoryComponent.cs @@ -24,6 +24,9 @@ public sealed partial class InventoryComponent : Component [DataField(required: true)] public PrototypeLayerData Layer = default!; + [DataField] + public PrototypeLayerData? Layer48; //CP14 48*48 displacement support + [DataField] public string? ShaderOverride = "DisplacedStencilDraw"; } diff --git a/Resources/Locale/en-US/_CP14/markings/goblin-ears.ftl b/Resources/Locale/en-US/_CP14/markings/goblin-ears.ftl new file mode 100644 index 0000000000..fc3c62dfcb --- /dev/null +++ b/Resources/Locale/en-US/_CP14/markings/goblin-ears.ftl @@ -0,0 +1,3 @@ +marking-CP14GoblinEars = Big ear +marking-CP14GoblinEars2 = Lop-eared +marking-CP14GoblinEars3 = Rounded \ No newline at end of file diff --git a/Resources/Locale/en-US/_CP14/markings/goblin-hair.ftl b/Resources/Locale/en-US/_CP14/markings/goblin-hair.ftl new file mode 100644 index 0000000000..3d61300da5 --- /dev/null +++ b/Resources/Locale/en-US/_CP14/markings/goblin-hair.ftl @@ -0,0 +1,3 @@ +marking-CP14GoblinHairAntenna = Unruly Strands +marking-CP14GoblinHairBedHead2 = Bedhead 2 +marking-CP14GoblinHairDoubleBun = Double Bun \ No newline at end of file diff --git a/Resources/Locale/en-US/_CP14/markings/goblin-nose.ftl b/Resources/Locale/en-US/_CP14/markings/goblin-nose.ftl new file mode 100644 index 0000000000..f2fe04a07e --- /dev/null +++ b/Resources/Locale/en-US/_CP14/markings/goblin-nose.ftl @@ -0,0 +1,3 @@ +marking-CP14GoblinNose = Large nostrils +marking-CP14GoblinNose2 = Hook +marking-CP14GoblinNose3 = Proud dopey \ 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 79ce1f5935..58b71fa8bc 100644 --- a/Resources/Locale/en-US/_CP14/species/species-names.ftl +++ b/Resources/Locale/en-US/_CP14/species/species-names.ftl @@ -477,4 +477,60 @@ 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 +cp14-species-name-elf-last-18 = Galfre + +# GOBLIN + +cp14-species-name-goblin-male-first-1 = Aruguet +cp14-species-name-goblin-male-first-2 = Vanii +cp14-species-name-goblin-male-first-3 = Vanon +cp14-species-name-goblin-male-first-4 = Vuudaraj +cp14-species-name-goblin-male-first-5 = Goodruun +cp14-species-name-goblin-male-first-6 = Daavn +cp14-species-name-goblin-male-first-7 = Dabrak +cp14-species-name-goblin-male-first-8 = Daghiyi +cp14-species-name-goblin-male-first-9 = Jazaal +cp14-species-name-goblin-male-first-10 = Dravduul +cp14-species-name-goblin-male-first-11 = Duulan +cp14-species-name-goblin-male-first-12 = Kallaad +cp14-species-name-goblin-male-first-13 = Krakuul +cp14-species-name-goblin-male-first-14 = Crootad +cp14-species-name-goblin-male-first-15 = Mazaan +cp14-species-name-goblin-male-first-16 = Munta +cp14-species-name-goblin-male-first-17 = Nasaar +cp14-species-name-goblin-male-first-18 = Rakari +cp14-species-name-goblin-male-first-19 = Rexyite +cp14-species-name-goblin-male-first-20 = Tarik +cp14-species-name-goblin-male-first-21 = Taruuzh +cp14-species-name-goblin-male-first-22 = Tuun +cp14-species-name-goblin-male-first-23 = Fenik +cp14-species-name-goblin-male-first-24 = Chetin +cp14-species-name-goblin-male-first-25 = Haluun +cp14-species-name-goblin-male-first-26 = Haruuk + +cp14-species-name-goblin-female-first-1 = Aaspar +cp14-species-name-goblin-female-first-2 = Aguus +cp14-species-name-goblin-female-first-3 = Belaluur +cp14-species-name-goblin-female-first-4 = Vali +cp14-species-name-goblin-female-first-5 = Vuun +cp14-species-name-goblin-female-first-6 = Grail +cp14-species-name-goblin-female-first-7 = Gaduul +cp14-species-name-goblin-female-first-8 = Denaal +cp14-species-name-goblin-female-first-9 = Jaluum +cp14-species-name-goblin-female-first-10 = Draraar +cp14-species-name-goblin-female-first-11 = Duusha +cp14-species-name-goblin-female-first-12 = Kelaal +cp14-species-name-goblin-female-first-13 = Mulaan +cp14-species-name-goblin-female-first-14 = Nasri +cp14-species-name-goblin-female-first-15 = Razu +cp14-species-name-goblin-female-first-16 = Ralin +cp14-species-name-goblin-female-first-17 = Rexin +cp14-species-name-goblin-female-first-18 = Senen +cp14-species-name-goblin-female-first-19 = Tajin +cp14-species-name-goblin-female-first-20 = Tuner +cp14-species-name-goblin-female-first-21 = Hashak +cp14-species-name-goblin-female-first-22 = Shadruor +cp14-species-name-goblin-female-first-23 = Ehaas +cp14-species-name-goblin-female-first-24 = Eluun + +cp14-species-name-goblin-last-1 = "" \ 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 39c356bd26..7fd42389e6 100644 --- a/Resources/Locale/en-US/_CP14/species/species.ftl +++ b/Resources/Locale/en-US/_CP14/species/species.ftl @@ -1,4 +1,5 @@ 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 +cp14-species-name-elf = Elf +cp14-species-name-goblin = Goblin \ No newline at end of file diff --git a/Resources/Locale/ru-RU/_CP14/markings/goblin-ears.ftl b/Resources/Locale/ru-RU/_CP14/markings/goblin-ears.ftl new file mode 100644 index 0000000000..eaad878d7a --- /dev/null +++ b/Resources/Locale/ru-RU/_CP14/markings/goblin-ears.ftl @@ -0,0 +1,3 @@ +marking-CP14GoblinEars = Большой ух +marking-CP14GoblinEars2 = Вислоухий +marking-CP14GoblinEars3 = Округления \ No newline at end of file diff --git a/Resources/Locale/ru-RU/_CP14/markings/goblin-hair.ftl b/Resources/Locale/ru-RU/_CP14/markings/goblin-hair.ftl new file mode 100644 index 0000000000..4fe3574bda --- /dev/null +++ b/Resources/Locale/ru-RU/_CP14/markings/goblin-hair.ftl @@ -0,0 +1,3 @@ +marking-CP14GoblinHairAntenna = Непослушные пряди +marking-CP14GoblinHairBedHead2 = С бодуна 2 +marking-CP14GoblinHairDoubleBun = Два пунпона \ No newline at end of file diff --git a/Resources/Locale/ru-RU/_CP14/markings/goblin-nose.ftl b/Resources/Locale/ru-RU/_CP14/markings/goblin-nose.ftl new file mode 100644 index 0000000000..acbd4363c5 --- /dev/null +++ b/Resources/Locale/ru-RU/_CP14/markings/goblin-nose.ftl @@ -0,0 +1,3 @@ +marking-CP14GoblinNose = Большие ноздри +marking-CP14GoblinNose2 = Крючок +marking-CP14GoblinNose3 = Гордый торчок \ 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 0ba8c558d7..ee0b3ca171 100644 --- a/Resources/Locale/ru-RU/_CP14/species/species-names.ftl +++ b/Resources/Locale/ru-RU/_CP14/species/species-names.ftl @@ -479,4 +479,60 @@ 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 +cp14-species-name-elf-last-18 = Гальфре + +# GOBLIN + +cp14-species-name-goblin-male-first-1 = Аругет +cp14-species-name-goblin-male-first-2 = Вании +cp14-species-name-goblin-male-first-3 = Ванон +cp14-species-name-goblin-male-first-4 = Вуударадж +cp14-species-name-goblin-male-first-5 = Гудруун +cp14-species-name-goblin-male-first-6 = Даавн +cp14-species-name-goblin-male-first-7 = Дабрак +cp14-species-name-goblin-male-first-8 = Дагии +cp14-species-name-goblin-male-first-9 = Джазаал +cp14-species-name-goblin-male-first-10 = Древдуул +cp14-species-name-goblin-male-first-11 = Дуулан +cp14-species-name-goblin-male-first-12 = Каллаад +cp14-species-name-goblin-male-first-13 = Кракуул +cp14-species-name-goblin-male-first-14 = Кроотад +cp14-species-name-goblin-male-first-15 = Мазаан +cp14-species-name-goblin-male-first-16 = Мунта +cp14-species-name-goblin-male-first-17 = Насаар +cp14-species-name-goblin-male-first-18 = Ракари +cp14-species-name-goblin-male-first-19 = Рексиит +cp14-species-name-goblin-male-first-20 = Тарик +cp14-species-name-goblin-male-first-21 = Тарууж +cp14-species-name-goblin-male-first-22 = Туун +cp14-species-name-goblin-male-first-23 = Феник +cp14-species-name-goblin-male-first-24 = Четин +cp14-species-name-goblin-male-first-25 = Халуун +cp14-species-name-goblin-male-first-26 = Харуук + +cp14-species-name-goblin-female-first-1 = Ааспар +cp14-species-name-goblin-female-first-2 = Агуус +cp14-species-name-goblin-female-first-3 = Белалуур +cp14-species-name-goblin-female-first-4 = Вали +cp14-species-name-goblin-female-first-5 = Вуун +cp14-species-name-goblin-female-first-6 = Грааль +cp14-species-name-goblin-female-first-7 = Гадуул +cp14-species-name-goblin-female-first-8 = Денаал +cp14-species-name-goblin-female-first-9 = Джелуум +cp14-species-name-goblin-female-first-10 = Драраар +cp14-species-name-goblin-female-first-11 = Дууша +cp14-species-name-goblin-female-first-12 = Келаал +cp14-species-name-goblin-female-first-13 = Мулаан +cp14-species-name-goblin-female-first-14 = Насри +cp14-species-name-goblin-female-first-15 = Разу +cp14-species-name-goblin-female-first-16 = Ралин +cp14-species-name-goblin-female-first-17 = Рексин +cp14-species-name-goblin-female-first-18 = Сенен +cp14-species-name-goblin-female-first-19 = Таджин +cp14-species-name-goblin-female-first-20 = Тюнер +cp14-species-name-goblin-female-first-21 = Хашак +cp14-species-name-goblin-female-first-22 = Шедруор +cp14-species-name-goblin-female-first-23 = Эхаас +cp14-species-name-goblin-female-first-24 = Элуун + +cp14-species-name-goblin-last-1 = "" \ 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 0a5432f86e..ab5887d14f 100644 --- a/Resources/Locale/ru-RU/_CP14/species/species.ftl +++ b/Resources/Locale/ru-RU/_CP14/species/species.ftl @@ -1,4 +1,5 @@ cp14-species-name-human = Человек cp14-species-name-tiefling = Тифлинг cp14-species-name-dwarf = Дварф -cp14-species-name-elf = Эльф \ No newline at end of file +cp14-species-name-elf = Эльф +cp14-species-name-goblin = Гоблин \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Datasets/Names/species-names.yml b/Resources/Prototypes/_CP14/Datasets/Names/species-names.yml index ed1bae624f..30f3304a90 100644 --- a/Resources/Prototypes/_CP14/Datasets/Names/species-names.yml +++ b/Resources/Prototypes/_CP14/Datasets/Names/species-names.yml @@ -77,4 +77,24 @@ id: CP14_Names_Elf_Last values: prefix: cp14-species-name-elf-last- - count: 18 \ No newline at end of file + count: 18 + +# Goblin + +- type: localizedDataset + id: CP14_Names_Goblin_Male_First + values: + prefix: cp14-species-name-goblin-male-first- + count: 26 + +- type: localizedDataset + id: CP14_Names_Goblin_Female_First + values: + prefix: cp14-species-name-goblin-female-first- + count: 24 + +- type: localizedDataset + id: CP14_Names_Goblin_Last + values: + prefix: cp14-species-name-goblin-last- + count: 1 \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Entities/Mobs/Customization/Markings/goblin_ears.yml b/Resources/Prototypes/_CP14/Entities/Mobs/Customization/Markings/goblin_ears.yml new file mode 100644 index 0000000000..ef25a45dbd --- /dev/null +++ b/Resources/Prototypes/_CP14/Entities/Mobs/Customization/Markings/goblin_ears.yml @@ -0,0 +1,32 @@ +- type: marking + id: CP14GoblinEars + bodyPart: HeadTop + markingCategory: HeadTop + followSkinColor: true + forcedColoring: true + speciesRestriction: [ CP14Goblin ] + sprites: + - sprite: _CP14/Mobs/Customization/goblin_ears.rsi + state: ears1 + +- type: marking + id: CP14GoblinEars2 + bodyPart: HeadTop + markingCategory: HeadTop + followSkinColor: true + forcedColoring: true + speciesRestriction: [ CP14Goblin ] + sprites: + - sprite: _CP14/Mobs/Customization/goblin_ears.rsi + state: ears2 + +- type: marking + id: CP14GoblinEars3 + bodyPart: HeadTop + markingCategory: HeadTop + followSkinColor: true + forcedColoring: true + speciesRestriction: [ CP14Goblin ] + sprites: + - sprite: _CP14/Mobs/Customization/goblin_ears.rsi + state: ears3 \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Entities/Mobs/Customization/Markings/goblin_hairs.yml b/Resources/Prototypes/_CP14/Entities/Mobs/Customization/Markings/goblin_hairs.yml new file mode 100644 index 0000000000..db13523cd1 --- /dev/null +++ b/Resources/Prototypes/_CP14/Entities/Mobs/Customization/Markings/goblin_hairs.yml @@ -0,0 +1,26 @@ +- type: marking + id: CP14GoblinHairAntenna + bodyPart: Hair + markingCategory: Hair + speciesRestriction: [ CP14Goblin ] + sprites: + - sprite: _CP14/Mobs/Customization/goblin_hair.rsi + state: antenna + +- type: marking + id: CP14GoblinHairBedHead2 + bodyPart: Hair + markingCategory: Hair + speciesRestriction: [ CP14Goblin ] + sprites: + - sprite: _CP14/Mobs/Customization/goblin_hair.rsi + state: bedheadv2 + +- type: marking + id: CP14GoblinHairDoubleBun + bodyPart: Hair + markingCategory: Hair + speciesRestriction: [ CP14Goblin ] + sprites: + - sprite: _CP14/Mobs/Customization/goblin_hair.rsi + state: doublebun \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Entities/Mobs/Customization/Markings/goblin_nose.yml b/Resources/Prototypes/_CP14/Entities/Mobs/Customization/Markings/goblin_nose.yml new file mode 100644 index 0000000000..b99e310cd7 --- /dev/null +++ b/Resources/Prototypes/_CP14/Entities/Mobs/Customization/Markings/goblin_nose.yml @@ -0,0 +1,32 @@ +- type: marking + id: CP14GoblinNose + bodyPart: Snout + markingCategory: Snout + followSkinColor: true + forcedColoring: true + speciesRestriction: [ CP14Goblin ] + sprites: + - sprite: _CP14/Mobs/Customization/goblin_nose.rsi + state: nose1 + +- type: marking + id: CP14GoblinNose2 + bodyPart: Snout + markingCategory: Snout + followSkinColor: true + forcedColoring: true + speciesRestriction: [ CP14Goblin ] + sprites: + - sprite: _CP14/Mobs/Customization/goblin_nose.rsi + state: nose2 + +- type: marking + id: CP14GoblinNose3 + bodyPart: Snout + markingCategory: Snout + followSkinColor: true + forcedColoring: true + speciesRestriction: [ CP14Goblin ] + sprites: + - sprite: _CP14/Mobs/Customization/goblin_nose.rsi + state: nose3 \ 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 5e17561181..fdce8373e5 100644 --- a/Resources/Prototypes/_CP14/Entities/Mobs/Customization/Markings/tiefling_horns.yml +++ b/Resources/Prototypes/_CP14/Entities/Mobs/Customization/Markings/tiefling_horns.yml @@ -12,6 +12,7 @@ id: CP14TieflingHorns2 bodyPart: HeadTop markingCategory: HeadTop + speciesRestriction: [ CP14Tiefling ] followSkinColor: true sprites: - sprite: _CP14/Mobs/Customization/tiefling_horns.rsi @@ -21,6 +22,7 @@ id: CP14TieflingHorns3 bodyPart: HeadTop markingCategory: HeadTop + speciesRestriction: [ CP14Tiefling ] followSkinColor: true sprites: - sprite: _CP14/Mobs/Customization/tiefling_horns.rsi @@ -30,6 +32,7 @@ id: CP14TieflingHorns3Broken bodyPart: HeadTop markingCategory: HeadTop + speciesRestriction: [ CP14Tiefling ] followSkinColor: true sprites: - sprite: _CP14/Mobs/Customization/tiefling_horns.rsi @@ -39,6 +42,7 @@ id: CP14TieflingHorns4 bodyPart: HeadTop markingCategory: HeadTop + speciesRestriction: [ CP14Tiefling ] followSkinColor: true sprites: - sprite: _CP14/Mobs/Customization/tiefling_horns.rsi @@ -48,6 +52,7 @@ id: CP14TieflingHorns5 bodyPart: HeadTop markingCategory: HeadTop + speciesRestriction: [ CP14Tiefling ] followSkinColor: true sprites: - sprite: _CP14/Mobs/Customization/tiefling_horns.rsi @@ -57,6 +62,7 @@ id: CP14TieflingHorns5Broken bodyPart: HeadTop markingCategory: HeadTop + speciesRestriction: [ CP14Tiefling ] followSkinColor: true sprites: - sprite: _CP14/Mobs/Customization/tiefling_horns.rsi @@ -66,6 +72,7 @@ id: CP14TieflingHorns6 bodyPart: HeadTop markingCategory: HeadTop + speciesRestriction: [ CP14Tiefling ] followSkinColor: true sprites: - sprite: _CP14/Mobs/Customization/tiefling_horns.rsi @@ -75,6 +82,7 @@ id: CP14TieflingHorns7 bodyPart: HeadTop markingCategory: HeadTop + speciesRestriction: [ CP14Tiefling ] followSkinColor: true sprites: - sprite: _CP14/Mobs/Customization/tiefling_horns.rsi diff --git a/Resources/Prototypes/_CP14/Entities/Mobs/Player/goblin.yml b/Resources/Prototypes/_CP14/Entities/Mobs/Player/goblin.yml new file mode 100644 index 0000000000..773d89c946 --- /dev/null +++ b/Resources/Prototypes/_CP14/Entities/Mobs/Player/goblin.yml @@ -0,0 +1,4 @@ +- type: entity + save: false + parent: CP14BaseMobGoblin + id: CP14MobGoblin diff --git a/Resources/Prototypes/_CP14/Entities/Mobs/Species/goblin.yml b/Resources/Prototypes/_CP14/Entities/Mobs/Species/goblin.yml new file mode 100644 index 0000000000..bafbd574e1 --- /dev/null +++ b/Resources/Prototypes/_CP14/Entities/Mobs/Species/goblin.yml @@ -0,0 +1,205 @@ +- type: entity + parent: CP14BaseMobSpeciesOrganic + id: CP14BaseMobGoblin + name: Mr. Goblin + abstract: true + components: + - type: HumanoidAppearance + species: CP14Goblin + - type: Hunger + - type: Icon + sprite: _CP14/Mobs/Species/Goblin/parts.rsi + state: full + - type: Thirst + - type: Butcherable + butcheringType: Spike + spawned: + - id: FoodMeatHuman + amount: 5 + - type: Body + prototype: CP14Human + requiredLegs: 2 + - type: Bloodstream + bloodReagent: CP14Blood + - type: Hands + displacements: + Hands: + layer: + sprite: _CP14/Mobs/Species/Goblin/displacement.rsi + state: hands + copyToShaderParameters: + layerKey: dummy + parameterTexture: displacementMap + parameterUV: displacementUV + - type: Inventory + templateId: CP14Human + displacements: + belt: + layer: + sprite: _CP14/Mobs/Species/Goblin/displacement.rsi + state: belt + copyToShaderParameters: + layerKey: dummy + parameterTexture: displacementMap + parameterUV: displacementUV + cloak: + layer: + sprite: _CP14/Mobs/Species/Goblin/displacement.rsi + state: cloak + copyToShaderParameters: + layerKey: dummy + parameterTexture: displacementMap + parameterUV: displacementUV + eyes: + layer: + sprite: _CP14/Mobs/Species/Goblin/displacement.rsi + state: eyes + copyToShaderParameters: + layerKey: dummy + parameterTexture: displacementMap + parameterUV: displacementUV + gloves: + layer: + sprite: _CP14/Mobs/Species/Goblin/displacement.rsi + state: gloves + copyToShaderParameters: + layerKey: dummy + parameterTexture: displacementMap + parameterUV: displacementUV + head: + layer: + sprite: _CP14/Mobs/Species/Goblin/displacement.rsi + state: head + copyToShaderParameters: + layerKey: dummy + parameterTexture: displacementMap + parameterUV: displacementUV + layer48: + sprite: _CP14/Mobs/Species/Goblin/displacement48.rsi + state: head + copyToShaderParameters: + layerKey: dummy + parameterTexture: displacementMap + parameterUV: displacementUV + mask: + layer: + sprite: _CP14/Mobs/Species/Goblin/displacement.rsi + state: mask + copyToShaderParameters: + layerKey: dummy + parameterTexture: displacementMap + parameterUV: displacementUV + pants: + layer: + sprite: _CP14/Mobs/Species/Goblin/displacement.rsi + state: pants + copyToShaderParameters: + layerKey: dummy + parameterTexture: displacementMap + parameterUV: displacementUV + shirt: + layer: + sprite: _CP14/Mobs/Species/Goblin/displacement.rsi + state: shirt + copyToShaderParameters: + layerKey: dummy + parameterTexture: displacementMap + parameterUV: displacementUV + shoes: + layer: + sprite: _CP14/Mobs/Species/Goblin/displacement.rsi + state: shoes + copyToShaderParameters: + layerKey: dummy + parameterTexture: displacementMap + parameterUV: displacementUV + +- type: entity + parent: CP14BaseSpeciesDummy + id: CP14MobGoblinDummy + noSpawn: true + components: + - type: HumanoidAppearance + species: CP14Goblin + - type: Inventory + templateId: CP14Human + displacements: + belt: + layer: + sprite: _CP14/Mobs/Species/Goblin/displacement.rsi + state: belt + copyToShaderParameters: + layerKey: dummy + parameterTexture: displacementMap + parameterUV: displacementUV + cloak: + layer: + sprite: _CP14/Mobs/Species/Goblin/displacement.rsi + state: cloak + copyToShaderParameters: + layerKey: dummy + parameterTexture: displacementMap + parameterUV: displacementUV + eyes: + layer: + sprite: _CP14/Mobs/Species/Goblin/displacement.rsi + state: eyes + copyToShaderParameters: + layerKey: dummy + parameterTexture: displacementMap + parameterUV: displacementUV + gloves: + layer: + sprite: _CP14/Mobs/Species/Goblin/displacement.rsi + state: gloves + copyToShaderParameters: + layerKey: dummy + parameterTexture: displacementMap + parameterUV: displacementUV + head: + layer: + sprite: _CP14/Mobs/Species/Goblin/displacement.rsi + state: head + copyToShaderParameters: + layerKey: dummy + parameterTexture: displacementMap + parameterUV: displacementUV + layer48: + sprite: _CP14/Mobs/Species/Goblin/displacement48.rsi + state: head + copyToShaderParameters: + layerKey: dummy + parameterTexture: displacementMap + parameterUV: displacementUV + mask: + layer: + sprite: _CP14/Mobs/Species/Goblin/displacement.rsi + state: mask + copyToShaderParameters: + layerKey: dummy + parameterTexture: displacementMap + parameterUV: displacementUV + pants: + layer: + sprite: _CP14/Mobs/Species/Goblin/displacement.rsi + state: pants + copyToShaderParameters: + layerKey: dummy + parameterTexture: displacementMap + parameterUV: displacementUV + shirt: + layer: + sprite: _CP14/Mobs/Species/Goblin/displacement.rsi + state: shirt + copyToShaderParameters: + layerKey: dummy + parameterTexture: displacementMap + parameterUV: displacementUV + shoes: + layer: + sprite: _CP14/Mobs/Species/Goblin/displacement.rsi + state: shoes + copyToShaderParameters: + layerKey: dummy + parameterTexture: displacementMap + parameterUV: displacementUV \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Species/goblin.yml b/Resources/Prototypes/_CP14/Species/goblin.yml new file mode 100644 index 0000000000..68e097bbb5 --- /dev/null +++ b/Resources/Prototypes/_CP14/Species/goblin.yml @@ -0,0 +1,157 @@ +- type: species + id: CP14Goblin + name: cp14-species-name-goblin + roundStart: true + prototype: CP14MobGoblin + sprites: CP14MobGoblinSprites + markingLimits: CP14MobGoblinMarkingLimits + dollPrototype: CP14MobGoblinDummy + skinColoration: VoxFeathers + defaultSkinTone: "#74964d" + maleFirstNames: CP14_Names_Goblin_Male_First + femaleFirstNames: CP14_Names_Goblin_Female_First + lastNames: CP14_Names_Goblin_Last + +- type: speciesBaseSprites + id: CP14MobGoblinSprites + sprites: + Head: CP14MobGoblinHead + HeadTop: CP14MobGoblinMarkingMatchSkin + Hair: CP14MobGoblinAnyMarking + FacialHair: CP14MobGoblinAnyMarking + Snout: CP14MobGoblinMarkingMatchSkin + Chest: CP14MobGoblinTorso + Eyes: CP14MobGoblinEyes + LArm: CP14MobGoblinLArm + RArm: CP14MobGoblinRArm + LHand: CP14MobGoblinLHand + RHand: CP14MobGoblinRHand + LLeg: CP14MobGoblinLLeg + RLeg: CP14MobGoblinRLeg + LFoot: CP14MobGoblinLFoot + RFoot: CP14MobGoblinRFoot + +- type: markingPoints + id: CP14MobGoblinMarkingLimits + onlyWhitelisted: true + points: + Hair: + points: 1 + required: false + FacialHair: + points: 1 + required: false + Snout: + points: 1 + required: true + defaultMarkings: [ CP14GoblinNose ] + HeadTop: + points: 1 + required: true + defaultMarkings: [ CP14GoblinEars ] + Chest: + points: 1 + required: false + Legs: + points: 2 + required: false + Arms: + points: 2 + required: false + +- type: humanoidBaseSprite + id: CP14MobGoblinEyes + baseSprite: + sprite: _CP14/Mobs/Customization/eyes.rsi + state: goblin_eyes + +- type: humanoidBaseSprite + id: CP14MobGoblinAnyMarking + +- type: humanoidBaseSprite + id: CP14MobGoblinMarkingMatchSkin + markingsMatchSkin: true + +- type: humanoidBaseSprite + id: CP14MobGoblinHead + baseSprite: + sprite: _CP14/Mobs/Species/Goblin/parts.rsi + state: head_m + +- type: humanoidBaseSprite + id: CP14MobGoblinHeadMale + baseSprite: + sprite: _CP14/Mobs/Species/Goblin/parts.rsi + state: head_m + +- type: humanoidBaseSprite + id: CP14MobGoblinHeadFemale + baseSprite: + sprite: _CP14/Mobs/Species/Goblin/parts.rsi + state: head_f + +- type: humanoidBaseSprite + id: CP14MobGoblinTorso + baseSprite: + sprite: _CP14/Mobs/Species/Goblin/parts.rsi + state: torso_m + +- type: humanoidBaseSprite + id: CP14MobGoblinTorsoMale + baseSprite: + sprite: _CP14/Mobs/Species/Goblin/parts.rsi + state: torso_m + +- type: humanoidBaseSprite + id: CP14MobGoblinTorsoFemale + baseSprite: + sprite: _CP14/Mobs/Species/Goblin/parts.rsi + state: torso_f + +- type: humanoidBaseSprite + id: CP14MobGoblinLLeg + baseSprite: + sprite: _CP14/Mobs/Species/Goblin/parts.rsi + state: l_leg + +- type: humanoidBaseSprite + id: CP14MobGoblinLArm + baseSprite: + sprite: _CP14/Mobs/Species/Goblin/parts.rsi + state: l_arm + +- type: humanoidBaseSprite + id: CP14MobGoblinLHand + baseSprite: + sprite: _CP14/Mobs/Species/Goblin/parts.rsi + state: l_hand + +- type: humanoidBaseSprite + id: CP14MobGoblinLFoot + baseSprite: + sprite: _CP14/Mobs/Species/Goblin/parts.rsi + state: l_foot + +- type: humanoidBaseSprite + id: CP14MobGoblinRLeg + baseSprite: + sprite: _CP14/Mobs/Species/Goblin/parts.rsi + state: r_leg + +- type: humanoidBaseSprite + id: CP14MobGoblinRArm + baseSprite: + sprite: _CP14/Mobs/Species/Goblin/parts.rsi + state: r_arm + +- type: humanoidBaseSprite + id: CP14MobGoblinRHand + baseSprite: + sprite: _CP14/Mobs/Species/Goblin/parts.rsi + state: r_hand + +- type: humanoidBaseSprite + id: CP14MobGoblinRFoot + baseSprite: + sprite: _CP14/Mobs/Species/Goblin/parts.rsi + state: r_foot diff --git a/Resources/Textures/_CP14/Mobs/Customization/eyes.rsi/goblin_eyes.png b/Resources/Textures/_CP14/Mobs/Customization/eyes.rsi/goblin_eyes.png new file mode 100644 index 0000000000..064c92b7f7 Binary files /dev/null and b/Resources/Textures/_CP14/Mobs/Customization/eyes.rsi/goblin_eyes.png differ diff --git a/Resources/Textures/_CP14/Mobs/Customization/eyes.rsi/meta.json b/Resources/Textures/_CP14/Mobs/Customization/eyes.rsi/meta.json index ec44bd8409..ab3a011d2d 100644 --- a/Resources/Textures/_CP14/Mobs/Customization/eyes.rsi/meta.json +++ b/Resources/Textures/_CP14/Mobs/Customization/eyes.rsi/meta.json @@ -11,6 +11,10 @@ "name": "eyes", "directions": 4 }, + { + "name": "goblin_eyes", + "directions": 4 + }, { "name": "no_eyes" } diff --git a/Resources/Textures/_CP14/Mobs/Customization/goblin_ears.rsi/ears1.png b/Resources/Textures/_CP14/Mobs/Customization/goblin_ears.rsi/ears1.png new file mode 100644 index 0000000000..7d01e9aac0 Binary files /dev/null and b/Resources/Textures/_CP14/Mobs/Customization/goblin_ears.rsi/ears1.png differ diff --git a/Resources/Textures/_CP14/Mobs/Customization/goblin_ears.rsi/ears2.png b/Resources/Textures/_CP14/Mobs/Customization/goblin_ears.rsi/ears2.png new file mode 100644 index 0000000000..aadb01cde6 Binary files /dev/null and b/Resources/Textures/_CP14/Mobs/Customization/goblin_ears.rsi/ears2.png differ diff --git a/Resources/Textures/_CP14/Mobs/Customization/goblin_ears.rsi/ears3.png b/Resources/Textures/_CP14/Mobs/Customization/goblin_ears.rsi/ears3.png new file mode 100644 index 0000000000..6246e44163 Binary files /dev/null and b/Resources/Textures/_CP14/Mobs/Customization/goblin_ears.rsi/ears3.png differ diff --git a/Resources/Textures/_CP14/Mobs/Customization/goblin_ears.rsi/meta.json b/Resources/Textures/_CP14/Mobs/Customization/goblin_ears.rsi/meta.json new file mode 100644 index 0000000000..6ec23e1cce --- /dev/null +++ b/Resources/Textures/_CP14/Mobs/Customization/goblin_ears.rsi/meta.json @@ -0,0 +1,23 @@ +{ + "version": 1, + "license": "All rights reserved for the CrystallPunk14 project only", + "copyright": "Created by TheShuEd (Github) for CrystallPunk", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "ears1", + "directions": 4 + }, + { + "name": "ears2", + "directions": 4 + }, + { + "name": "ears3", + "directions": 4 + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/_CP14/Mobs/Customization/goblin_hair.rsi/antenna.png b/Resources/Textures/_CP14/Mobs/Customization/goblin_hair.rsi/antenna.png new file mode 100644 index 0000000000..43da1e53f1 Binary files /dev/null and b/Resources/Textures/_CP14/Mobs/Customization/goblin_hair.rsi/antenna.png differ diff --git a/Resources/Textures/_CP14/Mobs/Customization/goblin_hair.rsi/bedheadv2.png b/Resources/Textures/_CP14/Mobs/Customization/goblin_hair.rsi/bedheadv2.png new file mode 100644 index 0000000000..acdc34cbfd Binary files /dev/null and b/Resources/Textures/_CP14/Mobs/Customization/goblin_hair.rsi/bedheadv2.png differ diff --git a/Resources/Textures/_CP14/Mobs/Customization/goblin_hair.rsi/doublebun.png b/Resources/Textures/_CP14/Mobs/Customization/goblin_hair.rsi/doublebun.png new file mode 100644 index 0000000000..4c2c480081 Binary files /dev/null and b/Resources/Textures/_CP14/Mobs/Customization/goblin_hair.rsi/doublebun.png differ diff --git a/Resources/Textures/_CP14/Mobs/Customization/goblin_hair.rsi/meta.json b/Resources/Textures/_CP14/Mobs/Customization/goblin_hair.rsi/meta.json new file mode 100644 index 0000000000..d1be99b273 --- /dev/null +++ b/Resources/Textures/_CP14/Mobs/Customization/goblin_hair.rsi/meta.json @@ -0,0 +1,23 @@ +{ + "version": 1, + "license": "All rights reserved for the CrystallPunk14 project only", + "copyright": "Created by TheShuEd (Github) for CrystallPunk", + "size": { + "x": 48, + "y": 48 + }, + "states": [ + { + "name": "antenna", + "directions": 4 + }, + { + "name": "bedheadv2", + "directions": 4 + }, + { + "name": "doublebun", + "directions": 4 + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/_CP14/Mobs/Customization/goblin_nose.rsi/meta.json b/Resources/Textures/_CP14/Mobs/Customization/goblin_nose.rsi/meta.json new file mode 100644 index 0000000000..56bdee7445 --- /dev/null +++ b/Resources/Textures/_CP14/Mobs/Customization/goblin_nose.rsi/meta.json @@ -0,0 +1,23 @@ +{ + "version": 1, + "license": "All rights reserved for the CrystallPunk14 project only", + "copyright": "Created by TheShuEd (Github) for CrystallPunk", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "nose1", + "directions": 4 + }, + { + "name": "nose2", + "directions": 4 + }, + { + "name": "nose3", + "directions": 4 + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/_CP14/Mobs/Customization/goblin_nose.rsi/nose1.png b/Resources/Textures/_CP14/Mobs/Customization/goblin_nose.rsi/nose1.png new file mode 100644 index 0000000000..20889171d1 Binary files /dev/null and b/Resources/Textures/_CP14/Mobs/Customization/goblin_nose.rsi/nose1.png differ diff --git a/Resources/Textures/_CP14/Mobs/Customization/goblin_nose.rsi/nose2.png b/Resources/Textures/_CP14/Mobs/Customization/goblin_nose.rsi/nose2.png new file mode 100644 index 0000000000..671b8e5ebe Binary files /dev/null and b/Resources/Textures/_CP14/Mobs/Customization/goblin_nose.rsi/nose2.png differ diff --git a/Resources/Textures/_CP14/Mobs/Customization/goblin_nose.rsi/nose3.png b/Resources/Textures/_CP14/Mobs/Customization/goblin_nose.rsi/nose3.png new file mode 100644 index 0000000000..ef1c9730a9 Binary files /dev/null and b/Resources/Textures/_CP14/Mobs/Customization/goblin_nose.rsi/nose3.png differ diff --git a/Resources/Textures/_CP14/Mobs/Species/Goblin/displacement.rsi/belt.png b/Resources/Textures/_CP14/Mobs/Species/Goblin/displacement.rsi/belt.png new file mode 100644 index 0000000000..326b8b8a05 Binary files /dev/null and b/Resources/Textures/_CP14/Mobs/Species/Goblin/displacement.rsi/belt.png differ diff --git a/Resources/Textures/_CP14/Mobs/Species/Goblin/displacement.rsi/cloak.png b/Resources/Textures/_CP14/Mobs/Species/Goblin/displacement.rsi/cloak.png new file mode 100644 index 0000000000..01be96ed98 Binary files /dev/null and b/Resources/Textures/_CP14/Mobs/Species/Goblin/displacement.rsi/cloak.png differ diff --git a/Resources/Textures/_CP14/Mobs/Species/Goblin/displacement.rsi/eyes.png b/Resources/Textures/_CP14/Mobs/Species/Goblin/displacement.rsi/eyes.png new file mode 100644 index 0000000000..9589a09663 Binary files /dev/null and b/Resources/Textures/_CP14/Mobs/Species/Goblin/displacement.rsi/eyes.png differ diff --git a/Resources/Textures/_CP14/Mobs/Species/Goblin/displacement.rsi/gloves.png b/Resources/Textures/_CP14/Mobs/Species/Goblin/displacement.rsi/gloves.png new file mode 100644 index 0000000000..c56303e696 Binary files /dev/null and b/Resources/Textures/_CP14/Mobs/Species/Goblin/displacement.rsi/gloves.png differ diff --git a/Resources/Textures/_CP14/Mobs/Species/Goblin/displacement.rsi/hands.png b/Resources/Textures/_CP14/Mobs/Species/Goblin/displacement.rsi/hands.png new file mode 100644 index 0000000000..bb21f1063c Binary files /dev/null and b/Resources/Textures/_CP14/Mobs/Species/Goblin/displacement.rsi/hands.png differ diff --git a/Resources/Textures/_CP14/Mobs/Species/Goblin/displacement.rsi/head.png b/Resources/Textures/_CP14/Mobs/Species/Goblin/displacement.rsi/head.png new file mode 100644 index 0000000000..473dadefa3 Binary files /dev/null and b/Resources/Textures/_CP14/Mobs/Species/Goblin/displacement.rsi/head.png differ diff --git a/Resources/Textures/_CP14/Mobs/Species/Goblin/displacement.rsi/mask.png b/Resources/Textures/_CP14/Mobs/Species/Goblin/displacement.rsi/mask.png new file mode 100644 index 0000000000..8a7af6030c Binary files /dev/null and b/Resources/Textures/_CP14/Mobs/Species/Goblin/displacement.rsi/mask.png differ diff --git a/Resources/Textures/_CP14/Mobs/Species/Goblin/displacement.rsi/meta.json b/Resources/Textures/_CP14/Mobs/Species/Goblin/displacement.rsi/meta.json new file mode 100644 index 0000000000..f962bb5bec --- /dev/null +++ b/Resources/Textures/_CP14/Mobs/Species/Goblin/displacement.rsi/meta.json @@ -0,0 +1,54 @@ +{ + "version": 1, + "license": "All rights reserved for the CrystallPunk14 project only", + "copyright": "Created by TheShuEd (Github) for CrystallPunk14", + "size": { + "x": 32, + "y": 32 + }, + "load": { + "srgb": false + }, + "states": [ + { + "name": "belt", + "directions": 4 + }, + { + "name": "cloak", + "directions": 4 + }, + { + "name": "eyes", + "directions": 4 + }, + { + "name": "gloves", + "directions": 4 + }, + { + "name": "hands", + "directions": 4 + }, + { + "name": "head", + "directions": 4 + }, + { + "name": "mask", + "directions": 4 + }, + { + "name": "pants", + "directions": 4 + }, + { + "name": "shirt", + "directions": 4 + }, + { + "name": "shoes", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/_CP14/Mobs/Species/Goblin/displacement.rsi/pants.png b/Resources/Textures/_CP14/Mobs/Species/Goblin/displacement.rsi/pants.png new file mode 100644 index 0000000000..4686908cd3 Binary files /dev/null and b/Resources/Textures/_CP14/Mobs/Species/Goblin/displacement.rsi/pants.png differ diff --git a/Resources/Textures/_CP14/Mobs/Species/Goblin/displacement.rsi/shirt.png b/Resources/Textures/_CP14/Mobs/Species/Goblin/displacement.rsi/shirt.png new file mode 100644 index 0000000000..09b2f4caf9 Binary files /dev/null and b/Resources/Textures/_CP14/Mobs/Species/Goblin/displacement.rsi/shirt.png differ diff --git a/Resources/Textures/_CP14/Mobs/Species/Goblin/displacement.rsi/shoes.png b/Resources/Textures/_CP14/Mobs/Species/Goblin/displacement.rsi/shoes.png new file mode 100644 index 0000000000..908373ab07 Binary files /dev/null and b/Resources/Textures/_CP14/Mobs/Species/Goblin/displacement.rsi/shoes.png differ diff --git a/Resources/Textures/_CP14/Mobs/Species/Goblin/displacement48.rsi/head.png b/Resources/Textures/_CP14/Mobs/Species/Goblin/displacement48.rsi/head.png new file mode 100644 index 0000000000..fb7a43d26b Binary files /dev/null and b/Resources/Textures/_CP14/Mobs/Species/Goblin/displacement48.rsi/head.png differ diff --git a/Resources/Textures/_CP14/Mobs/Species/Goblin/displacement48.rsi/meta.json b/Resources/Textures/_CP14/Mobs/Species/Goblin/displacement48.rsi/meta.json new file mode 100644 index 0000000000..0443f7dae6 --- /dev/null +++ b/Resources/Textures/_CP14/Mobs/Species/Goblin/displacement48.rsi/meta.json @@ -0,0 +1,18 @@ +{ + "version": 1, + "license": "All rights reserved for the CrystallPunk14 project only", + "copyright": "Created by TheShuEd (Github) for CrystallPunk14", + "size": { + "x": 48, + "y": 48 + }, + "load": { + "srgb": false + }, + "states": [ + { + "name": "head", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/_CP14/Mobs/Species/Goblin/parts.rsi/full.png b/Resources/Textures/_CP14/Mobs/Species/Goblin/parts.rsi/full.png new file mode 100644 index 0000000000..74cbe44f66 Binary files /dev/null and b/Resources/Textures/_CP14/Mobs/Species/Goblin/parts.rsi/full.png differ diff --git a/Resources/Textures/_CP14/Mobs/Species/Goblin/parts.rsi/head_f.png b/Resources/Textures/_CP14/Mobs/Species/Goblin/parts.rsi/head_f.png new file mode 100644 index 0000000000..d8ec886210 Binary files /dev/null and b/Resources/Textures/_CP14/Mobs/Species/Goblin/parts.rsi/head_f.png differ diff --git a/Resources/Textures/_CP14/Mobs/Species/Goblin/parts.rsi/head_m.png b/Resources/Textures/_CP14/Mobs/Species/Goblin/parts.rsi/head_m.png new file mode 100644 index 0000000000..d8ec886210 Binary files /dev/null and b/Resources/Textures/_CP14/Mobs/Species/Goblin/parts.rsi/head_m.png differ diff --git a/Resources/Textures/_CP14/Mobs/Species/Goblin/parts.rsi/l_arm.png b/Resources/Textures/_CP14/Mobs/Species/Goblin/parts.rsi/l_arm.png new file mode 100644 index 0000000000..892d0c83c3 Binary files /dev/null and b/Resources/Textures/_CP14/Mobs/Species/Goblin/parts.rsi/l_arm.png differ diff --git a/Resources/Textures/_CP14/Mobs/Species/Goblin/parts.rsi/l_foot.png b/Resources/Textures/_CP14/Mobs/Species/Goblin/parts.rsi/l_foot.png new file mode 100644 index 0000000000..39957347dd Binary files /dev/null and b/Resources/Textures/_CP14/Mobs/Species/Goblin/parts.rsi/l_foot.png differ diff --git a/Resources/Textures/_CP14/Mobs/Species/Goblin/parts.rsi/l_hand.png b/Resources/Textures/_CP14/Mobs/Species/Goblin/parts.rsi/l_hand.png new file mode 100644 index 0000000000..f7aed8a491 Binary files /dev/null and b/Resources/Textures/_CP14/Mobs/Species/Goblin/parts.rsi/l_hand.png differ diff --git a/Resources/Textures/_CP14/Mobs/Species/Goblin/parts.rsi/l_leg.png b/Resources/Textures/_CP14/Mobs/Species/Goblin/parts.rsi/l_leg.png new file mode 100644 index 0000000000..2ca5cf3c0a Binary files /dev/null and b/Resources/Textures/_CP14/Mobs/Species/Goblin/parts.rsi/l_leg.png differ diff --git a/Resources/Textures/_CP14/Mobs/Species/Goblin/parts.rsi/meta.json b/Resources/Textures/_CP14/Mobs/Species/Goblin/parts.rsi/meta.json new file mode 100644 index 0000000000..63283b0a07 --- /dev/null +++ b/Resources/Textures/_CP14/Mobs/Species/Goblin/parts.rsi/meta.json @@ -0,0 +1,62 @@ +{ + "version": 1, + "license": "All rights reserved for the CrystallPunk14 project only", + "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/Goblin/parts.rsi/r_arm.png b/Resources/Textures/_CP14/Mobs/Species/Goblin/parts.rsi/r_arm.png new file mode 100644 index 0000000000..262b1c7915 Binary files /dev/null and b/Resources/Textures/_CP14/Mobs/Species/Goblin/parts.rsi/r_arm.png differ diff --git a/Resources/Textures/_CP14/Mobs/Species/Goblin/parts.rsi/r_foot.png b/Resources/Textures/_CP14/Mobs/Species/Goblin/parts.rsi/r_foot.png new file mode 100644 index 0000000000..eca3af2865 Binary files /dev/null and b/Resources/Textures/_CP14/Mobs/Species/Goblin/parts.rsi/r_foot.png differ diff --git a/Resources/Textures/_CP14/Mobs/Species/Goblin/parts.rsi/r_hand.png b/Resources/Textures/_CP14/Mobs/Species/Goblin/parts.rsi/r_hand.png new file mode 100644 index 0000000000..be1a9321c2 Binary files /dev/null and b/Resources/Textures/_CP14/Mobs/Species/Goblin/parts.rsi/r_hand.png differ diff --git a/Resources/Textures/_CP14/Mobs/Species/Goblin/parts.rsi/r_leg.png b/Resources/Textures/_CP14/Mobs/Species/Goblin/parts.rsi/r_leg.png new file mode 100644 index 0000000000..ac2a2b6a9c Binary files /dev/null and b/Resources/Textures/_CP14/Mobs/Species/Goblin/parts.rsi/r_leg.png differ diff --git a/Resources/Textures/_CP14/Mobs/Species/Goblin/parts.rsi/torso_f.png b/Resources/Textures/_CP14/Mobs/Species/Goblin/parts.rsi/torso_f.png new file mode 100644 index 0000000000..d38cd609d3 Binary files /dev/null and b/Resources/Textures/_CP14/Mobs/Species/Goblin/parts.rsi/torso_f.png differ diff --git a/Resources/Textures/_CP14/Mobs/Species/Goblin/parts.rsi/torso_m.png b/Resources/Textures/_CP14/Mobs/Species/Goblin/parts.rsi/torso_m.png new file mode 100644 index 0000000000..9b5b896b88 Binary files /dev/null and b/Resources/Textures/_CP14/Mobs/Species/Goblin/parts.rsi/torso_m.png differ