ss14-ganimed · Gorox221 · Mar 25, 2024 · Mar 21, 2024 · Mar 21, 2024 · Mar 21, 2024
diff --git a/Resources/Locale/ru-RU/markings/skrells.ftl 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
@@ -9,4 +9,5 @@ species-name-arachnid = Арахнид
 species-name-moth = Ниан
 species-name-skeleton = Скелет
 species-name-vulpkanin = Вульпканин
+species-name-skrell = Скрелл
 species-name-terminator = Терминатор
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
@@ -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
@@ -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
@@ -0,0 +1,2 @@
+ent-MobSkrell = Урист МакСкрелл
+    .desc = { ent-BaseMobSkrell.desc }
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
@@ -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
@@ -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
diff --git a/Resources/Prototypes/Body/Parts/skrell.yml 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
@@ -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
@@ -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
@@ -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
@@ -0,0 +1,27 @@
+- type: dataset
+  id: names_skrell_first
+  values:
+  - Квиизароо'Заухеюгенс
+  - Ганоуреель'Хабаушолнгс
+  - Криксе'Врезуа
+  - Зеикс'Ашаониурокс
+  - Ниизороп'Ниогук
+  - Флоупнр'Лиркол
+  - Мирауп'Уриэль
+  - Розеорупоп'Енлифуел
+  - Одионаен'Блингуоль
+  - Ниизееуу'Паамнгорль
+  - Иваавуу'Оруупль
+  - Бихтоор'Улиель
+  - Доораа'Трурли
+  - Щхиир'Ква
+  - Ашаониурокс'Кре
+  - Шиир'Кро
+  - Кур'Кри
+  - Цэрси'Шис
+  - Курсен'Вех
+  - Ниоб'Плу
+  - Уэб'Ули
+  - Кендзи'Влех
+  - Вяльнд'Укс
+  - Цендор'Всо
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		ent-MobSkrell = Урист МакСкрелл
		.desc = { ent-BaseMobSkrell.desc }