diff --git a/Resources/Locale/en-US/ADT/Body/Parts/demon.ftl b/Resources/Locale/en-US/ADT/Body/Parts/demon.ftl new file mode 100644 index 00000000000..48a7c98fb8e --- /dev/null +++ b/Resources/Locale/en-US/ADT/Body/Parts/demon.ftl @@ -0,0 +1,22 @@ +ent-PartDemon = demon body part + .desc = { ent-BaseItem.desc } +ent-TorsoDemon = demon torso + .desc = { ent-PartDemon.desc } +ent-HeadDemon = demon head + .desc = { ent-PartDemon.desc } +ent-LeftArmDemon = left demon arm + .desc = { ent-PartDemon.desc } +ent-RightArmDemon = right demon arm + .desc = { ent-PartDemon.desc } +ent-LeftHandDemon = left demon hand + .desc = { ent-PartDemon.desc } +ent-RightHandDemon = right demon hand + .desc = { ent-PartDemon.desc } +ent-LeftLegDemon = left demon leg + .desc = { ent-PartDemon.desc } +ent-RightLegDemon = right demon leg + .desc = { ent-PartDemon.desc } +ent-LeftFootDemon = left demon foot + .desc = { ent-PartDemon.desc } +ent-RightFootDemon = right demon foot + .desc = { ent-PartDemon.desc } diff --git a/Resources/Locale/en-US/ADT/Entities/Mobs/Species/demon.ftl b/Resources/Locale/en-US/ADT/Entities/Mobs/Species/demon.ftl new file mode 100644 index 00000000000..d07b87e90b4 --- /dev/null +++ b/Resources/Locale/en-US/ADT/Entities/Mobs/Species/demon.ftl @@ -0,0 +1,4 @@ +ent-BaseMobDemon = Urisst' Mzhand Demon + .desc = { ent-BaseMobSpecies.desc } +ent-MobDemonDummy = Urist McHands + .desc = A dummy reptilian meant to be used in character setup. diff --git a/Resources/Locale/ru-RU/ADT/Body/Organs/demon.ftl b/Resources/Locale/ru-RU/ADT/Body/Organs/demon.ftl new file mode 100644 index 00000000000..a216c9d900e --- /dev/null +++ b/Resources/Locale/ru-RU/ADT/Body/Organs/demon.ftl @@ -0,0 +1,2 @@ +ent-OrganDemonStomach = { ent-OrganAnimalStomach } + .desc = { ent-OrganAnimalStomach.desc } diff --git a/Resources/Locale/ru-RU/ADT/Body/Organs/drask.ftl b/Resources/Locale/ru-RU/ADT/Body/Organs/drask.ftl new file mode 100644 index 00000000000..63dfb61b328 --- /dev/null +++ b/Resources/Locale/ru-RU/ADT/Body/Organs/drask.ftl @@ -0,0 +1,10 @@ +ent-OrganDraskEyes = глаза + .desc = Я тебя вижу! +ent-OrganDraskLungs = лёгкие + .desc = Фильтрует кислород из атмосферы, который затем поступает в кровь для использования в качестве переносчика электронов. +ent-OrganDraskHeart = сердце + .desc = Мне жаль того бессердечного ублюдка, который его потерял. +ent-OrganDraskInnards = внутренности + .desc = Мерзость. +ent-OrganDraskKidneys = почки + .desc = Выводят токсины из кровеносной системы. diff --git a/Resources/Locale/ru-RU/ADT/Body/Parts/demon.ftl b/Resources/Locale/ru-RU/ADT/Body/Parts/demon.ftl new file mode 100644 index 00000000000..d3d5b5e8ae6 --- /dev/null +++ b/Resources/Locale/ru-RU/ADT/Body/Parts/demon.ftl @@ -0,0 +1,22 @@ +ent-PartDemon = часть тела арканы + .desc = { ent-BaseItem.desc } +ent-TorsoDemon = торс арканы + .desc = { ent-PartDemon.desc } +ent-HeadDemon = голова арканы + .desc = { ent-PartDemon.desc } +ent-LeftArmDemon = левая рука арканы + .desc = { ent-PartDemon.desc } +ent-RightArmDemon = правая рука арканы + .desc = { ent-PartDemon.desc } +ent-LeftHandDemon = левая кисть арканы + .desc = { ent-PartDemon.desc } +ent-RightHandDemon = правая кисть арканы + .desc = { ent-PartDemon.desc } +ent-LeftLegDemon = левая нога арканы + .desc = { ent-PartDemon.desc } +ent-RightLegDemon = правая нога арканы + .desc = { ent-PartDemon.desc } +ent-LeftFootDemon = левая стопа арканы + .desc = { ent-PartDemon.desc } +ent-RightFootDemon = правая стопа арканы + .desc = { ent-PartDemon.desc } diff --git a/Resources/Locale/ru-RU/ADT/Body/Parts/drask.ftl b/Resources/Locale/ru-RU/ADT/Body/Parts/drask.ftl new file mode 100644 index 00000000000..5dd856b7d7d --- /dev/null +++ b/Resources/Locale/ru-RU/ADT/Body/Parts/drask.ftl @@ -0,0 +1,2 @@ +marking-DraskArmRight = правая рука +marking-DraskArmLeft = левая рука diff --git a/Resources/Locale/ru-RU/ADT/Chemistry/metabolizer-types.ftl b/Resources/Locale/ru-RU/ADT/Chemistry/metabolizer-types.ftl index ff10a218e10..c7d9b2badd2 100644 --- a/Resources/Locale/ru-RU/ADT/Chemistry/metabolizer-types.ftl +++ b/Resources/Locale/ru-RU/ADT/Chemistry/metabolizer-types.ftl @@ -10,3 +10,11 @@ metabolizer-type-dwarf = Дварф metabolizer-type-moth = Ниан metabolizer-type-arachnid = Арахнид metabolizer-type-drask = Драск +metabolizer-type-demon = Аркана +metabolizer-type-novakid = Новакид +metabolizer-type-shark = Акула +metabolizer-type-vulpkanin = Вульпканин +metabolizer-type-tajaran = Таяран +metabolizer-type-reptilian = Унатх +metabolizer-type-ursus = Урс +metabolizer-type-felinid = Фелинид diff --git a/Resources/Locale/ru-RU/ADT/Entities/Mobs/Player/demon.ftl b/Resources/Locale/ru-RU/ADT/Entities/Mobs/Player/demon.ftl new file mode 100644 index 00000000000..c9f0b371ae2 --- /dev/null +++ b/Resources/Locale/ru-RU/ADT/Entities/Mobs/Player/demon.ftl @@ -0,0 +1,2 @@ +ent-MobDemon = { ent-BaseMobDemon } + .desc = { ent-BaseMobDemon.desc } diff --git a/Resources/Locale/ru-RU/ADT/Entities/Mobs/Species/demon.ftl b/Resources/Locale/ru-RU/ADT/Entities/Mobs/Species/demon.ftl new file mode 100644 index 00000000000..ae5d1f883b4 --- /dev/null +++ b/Resources/Locale/ru-RU/ADT/Entities/Mobs/Species/demon.ftl @@ -0,0 +1,5 @@ +ent-BaseMobDemon = Урист МакАркана + .desc = { ent-BaseMobSpeciesOrganic.desc } + .suffix = Аркана +ent-MobDemonDummy = { ent-BaseSpeciesDummy } + .desc = { ent-BaseSpeciesDummy.desc } diff --git a/Resources/Locale/ru-RU/ADT/Species/demon.ftl b/Resources/Locale/ru-RU/ADT/Species/demon.ftl new file mode 100644 index 00000000000..903d09dfbd2 --- /dev/null +++ b/Resources/Locale/ru-RU/ADT/Species/demon.ftl @@ -0,0 +1 @@ +species-name-demon = Аркана diff --git a/Resources/Locale/ru-RU/ADT/Species/drask.ftl b/Resources/Locale/ru-RU/ADT/Species/drask.ftl index 6f61062aefc..5cdbc67a20a 100644 --- a/Resources/Locale/ru-RU/ADT/Species/drask.ftl +++ b/Resources/Locale/ru-RU/ADT/Species/drask.ftl @@ -1,13 +1 @@ species-name-drask = Драск -marking-DraskArmRight = правая рука -marking-DraskArmLeft = левая рука -ent-OrganDraskEyes = глаза - .desc = Я тебя вижу! -ent-OrganDraskLungs = лёгкие - .desc = Фильтрует кислород из атмосферы, который затем поступает в кровь для использования в качестве переносчика электронов. -ent-OrganDraskHeart = сердце - .desc = Мне жаль того бессердечного ублюдка, который его потерял. -ent-OrganDraskInnards = внутренности - .desc = Мерзость. -ent-OrganDraskKidneys = почки - .desc = Выводят токсины из кровеносной системы. diff --git a/Resources/Locale/ru-RU/ADT/Species/kobolt.ftl b/Resources/Locale/ru-RU/ADT/Species/kobolt.ftl new file mode 100644 index 00000000000..c3a413cdb86 --- /dev/null +++ b/Resources/Locale/ru-RU/ADT/Species/kobolt.ftl @@ -0,0 +1 @@ +species-name-kobolt = Кобольд diff --git a/Resources/Prototypes/ADT/Body/Organs/demon.yml b/Resources/Prototypes/ADT/Body/Organs/demon.yml new file mode 100644 index 00000000000..544df0ff960 --- /dev/null +++ b/Resources/Prototypes/ADT/Body/Organs/demon.yml @@ -0,0 +1,21 @@ +- type: entity + id: OrganDemonStomach + parent: OrganAnimalStomach + noSpawn: true + components: + - type: SolutionContainerManager + solutions: + stomach: + maxVol: 50 + +- type: entity + id: OrganDemonHeart + parent: OrganAnimalHeart + components: + - type: Metabolizer + maxReagents: 2 + metabolizerTypes: [ Demon ] + groups: + - id: Medicine + - id: Poison + - id: Narcotic diff --git a/Resources/Prototypes/ADT/Body/Organs/fill.txt b/Resources/Prototypes/ADT/Body/Organs/fill.txt deleted file mode 100644 index b4954caf47d..00000000000 --- a/Resources/Prototypes/ADT/Body/Organs/fill.txt +++ /dev/null @@ -1 +0,0 @@ -# Данный файл существует по причине того что Githab плохо дружит с пустыми папками, при работе с этой папкой этот файл можно спокойно удалить \ No newline at end of file diff --git a/Resources/Prototypes/ADT/Body/Parts/demon.yml b/Resources/Prototypes/ADT/Body/Parts/demon.yml new file mode 100644 index 00000000000..ddc0a23bd84 --- /dev/null +++ b/Resources/Prototypes/ADT/Body/Parts/demon.yml @@ -0,0 +1,193 @@ +# TODO: Add descriptions (many) +# TODO BODY: Part damage +- type: entity + id: PartDemon + parent: BaseItem + name: "demon body part" + abstract: true + components: + - type: Damageable + damageContainer: Biological + - type: BodyPart + - type: ContainerContainer + containers: + bodypart: !type:Container + ents: [] + - type: Tag + tags: + - Trash + +- type: entity + id: TorsoDemon + name: "demon torso" + parent: PartDemon + components: + - type: Sprite + netsync: false + sprite: ADT/Mobs/Demon/parts.rsi + state: "torso_m" + - type: Icon + sprite: ADT/Mobs/Demon/parts.rsi + state: "torso_m" + - type: BodyPart + partType: Torso + +- type: entity + id: HeadDemon + name: "demon head" + parent: PartDemon + components: + - type: Sprite + netsync: false + sprite: ADT/Mobs/Demon/parts.rsi + state: "head_m" + - type: Icon + sprite: ADT/Mobs/Demon/parts.rsi + state: "head_m" + - type: BodyPart + partType: Head + vital: true + - type: Input + context: "ghost" + - type: MovementSpeedModifier + baseWalkSpeed: 0 + baseSprintSpeed: 0 + - type: InputMover + - type: GhostOnMove + - type: Tag + tags: + - Head + +- type: entity + id: LeftArmDemon + name: "left demon arm" + parent: PartDemon + components: + - type: Sprite + netsync: false + sprite: ADT/Mobs/Demon/parts.rsi + state: "l_arm" + - type: Icon + sprite: ADT/Mobs/Demon/parts.rsi + state: "l_arm" + - type: BodyPart + partType: Arm + symmetry: Left + +- type: entity + id: RightArmDemon + name: "right demon arm" + parent: PartDemon + components: + - type: Sprite + netsync: false + sprite: ADT/Mobs/Demon/parts.rsi + state: "r_arm" + - type: Icon + sprite: ADT/Mobs/Demon/parts.rsi + state: "r_arm" + - type: BodyPart + partType: Arm + symmetry: Right + +- type: entity + id: LeftHandDemon + name: "left demon hand" + parent: PartDemon + components: + - type: Sprite + netsync: false + sprite: ADT/Mobs/Demon/parts.rsi + state: "l_hand" + - type: Icon + sprite: ADT/Mobs/Demon/parts.rsi + state: "l_hand" + - type: BodyPart + partType: Hand + symmetry: Left + +- type: entity + id: RightHandDemon + name: "right demon hand" + parent: PartDemon + components: + - type: Sprite + netsync: false + sprite: ADT/Mobs/Demon/parts.rsi + state: "r_hand" + - type: Icon + sprite: ADT/Mobs/Demon/parts.rsi + state: "r_hand" + - type: BodyPart + partType: Hand + symmetry: Right + +- type: entity + id: LeftLegDemon + name: "left demon leg" + parent: PartDemon + components: + - type: Sprite + netsync: false + sprite: ADT/Mobs/Demon/parts.rsi + state: "l_leg" + - type: Icon + sprite: ADT/Mobs/Demon/parts.rsi + state: "l_leg" + - type: BodyPart + partType: Leg + symmetry: Left + - type: MovementBodyPart + walkSpeed : 2.5 + sprintSpeed : 4.5 + +- type: entity + id: RightLegDemon + name: "right demon leg" + parent: PartDemon + components: + - type: Sprite + netsync: false + sprite: ADT/Mobs/Demon/parts.rsi + state: "r_leg" + - type: Icon + sprite: ADT/Mobs/Demon/parts.rsi + state: "r_leg" + - type: BodyPart + partType: Leg + symmetry: Right + - type: MovementBodyPart + walkSpeed : 2.5 + sprintSpeed : 4.5 + +- type: entity + id: LeftFootDemon + name: "left demon foot" + parent: PartDemon + components: + - type: Sprite + netsync: false + sprite: ADT/Mobs/Demon/parts.rsi + state: "l_foot" + - type: Icon + sprite: ADT/Mobs/Demon/parts.rsi + state: "l_foot" + - type: BodyPart + partType: Foot + symmetry: Left + +- type: entity + id: RightFootDemon + name: "right demon foot" + parent: PartDemon + components: + - type: Sprite + netsync: false + sprite: ADT/Mobs/Demon/parts.rsi + state: "r_foot" + - type: Icon + sprite: ADT/Mobs/Demon/parts.rsi + state: "r_foot" + - type: BodyPart + partType: Foot + symmetry: Right diff --git a/Resources/Prototypes/ADT/Body/Parts/fill.txt b/Resources/Prototypes/ADT/Body/Parts/fill.txt deleted file mode 100644 index b4954caf47d..00000000000 --- a/Resources/Prototypes/ADT/Body/Parts/fill.txt +++ /dev/null @@ -1 +0,0 @@ -# Данный файл существует по причине того что Githab плохо дружит с пустыми папками, при работе с этой папкой этот файл можно спокойно удалить \ No newline at end of file diff --git a/Resources/Prototypes/ADT/Body/Prototypes/demon.yml b/Resources/Prototypes/ADT/Body/Prototypes/demon.yml new file mode 100644 index 00000000000..ab2d8e2bdb1 --- /dev/null +++ b/Resources/Prototypes/ADT/Body/Prototypes/demon.yml @@ -0,0 +1,49 @@ +- type: body + name: "demon" + id: Demon + root: torso + slots: + head: + part: HeadDemon + connections: + - torso + organs: + brain: OrganHumanBrain + eyes: OrganHumanEyes + torso: + part: TorsoDemon + organs: + heart: OrganDemonHeart + lungs: OrganHumanLungs + stomach: OrganDemonStomach + liver: OrganAnimalLiver + kidneys: OrganHumanKidneys + connections: + - left arm + - right arm + - left leg + - right leg + right arm: + part: RightArmDemon + connections: + - right hand + left arm: + part: LeftArmDemon + connections: + - left hand + right hand: + part: RightHandDemon + left hand: + part: LeftHandDemon + right leg: + part: RightLegDemon + connections: + - right foot + left leg: + part: LeftLegDemon + connections: + - left foot + right foot: + part: RightFootDemon + left foot: + part: LeftFootDemon diff --git a/Resources/Prototypes/ADT/Chemistry/metabolizer_types.yml b/Resources/Prototypes/ADT/Chemistry/metabolizer_types.yml index 0e7706c1e5a..a492dde8d02 100644 --- a/Resources/Prototypes/ADT/Chemistry/metabolizer_types.yml +++ b/Resources/Prototypes/ADT/Chemistry/metabolizer_types.yml @@ -1,4 +1,4 @@ -# If your species wants to metabolize stuff differently, +# If your species wants to metabolize stuff differently, # you'll likely have to tag its metabolizers with something other than Human. - type: metabolizerType @@ -45,8 +45,38 @@ id: Arachnid name: metabolizer-type-arachnid - # Start ADT tweak: Drask +- type: metabolizerType + id: Novakid + name: metabolizer-type-novakid + +- type: metabolizerType + id: Demon + name: metabolizer-type-demon + +- type: metabolizerType + id: Shark + name: metabolizer-type-shark + +- type: metabolizerType + id: Vulpkanin + name: metabolizer-type-vulpkanin + +- type: metabolizerType + id: Tajaran + name: metabolizer-type-tajaran + +- type: metabolizerType + id: Reptilian + name: metabolizer-type-reptilian + +- type: metabolizerType + id: Ursus + name: metabolizer-type-ursus + - type: metabolizerType id: Drask name: metabolizer-type-drask - # End ADT tweak + +- type: metabolizerType + id: Felinid + name: metabolizer-type-felinid diff --git a/Resources/Prototypes/ADT/Damage/ADTmodifiers.yml b/Resources/Prototypes/ADT/Damage/ADTmodifiers.yml index 3f73c916c9f..17be8eafaad 100644 --- a/Resources/Prototypes/ADT/Damage/ADTmodifiers.yml +++ b/Resources/Prototypes/ADT/Damage/ADTmodifiers.yml @@ -1,12 +1,12 @@ -# - type: damageModifierSet -# id: Fur # 1) - ебучий годспид, балансим уроном. 2) - шерсть должна гореть -# coefficients: -# Blunt: 1 -# Piercing: 1.2 -# Slash: 1.2 -# Cold: 0.6 -# Heat: 1.5 -# Poison: 1 +- type: damageModifierSet + id: Fur # 1) - ебучий годспид, балансим уроном. 2) - шерсть должна гореть + coefficients: + Blunt: 1 + Piercing: 1.2 + Slash: 1.2 + Cold: 0.6 + Heat: 1.5 + Poison: 1 - type: damageModifierSet id: Kobalt # мне даже жаль кобальдов, но жизнь такова какова она какова и больше не какова @@ -19,27 +19,27 @@ Poison: 1 Bloodloss: 0.3 -# - type: damageModifierSet -# id: Demon # они вообще то мутанты, но кого ебёт так? -# coefficients: -# Blunt: 1 -# Piercing: 1 -# Slash: 1.0 -# Cold: 0.8 -# Heat: 0.8 -# Poison: 0.8 -# Cellular: 1.5 - -# - type: damageModifierSet -# id: Shadowkin # пупупу -# coefficients: -# Blunt: 1.2 -# Piercing: 1.2 -# Slash: 1.2 -# Cold: 0.8 -# Heat: 0.8 -# Poison: 1 -# Cellular: 1 +- type: damageModifierSet + id: Demon # они вообще то мутанты, но кого ебёт так? + coefficients: + Blunt: 1 + Piercing: 1 + Slash: 1.0 + Cold: 0.8 + Heat: 0.8 + Poison: 0.8 + Cellular: 1.5 + +- type: damageModifierSet + id: Shadowkin # пупупу + coefficients: + Blunt: 1.2 + Piercing: 1.2 + Slash: 1.2 + Cold: 0.8 + Heat: 0.8 + Poison: 1 + Cellular: 1 - type: damageModifierSet id: Drask # саморезы @@ -47,15 +47,15 @@ Heat: 1.5 Asphyxiation: 2.0 -# - type: damageModifierSet -# id: Felinid # мяу -# coefficients: -# Blunt: 1.0 -# Piercing: 1.15 -# Slash: 1.30 -# Cold: 1.5 -# Heat: 2.0 -# Poison: 1.1 +- type: damageModifierSet + id: Felinid # мяу + coefficients: + Blunt: 1.0 + Piercing: 1.15 + Slash: 1.30 + Cold: 1.5 + Heat: 2.0 + Poison: 1.1 - type: damageModifierSet id: CyborgMetallic @@ -86,10 +86,10 @@ Piercing: 9 Heat: 9 -# - type: damageModifierSet -# id: Ursus # мишк -# coefficients: -# Blunt: 1.0 +- type: damageModifierSet + id: Ursus # мишк + coefficients: + Blunt: 1.0 - type: damageModifierSet id: AshWalker # Груба кожа = умно ящериц diff --git a/Resources/Prototypes/ADT/Entities/Mobs/Customization/Markings/demon.yml b/Resources/Prototypes/ADT/Entities/Mobs/Customization/Markings/demon.yml new file mode 100644 index 00000000000..bb197ca124a --- /dev/null +++ b/Resources/Prototypes/ADT/Entities/Mobs/Customization/Markings/demon.yml @@ -0,0 +1,133 @@ +- type: marking + id: DemomTail1 + bodyPart: Tail + markingCategory: Tail + speciesRestriction: [DemonSpecies] + sprites: + - sprite: ADT/Mobs/Demon/custom.rsi + state: demon_tail + +- type: marking + id: DemomTailLong + bodyPart: Tail + markingCategory: Tail + speciesRestriction: [DemonSpecies] + sprites: + - sprite: ADT/Mobs/Demon/custom.rsi + state: long + +- type: marking + id: DemomTailUp + bodyPart: Tail + markingCategory: Tail + speciesRestriction: [DemonSpecies] + sprites: + - sprite: ADT/Mobs/Demon/custom.rsi + state: up + +- type: marking + id: DemonCowEars + bodyPart: HeadSide + markingCategory: HeadSide + speciesRestriction: [DemonSpecies] + sprites: + - sprite: ADT/Mobs/Demon/custom.rsi + state: cow_ears + +- type: marking + id: DemonEars + bodyPart: HeadSide + markingCategory: HeadSide + speciesRestriction: [DemonSpecies] + sprites: + - sprite: ADT/Mobs/Demon/custom.rsi + state: demon_ears + +- type: marking + id: DemonCowHorns + bodyPart: HeadTop + markingCategory: HeadTop + speciesRestriction: [DemonSpecies] + sprites: + - sprite: ADT/Mobs/Demon/custom.rsi + state: cow_horns + +- type: marking + id: DemonHornsDeer + bodyPart: HeadTop + markingCategory: HeadTop + speciesRestriction: [DemonSpecies] + sprites: + - sprite: ADT/Mobs/Demon/custom.rsi + state: deer_antlers_horns + +- type: marking + id: DemonHornsSmall + bodyPart: HeadTop + markingCategory: HeadTop + speciesRestriction: [DemonSpecies] + sprites: + - sprite: ADT/Mobs/Demon/custom.rsi + state: small_horns + +- type: marking + id: DemonChestCowSpots + bodyPart: Chest + markingCategory: Chest + speciesRestriction: [DemonSpecies] + sprites: + - sprite: ADT/Mobs/Demon/custom.rsi + state: cow_spots + +- type: marking + id: DemonChestGuard + bodyPart: Chest + markingCategory: Chest + speciesRestriction: [DemonSpecies] + sprites: + - sprite: ADT/Mobs/Demon/custom.rsi + state: guards_stripes + +- type: marking + id: DemonChestLinesEmperos + bodyPart: Chest + markingCategory: Chest + speciesRestriction: [DemonSpecies] + sprites: + - sprite: ADT/Mobs/Demon/custom.rsi + state: lines_emperos + +- type: marking + id: DemonChestQueenLines + bodyPart: Chest + markingCategory: Chest + speciesRestriction: [DemonSpecies] + sprites: + - sprite: ADT/Mobs/Demon/custom.rsi + state: queen_lines + +- type: marking + id: DemonChestTreeLines + bodyPart: Chest + markingCategory: Chest + speciesRestriction: [DemonSpecies] + sprites: + - sprite: ADT/Mobs/Demon/custom.rsi + state: tree_lines + +- type: marking + id: DemonChestTrinitySpots + bodyPart: Chest + markingCategory: Chest + speciesRestriction: [DemonSpecies] + sprites: + - sprite: ADT/Mobs/Demon/custom.rsi + state: trinity_spots + +- type: marking + id: DemonGoatee + bodyPart: FacialHair + markingCategory: FacialHair + sprites: + - sprite: ADT/Mobs/Demon/custom.rsi + state: goatee diff --git a/Resources/Prototypes/ADT/Entities/Mobs/Customization/Markings/fill.txt b/Resources/Prototypes/ADT/Entities/Mobs/Customization/Markings/fill.txt deleted file mode 100644 index b4954caf47d..00000000000 --- a/Resources/Prototypes/ADT/Entities/Mobs/Customization/Markings/fill.txt +++ /dev/null @@ -1 +0,0 @@ -# Данный файл существует по причине того что Githab плохо дружит с пустыми папками, при работе с этой папкой этот файл можно спокойно удалить \ No newline at end of file diff --git a/Resources/Prototypes/ADT/Entities/Mobs/Player/demon.yml b/Resources/Prototypes/ADT/Entities/Mobs/Player/demon.yml new file mode 100644 index 00000000000..04c38254a16 --- /dev/null +++ b/Resources/Prototypes/ADT/Entities/Mobs/Player/demon.yml @@ -0,0 +1,50 @@ +- type: entity + save: false + name: Urisst' Mzhand Demon + parent: BaseMobDemon + id: MobDemon + components: + - type: CombatMode + - type: InteractionPopup + successChance: 1 + interactSuccessString: hugging-success-generic + interactSuccessSound: /Audio/Effects/thudswoosh.ogg + messagePerceivedByOthers: hugging-success-generic-others + - type: MindContainer + showExamineInfo: true + - type: Input + context: "human" + - type: MobMover + - type: InputMover + - type: Alerts + - type: Eye + - type: CameraRecoil + - type: Examiner + - type: CanHostGuardian + + # ОТКОММЕНТИТЬ ПРИ ПЕРЕНОСЕ ЯЗЫКОВ И РАЗМЕРОВ + # - type: LanguageSpeaker + # speaks: + # - GalacticCommon + # - Arkane + # understands: + # - GalacticCommon + # - Arkane + + - type: NpcFactionMember + factions: + - NanoTrasen + - type: Respirator + damage: + types: + Asphyxiation: 1.0 + damageRecovery: + types: + Asphyxiation: -1.0 + # - type: SizeAttributeWhitelist # Frontier + # tall: true + # tallscale: 1.1 + # short: true + # shortscale: 0.9 + +#Weh diff --git a/Resources/Prototypes/ADT/Entities/Mobs/Player/fill.txt b/Resources/Prototypes/ADT/Entities/Mobs/Player/fill.txt deleted file mode 100644 index b4954caf47d..00000000000 --- a/Resources/Prototypes/ADT/Entities/Mobs/Player/fill.txt +++ /dev/null @@ -1 +0,0 @@ -# Данный файл существует по причине того что Githab плохо дружит с пустыми папками, при работе с этой папкой этот файл можно спокойно удалить \ No newline at end of file diff --git a/Resources/Prototypes/ADT/Entities/Mobs/Species/demon.yml b/Resources/Prototypes/ADT/Entities/Mobs/Species/demon.yml new file mode 100644 index 00000000000..6f99d513004 --- /dev/null +++ b/Resources/Prototypes/ADT/Entities/Mobs/Species/demon.yml @@ -0,0 +1,66 @@ +- type: entity + save: false + name: Urisst' Mzhand Demon + parent: BaseMobSpeciesOrganic + id: BaseMobDemon + abstract: true + components: + - type: HumanoidAppearance + species: DemonSpecies + - type: Hunger + - type: Thirst + - type: Icon + sprite: ADT/Mobs/Demon/parts.rsi + state: full_m + - type: Sprite + netsync: false + noRot: true + drawdepth: Mobs + - type: Body + prototype: Demon + requiredLegs: 2 + - type: Speech + speechSounds: Lizard + - type: Vocal + sounds: + Male: MaleHuman + Female: FemaleHuman + Unsexed: FemaleHuman + - type: Damageable + damageContainer: Biological + damageModifierSet: Demon + - type: MeleeWeapon + # hidden: true + soundHit: + path: /Audio/Weapons/pierce.ogg + angle: 30 + animation: WeaponArcPunch + damage: + types: + Piercing: 5 + - type: Temperature + heatDamageThreshold: 400 + coldDamageThreshold: 193 #starting temperature damage treshold + currentTemperature: 310.15 + specificHeat: 46 + coldDamage: + types: + Cold : 0.1 #per second, scales with temperature & other constants + heatDamage: + types: + Heat : 0.3 #per second, scales with temperature & other constants + - type: MovementSpeedModifier + baseWalkSpeed : 2.5 + baseSprintSpeed : 4.5 + - type: Perishable + +- type: entity + save: false + name: Urist McHands + parent: MobHumanDummy + id: MobDemonDummy + noSpawn: true + description: A dummy reptilian meant to be used in character setup. + components: + - type: HumanoidAppearance + species: DemonSpecies diff --git a/Resources/Prototypes/ADT/Entities/Mobs/Species/fill.txt b/Resources/Prototypes/ADT/Entities/Mobs/Species/fill.txt deleted file mode 100644 index b4954caf47d..00000000000 --- a/Resources/Prototypes/ADT/Entities/Mobs/Species/fill.txt +++ /dev/null @@ -1 +0,0 @@ -# Данный файл существует по причине того что Githab плохо дружит с пустыми папками, при работе с этой папкой этот файл можно спокойно удалить \ No newline at end of file diff --git a/Resources/Prototypes/ADT/Species/demon.yml b/Resources/Prototypes/ADT/Species/demon.yml new file mode 100644 index 00000000000..82bbe62c593 --- /dev/null +++ b/Resources/Prototypes/ADT/Species/demon.yml @@ -0,0 +1,157 @@ +- type: species + id: DemonSpecies + name: species-name-demon + roundStart: true + prototype: MobDemon + sprites: MobDemonSprites + defaultSkinTone: "#34a223" + markingLimits: MobDemonMarkingLimits + dollPrototype: MobDemonDummy + skinColoration: Hues + maleFirstNames: names_first_male + femaleFirstNames: names_first_female + maleLastNames: names_last_male + femaleLastNames: names_last_female + naming: firstlast + +- type: speciesBaseSprites + id: MobDemonSprites + sprites: + Head: MobDemonHead + Hair: MobHumanoidAnyMarking + FacialHair: MobHumanoidAnyMarking + Snout: MobHumanoidAnyMarking + Chest: MobDemonTorso + HeadTop: MobHumanoidAnyMarking + HeadSide: MobHumanoidAnyMarking + Tail: MobDemonTail + Eyes: MobHumanoidEyes + LArm: MobDemonLArm + RArm: MobDemonRArm + LHand: MobDemonLHand + RHand: MobDemonRHand + LLeg: MobDemonLLeg + RLeg: MobDemonRLeg + LFoot: MobDemonLFoot + RFoot: MobDemonRFoot + +- type: markingPoints + id: MobDemonMarkingLimits + points: + Hair: + points: 1 + required: false + FacialHair: + points: 1 + required: false + HeadTop: + points: 1 + required: false + HeadSide: + points: 1 + required: false + Chest: + points: 1 + required: false + Tail: + points: 1 + required: false + Snout: + points: 1 + required: false + Legs: + points: 2 + required: false + Arms: + points: 2 + required: false + +- type: humanoidBaseSprite + id: MobDemonHead + baseSprite: + sprite: ADT/Mobs/Demon/parts.rsi + state: head_m + +- type: humanoidBaseSprite + id: MobDemonHeadMale + baseSprite: + sprite: ADT/Mobs/Demon/parts.rsi + state: head_m + +- type: humanoidBaseSprite + id: MobDemonHeadFemale + baseSprite: + sprite: ADT/Mobs/Demon/parts.rsi + state: head_f + +- type: humanoidBaseSprite + id: MobDemonTorso + baseSprite: + sprite: ADT/Mobs/Demon/parts.rsi + state: torso_m + +- type: humanoidBaseSprite + id: MobDemonTorsoMale + baseSprite: + sprite: ADT/Mobs/Demon/parts.rsi + state: torso_m + +- type: humanoidBaseSprite + id: MobDemonTorsoFemale + baseSprite: + sprite: ADT/Mobs/Demon/parts.rsi + state: torso_f + +- type: humanoidBaseSprite + id: MobDemonLLeg + baseSprite: + sprite: ADT/Mobs/Demon/parts.rsi + state: l_leg + +- type: humanoidBaseSprite + id: MobDemonLHand + baseSprite: + sprite: ADT/Mobs/Demon/parts.rsi + state: l_hand + +- type: humanoidBaseSprite + id: MobDemonLArm + baseSprite: + sprite: ADT/Mobs/Demon/parts.rsi + state: l_arm + +- type: humanoidBaseSprite + id: MobDemonLFoot + baseSprite: + sprite: ADT/Mobs/Demon/parts.rsi + state: l_foot + +- type: humanoidBaseSprite + id: MobDemonRLeg + baseSprite: + sprite: ADT/Mobs/Demon/parts.rsi + state: r_leg + +- type: humanoidBaseSprite + id: MobDemonRHand + baseSprite: + sprite: ADT/Mobs/Demon/parts.rsi + state: r_hand + +- type: humanoidBaseSprite + id: MobDemonRArm + baseSprite: + sprite: ADT/Mobs/Demon/parts.rsi + state: r_arm + +- type: humanoidBaseSprite + id: MobDemonRFoot + baseSprite: + sprite: ADT/Mobs/Demon/parts.rsi + state: r_foot + +- type: humanoidBaseSprite + id: MobDemonTail + baseSprite: + sprite: ADT/Mobs/Demon/parts.rsi + state: tail diff --git a/Resources/Textures/ADT/Mobs/Demon/custom.rsi/cow_ears.png b/Resources/Textures/ADT/Mobs/Demon/custom.rsi/cow_ears.png new file mode 100644 index 00000000000..6c7c43592a0 Binary files /dev/null and b/Resources/Textures/ADT/Mobs/Demon/custom.rsi/cow_ears.png differ diff --git a/Resources/Textures/ADT/Mobs/Demon/custom.rsi/cow_horns.png b/Resources/Textures/ADT/Mobs/Demon/custom.rsi/cow_horns.png new file mode 100644 index 00000000000..9475831cebf Binary files /dev/null and b/Resources/Textures/ADT/Mobs/Demon/custom.rsi/cow_horns.png differ diff --git a/Resources/Textures/ADT/Mobs/Demon/custom.rsi/cow_spots.png b/Resources/Textures/ADT/Mobs/Demon/custom.rsi/cow_spots.png new file mode 100644 index 00000000000..f6e3dbc9452 Binary files /dev/null and b/Resources/Textures/ADT/Mobs/Demon/custom.rsi/cow_spots.png differ diff --git a/Resources/Textures/ADT/Mobs/Demon/custom.rsi/deer_antlers_horns.png b/Resources/Textures/ADT/Mobs/Demon/custom.rsi/deer_antlers_horns.png new file mode 100644 index 00000000000..2341a2e340e Binary files /dev/null and b/Resources/Textures/ADT/Mobs/Demon/custom.rsi/deer_antlers_horns.png differ diff --git a/Resources/Textures/ADT/Mobs/Demon/custom.rsi/demon_ears.png b/Resources/Textures/ADT/Mobs/Demon/custom.rsi/demon_ears.png new file mode 100644 index 00000000000..14e05f4b545 Binary files /dev/null and b/Resources/Textures/ADT/Mobs/Demon/custom.rsi/demon_ears.png differ diff --git a/Resources/Textures/ADT/Mobs/Demon/custom.rsi/demon_tail.png b/Resources/Textures/ADT/Mobs/Demon/custom.rsi/demon_tail.png new file mode 100644 index 00000000000..53bb821fa88 Binary files /dev/null and b/Resources/Textures/ADT/Mobs/Demon/custom.rsi/demon_tail.png differ diff --git a/Resources/Textures/ADT/Mobs/Demon/custom.rsi/goatee.png b/Resources/Textures/ADT/Mobs/Demon/custom.rsi/goatee.png new file mode 100644 index 00000000000..98a511a24ab Binary files /dev/null and b/Resources/Textures/ADT/Mobs/Demon/custom.rsi/goatee.png differ diff --git a/Resources/Textures/ADT/Mobs/Demon/custom.rsi/guards_stripes.png b/Resources/Textures/ADT/Mobs/Demon/custom.rsi/guards_stripes.png new file mode 100644 index 00000000000..0c55c27d6fb Binary files /dev/null and b/Resources/Textures/ADT/Mobs/Demon/custom.rsi/guards_stripes.png differ diff --git a/Resources/Textures/ADT/Mobs/Demon/custom.rsi/lines_emperos.png b/Resources/Textures/ADT/Mobs/Demon/custom.rsi/lines_emperos.png new file mode 100644 index 00000000000..5e8536c75c6 Binary files /dev/null and b/Resources/Textures/ADT/Mobs/Demon/custom.rsi/lines_emperos.png differ diff --git a/Resources/Textures/ADT/Mobs/Demon/custom.rsi/long.png b/Resources/Textures/ADT/Mobs/Demon/custom.rsi/long.png new file mode 100644 index 00000000000..af7875e2fb5 Binary files /dev/null and b/Resources/Textures/ADT/Mobs/Demon/custom.rsi/long.png differ diff --git a/Resources/Textures/ADT/Mobs/Demon/custom.rsi/meta.json b/Resources/Textures/ADT/Mobs/Demon/custom.rsi/meta.json new file mode 100644 index 00000000000..5c76f5ca418 --- /dev/null +++ b/Resources/Textures/ADT/Mobs/Demon/custom.rsi/meta.json @@ -0,0 +1,71 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Created by discord:lunalita", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "cow_ears", + "directions": 4 + }, + { + "name": "demon_ears", + "directions": 4 + }, + { + "name": "goatee", + "directions": 4 + }, + { + "name": "cow_horns", + "directions": 4 + }, + { + "name": "cow_spots", + "directions": 4 + }, + { + "name": "deer_antlers_horns", + "directions": 4 + }, + { + "name": "guards_stripes", + "directions": 4 + }, + { + "name": "lines_emperos", + "directions": 4 + }, + { + "name": "queen_lines", + "directions": 4 + }, + { + "name": "small_horns", + "directions": 4 + }, + { + "name": "tree_lines", + "directions": 4 + }, + { + "name": "trinity_spots", + "directions": 4 + }, + { + "name": "demon_tail", + "directions": 4 + }, + { + "name": "long", + "directions": 4 + }, + { + "name": "up", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/ADT/Mobs/Demon/custom.rsi/queen_lines.png b/Resources/Textures/ADT/Mobs/Demon/custom.rsi/queen_lines.png new file mode 100644 index 00000000000..0e30ea261a4 Binary files /dev/null and b/Resources/Textures/ADT/Mobs/Demon/custom.rsi/queen_lines.png differ diff --git a/Resources/Textures/ADT/Mobs/Demon/custom.rsi/small_horns.png b/Resources/Textures/ADT/Mobs/Demon/custom.rsi/small_horns.png new file mode 100644 index 00000000000..44618403c91 Binary files /dev/null and b/Resources/Textures/ADT/Mobs/Demon/custom.rsi/small_horns.png differ diff --git a/Resources/Textures/ADT/Mobs/Demon/custom.rsi/tree_lines.png b/Resources/Textures/ADT/Mobs/Demon/custom.rsi/tree_lines.png new file mode 100644 index 00000000000..4a555c4d113 Binary files /dev/null and b/Resources/Textures/ADT/Mobs/Demon/custom.rsi/tree_lines.png differ diff --git a/Resources/Textures/ADT/Mobs/Demon/custom.rsi/trinity_spots.png b/Resources/Textures/ADT/Mobs/Demon/custom.rsi/trinity_spots.png new file mode 100644 index 00000000000..1fec0d2cade Binary files /dev/null and b/Resources/Textures/ADT/Mobs/Demon/custom.rsi/trinity_spots.png differ diff --git a/Resources/Textures/ADT/Mobs/Demon/custom.rsi/up.png b/Resources/Textures/ADT/Mobs/Demon/custom.rsi/up.png new file mode 100644 index 00000000000..898e7d4b914 Binary files /dev/null and b/Resources/Textures/ADT/Mobs/Demon/custom.rsi/up.png differ diff --git a/Resources/Textures/ADT/Mobs/Demon/parts.rsi/full_f.png b/Resources/Textures/ADT/Mobs/Demon/parts.rsi/full_f.png new file mode 100644 index 00000000000..f9eec1209b8 Binary files /dev/null and b/Resources/Textures/ADT/Mobs/Demon/parts.rsi/full_f.png differ diff --git a/Resources/Textures/ADT/Mobs/Demon/parts.rsi/full_m.png b/Resources/Textures/ADT/Mobs/Demon/parts.rsi/full_m.png new file mode 100644 index 00000000000..f8f1bbbcf65 Binary files /dev/null and b/Resources/Textures/ADT/Mobs/Demon/parts.rsi/full_m.png differ diff --git a/Resources/Textures/ADT/Mobs/Demon/parts.rsi/full_t.png b/Resources/Textures/ADT/Mobs/Demon/parts.rsi/full_t.png new file mode 100644 index 00000000000..3c71c7d8c3f Binary files /dev/null and b/Resources/Textures/ADT/Mobs/Demon/parts.rsi/full_t.png differ diff --git a/Resources/Textures/ADT/Mobs/Demon/parts.rsi/head_f.png b/Resources/Textures/ADT/Mobs/Demon/parts.rsi/head_f.png new file mode 100644 index 00000000000..1285b693dcc Binary files /dev/null and b/Resources/Textures/ADT/Mobs/Demon/parts.rsi/head_f.png differ diff --git a/Resources/Textures/ADT/Mobs/Demon/parts.rsi/head_m.png b/Resources/Textures/ADT/Mobs/Demon/parts.rsi/head_m.png new file mode 100644 index 00000000000..181643e9ddc Binary files /dev/null and b/Resources/Textures/ADT/Mobs/Demon/parts.rsi/head_m.png differ diff --git a/Resources/Textures/ADT/Mobs/Demon/parts.rsi/head_t.png b/Resources/Textures/ADT/Mobs/Demon/parts.rsi/head_t.png new file mode 100644 index 00000000000..1285b693dcc Binary files /dev/null and b/Resources/Textures/ADT/Mobs/Demon/parts.rsi/head_t.png differ diff --git a/Resources/Textures/ADT/Mobs/Demon/parts.rsi/l_arm.png b/Resources/Textures/ADT/Mobs/Demon/parts.rsi/l_arm.png new file mode 100644 index 00000000000..0b124d8c83d Binary files /dev/null and b/Resources/Textures/ADT/Mobs/Demon/parts.rsi/l_arm.png differ diff --git a/Resources/Textures/ADT/Mobs/Demon/parts.rsi/l_foot.png b/Resources/Textures/ADT/Mobs/Demon/parts.rsi/l_foot.png new file mode 100644 index 00000000000..d7fa72f6b5a Binary files /dev/null and b/Resources/Textures/ADT/Mobs/Demon/parts.rsi/l_foot.png differ diff --git a/Resources/Textures/ADT/Mobs/Demon/parts.rsi/l_hand.png b/Resources/Textures/ADT/Mobs/Demon/parts.rsi/l_hand.png new file mode 100644 index 00000000000..ff61ecd0cff Binary files /dev/null and b/Resources/Textures/ADT/Mobs/Demon/parts.rsi/l_hand.png differ diff --git a/Resources/Textures/ADT/Mobs/Demon/parts.rsi/l_leg.png b/Resources/Textures/ADT/Mobs/Demon/parts.rsi/l_leg.png new file mode 100644 index 00000000000..2125370c5b0 Binary files /dev/null and b/Resources/Textures/ADT/Mobs/Demon/parts.rsi/l_leg.png differ diff --git a/Resources/Textures/ADT/Mobs/Demon/parts.rsi/meta.json b/Resources/Textures/ADT/Mobs/Demon/parts.rsi/meta.json new file mode 100644 index 00000000000..7aa4c0b100c --- /dev/null +++ b/Resources/Textures/ADT/Mobs/Demon/parts.rsi/meta.json @@ -0,0 +1,80 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Created by discord:lunalita", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "full_f" + }, + { + "name": "full_m" + }, + { + "name": "full_t" + }, + { + "name": "head_f", + "directions": 4 + }, + { + "name": "head_m", + "directions": 4 + }, + { + "name": "head_t", + "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 + }, + { + "name": "torso_t", + "directions": 4 + }, + { + "name": "tail", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/ADT/Mobs/Demon/parts.rsi/r_arm.png b/Resources/Textures/ADT/Mobs/Demon/parts.rsi/r_arm.png new file mode 100644 index 00000000000..3b88f4ec6a2 Binary files /dev/null and b/Resources/Textures/ADT/Mobs/Demon/parts.rsi/r_arm.png differ diff --git a/Resources/Textures/ADT/Mobs/Demon/parts.rsi/r_foot.png b/Resources/Textures/ADT/Mobs/Demon/parts.rsi/r_foot.png new file mode 100644 index 00000000000..92cc25101de Binary files /dev/null and b/Resources/Textures/ADT/Mobs/Demon/parts.rsi/r_foot.png differ diff --git a/Resources/Textures/ADT/Mobs/Demon/parts.rsi/r_hand.png b/Resources/Textures/ADT/Mobs/Demon/parts.rsi/r_hand.png new file mode 100644 index 00000000000..74b5130e82e Binary files /dev/null and b/Resources/Textures/ADT/Mobs/Demon/parts.rsi/r_hand.png differ diff --git a/Resources/Textures/ADT/Mobs/Demon/parts.rsi/r_leg.png b/Resources/Textures/ADT/Mobs/Demon/parts.rsi/r_leg.png new file mode 100644 index 00000000000..020edfde734 Binary files /dev/null and b/Resources/Textures/ADT/Mobs/Demon/parts.rsi/r_leg.png differ diff --git a/Resources/Textures/ADT/Mobs/Demon/parts.rsi/tail.png b/Resources/Textures/ADT/Mobs/Demon/parts.rsi/tail.png new file mode 100644 index 00000000000..cd8f833d5d3 Binary files /dev/null and b/Resources/Textures/ADT/Mobs/Demon/parts.rsi/tail.png differ diff --git a/Resources/Textures/ADT/Mobs/Demon/parts.rsi/torso_f.png b/Resources/Textures/ADT/Mobs/Demon/parts.rsi/torso_f.png new file mode 100644 index 00000000000..c7c0027dafb Binary files /dev/null and b/Resources/Textures/ADT/Mobs/Demon/parts.rsi/torso_f.png differ diff --git a/Resources/Textures/ADT/Mobs/Demon/parts.rsi/torso_m.png b/Resources/Textures/ADT/Mobs/Demon/parts.rsi/torso_m.png new file mode 100644 index 00000000000..bfef26f5c21 Binary files /dev/null and b/Resources/Textures/ADT/Mobs/Demon/parts.rsi/torso_m.png differ diff --git a/Resources/Textures/ADT/Mobs/Demon/parts.rsi/torso_t.png b/Resources/Textures/ADT/Mobs/Demon/parts.rsi/torso_t.png new file mode 100644 index 00000000000..3987d315315 Binary files /dev/null and b/Resources/Textures/ADT/Mobs/Demon/parts.rsi/torso_t.png differ