Фиксы и блаблаба (#428)

* coolpr

* fix

ААААААААААААААААААААААААААААААААААААААА

Content.Client/HealthAnalyzer/UI/HealthAnalyzerControl.xaml.cs

@@ -158,6 +158,7 @@ public sealed partial class HealthAnalyzerControl : BoxContainer
         return mobState switch
         {
             MobState.Alive => Loc.GetString("health-analyzer-window-entity-alive-text"),
+            MobState.PreCritical => Loc.GetString("health-analyzer-window-entity-precritical-text"), // Corvax-Wega-Add
             MobState.Critical => Loc.GetString("health-analyzer-window-entity-critical-text"),
             MobState.Dead => Loc.GetString("health-analyzer-window-entity-dead-text"),
             _ => Loc.GetString("health-analyzer-window-entity-unknown-text"),

Content.Server/GameTicking/Rules/Components/NukeopsRuleComponent.cs

@@ -18,7 +18,7 @@ public sealed partial class NukeopsRuleComponent : Component
     [DataField]
     public RoundEndBehavior RoundEndBehavior = RoundEndBehavior.ShuttleCall;
     //Corvax-Wega-War-Edit-Start
-    public string? SetAlertlevel = "martial_law";
+    public string? SetAlertlevel = "gamma";
     [DataField]
     public uint AlertlevelDelay = 10;
     [DataField]

Resources/Locale/ru-RU/_wega/medical/components/health-analyzer-component.ftl

@@ -0,0 +1,2 @@
+health-analyzer-window-entity-precritical-text = Подкритическое
+

Resources/Locale/ru-RU/ss14-ru/prototypes/_wega/entities/objects/fun/pai.ftl

@@ -1,3 +1,7 @@
 ent-ThiefPersonalAI = { ent-PersonalAI }
     .desc = { ent-PersonalAI.desc }
-    .suffix = Воровской
+    .suffix = Воровской
+ent-ActionPAIPolymorphBorgi = Форма "Гав"
+    .desc = Станьте борги и следуйте за своим хозяином.
+ent-Borgi = борги
+    .desc = ПИИ теперь физически следует за вами, невероятно!

Resources/Prototypes/AlertLevels/alert_levels.yml

@@ -6,7 +6,7 @@
       announcement: alert-level-green-announcement
       color: Green
       emergencyLightColor: LawnGreen
-      shuttleTime: 600
+      shuttleTime: 300 # Corvax-Wega-Edit
     blue:
       announcement: alert-level-blue-announcement
       sound: /Audio/Misc/bluealert.ogg
@@ -46,6 +46,7 @@
       color: PaleVioletRed
       emergencyLightColor: PaleVioletRed
       forceEnableEmergencyLights: true
+      shuttleTime: 600 # Corvax-Wega-Add
     delta:
       announcement: alert-level-delta-announcement
       selectable: false
@@ -57,7 +58,7 @@
       color: DarkRed
       emergencyLightColor: Orange
       forceEnableEmergencyLights: true
-      shuttleTime: 1200
+      shuttleTime: 300 # Corvax-Wega-Edit
     epsilon:
       announcement: alert-level-epsilon-announcement
       selectable: false

Resources/Prototypes/Entities/Structures/Power/chargers.yml

@@ -344,11 +344,19 @@
   - type: DamageInContainer
     allowedStates:
     - Alive
+    - PreCritical
     - Critical
     damage:
       types:
-        Heat: -3
-        Blunt: -3
+        Heat: -6
+        Blunt: -6   
+        Slash: -6
+        Piercing: -6
+        Shock: -2
+    damageGroups:
+      groups:
+        Brute: 0
+        Burn: 0
     slotId: entity_storage
     whitelist:
       components:

Resources/Prototypes/Recipes/Lathes/Packs/robotics.yml

@@ -49,13 +49,13 @@
   recipes:
   - ProximitySensor
   # # Corvax-Wega-Android-Start
-  # - AndroidBodyPart
-  # - ArmSyntheticPry
-  # - ArmSyntheticDefib
-  # - ArmSyntheticProtoKinetic
-  # - ArmSyntheticCharger
-  # - LegSyntheticMagboots
-  # - LegSyntheticJump
+  - AndroidBodyPart
+  - ArmSyntheticPry
+  - ArmSyntheticDefib
+  - ArmSyntheticProtoKinetic
+  - ArmSyntheticCharger
+  - LegSyntheticMagboots
+  - LegSyntheticJump
   # # Corvax-Wega-Android-End
 
 - type: latheRecipePack

Resources/Prototypes/Research/arsenal.yml

@@ -13,7 +13,7 @@
   - WeaponProtoKineticAccelerator
   - ShuttleGunKineticCircuitboard
   - BorgModuleKinetic # Corvax-Wega-Kinetic
-  # - ArmSyntheticProtoKinetic # Corvax-Wega-Androids
+  - ArmSyntheticProtoKinetic # Corvax-Wega-Androids
   # These are roundstart but not replenishable for salvage
 
 - type: technology

Resources/Prototypes/Research/experimental.yml

@@ -11,7 +11,6 @@
   cost: 5000
   recipeUnlocks:
   - ProximitySensor
-  # - AndroidBodyPart # Corvax-Wega-Android
   - BorgModuleRobotics # Corvax-Wega-Add
 
 - type: technology
@@ -69,7 +68,7 @@
   recipeUnlocks:
   - ClothingShoesBootsMagSci
   - ClothingShoesBootsMoon
-  # - LegSyntheticMagboots # Corvax-Wega-Androids
+  - LegSyntheticMagboots # Corvax-Wega-Androids
   - MagnetSuitModule # Corvax-Wega-add
 
 - type: technology

Resources/Prototypes/Research/industrial.yml

@@ -44,7 +44,7 @@
   - PowerCellHigh
   - TurboItemRechargerCircuitboard
   - SMESAdvancedMachineCircuitboard
-  # - ArmSyntheticCharger # Corvax-Wega-Androids
+  - ArmSyntheticCharger # Corvax-Wega-Androids
 
 - type: technology
   id: MechanicalCompression

Resources/Prototypes/Roles/Jobs/Civilian/chaplain.yml

@@ -25,6 +25,7 @@
     # shoes: ClothingShoesColorBlack # Corvax-Wega-Edit
     id: ChaplainPDA
     ears: ClothingHeadsetService
+    belt: ClothingBeltSheathChaplinFilled
   storage:
     back:
     - RubberStampChaplain

Resources/Prototypes/_Wega/Entities/Objects/Specific/Robotics/borg_modules.yml

@@ -267,12 +267,12 @@
         whitelist:
           components:
           - BorgModule
-    # - hand:
-    #     emptyRepresentative: LeftArmSyntheticPry
-    #     emptyLabel: borg-slot-bodypart-empty
-    #     whitelist:
-    #       tags:
-    #       - BaseBodyPart
+    - hand:
+        emptyRepresentative: ArmSyntheticPry
+        emptyLabel: borg-slot-bodypart-empty
+        whitelist:
+          tags:
+          - BaseBodyPart
     - hand:
         emptyRepresentative: PowerCellSmall
         emptyLabel: borg-slot-powercell-empty

Resources/Prototypes/_Wega/Entities/Structures/Power/chargers.yml

@@ -17,7 +17,14 @@
     damage:
       types:
         Heat: -3
-        Blunt: -3
+        Blunt: -3   
+        Slash: -3
+        Piercing: -3
+        Shock: -1
+    damageGroups:
+      groups:
+        Brute: 0
+        Burn: 0
     slotId: entity_storage
     whitelist:
       components:

Resources/Prototypes/_Wega/Recipes/Lathes/robotics.yml

@@ -175,80 +175,80 @@
     Gold: 500
     Plasma: 500
 
-# - type: latheRecipe
-#   parent: BaseRoboticsRecipe
-#   id: ArmSyntheticPry
-#   result: LeftArmSyntheticPry
-#   categories:
-#     - Android
-#   completetime: 5
-#   materials:
-#     Steel: 750
-#     Plastic: 300
-#     Gold: 200
-#     Plasma: 150
+- type: latheRecipe
+  parent: BaseRoboticsRecipe
+  id: ArmSyntheticPry
+  result: ArmSyntheticPry
+  categories:
+    - Android
+  completetime: 5
+  materials:
+    Steel: 750
+    Plastic: 300
+    Gold: 200
+    Plasma: 150
 
-# - type: latheRecipe
-#   parent: BaseRoboticsRecipe
-#   id: ArmSyntheticDefib
-#   result: LeftArmSyntheticDefib
-#   categories:
-#     - Android
-#   completetime: 5
-#   materials:
-#     Steel: 750
-#     Plastic: 300
-#     Silver: 250
+- type: latheRecipe
+  parent: BaseRoboticsRecipe
+  id: ArmSyntheticDefib
+  result: ArmSyntheticDefib
+  categories:
+    - Android
+  completetime: 5
+  materials:
+    Steel: 750
+    Plastic: 300
+    Silver: 250
 
-# - type: latheRecipe
-#   parent: BaseRoboticsRecipe
-#   id: ArmSyntheticProtoKinetic
-#   result: LeftArmSyntheticProtoKinetic
-#   categories:
-#     - Android
-#   completetime: 5
-#   materials:
-#     Steel: 750
-#     Plastic: 300
-#     Silver: 200
-#     Plasma: 150
+- type: latheRecipe
+  parent: BaseRoboticsRecipe
+  id: ArmSyntheticProtoKinetic
+  result: ArmSyntheticProtoKinetic
+  categories:
+    - Android
+  completetime: 5
+  materials:
+    Steel: 750
+    Plastic: 300
+    Silver: 200
+    Plasma: 150
 
-# - type: latheRecipe
-#   parent: BaseRoboticsRecipe
-#   id: ArmSyntheticCharger
-#   result: LeftArmSyntheticCharger
-#   categories:
-#     - Android
-#   completetime: 5
-#   materials:
-#     Steel: 750
-#     Plastic: 300
-#     Gold: 200
+- type: latheRecipe
+  parent: BaseRoboticsRecipe
+  id: ArmSyntheticCharger
+  result: ArmSyntheticCharger
+  categories:
+    - Android
+  completetime: 5
+  materials:
+    Steel: 750
+    Plastic: 300
+    Gold: 200
 
-# - type: latheRecipe
-#   parent: BaseRoboticsRecipe
-#   id: LegSyntheticMagboots
-#   result: LeftLegSyntheticMagboots
-#   categories:
-#     - Android
-#   completetime: 5
-#   materials:
-#     Steel: 750
-#     Plastic: 300
-#     Gold: 300
+- type: latheRecipe
+  parent: BaseRoboticsRecipe
+  id: LegSyntheticMagboots
+  result: LegSyntheticMagboots
+  categories:
+    - Android
+  completetime: 5
+  materials:
+    Steel: 750
+    Plastic: 300
+    Gold: 300
 
-# - type: latheRecipe
-#   parent: BaseRoboticsRecipe
-#   id: LegSyntheticJump
-#   result: LeftLegSyntheticJump
-#   categories:
-#     - Android
-#   completetime: 5
-#   materials:
-#     Steel: 750
-#     Plastic: 300
-#     Gold: 250
-#     Plasma: 150
+- type: latheRecipe
+  parent: BaseRoboticsRecipe
+  id: LegSyntheticJump
+  result: LegSyntheticJump
+  categories:
+    - Android
+  completetime: 5
+  materials:
+    Steel: 750
+    Plastic: 300
+    Gold: 250
+    Plasma: 150
 
 - type: latheRecipe
   parent: BaseRoboticsRecipe

Resources/Prototypes/_Wega/Research/biochemical.yml

@@ -99,6 +99,7 @@
   - AdvancedJetInjector
   - Hynospray
   - DefibrillatorCompact
+  - ArmSyntheticDefib
 
 - type: technology
   id: ChemicalDispensary

Resources/Prototypes/_Wega/Research/industrial.yml

@@ -24,8 +24,8 @@
     - OreBagSuitModule
     - DrillSuitModule
     - EngineeringPlating
-    # - ArmSyntheticPry
-    # - LegSyntheticJump
+    - ArmSyntheticPry
+    - LegSyntheticJump
 
 - type: technology
   id: Gidravlik