diff --git a/Resources/Locale/ru-RU/markings/skrells.ftl b/Resources/Locale/ru-RU/markings/skrells.ftl new file mode 100644 index 00000000000..6abad9f8394 --- /dev/null +++ b/Resources/Locale/ru-RU/markings/skrells.ftl @@ -0,0 +1,3 @@ +marking-SkrellHairVeryShort = Очень короткие отростки +marking-SkrellHairShort = Короткие отростки +marking-SkrellHairLong = Длинные отростки diff --git a/Resources/Locale/ru-RU/species/species.ftl b/Resources/Locale/ru-RU/species/species.ftl index 4e5e5e23d63..511ef5876b5 100644 --- a/Resources/Locale/ru-RU/species/species.ftl +++ b/Resources/Locale/ru-RU/species/species.ftl @@ -9,4 +9,5 @@ species-name-arachnid = Арахнид species-name-moth = Ниан species-name-skeleton = Скелет species-name-vulpkanin = Вульпканин +species-name-skrell = Скрелл species-name-terminator = Терминатор \ No newline at end of file diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/body/organs/skrell.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/body/organs/skrell.ftl new file mode 100644 index 00000000000..df8de22168d --- /dev/null +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/body/organs/skrell.ftl @@ -0,0 +1,4 @@ +ent-OrganSkrellLiver = печень скрелла + .desc = { ent-OrganHumanLiver.desc } +ent-OrganSkrellStomach = желудок скрелла + .desc = { ent-OrganHumanStomach.desc } diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/body/parts/skrell.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/body/parts/skrell.ftl new file mode 100644 index 00000000000..5b18f179cef --- /dev/null +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/body/parts/skrell.ftl @@ -0,0 +1,22 @@ +ent-PartSkrell = часть тела скрелла + .desc = { ent-BaseItem.desc } +ent-TorsoSkrell = туловище скрелла + .desc = { ent-PartSkrell.desc } +ent-HeadSkrell = голова скрелла + .desc = { ent-PartSkrell.desc } +ent-LeftArmSkrell = левая рука скрелла + .desc = { ent-PartSkrell.desc } +ent-RightArmSkrell = правая рука скрелла + .desc = { ent-PartSkrell.desc } +ent-LeftHandSkrell = левая кисть скрелла + .desc = { ent-PartSkrell.desc } +ent-RightHandSkrell = правая кисть скрелла + .desc = { ent-PartSkrell.desc } +ent-LeftLegSkrell = левая нога скрелла + .desc = { ent-PartSkrell.desc } +ent-RightLegSkrell = правая нога скрелла + .desc = { ent-PartSkrell.desc } +ent-LeftFootSkrell = левая стопа скрелла + .desc = { ent-PartSkrell.desc } +ent-RightFootSkrell = правая стопа скрелла + .desc = { ent-PartSkrell.desc } diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/mobs/player/skrell.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/mobs/player/skrell.ftl new file mode 100644 index 00000000000..0e4d75ff564 --- /dev/null +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/mobs/player/skrell.ftl @@ -0,0 +1,2 @@ +ent-MobSkrell = Урист МакСкрелл + .desc = { ent-BaseMobSkrell.desc } \ No newline at end of file diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/mobs/species/skrell.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/mobs/species/skrell.ftl new file mode 100644 index 00000000000..7a5cd16236e --- /dev/null +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/mobs/species/skrell.ftl @@ -0,0 +1,5 @@ +ent-BaseMobSkrell = Урист МакСкрелл + .desc = { ent-BaseMobSpeciesOrganic.desc } + .suffix = Человек +ent-MobSkrellDummy = { ent-BaseSpeciesDummy } + .desc = { ent-BaseSpeciesDummy.desc } diff --git a/Resources/Prototypes/Body/Organs/skrell.yml b/Resources/Prototypes/Body/Organs/skrell.yml new file mode 100644 index 00000000000..bef1afa7c90 --- /dev/null +++ b/Resources/Prototypes/Body/Organs/skrell.yml @@ -0,0 +1,41 @@ +#license: CLA +#copyright: https://github.com/ss14-ganimed/ENT14-Master/blob/master/CLA.txt +- type: entity + id: OrganSkrellStomach + parent: OrganAnimalStomach + noSpawn: true + components: + - type: Stomach + specialDigestible: + tags: + - Fruit + - Pill + - Crayon + - FoodSnack + - type: SolutionContainerManager + solutions: + stomach: + maxVol: 50 + food: + maxVol: 5 + reagents: + - ReagentId: UncookedAnimalProteins + Quantity: 5 + +- type: entity + id: OrganSkrellLiver + parent: OrganHumanLiver + name: skrell liver + components: + - type: Metabolizer + maxReagents: 3 + metabolizerTypes: [ Skrell ] + removeEmpty: true + groups: + - id: Food + - id: Drink + - id: Medicine + - id: Poison + - id: Narcotic + - id: Alcohol + rateModifier: 0.1 \ No newline at end of file diff --git a/Resources/Prototypes/Body/Parts/skrell.yml b/Resources/Prototypes/Body/Parts/skrell.yml new file mode 100644 index 00000000000..b9af1381f8e --- /dev/null +++ b/Resources/Prototypes/Body/Parts/skrell.yml @@ -0,0 +1,121 @@ +# TODO: Add descriptions (many) +# TODO BODY: Part damage +#license: CLA +#copyright: https://github.com/ss14-ganimed/ENT14-Master/blob/master/CLA.txt +- type: entity + id: PartSkrell + parent: [BaseItem, BasePart] + name: "skrell body part" + abstract: true + components: + - type: Extractable + juiceSolution: + reagents: + - ReagentId: Fat + Quantity: 3 + - ReagentId: Blood + Quantity: 10 + +- type: entity + id: TorsoSkrell + name: "skrell torso" + parent: [PartSkrell, BaseTorso] + components: + - type: Sprite + sprite: Mobs/Species/Skrell/parts.rsi + state: "torso_m" + - type: Extractable + juiceSolution: + reagents: + - ReagentId: Fat + Quantity: 10 + - ReagentId: Blood + Quantity: 20 + +- type: entity + id: HeadSkrell + name: "skrell head" + parent: [PartSkrell, BaseHead] + components: + - type: Sprite + sprite: Mobs/Species/Skrell/parts.rsi + state: "head_m" + - type: Extractable + juiceSolution: + reagents: + - ReagentId: Fat + Quantity: 5 + - ReagentId: Blood + Quantity: 10 + +- type: entity + id: LeftArmSkrell + name: "left skrell arm" + parent: [PartSkrell, BaseLeftArm] + components: + - type: Sprite + sprite: Mobs/Species/Skrell/parts.rsi + state: "l_arm" + +- type: entity + id: RightArmSkrell + name: "right skrell arm" + parent: [PartSkrell, BaseRightArm] + components: + - type: Sprite + sprite: Mobs/Species/Skrell/parts.rsi + state: "r_arm" + +- type: entity + id: LeftHandSkrell + name: "left skrell hand" + parent: [PartSkrell, BaseLeftHand] + components: + - type: Sprite + sprite: Mobs/Species/Skrell/parts.rsi + state: "l_hand" + +- type: entity + id: RightHandSkrell + name: "right skrell hand" + parent: [PartSkrell, BaseRightHand] + components: + - type: Sprite + sprite: Mobs/Species/Skrell/parts.rsi + state: "r_hand" + +- type: entity + id: LeftLegSkrell + name: "left skrell leg" + parent: [PartSkrell, BaseLeftLeg] + components: + - type: Sprite + sprite: Mobs/Species/Skrell/parts.rsi + state: "l_leg" + +- type: entity + id: RightLegSkrell + name: "right skrell leg" + parent: [PartSkrell, BaseRightLeg] + components: + - type: Sprite + sprite: Mobs/Species/Skrell/parts.rsi + state: "r_leg" + +- type: entity + id: LeftFootSkrell + name: "left skrell foot" + parent: [PartSkrell, BaseLeftFoot] + components: + - type: Sprite + sprite: Mobs/Species/Skrell/parts.rsi + state: "l_foot" + +- type: entity + id: RightFootSkrell + name: "right skrell foot" + parent: [PartSkrell, BaseRightFoot] + components: + - type: Sprite + sprite: Mobs/Species/Skrell/parts.rsi + state: "r_foot" diff --git a/Resources/Prototypes/Body/Prototypes/skrell.yml b/Resources/Prototypes/Body/Prototypes/skrell.yml new file mode 100644 index 00000000000..b6f0fbea01b --- /dev/null +++ b/Resources/Prototypes/Body/Prototypes/skrell.yml @@ -0,0 +1,51 @@ +#license: CLA +#copyright: https://github.com/ss14-ganimed/ENT14-Master/blob/master/CLA.txt +- type: body + id: Skrell + name: "skrell" + root: torso + slots: + head: + part: HeadSkrell + connections: + - torso + organs: + brain: OrganHumanBrain + eyes: OrganHumanEyes + torso: + part: TorsoSkrell + connections: + - right_arm + - left_arm + - right_leg + - left_leg + organs: + heart: OrganHumanHeart + lungs: OrganHumanLungs + stomach: OrganSkrellStomach + liver: OrganSkrellLiver + kidneys: OrganHumanKidneys + right_arm: + part: RightArmSkrell + connections: + - right_hand + left_arm: + part: LeftArmSkrell + connections: + - left_hand + right_hand: + part: RightHandSkrell + left_hand: + part: LeftHandSkrell + right_leg: + part: RightLegSkrell + connections: + - right_foot + left_leg: + part: LeftLegSkrell + connections: + - left_foot + right_foot: + part: RightFootSkrell + left_foot: + part: LeftFootSkrell diff --git a/Resources/Prototypes/Chemistry/metabolizer_types.yml b/Resources/Prototypes/Chemistry/metabolizer_types.yml index 259387b6d5c..cf89ec96c6e 100644 --- a/Resources/Prototypes/Chemistry/metabolizer_types.yml +++ b/Resources/Prototypes/Chemistry/metabolizer_types.yml @@ -37,6 +37,10 @@ id: Dwarf name: dwarf +- type: metabolizerType + id: Skrell + name: skrell + - type: metabolizerType id: Moth name: moth diff --git a/Resources/Prototypes/Damage/modifier_sets.yml b/Resources/Prototypes/Damage/modifier_sets.yml index 18d2e99d5bf..35790745570 100644 --- a/Resources/Prototypes/Damage/modifier_sets.yml +++ b/Resources/Prototypes/Damage/modifier_sets.yml @@ -137,6 +137,13 @@ Poison: 0.8 Cellular: 0.2 +- type: damageModifierSet + id: Skrell + coefficients: + Slash: 1.2 + Cold: 1.5 + Poison: 0.75 + - type: damageModifierSet id: Infernal coefficients: diff --git a/Resources/Prototypes/Datasets/Names/skrell.yml b/Resources/Prototypes/Datasets/Names/skrell.yml new file mode 100644 index 00000000000..52a13089f94 --- /dev/null +++ b/Resources/Prototypes/Datasets/Names/skrell.yml @@ -0,0 +1,27 @@ +- type: dataset + id: names_skrell_first + values: + - Квиизароо'Заухеюгенс + - Ганоуреель'Хабаушолнгс + - Криксе'Врезуа + - Зеикс'Ашаониурокс + - Ниизороп'Ниогук + - Флоупнр'Лиркол + - Мирауп'Уриэль + - Розеорупоп'Енлифуел + - Одионаен'Блингуоль + - Ниизееуу'Паамнгорль + - Иваавуу'Оруупль + - Бихтоор'Улиель + - Доораа'Трурли + - Щхиир'Ква + - Ашаониурокс'Кре + - Шиир'Кро + - Кур'Кри + - Цэрси'Шис + - Курсен'Вех + - Ниоб'Плу + - Уэб'Ули + - Кендзи'Влех + - Вяльнд'Укс + - Цендор'Всо \ No newline at end of file diff --git a/Resources/Prototypes/Entities/Mobs/Customization/Markings/gauze.yml b/Resources/Prototypes/Entities/Mobs/Customization/Markings/gauze.yml index 9dc5323bc13..638c3a2ab27 100644 --- a/Resources/Prototypes/Entities/Mobs/Customization/Markings/gauze.yml +++ b/Resources/Prototypes/Entities/Mobs/Customization/Markings/gauze.yml @@ -2,7 +2,7 @@ id: GauzeLefteyePatch bodyPart: Eyes markingCategory: Head - speciesRestriction: [Moth, Dwarf, Human, Arachnid, SlimePerson] + speciesRestriction: [Moth, Dwarf, Human, Arachnid, SlimePerson, Skrell] coloring: default: type: @@ -16,7 +16,7 @@ id: GauzeLefteyeTape bodyPart: Eyes markingCategory: Head - speciesRestriction: [Moth, Dwarf, Human, Reptilian, Arachnid, SlimePerson] + speciesRestriction: [Moth, Dwarf, Human, Reptilian, Arachnid, SlimePerson, Skrell] coloring: default: type: @@ -30,7 +30,7 @@ id: GauzeRighteyePatch bodyPart: Eyes markingCategory: Head - speciesRestriction: [Moth, Dwarf, Human, Arachnid, SlimePerson] + speciesRestriction: [Moth, Dwarf, Human, Arachnid, SlimePerson, Skrell] coloring: default: type: @@ -44,7 +44,7 @@ id: GauzeRighteyeTape bodyPart: Eyes markingCategory: Head - speciesRestriction: [Moth, Dwarf, Human, Reptilian, Arachnid, SlimePerson] + speciesRestriction: [Moth, Dwarf, Human, Reptilian, Arachnid, SlimePerson, Skrell] coloring: default: type: @@ -58,7 +58,7 @@ id: GauzeBlindfold bodyPart: Eyes markingCategory: Head - speciesRestriction: [Moth, Dwarf, Human, Arachnid, SlimePerson] + speciesRestriction: [Moth, Dwarf, Human, Arachnid, SlimePerson, Skrell] coloring: default: type: @@ -72,7 +72,7 @@ id: GauzeShoulder bodyPart: Chest markingCategory: Chest - speciesRestriction: [Moth, Dwarf, Human, Reptilian, Arachnid, SlimePerson] + speciesRestriction: [Moth, Dwarf, Human, Reptilian, Arachnid, SlimePerson, Skrell] coloring: default: type: @@ -86,7 +86,7 @@ id: GauzeStomach bodyPart: Chest markingCategory: Chest - speciesRestriction: [Moth, Dwarf, Human, Reptilian, Arachnid, SlimePerson] + speciesRestriction: [Moth, Dwarf, Human, Reptilian, Arachnid, SlimePerson, Skrell] coloring: default: type: @@ -100,7 +100,7 @@ id: GauzeUpperArmRight bodyPart: RArm markingCategory: Arms - speciesRestriction: [Moth, Dwarf, Human, Reptilian, Arachnid, SlimePerson] + speciesRestriction: [Moth, Dwarf, Human, Reptilian, Arachnid, SlimePerson, Skrell] coloring: default: type: @@ -114,7 +114,7 @@ id: GauzeLowerArmRight bodyPart: RArm, RHand markingCategory: Arms - speciesRestriction: [Moth, Dwarf, Human, Reptilian, Arachnid, SlimePerson] + speciesRestriction: [Moth, Dwarf, Human, Reptilian, Arachnid, SlimePerson, Skrell] coloring: default: type: @@ -128,7 +128,7 @@ id: GauzeLeftArm bodyPart: LArm, LHand markingCategory: Arms - speciesRestriction: [Moth, Dwarf, Human, Reptilian, Arachnid, SlimePerson] + speciesRestriction: [Moth, Dwarf, Human, Reptilian, Arachnid, SlimePerson, Skrell] coloring: default: type: @@ -142,7 +142,7 @@ id: GauzeLowerLegLeft bodyPart: LFoot markingCategory: Legs - speciesRestriction: [Moth, Dwarf, Human, Arachnid, SlimePerson] + speciesRestriction: [Moth, Dwarf, Human, Arachnid, SlimePerson, Skrell] coloring: default: type: @@ -156,7 +156,7 @@ id: GauzeUpperLegLeft bodyPart: LLeg markingCategory: Legs - speciesRestriction: [Moth, Dwarf, Human, Reptilian, Arachnid, SlimePerson] + speciesRestriction: [Moth, Dwarf, Human, Reptilian, Arachnid, SlimePerson, Skrell] coloring: default: type: @@ -170,7 +170,7 @@ id: GauzeUpperLegRight bodyPart: RLeg markingCategory: Legs - speciesRestriction: [Moth, Dwarf, Human, Reptilian, Arachnid, SlimePerson] + speciesRestriction: [Moth, Dwarf, Human, Reptilian, Arachnid, SlimePerson, Skrell] coloring: default: type: @@ -184,7 +184,7 @@ id: GauzeLowerLegRight bodyPart: RFoot markingCategory: Legs - speciesRestriction: [Moth, Dwarf, Human, Arachnid, SlimePerson] + speciesRestriction: [Moth, Dwarf, Human, Arachnid, SlimePerson, Skrell] coloring: default: type: @@ -198,7 +198,7 @@ id: GauzeBoxerWrapRight bodyPart: RHand markingCategory: Arms - speciesRestriction: [Moth, Dwarf, Human, Reptilian, Arachnid, SlimePerson] + speciesRestriction: [Moth, Dwarf, Human, Reptilian, Arachnid, SlimePerson, Skrell] coloring: default: type: @@ -212,7 +212,7 @@ id: GauzeBoxerWrapLeft bodyPart: LHand markingCategory: Arms - speciesRestriction: [Moth, Dwarf, Human, Reptilian, Arachnid, SlimePerson] + speciesRestriction: [Moth, Dwarf, Human, Reptilian, Arachnid, SlimePerson, Skrell] coloring: default: type: diff --git a/Resources/Prototypes/Entities/Mobs/Customization/Markings/skrell.yml b/Resources/Prototypes/Entities/Mobs/Customization/Markings/skrell.yml new file mode 100644 index 00000000000..1ae8de2b5af --- /dev/null +++ b/Resources/Prototypes/Entities/Mobs/Customization/Markings/skrell.yml @@ -0,0 +1,27 @@ +#license: CLA +#copyright: https://github.com/ss14-ganimed/ENT14-Master/blob/master/CLA.txt +- type: marking + id: SkrellHairShort + bodyPart: HeadTop + speciesRestriction: [Skrell] + markingCategory: HeadTop + sprites: + - sprite: Mobs/Customization/skrell_hair.rsi + state: short +- type: marking + id: SkrellHairLong + bodyPart: HeadTop + speciesRestriction: [Skrell] + markingCategory: HeadTop + sprites: + - sprite: Mobs/Customization/skrell_hair.rsi + state: long + +- type: marking + id: SkrellHairVeryShort + bodyPart: HeadTop + speciesRestriction: [Skrell] + markingCategory: HeadTop + sprites: + - sprite: Mobs/Customization/skrell_hair.rsi + state: very_short \ No newline at end of file diff --git a/Resources/Prototypes/Entities/Mobs/Player/skrell.yml b/Resources/Prototypes/Entities/Mobs/Player/skrell.yml new file mode 100644 index 00000000000..808f3fc6eb3 --- /dev/null +++ b/Resources/Prototypes/Entities/Mobs/Player/skrell.yml @@ -0,0 +1,8 @@ +#license: CLA +#copyright: https://github.com/ss14-ganimed/ENT14-Master/blob/master/CLA.txt +- type: entity + save: false + name: Urisst McSkrell + parent: BaseMobSkrell + id: MobSkrell + diff --git a/Resources/Prototypes/Entities/Mobs/Species/skrell.yml b/Resources/Prototypes/Entities/Mobs/Species/skrell.yml new file mode 100644 index 00000000000..34841cfb212 --- /dev/null +++ b/Resources/Prototypes/Entities/Mobs/Species/skrell.yml @@ -0,0 +1,72 @@ +#license: CLA +#copyright: https://github.com/ss14-ganimed/ENT14-Master/blob/master/CLA.txt +- type: entity + save: false + parent: BaseMobSpeciesOrganic + id: BaseMobSkrell + name: Urist McSkrell + abstract: true + components: + - type: HumanoidAppearance + species: Skrell + - type: Hunger + starvationDamage: + types: + Cold: 1 + Bloodloss: 1 + - type: Icon # It will not have an icon in the adminspawn menu without this. Body parts seem fine for whatever reason. + sprite: Mobs/Species/Skrell/parts.rsi + state: full + - type: Thirst + - type: SolutionScanner + - type: Butcherable + butcheringType: Spike + spawned: + - id: FoodMeatHuman + amount: 5 + - type: Body + prototype: Skrell + requiredLegs: 2 + - type: Damageable + damageContainer: Biological + damageModifierSet: Skrell + - type: Temperature + heatDamageThreshold: 400 + coldDamageThreshold: 285 + currentTemperature: 310.15 + specificHeat: 42 + coldDamage: + types: + Cold : 1 #per second, scales with temperature & other constants + heatDamage: + types: + Heat : 1 #per second, scales with temperature & other constants + - type: Reactive + groups: + Flammable: [ Touch ] + Extinguish: [ Touch ] + reactions: + - reagents: [ Water ] + methods: [ Touch ] + effects: + - !type:WashCreamPieReaction + - reagents: [ Water ] + methods: [ Touch ] + effects: + - !type:HealthChange + scaled: true + damage: + types: + Heat: -1 + Slash: -1 + Piersing: -1 + Blunt: -1 + + +- type: entity + parent: MobHumanDummy + id: MobSkrellDummy + noSpawn: true + components: + - type: HumanoidAppearance + species: Skrell diff --git a/Resources/Prototypes/Reagents/Consumable/Drink/alcohol.yml b/Resources/Prototypes/Reagents/Consumable/Drink/alcohol.yml index d010588e5f6..403414d2dda 100644 --- a/Resources/Prototypes/Reagents/Consumable/Drink/alcohol.yml +++ b/Resources/Prototypes/Reagents/Consumable/Drink/alcohol.yml @@ -132,6 +132,14 @@ damage: types: Poison: 1 + - !type:HealthChange + conditions: + - !type:OrganType + type: Skrell + shouldHave: true + damage: + types: + Poison: 3 # dwarves take less toxin damage and heal a marginal amount of brute - !type:HealthChange conditions: diff --git a/Resources/Prototypes/Species/skrell.yml b/Resources/Prototypes/Species/skrell.yml new file mode 100644 index 00000000000..ff39a83d9af --- /dev/null +++ b/Resources/Prototypes/Species/skrell.yml @@ -0,0 +1,142 @@ +#license: CLA +#copyright: https://github.com/ss14-ganimed/ENT14-Master/blob/master/CLA.txt +- type: species + id: Skrell + name: species-name-skrell + roundStart: true + prototype: MobSkrell + sprites: MobSkrellSprites + defaultSkinTone: "#b8b8b8" + markingLimits: MobSkrellMarkingLimits + dollPrototype: MobSkrellDummy + skinColoration: Hues + maleFirstNames: names_skrell_first + femaleFirstNames: names_skrell_first + naming: FirstDashFirst + +- type: speciesBaseSprites + id: MobSkrellSprites + sprites: + Head: MobSkrellHead + HeadTop: MobSkrellMarkingFollowSkin + Chest: MobSkrellTorso + Eyes: MobSkrellEyes + LArm: MobSkrellLArm + RArm: MobSkrellRArm + LHand: MobSkrellLHand + RHand: MobSkrellRHand + LLeg: MobSkrellLLeg + RLeg: MobSkrellRLeg + LFoot: MobSkrellLFoot + RFoot: MobSkrellRFoot + +- type: markingPoints + id: MobSkrellMarkingLimits + points: + HeadTop: + points: 1 + required: true + defaultMarkings: [ SkrellHairVeryShort ] + Chest: + points: 1 + required: false + Legs: + points: 2 + required: false + Arms: + points: 2 + required: false + +- type: humanoidBaseSprite + id: MobSkrellMarkingFollowSkin + markingsMatchSkin: true + +- type: humanoidBaseSprite + id: MobSkrellEyes + baseSprite: + sprite: Mobs/Customization/eyes.rsi + state: skrell + +- type: humanoidBaseSprite + id: MobSkrellHead + baseSprite: + sprite: Mobs/Species/Skrell/parts.rsi + state: head_m + +- type: humanoidBaseSprite + id: MobSkrellHeadMale + baseSprite: + sprite: Mobs/Species/Skrell/parts.rsi + state: head_m + +- type: humanoidBaseSprite + id: MobSkrellHeadFemale + baseSprite: + sprite: Mobs/Species/Skrell/parts.rsi + state: head_f + +- type: humanoidBaseSprite + id: MobSkrellTorso + baseSprite: + sprite: Mobs/Species/Skrell/parts.rsi + state: torso_m + +- type: humanoidBaseSprite + id: MobSkrellTorsoMale + baseSprite: + sprite: Mobs/Species/Skrell/parts.rsi + state: torso_m + +- type: humanoidBaseSprite + id: MobSkrellTorsoFemale + baseSprite: + sprite: Mobs/Species/Skrell/parts.rsi + state: torso_f + +- type: humanoidBaseSprite + id: MobSkrellLLeg + baseSprite: + sprite: Mobs/Species/Skrell/parts.rsi + state: l_leg + +- type: humanoidBaseSprite + id: MobSkrellLArm + baseSprite: + sprite: Mobs/Species/Skrell/parts.rsi + state: l_arm + +- type: humanoidBaseSprite + id: MobSkrellLHand + baseSprite: + sprite: Mobs/Species/Skrell/parts.rsi + state: l_hand + +- type: humanoidBaseSprite + id: MobSkrellLFoot + baseSprite: + sprite: Mobs/Species/Skrell/parts.rsi + state: l_foot + +- type: humanoidBaseSprite + id: MobSkrellRLeg + baseSprite: + sprite: Mobs/Species/Skrell/parts.rsi + state: r_leg + +- type: humanoidBaseSprite + id: MobSkrellRArm + baseSprite: + sprite: Mobs/Species/Skrell/parts.rsi + state: r_arm + +- type: humanoidBaseSprite + id: MobSkrellRHand + baseSprite: + sprite: Mobs/Species/Skrell/parts.rsi + state: r_hand + +- type: humanoidBaseSprite + id: MobSkrellRFoot + baseSprite: + sprite: Mobs/Species/Skrell/parts.rsi + state: r_foot diff --git a/Resources/Textures/Mobs/Customization/eyes.rsi/meta.json b/Resources/Textures/Mobs/Customization/eyes.rsi/meta.json index cb94dfab3e1..a8d4fd11f04 100644 --- a/Resources/Textures/Mobs/Customization/eyes.rsi/meta.json +++ b/Resources/Textures/Mobs/Customization/eyes.rsi/meta.json @@ -1 +1 @@ -{"version": 1, "license": "CC-BY-SA-3.0","copyright": "Vox_eyes Taken from https://github.com/vgstation-coders/vgstation13 at 02ff588d59b3c560c685d9ca75e882d32a72d8cb and human_eyes taken from https://github.com/tgstation/tgstation/blob/8024397cc81c5f47f74cf4279e35728487d0a1a7/icons/mob/human_parts_greyscale.dmi and modified by DrSmugleaf", "size": {"x": 32, "y": 32}, "states": [{"name": "diona", "directions": 4}, {"name": "eyes", "directions": 4}, {"name":"no_eyes"},{"name": "vox_eyes_s", "directions": 4}]} +{"version": 1, "license": "CC-BY-SA-3.0","copyright": "Vox_eyes Taken from https://github.com/vgstation-coders/vgstation13 at 02ff588d59b3c560c685d9ca75e882d32a72d8cb and human_eyes taken from https://github.com/tgstation/tgstation/blob/8024397cc81c5f47f74cf4279e35728487d0a1a7/icons/mob/human_parts_greyscale.dmi and modified by DrSmugleaf", "size": {"x": 32, "y": 32}, "states": [{"name": "diona", "directions": 4}, {"name": "eyes", "directions": 4}, {"name": "skrell", "directions": 4}, {"name":"no_eyes"},{"name": "vox_eyes_s", "directions": 4}]} diff --git a/Resources/Textures/Mobs/Customization/eyes.rsi/skrell.png b/Resources/Textures/Mobs/Customization/eyes.rsi/skrell.png new file mode 100644 index 00000000000..5189e091301 Binary files /dev/null and b/Resources/Textures/Mobs/Customization/eyes.rsi/skrell.png differ diff --git a/Resources/Textures/Mobs/Customization/skrell_hair.rsi/long.png b/Resources/Textures/Mobs/Customization/skrell_hair.rsi/long.png new file mode 100644 index 00000000000..eca0690b6f7 Binary files /dev/null and b/Resources/Textures/Mobs/Customization/skrell_hair.rsi/long.png differ diff --git a/Resources/Textures/Mobs/Customization/skrell_hair.rsi/meta.json b/Resources/Textures/Mobs/Customization/skrell_hair.rsi/meta.json new file mode 100644 index 00000000000..8781d64c0e2 --- /dev/null +++ b/Resources/Textures/Mobs/Customization/skrell_hair.rsi/meta.json @@ -0,0 +1,23 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "copyright": "Taken from https://github.com/tgstation/tgstation/blob/05ec94e46349c35e29ca91e5e97d0c88ae26ad44/icons/mob/species/human/human_face.dmi , resprited by Alekshhh, a modified by potato1234x, uneven is drawn by Ubaser", + "license": "CC-BY-SA-3.0", + "states": [ + { + "name": "very_short", + "directions": 4 + }, + { + "name": "short", + "directions": 4 + }, + { + "name": "long", + "directions": 4 + } + ] + } \ No newline at end of file diff --git a/Resources/Textures/Mobs/Customization/skrell_hair.rsi/short.png b/Resources/Textures/Mobs/Customization/skrell_hair.rsi/short.png new file mode 100644 index 00000000000..ceba1325bc9 Binary files /dev/null and b/Resources/Textures/Mobs/Customization/skrell_hair.rsi/short.png differ diff --git a/Resources/Textures/Mobs/Customization/skrell_hair.rsi/very_short.png b/Resources/Textures/Mobs/Customization/skrell_hair.rsi/very_short.png new file mode 100644 index 00000000000..58743e5012d Binary files /dev/null and b/Resources/Textures/Mobs/Customization/skrell_hair.rsi/very_short.png differ diff --git a/Resources/Textures/Mobs/Species/Skrell/parts.rsi/full.png b/Resources/Textures/Mobs/Species/Skrell/parts.rsi/full.png new file mode 100644 index 00000000000..0eb74affba4 Binary files /dev/null and b/Resources/Textures/Mobs/Species/Skrell/parts.rsi/full.png differ diff --git a/Resources/Textures/Mobs/Species/Skrell/parts.rsi/head_f.png b/Resources/Textures/Mobs/Species/Skrell/parts.rsi/head_f.png new file mode 100644 index 00000000000..4c55f276b44 Binary files /dev/null and b/Resources/Textures/Mobs/Species/Skrell/parts.rsi/head_f.png differ diff --git a/Resources/Textures/Mobs/Species/Skrell/parts.rsi/head_m.png b/Resources/Textures/Mobs/Species/Skrell/parts.rsi/head_m.png new file mode 100644 index 00000000000..a5e82ab0d45 Binary files /dev/null and b/Resources/Textures/Mobs/Species/Skrell/parts.rsi/head_m.png differ diff --git a/Resources/Textures/Mobs/Species/Skrell/parts.rsi/l_arm.png b/Resources/Textures/Mobs/Species/Skrell/parts.rsi/l_arm.png new file mode 100644 index 00000000000..7ba3f2a0fd2 Binary files /dev/null and b/Resources/Textures/Mobs/Species/Skrell/parts.rsi/l_arm.png differ diff --git a/Resources/Textures/Mobs/Species/Skrell/parts.rsi/l_foot.png b/Resources/Textures/Mobs/Species/Skrell/parts.rsi/l_foot.png new file mode 100644 index 00000000000..a1a02aab720 Binary files /dev/null and b/Resources/Textures/Mobs/Species/Skrell/parts.rsi/l_foot.png differ diff --git a/Resources/Textures/Mobs/Species/Skrell/parts.rsi/l_hand.png b/Resources/Textures/Mobs/Species/Skrell/parts.rsi/l_hand.png new file mode 100644 index 00000000000..0b9327c8269 Binary files /dev/null and b/Resources/Textures/Mobs/Species/Skrell/parts.rsi/l_hand.png differ diff --git a/Resources/Textures/Mobs/Species/Skrell/parts.rsi/l_leg.png b/Resources/Textures/Mobs/Species/Skrell/parts.rsi/l_leg.png new file mode 100644 index 00000000000..e3beb5279db Binary files /dev/null and b/Resources/Textures/Mobs/Species/Skrell/parts.rsi/l_leg.png differ diff --git a/Resources/Textures/Mobs/Species/Skrell/parts.rsi/meta.json b/Resources/Textures/Mobs/Species/Skrell/parts.rsi/meta.json new file mode 100644 index 00000000000..a69622e9d04 --- /dev/null +++ b/Resources/Textures/Mobs/Species/Skrell/parts.rsi/meta.json @@ -0,0 +1,62 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "https://github.com/ParadiseSS13/Paradise/tree/master/icons/mob/human_races", + "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/Skrell/parts.rsi/r_arm.png b/Resources/Textures/Mobs/Species/Skrell/parts.rsi/r_arm.png new file mode 100644 index 00000000000..71827ac3c21 Binary files /dev/null and b/Resources/Textures/Mobs/Species/Skrell/parts.rsi/r_arm.png differ diff --git a/Resources/Textures/Mobs/Species/Skrell/parts.rsi/r_foot.png b/Resources/Textures/Mobs/Species/Skrell/parts.rsi/r_foot.png new file mode 100644 index 00000000000..e6d3c3374d3 Binary files /dev/null and b/Resources/Textures/Mobs/Species/Skrell/parts.rsi/r_foot.png differ diff --git a/Resources/Textures/Mobs/Species/Skrell/parts.rsi/r_hand.png b/Resources/Textures/Mobs/Species/Skrell/parts.rsi/r_hand.png new file mode 100644 index 00000000000..d26065700ee Binary files /dev/null and b/Resources/Textures/Mobs/Species/Skrell/parts.rsi/r_hand.png differ diff --git a/Resources/Textures/Mobs/Species/Skrell/parts.rsi/r_leg.png b/Resources/Textures/Mobs/Species/Skrell/parts.rsi/r_leg.png new file mode 100644 index 00000000000..de5a8960249 Binary files /dev/null and b/Resources/Textures/Mobs/Species/Skrell/parts.rsi/r_leg.png differ diff --git a/Resources/Textures/Mobs/Species/Skrell/parts.rsi/torso_f.png b/Resources/Textures/Mobs/Species/Skrell/parts.rsi/torso_f.png new file mode 100644 index 00000000000..cbbe526d1b6 Binary files /dev/null and b/Resources/Textures/Mobs/Species/Skrell/parts.rsi/torso_f.png differ diff --git a/Resources/Textures/Mobs/Species/Skrell/parts.rsi/torso_m.png b/Resources/Textures/Mobs/Species/Skrell/parts.rsi/torso_m.png new file mode 100644 index 00000000000..cbbe526d1b6 Binary files /dev/null and b/Resources/Textures/Mobs/Species/Skrell/parts.rsi/torso_m.png differ