diff --git a/Content.Client/Humanoid/HumanoidAppearanceSystem.cs b/Content.Client/Humanoid/HumanoidAppearanceSystem.cs index 6eb5dd9ec9..bc130c095a 100644 --- a/Content.Client/Humanoid/HumanoidAppearanceSystem.cs +++ b/Content.Client/Humanoid/HumanoidAppearanceSystem.cs @@ -85,8 +85,19 @@ public sealed class HumanoidAppearanceSystem : SharedHumanoidAppearanceSystem if (protoId == null) return; + //if (sexMorph) + // protoId = HumanoidVisualLayersExtension.GetSexMorph(key, component.Sex, protoId); + + //CP14 female bodies support if (sexMorph) - protoId = HumanoidVisualLayersExtension.GetSexMorph(key, component.Sex, protoId); + { + var tempProto = HumanoidVisualLayersExtension.GetSexMorph(key, component.Sex, protoId); + if (_prototypeManager.TryIndex(tempProto, out _)) + { + protoId = tempProto; + } + } + //CP14 female bodies support end var proto = _prototypeManager.Index(protoId); component.BaseLayers[key] = proto; diff --git a/Content.Shared/Humanoid/HumanoidVisualLayersExtension.cs b/Content.Shared/Humanoid/HumanoidVisualLayersExtension.cs index 0f8b940bd6..1a86462427 100644 --- a/Content.Shared/Humanoid/HumanoidVisualLayersExtension.cs +++ b/Content.Shared/Humanoid/HumanoidVisualLayersExtension.cs @@ -7,12 +7,13 @@ namespace Content.Shared.Humanoid { public static bool HasSexMorph(HumanoidVisualLayers layer) { - return layer switch - { - HumanoidVisualLayers.Chest => true, - HumanoidVisualLayers.Head => true, - _ => false - }; + return true; //Support female body + //return layer switch + //{ + // HumanoidVisualLayers.Chest => true, + // HumanoidVisualLayers.Head => true, + // _ => false + //}; } public static string GetSexMorph(HumanoidVisualLayers layer, Sex sex, string id) diff --git a/Resources/Prototypes/_CP14/Body/Parts/human.yml b/Resources/Prototypes/_CP14/Body/Parts/human.yml index bd6c2715e7..96760efec1 100644 --- a/Resources/Prototypes/_CP14/Body/Parts/human.yml +++ b/Resources/Prototypes/_CP14/Body/Parts/human.yml @@ -5,6 +5,7 @@ components: - type: Sprite sprite: _CP14/Mobs/Species/Human/parts.rsi + state: torso - type: entity id: CP14HeadHuman @@ -12,6 +13,7 @@ components: - type: Sprite sprite: _CP14/Mobs/Species/Human/parts.rsi + state: head - type: entity id: CP14LeftArmHuman diff --git a/Resources/Prototypes/_CP14/Entities/Mobs/Player/tiefling.yml b/Resources/Prototypes/_CP14/Entities/Mobs/Player/tiefling.yml index eaca1aa1ff..76ff0845ac 100644 --- a/Resources/Prototypes/_CP14/Entities/Mobs/Player/tiefling.yml +++ b/Resources/Prototypes/_CP14/Entities/Mobs/Player/tiefling.yml @@ -2,3 +2,4 @@ save: false parent: CP14BaseMobTiefling id: CP14MobTiefling + \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Entities/Mobs/Species/human.yml b/Resources/Prototypes/_CP14/Entities/Mobs/Species/human.yml index e5957b49fe..80caed8883 100644 --- a/Resources/Prototypes/_CP14/Entities/Mobs/Species/human.yml +++ b/Resources/Prototypes/_CP14/Entities/Mobs/Species/human.yml @@ -21,11 +21,50 @@ requiredLegs: 2 - type: Inventory templateId: CP14Human + femaleDisplacements: + cloak: + sizeMaps: + 32: + sprite: _CP14/Mobs/Species/Human/displacement.rsi + state: female_cloak + pants: + sizeMaps: + 32: + sprite: _CP14/Mobs/Species/Human/displacement.rsi + state: female_pants + shirt: + sizeMaps: + 32: + sprite: _CP14/Mobs/Species/Human/displacement.rsi + state: female_shirt - type: entity parent: CP14BaseSpeciesDummy id: CP14MobHumanDummy noSpawn: true components: - - type: HumanoidAppearance - species: CP14Human \ No newline at end of file + - type: HumanoidAppearance + species: CP14Human + - type: Inventory + templateId: CP14Human + femaleDisplacements: + cloak: + sizeMaps: + 32: + sprite: _CP14/Mobs/Species/Human/displacement.rsi + state: female_cloak + gloves: + sizeMaps: + 32: + sprite: _CP14/Mobs/Species/Human/displacement.rsi + state: female_cloak #Its ok for gloves + pants: + sizeMaps: + 32: + sprite: _CP14/Mobs/Species/Human/displacement.rsi + state: female_pants + shirt: + sizeMaps: + 32: + sprite: _CP14/Mobs/Species/Human/displacement.rsi + state: female_shirt diff --git a/Resources/Prototypes/_CP14/Entities/Mobs/Species/tiefling.yml b/Resources/Prototypes/_CP14/Entities/Mobs/Species/tiefling.yml index 330f0bb240..0071227d63 100644 --- a/Resources/Prototypes/_CP14/Entities/Mobs/Species/tiefling.yml +++ b/Resources/Prototypes/_CP14/Entities/Mobs/Species/tiefling.yml @@ -19,16 +19,62 @@ - type: Body prototype: CP14Tiefling requiredLegs: 2 - - type: Inventory - templateId: CP14Human - type: Wagging - type: Bloodstream bloodReagent: CP14BloodTiefling + - type: Inventory + templateId: CP14Human + femaleDisplacements: + cloak: + sizeMaps: + 32: + sprite: _CP14/Mobs/Species/Human/displacement.rsi + state: female_cloak + gloves: + sizeMaps: + 32: + sprite: _CP14/Mobs/Species/Human/displacement.rsi + state: female_cloak #Its ok for gloves + pants: + sizeMaps: + 32: + sprite: _CP14/Mobs/Species/Human/displacement.rsi + state: female_pants + shirt: + sizeMaps: + 32: + sprite: _CP14/Mobs/Species/Human/displacement.rsi + state: female_shirt + - type: entity parent: CP14BaseSpeciesDummy id: CP14MobTieflingDummy noSpawn: true components: - - type: HumanoidAppearance - species: CP14Tiefling + - type: HumanoidAppearance + species: CP14Tiefling + - type: Inventory + templateId: CP14Human + femaleDisplacements: + cloak: + sizeMaps: + 32: + sprite: _CP14/Mobs/Species/Human/displacement.rsi + state: female_cloak + gloves: + sizeMaps: + 32: + sprite: _CP14/Mobs/Species/Human/displacement.rsi + state: female_cloak #Its ok for gloves + pants: + sizeMaps: + 32: + sprite: _CP14/Mobs/Species/Human/displacement.rsi + state: female_pants + shirt: + sizeMaps: + 32: + sprite: _CP14/Mobs/Species/Human/displacement.rsi + state: female_shirt + diff --git a/Resources/Prototypes/_CP14/Species/human.yml b/Resources/Prototypes/_CP14/Species/human.yml index 9533b25374..29534f6905 100644 --- a/Resources/Prototypes/_CP14/Species/human.yml +++ b/Resources/Prototypes/_CP14/Species/human.yml @@ -46,37 +46,25 @@ id: CP14MobHumanHead baseSprite: sprite: _CP14/Mobs/Species/Human/parts.rsi - state: head_m - -- type: humanoidBaseSprite - id: CP14MobHumanHeadMale - baseSprite: - sprite: _CP14/Mobs/Species/Human/parts.rsi - state: head_m + state: head - type: humanoidBaseSprite id: CP14MobHumanHeadFemale baseSprite: - sprite: _CP14/Mobs/Species/Human/parts.rsi - state: head_f + sprite: _CP14/Mobs/Species/Human/female_parts.rsi + state: head - type: humanoidBaseSprite id: CP14MobHumanTorso baseSprite: sprite: _CP14/Mobs/Species/Human/parts.rsi - state: torso_m - -- type: humanoidBaseSprite - id: CP14MobHumanTorsoMale - baseSprite: - sprite: _CP14/Mobs/Species/Human/parts.rsi - state: torso_m + state: torso - type: humanoidBaseSprite id: CP14MobHumanTorsoFemale baseSprite: - sprite: _CP14/Mobs/Species/Human/parts.rsi - state: torso_f + sprite: _CP14/Mobs/Species/Human/female_parts.rsi + state: torso - type: humanoidBaseSprite id: CP14MobHumanLLeg @@ -84,44 +72,92 @@ sprite: _CP14/Mobs/Species/Human/parts.rsi state: l_leg +- type: humanoidBaseSprite + id: CP14MobHumanLLegFemale + baseSprite: + sprite: _CP14/Mobs/Species/Human/female_parts.rsi + state: l_leg + - type: humanoidBaseSprite id: CP14MobHumanLArm baseSprite: sprite: _CP14/Mobs/Species/Human/parts.rsi state: l_arm +- type: humanoidBaseSprite + id: CP14MobHumanLArmFemale + baseSprite: + sprite: _CP14/Mobs/Species/Human/female_parts.rsi + state: l_arm + - type: humanoidBaseSprite id: CP14MobHumanLHand baseSprite: sprite: _CP14/Mobs/Species/Human/parts.rsi state: l_hand +- type: humanoidBaseSprite + id: CP14MobHumanLHandFemale + baseSprite: + sprite: _CP14/Mobs/Species/Human/female_parts.rsi + state: l_hand + - type: humanoidBaseSprite id: CP14MobHumanLFoot baseSprite: sprite: _CP14/Mobs/Species/Human/parts.rsi state: l_foot +- type: humanoidBaseSprite + id: CP14MobHumanLFootFemale + baseSprite: + sprite: _CP14/Mobs/Species/Human/female_parts.rsi + state: l_foot + - type: humanoidBaseSprite id: CP14MobHumanRLeg baseSprite: sprite: _CP14/Mobs/Species/Human/parts.rsi state: r_leg +- type: humanoidBaseSprite + id: CP14MobHumanRLegFemale + baseSprite: + sprite: _CP14/Mobs/Species/Human/female_parts.rsi + state: r_leg + - type: humanoidBaseSprite id: CP14MobHumanRArm baseSprite: sprite: _CP14/Mobs/Species/Human/parts.rsi state: r_arm +- type: humanoidBaseSprite + id: CP14MobHumanRArmFemale + baseSprite: + sprite: _CP14/Mobs/Species/Human/female_parts.rsi + state: r_arm + - type: humanoidBaseSprite id: CP14MobHumanRHand baseSprite: sprite: _CP14/Mobs/Species/Human/parts.rsi state: r_hand +- type: humanoidBaseSprite + id: CP14MobHumanRHandFemale + baseSprite: + sprite: _CP14/Mobs/Species/Human/female_parts.rsi + state: r_hand + - type: humanoidBaseSprite id: CP14MobHumanRFoot baseSprite: sprite: _CP14/Mobs/Species/Human/parts.rsi + state: r_foot + +- type: humanoidBaseSprite + id: CP14MobHumanRFootFemale + baseSprite: + sprite: _CP14/Mobs/Species/Human/female_parts.rsi state: r_foot \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Species/tiefling.yml b/Resources/Prototypes/_CP14/Species/tiefling.yml index bdc3b2259a..8d2e633cff 100644 --- a/Resources/Prototypes/_CP14/Species/tiefling.yml +++ b/Resources/Prototypes/_CP14/Species/tiefling.yml @@ -84,37 +84,25 @@ id: CP14MobTieflingHead baseSprite: sprite: _CP14/Mobs/Species/Tiefling/parts.rsi - state: head_m - -- type: humanoidBaseSprite - id: CP14MobTieflingHeadMale - baseSprite: - sprite: _CP14/Mobs/Species/Tiefling/parts.rsi - state: head_m + state: head - type: humanoidBaseSprite id: CP14MobTieflingHeadFemale baseSprite: - sprite: _CP14/Mobs/Species/Tiefling/parts.rsi - state: head_f + sprite: _CP14/Mobs/Species/Tiefling/female_parts.rsi + state: head - type: humanoidBaseSprite id: CP14MobTieflingTorso baseSprite: sprite: _CP14/Mobs/Species/Tiefling/parts.rsi - state: torso_m - -- type: humanoidBaseSprite - id: CP14MobTieflingTorsoMale - baseSprite: - sprite: _CP14/Mobs/Species/Tiefling/parts.rsi - state: torso_m + state: torso - type: humanoidBaseSprite id: CP14MobTieflingTorsoFemale baseSprite: - sprite: _CP14/Mobs/Species/Tiefling/parts.rsi - state: torso_f + sprite: _CP14/Mobs/Species/Tiefling/female_parts.rsi + state: torso - type: humanoidBaseSprite id: CP14MobTieflingLLeg @@ -122,44 +110,93 @@ sprite: _CP14/Mobs/Species/Tiefling/parts.rsi state: l_leg +- type: humanoidBaseSprite + id: CP14MobTieflingLLegFemale + baseSprite: + sprite: _CP14/Mobs/Species/Tiefling/female_parts.rsi + state: l_leg + - type: humanoidBaseSprite id: CP14MobTieflingLArm baseSprite: sprite: _CP14/Mobs/Species/Tiefling/parts.rsi state: l_arm +- type: humanoidBaseSprite + id: CP14MobTieflingLArmFemale + baseSprite: + sprite: _CP14/Mobs/Species/Tiefling/female_parts.rsi + state: l_arm + - type: humanoidBaseSprite id: CP14MobTieflingLHand baseSprite: sprite: _CP14/Mobs/Species/Tiefling/parts.rsi state: l_hand +- type: humanoidBaseSprite + id: CP14MobTieflingLHandFemale + baseSprite: + sprite: _CP14/Mobs/Species/Tiefling/female_parts.rsi + state: l_hand + - type: humanoidBaseSprite id: CP14MobTieflingLFoot baseSprite: sprite: _CP14/Mobs/Species/Tiefling/parts.rsi state: l_foot +- type: humanoidBaseSprite + id: CP14MobTieflingLFootFemale + baseSprite: + sprite: _CP14/Mobs/Species/Tiefling/female_parts.rsi + state: l_foot + - type: humanoidBaseSprite id: CP14MobTieflingRLeg baseSprite: sprite: _CP14/Mobs/Species/Tiefling/parts.rsi state: r_leg +- type: humanoidBaseSprite + id: CP14MobTieflingRLegFemale + baseSprite: + sprite: _CP14/Mobs/Species/Tiefling/female_parts.rsi + state: r_leg + - type: humanoidBaseSprite id: CP14MobTieflingRArm baseSprite: sprite: _CP14/Mobs/Species/Tiefling/parts.rsi state: r_arm +- type: humanoidBaseSprite + id: CP14MobTieflingRArmFemale + baseSprite: + sprite: _CP14/Mobs/Species/Tiefling/female_parts.rsi + state: r_arm + - type: humanoidBaseSprite id: CP14MobTieflingRHand baseSprite: sprite: _CP14/Mobs/Species/Tiefling/parts.rsi state: r_hand +- type: humanoidBaseSprite + id: CP14MobTieflingRHandFemale + baseSprite: + sprite: _CP14/Mobs/Species/Tiefling/female_parts.rsi + state: r_hand + - type: humanoidBaseSprite id: CP14MobTieflingRFoot baseSprite: sprite: _CP14/Mobs/Species/Tiefling/parts.rsi state: r_foot + + +- type: humanoidBaseSprite + id: CP14MobTieflingRFootFemale + baseSprite: + sprite: _CP14/Mobs/Species/Tiefling/female_parts.rsi + state: r_foot diff --git a/Resources/Textures/_CP14/Mobs/Species/Human/displacement.rsi/female_cloak.png b/Resources/Textures/_CP14/Mobs/Species/Human/displacement.rsi/female_cloak.png new file mode 100644 index 0000000000..2d645b3512 Binary files /dev/null and b/Resources/Textures/_CP14/Mobs/Species/Human/displacement.rsi/female_cloak.png differ diff --git a/Resources/Textures/_CP14/Mobs/Species/Human/displacement.rsi/female_pants.png b/Resources/Textures/_CP14/Mobs/Species/Human/displacement.rsi/female_pants.png new file mode 100644 index 0000000000..c5af372166 Binary files /dev/null and b/Resources/Textures/_CP14/Mobs/Species/Human/displacement.rsi/female_pants.png differ diff --git a/Resources/Textures/_CP14/Mobs/Species/Human/displacement.rsi/female_shirt.png b/Resources/Textures/_CP14/Mobs/Species/Human/displacement.rsi/female_shirt.png new file mode 100644 index 0000000000..7c783e2909 Binary files /dev/null and b/Resources/Textures/_CP14/Mobs/Species/Human/displacement.rsi/female_shirt.png differ diff --git a/Resources/Textures/_CP14/Mobs/Species/Human/displacement.rsi/meta.json b/Resources/Textures/_CP14/Mobs/Species/Human/displacement.rsi/meta.json new file mode 100644 index 0000000000..a20c2eb824 --- /dev/null +++ b/Resources/Textures/_CP14/Mobs/Species/Human/displacement.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "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": "female_cloak", + "directions": 4 + }, + { + "name": "female_pants", + "directions": 4 + }, + { + "name": "female_shirt", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/_CP14/Mobs/Species/Human/female_parts.rsi/full.png b/Resources/Textures/_CP14/Mobs/Species/Human/female_parts.rsi/full.png new file mode 100644 index 0000000000..d85aa4bbed Binary files /dev/null and b/Resources/Textures/_CP14/Mobs/Species/Human/female_parts.rsi/full.png differ diff --git a/Resources/Textures/_CP14/Mobs/Species/Human/female_parts.rsi/head.png b/Resources/Textures/_CP14/Mobs/Species/Human/female_parts.rsi/head.png new file mode 100644 index 0000000000..d85bda0513 Binary files /dev/null and b/Resources/Textures/_CP14/Mobs/Species/Human/female_parts.rsi/head.png differ diff --git a/Resources/Textures/_CP14/Mobs/Species/Human/female_parts.rsi/l_arm.png b/Resources/Textures/_CP14/Mobs/Species/Human/female_parts.rsi/l_arm.png new file mode 100644 index 0000000000..4054aaffd6 Binary files /dev/null and b/Resources/Textures/_CP14/Mobs/Species/Human/female_parts.rsi/l_arm.png differ diff --git a/Resources/Textures/_CP14/Mobs/Species/Human/female_parts.rsi/l_foot.png b/Resources/Textures/_CP14/Mobs/Species/Human/female_parts.rsi/l_foot.png new file mode 100644 index 0000000000..81f6a357f3 Binary files /dev/null and b/Resources/Textures/_CP14/Mobs/Species/Human/female_parts.rsi/l_foot.png differ diff --git a/Resources/Textures/_CP14/Mobs/Species/Human/female_parts.rsi/l_hand.png b/Resources/Textures/_CP14/Mobs/Species/Human/female_parts.rsi/l_hand.png new file mode 100644 index 0000000000..69b9e9ad6d Binary files /dev/null and b/Resources/Textures/_CP14/Mobs/Species/Human/female_parts.rsi/l_hand.png differ diff --git a/Resources/Textures/_CP14/Mobs/Species/Human/female_parts.rsi/l_leg.png b/Resources/Textures/_CP14/Mobs/Species/Human/female_parts.rsi/l_leg.png new file mode 100644 index 0000000000..a6fc57cd18 Binary files /dev/null and b/Resources/Textures/_CP14/Mobs/Species/Human/female_parts.rsi/l_leg.png differ diff --git a/Resources/Textures/_CP14/Mobs/Species/Human/female_parts.rsi/meta.json b/Resources/Textures/_CP14/Mobs/Species/Human/female_parts.rsi/meta.json new file mode 100644 index 0000000000..79707fef4f --- /dev/null +++ b/Resources/Textures/_CP14/Mobs/Species/Human/female_parts.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 + }, + "states": [ + { + "name": "full" + }, + { + "name": "head", + "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", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/_CP14/Mobs/Species/Human/female_parts.rsi/r_arm.png b/Resources/Textures/_CP14/Mobs/Species/Human/female_parts.rsi/r_arm.png new file mode 100644 index 0000000000..7fad486a28 Binary files /dev/null and b/Resources/Textures/_CP14/Mobs/Species/Human/female_parts.rsi/r_arm.png differ diff --git a/Resources/Textures/_CP14/Mobs/Species/Human/female_parts.rsi/r_foot.png b/Resources/Textures/_CP14/Mobs/Species/Human/female_parts.rsi/r_foot.png new file mode 100644 index 0000000000..29cf192d6a Binary files /dev/null and b/Resources/Textures/_CP14/Mobs/Species/Human/female_parts.rsi/r_foot.png differ diff --git a/Resources/Textures/_CP14/Mobs/Species/Human/female_parts.rsi/r_hand.png b/Resources/Textures/_CP14/Mobs/Species/Human/female_parts.rsi/r_hand.png new file mode 100644 index 0000000000..b539809ae7 Binary files /dev/null and b/Resources/Textures/_CP14/Mobs/Species/Human/female_parts.rsi/r_hand.png differ diff --git a/Resources/Textures/_CP14/Mobs/Species/Human/female_parts.rsi/r_leg.png b/Resources/Textures/_CP14/Mobs/Species/Human/female_parts.rsi/r_leg.png new file mode 100644 index 0000000000..3bd9ec5003 Binary files /dev/null and b/Resources/Textures/_CP14/Mobs/Species/Human/female_parts.rsi/r_leg.png differ diff --git a/Resources/Textures/_CP14/Mobs/Species/Human/female_parts.rsi/torso.png b/Resources/Textures/_CP14/Mobs/Species/Human/female_parts.rsi/torso.png new file mode 100644 index 0000000000..b5c5ccc835 Binary files /dev/null and b/Resources/Textures/_CP14/Mobs/Species/Human/female_parts.rsi/torso.png differ diff --git a/Resources/Textures/_CP14/Mobs/Species/Human/parts.rsi/head_m.png b/Resources/Textures/_CP14/Mobs/Species/Human/parts.rsi/head.png similarity index 100% rename from Resources/Textures/_CP14/Mobs/Species/Human/parts.rsi/head_m.png rename to Resources/Textures/_CP14/Mobs/Species/Human/parts.rsi/head.png diff --git a/Resources/Textures/_CP14/Mobs/Species/Human/parts.rsi/head_f.png b/Resources/Textures/_CP14/Mobs/Species/Human/parts.rsi/head_f.png deleted file mode 100644 index 2a8798ce1b..0000000000 Binary files a/Resources/Textures/_CP14/Mobs/Species/Human/parts.rsi/head_f.png and /dev/null differ diff --git a/Resources/Textures/_CP14/Mobs/Species/Human/parts.rsi/meta.json b/Resources/Textures/_CP14/Mobs/Species/Human/parts.rsi/meta.json index 63283b0a07..79707fef4f 100644 --- a/Resources/Textures/_CP14/Mobs/Species/Human/parts.rsi/meta.json +++ b/Resources/Textures/_CP14/Mobs/Species/Human/parts.rsi/meta.json @@ -11,11 +11,7 @@ "name": "full" }, { - "name": "head_f", - "directions": 4 - }, - { - "name": "head_m", + "name": "head", "directions": 4 }, { @@ -51,11 +47,7 @@ "directions": 4 }, { - "name": "torso_f", - "directions": 4 - }, - { - "name": "torso_m", + "name": "torso", "directions": 4 } ] diff --git a/Resources/Textures/_CP14/Mobs/Species/Human/parts.rsi/torso_m.png b/Resources/Textures/_CP14/Mobs/Species/Human/parts.rsi/torso.png similarity index 100% rename from Resources/Textures/_CP14/Mobs/Species/Human/parts.rsi/torso_m.png rename to Resources/Textures/_CP14/Mobs/Species/Human/parts.rsi/torso.png diff --git a/Resources/Textures/_CP14/Mobs/Species/Human/parts.rsi/torso_f.png b/Resources/Textures/_CP14/Mobs/Species/Human/parts.rsi/torso_f.png deleted file mode 100644 index d252de33c8..0000000000 Binary files a/Resources/Textures/_CP14/Mobs/Species/Human/parts.rsi/torso_f.png and /dev/null differ diff --git a/Resources/Textures/_CP14/Mobs/Species/Tiefling/female_parts.rsi/full.png b/Resources/Textures/_CP14/Mobs/Species/Tiefling/female_parts.rsi/full.png new file mode 100644 index 0000000000..d85aa4bbed Binary files /dev/null and b/Resources/Textures/_CP14/Mobs/Species/Tiefling/female_parts.rsi/full.png differ diff --git a/Resources/Textures/_CP14/Mobs/Species/Tiefling/female_parts.rsi/head.png b/Resources/Textures/_CP14/Mobs/Species/Tiefling/female_parts.rsi/head.png new file mode 100644 index 0000000000..d85bda0513 Binary files /dev/null and b/Resources/Textures/_CP14/Mobs/Species/Tiefling/female_parts.rsi/head.png differ diff --git a/Resources/Textures/_CP14/Mobs/Species/Tiefling/female_parts.rsi/l_arm.png b/Resources/Textures/_CP14/Mobs/Species/Tiefling/female_parts.rsi/l_arm.png new file mode 100644 index 0000000000..4054aaffd6 Binary files /dev/null and b/Resources/Textures/_CP14/Mobs/Species/Tiefling/female_parts.rsi/l_arm.png differ diff --git a/Resources/Textures/_CP14/Mobs/Species/Tiefling/female_parts.rsi/l_foot.png b/Resources/Textures/_CP14/Mobs/Species/Tiefling/female_parts.rsi/l_foot.png new file mode 100644 index 0000000000..81f6a357f3 Binary files /dev/null and b/Resources/Textures/_CP14/Mobs/Species/Tiefling/female_parts.rsi/l_foot.png differ diff --git a/Resources/Textures/_CP14/Mobs/Species/Tiefling/female_parts.rsi/l_hand.png b/Resources/Textures/_CP14/Mobs/Species/Tiefling/female_parts.rsi/l_hand.png new file mode 100644 index 0000000000..69b9e9ad6d Binary files /dev/null and b/Resources/Textures/_CP14/Mobs/Species/Tiefling/female_parts.rsi/l_hand.png differ diff --git a/Resources/Textures/_CP14/Mobs/Species/Tiefling/female_parts.rsi/l_leg.png b/Resources/Textures/_CP14/Mobs/Species/Tiefling/female_parts.rsi/l_leg.png new file mode 100644 index 0000000000..a6fc57cd18 Binary files /dev/null and b/Resources/Textures/_CP14/Mobs/Species/Tiefling/female_parts.rsi/l_leg.png differ diff --git a/Resources/Textures/_CP14/Mobs/Species/Tiefling/female_parts.rsi/meta.json b/Resources/Textures/_CP14/Mobs/Species/Tiefling/female_parts.rsi/meta.json new file mode 100644 index 0000000000..79707fef4f --- /dev/null +++ b/Resources/Textures/_CP14/Mobs/Species/Tiefling/female_parts.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 + }, + "states": [ + { + "name": "full" + }, + { + "name": "head", + "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", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/_CP14/Mobs/Species/Tiefling/female_parts.rsi/r_arm.png b/Resources/Textures/_CP14/Mobs/Species/Tiefling/female_parts.rsi/r_arm.png new file mode 100644 index 0000000000..7fad486a28 Binary files /dev/null and b/Resources/Textures/_CP14/Mobs/Species/Tiefling/female_parts.rsi/r_arm.png differ diff --git a/Resources/Textures/_CP14/Mobs/Species/Tiefling/female_parts.rsi/r_foot.png b/Resources/Textures/_CP14/Mobs/Species/Tiefling/female_parts.rsi/r_foot.png new file mode 100644 index 0000000000..29cf192d6a Binary files /dev/null and b/Resources/Textures/_CP14/Mobs/Species/Tiefling/female_parts.rsi/r_foot.png differ diff --git a/Resources/Textures/_CP14/Mobs/Species/Tiefling/female_parts.rsi/r_hand.png b/Resources/Textures/_CP14/Mobs/Species/Tiefling/female_parts.rsi/r_hand.png new file mode 100644 index 0000000000..b539809ae7 Binary files /dev/null and b/Resources/Textures/_CP14/Mobs/Species/Tiefling/female_parts.rsi/r_hand.png differ diff --git a/Resources/Textures/_CP14/Mobs/Species/Tiefling/female_parts.rsi/r_leg.png b/Resources/Textures/_CP14/Mobs/Species/Tiefling/female_parts.rsi/r_leg.png new file mode 100644 index 0000000000..3bd9ec5003 Binary files /dev/null and b/Resources/Textures/_CP14/Mobs/Species/Tiefling/female_parts.rsi/r_leg.png differ diff --git a/Resources/Textures/_CP14/Mobs/Species/Tiefling/female_parts.rsi/torso.png b/Resources/Textures/_CP14/Mobs/Species/Tiefling/female_parts.rsi/torso.png new file mode 100644 index 0000000000..b5c5ccc835 Binary files /dev/null and b/Resources/Textures/_CP14/Mobs/Species/Tiefling/female_parts.rsi/torso.png differ diff --git a/Resources/Textures/_CP14/Mobs/Species/Tiefling/parts.rsi/full.png b/Resources/Textures/_CP14/Mobs/Species/Tiefling/parts.rsi/full.png index a0e572d045..d85aa4bbed 100644 Binary files a/Resources/Textures/_CP14/Mobs/Species/Tiefling/parts.rsi/full.png and b/Resources/Textures/_CP14/Mobs/Species/Tiefling/parts.rsi/full.png differ diff --git a/Resources/Textures/_CP14/Mobs/Species/Tiefling/parts.rsi/head_m.png b/Resources/Textures/_CP14/Mobs/Species/Tiefling/parts.rsi/head.png similarity index 100% rename from Resources/Textures/_CP14/Mobs/Species/Tiefling/parts.rsi/head_m.png rename to Resources/Textures/_CP14/Mobs/Species/Tiefling/parts.rsi/head.png diff --git a/Resources/Textures/_CP14/Mobs/Species/Tiefling/parts.rsi/head_f.png b/Resources/Textures/_CP14/Mobs/Species/Tiefling/parts.rsi/head_f.png deleted file mode 100644 index 2a8798ce1b..0000000000 Binary files a/Resources/Textures/_CP14/Mobs/Species/Tiefling/parts.rsi/head_f.png and /dev/null differ diff --git a/Resources/Textures/_CP14/Mobs/Species/Tiefling/parts.rsi/meta.json b/Resources/Textures/_CP14/Mobs/Species/Tiefling/parts.rsi/meta.json index 63283b0a07..79707fef4f 100644 --- a/Resources/Textures/_CP14/Mobs/Species/Tiefling/parts.rsi/meta.json +++ b/Resources/Textures/_CP14/Mobs/Species/Tiefling/parts.rsi/meta.json @@ -11,11 +11,7 @@ "name": "full" }, { - "name": "head_f", - "directions": 4 - }, - { - "name": "head_m", + "name": "head", "directions": 4 }, { @@ -51,11 +47,7 @@ "directions": 4 }, { - "name": "torso_f", - "directions": 4 - }, - { - "name": "torso_m", + "name": "torso", "directions": 4 } ] diff --git a/Resources/Textures/_CP14/Mobs/Species/Tiefling/parts.rsi/torso_m.png b/Resources/Textures/_CP14/Mobs/Species/Tiefling/parts.rsi/torso.png similarity index 100% rename from Resources/Textures/_CP14/Mobs/Species/Tiefling/parts.rsi/torso_m.png rename to Resources/Textures/_CP14/Mobs/Species/Tiefling/parts.rsi/torso.png diff --git a/Resources/Textures/_CP14/Mobs/Species/Tiefling/parts.rsi/torso_f.png b/Resources/Textures/_CP14/Mobs/Species/Tiefling/parts.rsi/torso_f.png deleted file mode 100644 index d252de33c8..0000000000 Binary files a/Resources/Textures/_CP14/Mobs/Species/Tiefling/parts.rsi/torso_f.png and /dev/null differ