diff --git a/Resources/Prototypes/_CP14/Entities/Mobs/Species/elf.yml b/Resources/Prototypes/_CP14/Entities/Mobs/Species/elf.yml index 8b7cfeb8d4..20eb67d61a 100644 --- a/Resources/Prototypes/_CP14/Entities/Mobs/Species/elf.yml +++ b/Resources/Prototypes/_CP14/Entities/Mobs/Species/elf.yml @@ -19,15 +19,61 @@ - type: Body prototype: CP14Elf requiredLegs: 2 - - type: Inventory - templateId: CP14Human - type: Bloodstream bloodReagent: CP14BloodElf + - type: Inventory + templateId: CP14Human + displacements: + 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/Elf/displacement.rsi + state: male_shirt + femaleDisplacements: + shirt: + sizeMaps: + 32: + sprite: _CP14/Mobs/Species/Elf/displacement.rsi + state: female_shirt - type: entity parent: CP14BaseSpeciesDummy id: CP14MobElfDummy categories: [ HideSpawnMenu ] components: - - type: HumanoidAppearance - species: CP14Elf + - type: HumanoidAppearance + species: CP14Elf + - type: Inventory + templateId: CP14Human + displacements: + 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/Elf/displacement.rsi + state: male_shirt + femaleDisplacements: + shirt: + sizeMaps: + 32: + sprite: _CP14/Mobs/Species/Elf/displacement.rsi + state: female_shirt \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Species/elf.yml b/Resources/Prototypes/_CP14/Species/elf.yml index 429e1a5655..98e87d3d99 100644 --- a/Resources/Prototypes/_CP14/Species/elf.yml +++ b/Resources/Prototypes/_CP14/Species/elf.yml @@ -74,37 +74,25 @@ 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 + state: head - type: humanoidBaseSprite id: CP14MobElfHeadFemale baseSprite: - sprite: _CP14/Mobs/Species/Elf/parts.rsi - state: head_f + sprite: _CP14/Mobs/Species/Elf/female_parts.rsi + state: head - 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 + state: torso - type: humanoidBaseSprite id: CP14MobElfTorsoFemale baseSprite: - sprite: _CP14/Mobs/Species/Elf/parts.rsi - state: torso_f + sprite: _CP14/Mobs/Species/Elf/female_parts.rsi + state: torso - type: humanoidBaseSprite id: CP14MobElfLLeg @@ -112,44 +100,93 @@ sprite: _CP14/Mobs/Species/Elf/parts.rsi state: l_leg +- type: humanoidBaseSprite + id: CP14MobElfLLegFemale + baseSprite: + sprite: _CP14/Mobs/Species/Elf/female_parts.rsi + state: l_leg + - type: humanoidBaseSprite id: CP14MobElfLArm baseSprite: sprite: _CP14/Mobs/Species/Elf/parts.rsi state: l_arm +- type: humanoidBaseSprite + id: CP14MobElfLArmFemale + baseSprite: + sprite: _CP14/Mobs/Species/Elf/female_parts.rsi + state: l_arm + - type: humanoidBaseSprite id: CP14MobElfLHand baseSprite: sprite: _CP14/Mobs/Species/Elf/parts.rsi state: l_hand +- type: humanoidBaseSprite + id: CP14MobElfLHandFemale + baseSprite: + sprite: _CP14/Mobs/Species/Elf/female_parts.rsi + state: l_hand + - type: humanoidBaseSprite id: CP14MobElfLFoot baseSprite: sprite: _CP14/Mobs/Species/Elf/parts.rsi state: l_foot +- type: humanoidBaseSprite + id: CP14MobElfLFootFemale + baseSprite: + sprite: _CP14/Mobs/Species/Elf/female_parts.rsi + state: l_foot + - type: humanoidBaseSprite id: CP14MobElfRLeg baseSprite: sprite: _CP14/Mobs/Species/Elf/parts.rsi state: r_leg +- type: humanoidBaseSprite + id: CP14MobElfRLegFemale + baseSprite: + sprite: _CP14/Mobs/Species/Elf/female_parts.rsi + state: r_leg + - type: humanoidBaseSprite id: CP14MobElfRArm baseSprite: sprite: _CP14/Mobs/Species/Elf/parts.rsi state: r_arm + +- type: humanoidBaseSprite + id: CP14MobElfRArmFemale + baseSprite: + sprite: _CP14/Mobs/Species/Elf/female_parts.rsi + state: r_arm + - type: humanoidBaseSprite id: CP14MobElfRHand baseSprite: sprite: _CP14/Mobs/Species/Elf/parts.rsi state: r_hand +- type: humanoidBaseSprite + id: CP14MobElfRHandFemale + baseSprite: + sprite: _CP14/Mobs/Species/Elf/female_parts.rsi + state: r_hand + - type: humanoidBaseSprite id: CP14MobElfRFoot baseSprite: sprite: _CP14/Mobs/Species/Elf/parts.rsi state: r_foot + +- type: humanoidBaseSprite + id: CP14MobElfRFootFemale + baseSprite: + sprite: _CP14/Mobs/Species/Elf/female_parts.rsi + state: r_foot diff --git a/Resources/Textures/_CP14/Mobs/Species/Elf/displacement.rsi/female_shirt.png b/Resources/Textures/_CP14/Mobs/Species/Elf/displacement.rsi/female_shirt.png new file mode 100644 index 0000000000..7c783e2909 Binary files /dev/null and b/Resources/Textures/_CP14/Mobs/Species/Elf/displacement.rsi/female_shirt.png differ diff --git a/Resources/Textures/_CP14/Mobs/Species/Elf/displacement.rsi/male_shirt.png b/Resources/Textures/_CP14/Mobs/Species/Elf/displacement.rsi/male_shirt.png new file mode 100644 index 0000000000..6b0baa576c Binary files /dev/null and b/Resources/Textures/_CP14/Mobs/Species/Elf/displacement.rsi/male_shirt.png differ diff --git a/Resources/Textures/_CP14/Mobs/Species/Elf/displacement.rsi/meta.json b/Resources/Textures/_CP14/Mobs/Species/Elf/displacement.rsi/meta.json new file mode 100644 index 0000000000..5d96b9d75b --- /dev/null +++ b/Resources/Textures/_CP14/Mobs/Species/Elf/displacement.rsi/meta.json @@ -0,0 +1,22 @@ +{ + "version": 1, + "license": "CLA", + "copyright": "Created by TheShuEd (Github)", + "size": { + "x": 32, + "y": 32 + }, + "load": { + "srgb": false + }, + "states": [ + { + "name": "male_shirt", + "directions": 4 + }, + { + "name": "female_shirt", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/_CP14/Mobs/Species/Elf/female_parts.rsi/full.png b/Resources/Textures/_CP14/Mobs/Species/Elf/female_parts.rsi/full.png new file mode 100644 index 0000000000..7c6da322c0 Binary files /dev/null and b/Resources/Textures/_CP14/Mobs/Species/Elf/female_parts.rsi/full.png differ diff --git a/Resources/Textures/_CP14/Mobs/Species/Elf/female_parts.rsi/head.png b/Resources/Textures/_CP14/Mobs/Species/Elf/female_parts.rsi/head.png new file mode 100644 index 0000000000..d85bda0513 Binary files /dev/null and b/Resources/Textures/_CP14/Mobs/Species/Elf/female_parts.rsi/head.png differ diff --git a/Resources/Textures/_CP14/Mobs/Species/Elf/female_parts.rsi/l_arm.png b/Resources/Textures/_CP14/Mobs/Species/Elf/female_parts.rsi/l_arm.png new file mode 100644 index 0000000000..4054aaffd6 Binary files /dev/null and b/Resources/Textures/_CP14/Mobs/Species/Elf/female_parts.rsi/l_arm.png differ diff --git a/Resources/Textures/_CP14/Mobs/Species/Elf/female_parts.rsi/l_foot.png b/Resources/Textures/_CP14/Mobs/Species/Elf/female_parts.rsi/l_foot.png new file mode 100644 index 0000000000..81f6a357f3 Binary files /dev/null and b/Resources/Textures/_CP14/Mobs/Species/Elf/female_parts.rsi/l_foot.png differ diff --git a/Resources/Textures/_CP14/Mobs/Species/Elf/female_parts.rsi/l_hand.png b/Resources/Textures/_CP14/Mobs/Species/Elf/female_parts.rsi/l_hand.png new file mode 100644 index 0000000000..69b9e9ad6d Binary files /dev/null and b/Resources/Textures/_CP14/Mobs/Species/Elf/female_parts.rsi/l_hand.png differ diff --git a/Resources/Textures/_CP14/Mobs/Species/Elf/female_parts.rsi/l_leg.png b/Resources/Textures/_CP14/Mobs/Species/Elf/female_parts.rsi/l_leg.png new file mode 100644 index 0000000000..a6fc57cd18 Binary files /dev/null and b/Resources/Textures/_CP14/Mobs/Species/Elf/female_parts.rsi/l_leg.png differ diff --git a/Resources/Textures/_CP14/Mobs/Species/Elf/female_parts.rsi/meta.json b/Resources/Textures/_CP14/Mobs/Species/Elf/female_parts.rsi/meta.json new file mode 100644 index 0000000000..eaf09fbe71 --- /dev/null +++ b/Resources/Textures/_CP14/Mobs/Species/Elf/female_parts.rsi/meta.json @@ -0,0 +1,55 @@ +{ + "version": 1, + "license": "CLA", + "copyright": "Created by TheShuEd (Github)", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "full", + "directions": 4 + }, + { + "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/Elf/female_parts.rsi/r_arm.png b/Resources/Textures/_CP14/Mobs/Species/Elf/female_parts.rsi/r_arm.png new file mode 100644 index 0000000000..7fad486a28 Binary files /dev/null and b/Resources/Textures/_CP14/Mobs/Species/Elf/female_parts.rsi/r_arm.png differ diff --git a/Resources/Textures/_CP14/Mobs/Species/Elf/female_parts.rsi/r_foot.png b/Resources/Textures/_CP14/Mobs/Species/Elf/female_parts.rsi/r_foot.png new file mode 100644 index 0000000000..29cf192d6a Binary files /dev/null and b/Resources/Textures/_CP14/Mobs/Species/Elf/female_parts.rsi/r_foot.png differ diff --git a/Resources/Textures/_CP14/Mobs/Species/Elf/female_parts.rsi/r_hand.png b/Resources/Textures/_CP14/Mobs/Species/Elf/female_parts.rsi/r_hand.png new file mode 100644 index 0000000000..b539809ae7 Binary files /dev/null and b/Resources/Textures/_CP14/Mobs/Species/Elf/female_parts.rsi/r_hand.png differ diff --git a/Resources/Textures/_CP14/Mobs/Species/Elf/female_parts.rsi/r_leg.png b/Resources/Textures/_CP14/Mobs/Species/Elf/female_parts.rsi/r_leg.png new file mode 100644 index 0000000000..3bd9ec5003 Binary files /dev/null and b/Resources/Textures/_CP14/Mobs/Species/Elf/female_parts.rsi/r_leg.png differ diff --git a/Resources/Textures/_CP14/Mobs/Species/Elf/female_parts.rsi/torso.png b/Resources/Textures/_CP14/Mobs/Species/Elf/female_parts.rsi/torso.png new file mode 100644 index 0000000000..b5c5ccc835 Binary files /dev/null and b/Resources/Textures/_CP14/Mobs/Species/Elf/female_parts.rsi/torso.png differ diff --git a/Resources/Textures/_CP14/Mobs/Species/Elf/parts.rsi/full.png b/Resources/Textures/_CP14/Mobs/Species/Elf/parts.rsi/full.png index a0e572d045..7c6da322c0 100644 Binary files a/Resources/Textures/_CP14/Mobs/Species/Elf/parts.rsi/full.png and b/Resources/Textures/_CP14/Mobs/Species/Elf/parts.rsi/full.png differ diff --git a/Resources/Textures/_CP14/Mobs/Species/Elf/parts.rsi/head.png b/Resources/Textures/_CP14/Mobs/Species/Elf/parts.rsi/head.png new file mode 100644 index 0000000000..d85bda0513 Binary files /dev/null and b/Resources/Textures/_CP14/Mobs/Species/Elf/parts.rsi/head.png differ 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 deleted file mode 100644 index 2a8798ce1b..0000000000 Binary files a/Resources/Textures/_CP14/Mobs/Species/Elf/parts.rsi/head_f.png and /dev/null differ diff --git a/Resources/Textures/_CP14/Mobs/Species/Elf/parts.rsi/head_m.png b/Resources/Textures/_CP14/Mobs/Species/Elf/parts.rsi/head_m.png deleted file mode 100644 index a577a1b925..0000000000 Binary files a/Resources/Textures/_CP14/Mobs/Species/Elf/parts.rsi/head_m.png and /dev/null differ 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 index b78dd49a7f..4054aaffd6 100644 Binary files a/Resources/Textures/_CP14/Mobs/Species/Elf/parts.rsi/l_arm.png and b/Resources/Textures/_CP14/Mobs/Species/Elf/parts.rsi/l_arm.png differ 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 index 045448afd6..81f6a357f3 100644 Binary files a/Resources/Textures/_CP14/Mobs/Species/Elf/parts.rsi/l_foot.png and b/Resources/Textures/_CP14/Mobs/Species/Elf/parts.rsi/l_foot.png differ 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 index 1c015eaba7..69b9e9ad6d 100644 Binary files a/Resources/Textures/_CP14/Mobs/Species/Elf/parts.rsi/l_hand.png and b/Resources/Textures/_CP14/Mobs/Species/Elf/parts.rsi/l_hand.png differ 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 index 7e045922af..a6fc57cd18 100644 Binary files a/Resources/Textures/_CP14/Mobs/Species/Elf/parts.rsi/l_leg.png and b/Resources/Textures/_CP14/Mobs/Species/Elf/parts.rsi/l_leg.png differ diff --git a/Resources/Textures/_CP14/Mobs/Species/Elf/parts.rsi/meta.json b/Resources/Textures/_CP14/Mobs/Species/Elf/parts.rsi/meta.json index 0ea7a81f6e..eaf09fbe71 100644 --- a/Resources/Textures/_CP14/Mobs/Species/Elf/parts.rsi/meta.json +++ b/Resources/Textures/_CP14/Mobs/Species/Elf/parts.rsi/meta.json @@ -8,14 +8,11 @@ }, "states": [ { - "name": "full" - }, - { - "name": "head_f", + "name": "full", "directions": 4 }, { - "name": "head_m", + "name": "head", "directions": 4 }, { @@ -51,11 +48,7 @@ "directions": 4 }, { - "name": "torso_f", - "directions": 4 - }, - { - "name": "torso_m", + "name": "torso", "directions": 4 } ] diff --git a/Resources/Textures/_CP14/Mobs/Species/Elf/parts.rsi/r_arm.png b/Resources/Textures/_CP14/Mobs/Species/Elf/parts.rsi/r_arm.png index 3bd7fe3228..7fad486a28 100644 Binary files a/Resources/Textures/_CP14/Mobs/Species/Elf/parts.rsi/r_arm.png and b/Resources/Textures/_CP14/Mobs/Species/Elf/parts.rsi/r_arm.png differ diff --git a/Resources/Textures/_CP14/Mobs/Species/Elf/parts.rsi/r_foot.png b/Resources/Textures/_CP14/Mobs/Species/Elf/parts.rsi/r_foot.png index e0737637b8..29cf192d6a 100644 Binary files a/Resources/Textures/_CP14/Mobs/Species/Elf/parts.rsi/r_foot.png and b/Resources/Textures/_CP14/Mobs/Species/Elf/parts.rsi/r_foot.png differ diff --git a/Resources/Textures/_CP14/Mobs/Species/Elf/parts.rsi/r_hand.png b/Resources/Textures/_CP14/Mobs/Species/Elf/parts.rsi/r_hand.png index 192a4b09e5..b539809ae7 100644 Binary files a/Resources/Textures/_CP14/Mobs/Species/Elf/parts.rsi/r_hand.png and b/Resources/Textures/_CP14/Mobs/Species/Elf/parts.rsi/r_hand.png differ 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 index 1414e70d15..3bd9ec5003 100644 Binary files a/Resources/Textures/_CP14/Mobs/Species/Elf/parts.rsi/r_leg.png and b/Resources/Textures/_CP14/Mobs/Species/Elf/parts.rsi/r_leg.png differ diff --git a/Resources/Textures/_CP14/Mobs/Species/Elf/parts.rsi/torso.png b/Resources/Textures/_CP14/Mobs/Species/Elf/parts.rsi/torso.png new file mode 100644 index 0000000000..414fc0b698 Binary files /dev/null and b/Resources/Textures/_CP14/Mobs/Species/Elf/parts.rsi/torso.png differ 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 deleted file mode 100644 index d252de33c8..0000000000 Binary files a/Resources/Textures/_CP14/Mobs/Species/Elf/parts.rsi/torso_f.png and /dev/null differ 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 deleted file mode 100644 index da01756126..0000000000 Binary files a/Resources/Textures/_CP14/Mobs/Species/Elf/parts.rsi/torso_m.png and /dev/null differ