diff --git a/Resources/Locale/en-US/species/species.ftl b/Resources/Locale/en-US/species/species.ftl index f31b1fa0f0..dd5f8cde50 100644 --- a/Resources/Locale/en-US/species/species.ftl +++ b/Resources/Locale/en-US/species/species.ftl @@ -8,4 +8,5 @@ species-name-diona = Diona species-name-arachnid = Arachnid species-name-moth = Moth Person species-name-skeleton = Skeleton +species-name-tiefling = Tiefling species-name-vox = Vox diff --git a/Resources/Locale/ru-RU/species/species.ftl b/Resources/Locale/ru-RU/species/species.ftl new file mode 100644 index 0000000000..a6e9ce4d39 --- /dev/null +++ b/Resources/Locale/ru-RU/species/species.ftl @@ -0,0 +1,10 @@ +species-name-human = Человек +species-name-dwarf = Дворф +species-name-reptilian = Унатх +species-name-slime = Слаймолюд +species-name-diona = Диона +species-name-arachnid = Арахнид +species-name-moth = Ниан +species-name-skeleton = Скелет +species-name-tiefling = Тифлинг +species-name-vox = Вокс diff --git a/Resources/Prototypes/Entities/Mobs/Customization/Markings/tiefling.yml b/Resources/Prototypes/Entities/Mobs/Customization/Markings/tiefling.yml new file mode 100644 index 0000000000..ea728d5de1 --- /dev/null +++ b/Resources/Prototypes/Entities/Mobs/Customization/Markings/tiefling.yml @@ -0,0 +1,8 @@ +- type: marking + id: TieflingTail + bodyPart: Tail + markingCategory: Tail + speciesRestriction: [Tiefling] + sprites: + - sprite: Mobs/Customization/cat_parts.rsi + state: tail_cat diff --git a/Resources/Prototypes/Entities/Mobs/Player/tiefling.yml b/Resources/Prototypes/Entities/Mobs/Player/tiefling.yml new file mode 100644 index 0000000000..6fb9fc36c7 --- /dev/null +++ b/Resources/Prototypes/Entities/Mobs/Player/tiefling.yml @@ -0,0 +1,5 @@ +- type: entity + parent: BaseMobTiefling + id: MobTiefling + name: Mr. Tiefling + save: false diff --git a/Resources/Prototypes/Entities/Mobs/Species/tiefling.yml b/Resources/Prototypes/Entities/Mobs/Species/tiefling.yml new file mode 100644 index 0000000000..0fc74fb205 --- /dev/null +++ b/Resources/Prototypes/Entities/Mobs/Species/tiefling.yml @@ -0,0 +1,19 @@ +- type: entity + parent: BaseMobSpeciesOrganic + id: BaseMobTiefling + name: Mr. Tiefling + abstract: true + components: + - type: Hunger + - type: Icon + sprite: Mobs/Species/Tiefling/parts.rsi + state: full + - type: Thirst + +- type: entity + parent: BaseSpeciesDummy + id: MobTieflingDummy + noSpawn: true + components: + - type: HumanoidAppearance + species: Tiefling diff --git a/Resources/Prototypes/Species/tiefling.yml b/Resources/Prototypes/Species/tiefling.yml new file mode 100644 index 0000000000..d672e55a00 --- /dev/null +++ b/Resources/Prototypes/Species/tiefling.yml @@ -0,0 +1,159 @@ +- type: species + id: Tiefling + name: species-name-tiefling + roundStart: true + prototype: MobTiefling + sprites: MobTieflingSprites + markingLimits: MobTieflingMarkingLimits + dollPrototype: MobTieflingDummy + skinColoration: Hues + +# The lack of a layer means that +# this person cannot have round-start anything +# applied to that layer. It has to instead +# be defined as a 'custom base layer' +# in either the mob's starting marking prototype, +# or it has to be added in C#. +- type: speciesBaseSprites + id: MobTieflingSprites + sprites: + Head: MobTieflingHead + Hair: MobTieflingAnyMarking + FacialHair: MobTieflingAnyMarking + Snout: MobTieflingAnyMarking + Chest: MobTieflingTorso + Eyes: MobTieflingEyes + LArm: MobTieflingLArm + RArm: MobTieflingRArm + LHand: MobTieflingLHand + RHand: MobTieflingRHand + LLeg: MobTieflingLLeg + RLeg: MobTieflingRLeg + LFoot: MobTieflingLFoot + RFoot: MobTieflingRFoot + +- type: markingPoints + id: MobTieflingMarkingLimits + points: + Hair: + points: 1 + required: false + FacialHair: + points: 1 + required: false + Snout: + points: 1 + required: false + Tail: + points: 1 + required: true + defaultMarkings: [TieflingTail] + HeadTop: + points: 0 + required: false + Chest: + points: 1 + required: false + Legs: + points: 2 + required: false + Arms: + points: 2 + required: false + +- type: humanoidBaseSprite + id: MobTieflingEyes + baseSprite: + sprite: Mobs/Customization/eyes.rsi + state: eyes + +- type: humanoidBaseSprite + id: MobTieflingAnyMarking + +- type: humanoidBaseSprite + id: MobTieflingMarkingMatchSkin + markingsMatchSkin: true + +- type: humanoidBaseSprite + id: MobTieflingHead + baseSprite: + sprite: Mobs/Species/Tiefling/parts.rsi + state: head_m + +- type: humanoidBaseSprite + id: MobTieflingHeadMale + baseSprite: + sprite: Mobs/Species/Tiefling/parts.rsi + state: head_m + +- type: humanoidBaseSprite + id: MobTieflingHeadFemale + baseSprite: + sprite: Mobs/Species/Tiefling/parts.rsi + state: head_f + +- type: humanoidBaseSprite + id: MobTieflingTorso + baseSprite: + sprite: Mobs/Species/Tiefling/parts.rsi + state: torso_m + +- type: humanoidBaseSprite + id: MobTieflingTorsoMale + baseSprite: + sprite: Mobs/Species/Tiefling/parts.rsi + state: torso_m + +- type: humanoidBaseSprite + id: MobTieflingTorsoFemale + baseSprite: + sprite: Mobs/Species/Tiefling/parts.rsi + state: torso_f + +- type: humanoidBaseSprite + id: MobTieflingLLeg + baseSprite: + sprite: Mobs/Species/Tiefling/parts.rsi + state: l_leg + +- type: humanoidBaseSprite + id: MobTieflingLArm + baseSprite: + sprite: Mobs/Species/Tiefling/parts.rsi + state: l_arm + +- type: humanoidBaseSprite + id: MobTieflingLHand + baseSprite: + sprite: Mobs/Species/Tiefling/parts.rsi + state: l_hand + +- type: humanoidBaseSprite + id: MobTieflingLFoot + baseSprite: + sprite: Mobs/Species/Tiefling/parts.rsi + state: l_foot + +- type: humanoidBaseSprite + id: MobTieflingRLeg + baseSprite: + sprite: Mobs/Species/Tiefling/parts.rsi + state: r_leg + +- type: humanoidBaseSprite + id: MobTieflingRArm + baseSprite: + sprite: Mobs/Species/Tiefling/parts.rsi + state: r_arm + +- type: humanoidBaseSprite + id: MobTieflingRHand + baseSprite: + sprite: Mobs/Species/Tiefling/parts.rsi + state: r_hand + +- type: humanoidBaseSprite + id: MobTieflingRFoot + baseSprite: + sprite: Mobs/Species/Tiefling/parts.rsi + state: r_foot diff --git a/Resources/Textures/Mobs/Species/Tiefling/parts.rsi/full.png b/Resources/Textures/Mobs/Species/Tiefling/parts.rsi/full.png new file mode 100644 index 0000000000..39d9a69915 Binary files /dev/null and b/Resources/Textures/Mobs/Species/Tiefling/parts.rsi/full.png differ diff --git a/Resources/Textures/Mobs/Species/Tiefling/parts.rsi/head_f.png b/Resources/Textures/Mobs/Species/Tiefling/parts.rsi/head_f.png new file mode 100644 index 0000000000..b705d2d50e Binary files /dev/null and b/Resources/Textures/Mobs/Species/Tiefling/parts.rsi/head_f.png differ diff --git a/Resources/Textures/Mobs/Species/Tiefling/parts.rsi/head_m.png b/Resources/Textures/Mobs/Species/Tiefling/parts.rsi/head_m.png new file mode 100644 index 0000000000..e555d030be Binary files /dev/null and b/Resources/Textures/Mobs/Species/Tiefling/parts.rsi/head_m.png differ diff --git a/Resources/Textures/Mobs/Species/Tiefling/parts.rsi/l_arm.png b/Resources/Textures/Mobs/Species/Tiefling/parts.rsi/l_arm.png new file mode 100644 index 0000000000..cf3997a120 Binary files /dev/null and b/Resources/Textures/Mobs/Species/Tiefling/parts.rsi/l_arm.png differ diff --git a/Resources/Textures/Mobs/Species/Tiefling/parts.rsi/l_foot.png b/Resources/Textures/Mobs/Species/Tiefling/parts.rsi/l_foot.png new file mode 100644 index 0000000000..c448837af2 Binary files /dev/null and b/Resources/Textures/Mobs/Species/Tiefling/parts.rsi/l_foot.png differ diff --git a/Resources/Textures/Mobs/Species/Tiefling/parts.rsi/l_hand.png b/Resources/Textures/Mobs/Species/Tiefling/parts.rsi/l_hand.png new file mode 100644 index 0000000000..7bf47c949a Binary files /dev/null and b/Resources/Textures/Mobs/Species/Tiefling/parts.rsi/l_hand.png differ diff --git a/Resources/Textures/Mobs/Species/Tiefling/parts.rsi/l_leg.png b/Resources/Textures/Mobs/Species/Tiefling/parts.rsi/l_leg.png new file mode 100644 index 0000000000..b3ce27ba86 Binary files /dev/null and b/Resources/Textures/Mobs/Species/Tiefling/parts.rsi/l_leg.png differ diff --git a/Resources/Textures/Mobs/Species/Tiefling/parts.rsi/meta.json b/Resources/Textures/Mobs/Species/Tiefling/parts.rsi/meta.json new file mode 100644 index 0000000000..ce03292c8a --- /dev/null +++ b/Resources/Textures/Mobs/Species/Tiefling/parts.rsi/meta.json @@ -0,0 +1,62 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "https://github.com/tgstation/tgstation/blob/8024397cc81c5f47f74cf4279e35728487d0a1a7/icons/mob/human_parts_greyscale.dmi and modified by DrSmugleaf", + "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/Mobs/Species/Tiefling/parts.rsi/r_arm.png b/Resources/Textures/Mobs/Species/Tiefling/parts.rsi/r_arm.png new file mode 100644 index 0000000000..8887c30fa2 Binary files /dev/null and b/Resources/Textures/Mobs/Species/Tiefling/parts.rsi/r_arm.png differ diff --git a/Resources/Textures/Mobs/Species/Tiefling/parts.rsi/r_foot.png b/Resources/Textures/Mobs/Species/Tiefling/parts.rsi/r_foot.png new file mode 100644 index 0000000000..8d51a591a4 Binary files /dev/null and b/Resources/Textures/Mobs/Species/Tiefling/parts.rsi/r_foot.png differ diff --git a/Resources/Textures/Mobs/Species/Tiefling/parts.rsi/r_hand.png b/Resources/Textures/Mobs/Species/Tiefling/parts.rsi/r_hand.png new file mode 100644 index 0000000000..a481028126 Binary files /dev/null and b/Resources/Textures/Mobs/Species/Tiefling/parts.rsi/r_hand.png differ diff --git a/Resources/Textures/Mobs/Species/Tiefling/parts.rsi/r_leg.png b/Resources/Textures/Mobs/Species/Tiefling/parts.rsi/r_leg.png new file mode 100644 index 0000000000..67917397a1 Binary files /dev/null and b/Resources/Textures/Mobs/Species/Tiefling/parts.rsi/r_leg.png differ diff --git a/Resources/Textures/Mobs/Species/Tiefling/parts.rsi/torso_f.png b/Resources/Textures/Mobs/Species/Tiefling/parts.rsi/torso_f.png new file mode 100644 index 0000000000..cf7d2e72b5 Binary files /dev/null and b/Resources/Textures/Mobs/Species/Tiefling/parts.rsi/torso_f.png differ diff --git a/Resources/Textures/Mobs/Species/Tiefling/parts.rsi/torso_m.png b/Resources/Textures/Mobs/Species/Tiefling/parts.rsi/torso_m.png new file mode 100644 index 0000000000..3097763a95 Binary files /dev/null and b/Resources/Textures/Mobs/Species/Tiefling/parts.rsi/torso_m.png differ