Фиксы фиксы фиксы

Resources/Locale/ru-RU/chemistry/components/injector-component.ftl

@@ -1,7 +1,6 @@
 ## UI
 
-injector-volume-transfer-label =
-    Volume: [color=white]{ $currentVolume }/{ $totalVolume }u[/color]
+injector-volume-transfer-label = Volume: [color=white]{ $currentVolume }/{ $totalVolume }u[/color]
     Mode: [color=white]{ $modeString }[/color] ([color=white]{ $transferVolume }u[/color])
 injector-draw-text = Забор
 injector-toggle-verb-text = Toggle Injector Mode
@@ -11,9 +10,8 @@ injector-component-draw-mode-name = draw
 injector-component-dynamic-mode-name = dynamic
 injector-component-mode-changed-text = Now { $mode }
 injector-invalid-injector-toggle-mode = Неверный режим
-injector-volume-label =
-    Объём: [color=white]{ $currentVolume }/{ $totalVolume }[/color]
-    Режим: [color=white]{ $modeString }[/color] ([color=white]{ $transferVolume } ед.[/color])
+injector-volume-label = Объём: [color=white]{ $currentVolume }/{ $totalVolume }[/color]
+    Режим: [color=white]{ $modeString }[/color]
 
 ## Entity
 

Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/specific/robotics/borg_modules.ftl

@@ -70,7 +70,7 @@ ent-BorgModuleRescue = спасательный модуль киборга
     .desc = { ent-BaseBorgModuleMedical.desc }
 ent-BorgModuleChemical = химический модуль киборга
     .desc = { ent-BaseBorgModuleMedical.desc }
-ent-BorgModuleAdvancedChemical = продвинутый химический модуль киборга
+ent-BorgModuleAdvancedTopical = продвинутый модуль первой помощи киборга
     .desc = Продвинутый медицинский модуль, содержащий киборговую версию многожеланного гипоспрея. Теперь ваши киборги могут ещё быстрее вводить вредителям хлоральгидрат!
 ent-BorgModuleArtifact = артефактный модуль киборга
     .desc = { ent-BaseBorgModuleScience.desc }

Resources/Prototypes/Body/Species/human.yml

@@ -44,6 +44,11 @@
     enum.HumanoidVisualLayers.Special:
       limit: 0
       required: false
+# Adventure start
+    enum.HumanoidVisualLayers.HeadTop:
+      limit: 1
+      required: false
+# Adventure end
 
 - type: entity
   parent: BaseSpeciesAppearance
@@ -141,6 +146,7 @@
     hideableLayers:
     - enum.HumanoidVisualLayers.Hair
     - enum.HumanoidVisualLayers.Snout
+    - enum.HumanoidVisualLayers.HeadTop # Adventure
 
 - type: entity
   parent: [ OrganBaseArmLeft, OrganHumanExternal ]

Resources/Prototypes/Body/Species/slime.yml

@@ -68,6 +68,7 @@
       FootLeft: OrganSlimePersonFootLeft
       FootRight: OrganSlimePersonFootRight
       Brain: OrganSlimePersonCore
+      Eyes: OrganSlimePersonEyes
       Lungs: OrganSlimePersonLungs
   - type: HumanoidProfile
     species: SlimePerson
@@ -264,6 +265,14 @@
     metabolizerTypes: [ Slime ]
     stages: [ Digestion, Bloodstream, Metabolites ]
 
+- type: entity
+  parent: [ OrganBaseEyes, OrganSlimePersonInternal, OrganSlimePersonExternal ]
+  id: OrganSlimePersonEyes
+  components:
+  - type: VisualOrgan
+    data:
+      sprite: Mobs/Customization/eyes.rsi
+
 - type: entity
   parent: [ OrganBaseLungs, OrganSlimePersonInternal, OrganSlimePersonMetabolizer ]
   id: OrganSlimePersonLungs

Resources/Prototypes/_Adventure/Races/Drask/Drask_organs.yml

@@ -24,6 +24,9 @@
       - state: eyeball-l
       - state: eyeball-r
       - state: eyeball-rl
+  - type: VisualOrgan
+    data:
+      sprite: _Adventure/Races/Drask/Species/parts.rsi
 
 - type: entity
   id: OrganDraskHeart

Resources/Prototypes/_Adventure/Races/Felinid/felinid.yml

@@ -76,14 +76,15 @@
         volume: -1
         variation: 0.05
 
-
 - type: entity
   parent: BaseSpeciesAppearance
   id: AppearanceFelinid
   categories: [ HideSpawnMenu ]
   components:
   - type: HumanoidProfile
     species: Felinid
+    hideLayersOnEquip:
+    - HeadSide
   - type: InitialBody
     organs:
       Torso: OrganFelinidTorso
@@ -96,109 +97,107 @@
       LegRight: OrganFelinidLegRight
       FootLeft: OrganFelinidFootLeft
       FootRight: OrganFelinidFootRight
-      Brain: OrganHumanBrain
+      Brain: OrganFelinidBrain
       Eyes: OrganFelinidEyes
-      Tongue: OrganHumanTongue
-      Appendix: OrganHumanAppendix
-      Ears: OrganHumanEars
-      Lungs: OrganHumanLungs
+      Tongue: OrganFelinidTongue
+      Appendix: OrganFelinidAppendix
+      Ears: OrganFelinidEars
+      Lungs: OrganFelinidLungs
       Heart: OrganFelinidHeart
       Stomach: OrganFelinidStomach
       Liver: OrganFelinidLiver
-      Kidneys: OrganHumanKidneys
+      Kidneys: OrganFelinidKidneys
   - type: Inventory
-  - type: Sprite
-    noRot: true
-    drawdepth: Mobs
+    femaleDisplacements:
+      jumpsuit:
+        sizeMaps:
+          32:
+            sprite: Mobs/Species/Human/displacement.rsi
+            state: jumpsuit-female
+  - type: ScaleVisuals
     scale: 0.85, 0.85
 
 - type: entity
-  id: OrganFelinidTorso
-  parent: OrganHumanTorso
+  parent: OrganBase
+  id: OrganFelinid
+  abstract: true
+  suffix: felinid
+
+- type: entity
+  parent: OrganFelinid
+  id: OrganFelinidInternal
+  abstract: true
   components:
+  - type: Sprite
+    sprite: Mobs/Species/Human/organs.rsi
+
+- type: entity
+  parent: OrganFelinid
+  id: OrganFelinidExternal
+  abstract: true
+  components:
+  - type: Sprite
+    sprite: Mobs/Species/Human/parts.rsi
+  - type: VisualOrgan
+    data:
+      sprite: Mobs/Species/Human/parts.rsi
   - type: VisualOrganMarkings
     markingData:
       group: Felinid
 
+- type: entity
+  id: OrganFelinidTorso
+  parent: [ OrganBaseTorsoSexed, OrganBaseTorso, OrganFelinidExternal ]
+
 - type: entity
   id: OrganFelinidHead
-  parent: OrganHumanHead
+  parent: [ OrganBaseHeadSexed, OrganBaseHead, OrganFelinidExternal ]
   components:
   - type: VisualOrganMarkings
-    markingData:
-      group: Felinid
+    hideableLayers:
+    - enum.HumanoidVisualLayers.HeadTop
+    - enum.HumanoidVisualLayers.Hair
+    - enum.HumanoidVisualLayers.Snout
 
 - type: entity
   id: OrganFelinidArmLeft
-  parent: OrganHumanArmLeft
-  components:
-  - type: VisualOrganMarkings
-    markingData:
-      group: Felinid
+  parent: [ OrganBaseArmLeft, OrganFelinidExternal ]
 
 - type: entity
   id: OrganFelinidArmRight
-  parent: OrganHumanArmRight
-  components:
-  - type: VisualOrganMarkings
-    markingData:
-      group: Felinid
+  parent: [ OrganBaseArmRight, OrganFelinidExternal ]
 
 - type: entity
   id: OrganFelinidHandLeft
-  parent: OrganHumanHandLeft
-  components:
-  - type: VisualOrganMarkings
-    markingData:
-      group: Felinid
+  parent: [ OrganBaseHandLeft, OrganFelinidExternal ]
 
 - type: entity
   id: OrganFelinidHandRight
-  parent: OrganHumanHandRight
-  components:
-  - type: VisualOrganMarkings
-    markingData:
-      group: Felinid
+  parent: [ OrganBaseHandRight, OrganFelinidExternal ]
 
 - type: entity
   id: OrganFelinidLegLeft
-  parent: OrganHumanLegLeft
-  components:
-  - type: VisualOrganMarkings
-    markingData:
-      group: Felinid
+  parent: [ OrganBaseLegLeft, OrganFelinidExternal ]
 
 - type: entity
   id: OrganFelinidLegRight
-  parent: OrganHumanLegRight
-  components:
-  - type: VisualOrganMarkings
-    markingData:
-      group: Felinid
+  parent: [ OrganBaseLegRight, OrganFelinidExternal ]
 
 - type: entity
   id: OrganFelinidFootLeft
-  parent: OrganHumanFootLeft
-  components:
-  - type: VisualOrganMarkings
-    markingData:
-      group: Felinid
+  parent: [ OrganBaseFootLeft, OrganFelinidExternal]
 
 - type: entity
   id: OrganFelinidFootRight
-  parent: OrganHumanFootRight
-  components:
-  - type: VisualOrganMarkings
-    markingData:
-      group: Felinid
+  parent: [ OrganBaseFootRight, OrganFelinidExternal]
 
 - type: entity
   id: OrganFelinidEyes
-  parent: OrganHumanEyes
+  parent: [ OrganBaseEyes, OrganFelinidInternal, OrganFelinidExternal]
   components:
-  - type: VisualOrganMarkings
-    markingData:
-      group: Felinid
+  - type: VisualOrgan
+    data:
+      sprite: Mobs/Customization/eyes.rsi
 
 - type: speechVerb
   id: Neco
@@ -207,3 +206,27 @@
   - мурчит
   - фыркает
   - мяукает
+
+- type: entity
+  parent: [ OrganBaseBrain, OrganSpriteHumanInternal, OrganFelinidInternal ]
+  id: OrganFelinidBrain
+
+- type: entity
+  parent: [ OrganBaseTongue, OrganFelinidInternal ]
+  id: OrganFelinidTongue
+
+- type: entity
+  parent: [ OrganBaseAppendix, OrganSpriteHumanInternal, OrganFelinidInternal ]
+  id: OrganFelinidAppendix
+
+- type: entity
+  parent: [ OrganBaseEars, OrganSpriteHumanInternal, OrganFelinidInternal ]
+  id: OrganFelinidEars
+
+- type: entity
+  parent: [ OrganBaseLungs, OrganFelinidInternal, OrganHumanMetabolizer ]
+  id: OrganFelinidLungs
+
+- type: entity
+  parent: [ OrganBaseKidneys, OrganSpriteHumanInternal, OrganFelinidInternal]
+  id: OrganFelinidKidneys

Resources/Prototypes/_Adventure/Races/Felinid/felinid_Species.yml

@@ -14,17 +14,16 @@
 - type: markingsGroup
   parent: Undergarments
   id: Felinid
-  onlyGroupWhitelisted: true
   limits:
+    enum.HumanoidVisualLayers.Hair:
+      limit: 1
+      required: false
     enum.HumanoidVisualLayers.Chest:
       limit: 2
       required: false
     enum.HumanoidVisualLayers.FacialHair:
       limit: 1
       required: false
-    enum.HumanoidVisualLayers.Hair:
-      limit: 1
-      required: false
     enum.HumanoidVisualLayers.HeadTop:
       limit: 1
       required: true

Resources/Prototypes/_Adventure/Races/Insect/Insect.yml

@@ -212,7 +212,6 @@
     layers:
     - map: [ "enum.HumanoidVisualLayers.Chest" ]
     - map: [ "enum.HumanoidVisualLayers.Head" ]
-    - map: [ "enum.HumanoidVisualLayers.Eyes" ]
     - map: [ "enum.HumanoidVisualLayers.RArm" ]
     - map: [ "enum.HumanoidVisualLayers.LArm" ]
     - map: [ "enum.HumanoidVisualLayers.RLeg" ]
@@ -229,6 +228,7 @@
     - map: [ "gloves" ]
     - map: [ "shoes" ]
     - map: [ "ears" ]
+    - map: [ "enum.HumanoidVisualLayers.Eyes" ]
     - map: [ "eyes" ]
     - map: [ "outerClothing" ]
     - map: [ "belt" ]

Resources/Prototypes/_Adventure/Races/Insect/Insect_organs.yml

@@ -23,6 +23,9 @@
     layers:
       - state: eyeball-l
       - state: eyeball-r
+  - type: VisualOrgan
+    data:
+      sprite: _Adventure/Races/Insect/Species/parts.rsi
 
 - type: entity
   id: OrganInsectHeart

Resources/Prototypes/_Adventure/Races/Resomi/Resomi_organs.yml

@@ -19,6 +19,9 @@
     layers:
       - state: eyeball-l
       - state: eyeball-r
+  - type: VisualOrgan
+    data:
+      sprite: _Adventure/Races/Resomi/Species/parts.rsi
 
 - type: entity
   id: OrganResomiHeart

Resources/Prototypes/_Adventure/Races/Skrell/Skrell_organs.yml

@@ -19,6 +19,9 @@
     layers:
       - state: eyeball-l
       - state: eyeball-r
+  - type: VisualOrgan
+    data:
+      sprite: _Adventure/Races/Skrell/Species/parts.rsi
 
 - type: entity
   id: OrganSkrellHeart

Resources/Prototypes/_Adventure/Races/Snake/Snake_organs.yml

@@ -23,6 +23,9 @@
     layers:
       - state: eyeball-l
       - state: eyeball-r
+  - type: VisualOrgan
+    data:
+      sprite: _Adventure/Races/Snake/Species/parts.rsi
 
 - type: entity
   id: OrganZerahHeart

Resources/Prototypes/_Adventure/Races/Xiod/Xiod_organs.yml

@@ -55,6 +55,9 @@
         reagents:
         - ReagentId: Water
           Quantity: 5
+  - type: VisualOrgan
+    data:
+      sprite: _Adventure/Races/Xiod/Species/parts.rsi
 
 - type: entity
   id: OrganXiodLungs
@@ -85,4 +88,4 @@
         maxVol: 5
         reagents:
         - ReagentId: Water
-          Quantity: 5
+          Quantity: 5

Resources/Prototypes/_Adventure/Research/biochemical.yml

@@ -51,7 +51,7 @@
   tier: 2
   cost: 5000
   recipeUnlocks:
-  - BorgModuleAdvancedChemical
+  - BorgModuleAdvancedTopical
   - AdvancedJetInjector
 
 - type: technology