From 347f21e7f5469852fa8b6e8478a84255f7f0f57c Mon Sep 17 00:00:00 2001
From: MartynDew <aminobust3@gmail.com>
Date: Sat, 31 Jan 2026 19:47:14 +0300
Subject: [PATCH] Merge pull request #294 from MartynDew/fixes
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

небольшие фиксы и изменения
---
 .../Prototypes/Body/Prototypes/vulpkanin.yml  | 32 +++++++++----------
 .../Entities/Mobs/Species/vulpkanin.yml       | 16 ++++++----
 .../Entities/Objects/Shields/shields.yml      |  6 ++++
 .../Loadouts/Miscellaneous/trinkets.yml       |  4 +--
 4 files changed, 34 insertions(+), 24 deletions(-)

diff --git a/Resources/Prototypes/Body/Prototypes/vulpkanin.yml b/Resources/Prototypes/Body/Prototypes/vulpkanin.yml
index e939e3ac47..70f39ed203 100644
--- a/Resources/Prototypes/Body/Prototypes/vulpkanin.yml
+++ b/Resources/Prototypes/Body/Prototypes/vulpkanin.yml
@@ -13,37 +13,37 @@
     torso:
       part: TorsoVulpkanin
       connections:
-      - right arm
-      - left arm
-      - right leg
-      - left leg
+      - right_arm
+      - left_arm
+      - right_leg
+      - left_leg
       organs:
         heart: OrganAnimalHeart
         lungs: OrganHumanLungs
         stomach: OrganVulpkaninStomach
         liver: OrganAnimalLiver
         kidneys: OrganHumanKidneys
-    right arm:
+    right_arm:
       part: RightArmVulpkanin
       connections:
-      - right hand
-    left arm:
+      - right_hand
+    left_arm:
       part: LeftArmVulpkanin
       connections:
-      - left hand
-    right hand:
+      - left_hand
+    right_hand:
       part: RightHandVulpkanin
-    left hand:
+    left_hand:
       part: LeftHandVulpkanin
-    right leg:
+    right_leg:
       part: RightLegVulpkanin
       connections:
-      - right foot
-    left leg:
+      - right_foot
+    left_leg:
       part: LeftLegVulpkanin
       connections:
-      - left foot
-    right foot:
+      - left_foot
+    right_foot:
       part: RightFootVulpkanin
-    left foot:
+    left_foot:
       part: LeftFootVulpkanin
diff --git a/Resources/Prototypes/Entities/Mobs/Species/vulpkanin.yml b/Resources/Prototypes/Entities/Mobs/Species/vulpkanin.yml
index 918946db74..2c53477a07 100644
--- a/Resources/Prototypes/Entities/Mobs/Species/vulpkanin.yml
+++ b/Resources/Prototypes/Entities/Mobs/Species/vulpkanin.yml
@@ -123,12 +123,14 @@
     - HeadSide
     - FacialHair
     - Hair
-    markingsDisplacement:
-      Hair:
-        sizeMaps:
-          32:
-            sprite: Mobs/Species/Vulpkanin/displacement.rsi
-            state: hair
+#   Corvax-Wega-Edit-start
+#     markingsDisplacement:
+#       Hair:
+#         sizeMaps:
+#           32:
+#             sprite: Mobs/Species/Vulpkanin/displacement.rsi
+#             state: hair
+#   Corvax-Wega-Edit-end
   - type: Inventory
     speciesId: vulpkanin #временно не corvaxvulpkanin Corvax-CorvaxVulp_Port
     #vulpkanin Corvax-CorvaxVulp_Port start
@@ -234,6 +236,8 @@
     damageRecovery:
       types:
         Asphyxiation: -2.0
+  - type: Carriable # Corvax-Wega-Carrying
+  - type: DiseaseCarrier # Corvax-Wega-Disease
 #vulpkanin Corvax-CorvaxVulp_Port end
 
 - type: entity
diff --git a/Resources/Prototypes/Entities/Objects/Shields/shields.yml b/Resources/Prototypes/Entities/Objects/Shields/shields.yml
index b5f6211225..5322e4d7ae 100644
--- a/Resources/Prototypes/Entities/Objects/Shields/shields.yml
+++ b/Resources/Prototypes/Entities/Objects/Shields/shields.yml
@@ -115,6 +115,12 @@
       state: riot_laser-icon
     - type: Item
       heldPrefix: riot_laser
+    # Corvax-Wega-Add-start
+    - type: Reflect
+      reflectProb: 0.4
+      reflects:
+        - Energy
+    # Corvax-Wega-Add-end
     - type: Blocking
       passiveBlockModifier:
         coefficients:
diff --git a/Resources/Prototypes/Loadouts/Miscellaneous/trinkets.yml b/Resources/Prototypes/Loadouts/Miscellaneous/trinkets.yml
index 7f6bd46571..25bbba8cd4 100644
--- a/Resources/Prototypes/Loadouts/Miscellaneous/trinkets.yml
+++ b/Resources/Prototypes/Loadouts/Miscellaneous/trinkets.yml
@@ -485,8 +485,8 @@
   - !type:JobRequirementLoadoutEffect
     requirement:
       !type:RoleTimeRequirement
-      role: JobLawyer
-      time: 100h
+      role: JobIAA
+      time: 50h
   storage:
     back:
     - TowelColorMaroon