Спрайты хвостов/ушей + пару фиксов

Resources/Prototypes/_LostParadise/Entities/Clothing/Neck/cloaks.yml

@@ -214,4 +214,13 @@
   description: Kore yon deru hito wa bakadayo.
   components:
     - type: Sprite
-      sprite: _LostParadise/Clothing/Neck/Cloaks/Monorich.rsi
+      sprite: _LostParadise/Clothing/Neck/Cloaks/Monorich.rsi
+
+- type: entity
+  parent: ClothingNeckBase
+  id: LPPCloakMantleNPZ
+  name: накидка НПЗ
+  description: Мы торопимся или действуем скрытно?
+  components:
+    - type: Sprite
+      sprite: _LostParadise/Clothing/Neck/NPZ/NPZmantle.rsi

Resources/Prototypes/_LostParadise/Entities/Clothing/Neck/shemags.yml

@@ -133,3 +133,30 @@
   - type: Clothing
     sprite: _LostParadise/Clothing/Neck/shemags/purpleup.rsi
 
+- type: entity
+  parent: ClothingNeckBase
+  id: LPPClothingNeckShemagNPZ
+  name: урбан шемаг
+  description: тёплая шёлковая ткань, защищающая от пыли и холода, а так же придающая брутальности и тактикульности носителю. Теперь в цветах НПЗ!
+  components:
+  - type: Sprite
+    sprite: _LostParadise/Clothing/Neck/shemags/NPZdown.rsi
+  - type: Clothing
+    sprite: _LostParadise/Clothing/Neck/shemags/NPZdown.rsi
+  - type: ToggleableClothing
+    clothingPrototype: LPPClothingMaskShemagNPZ
+    requiredSlot:
+    - neck
+    slot: mask
+
+- type: entity
+  parent: ClothingMaskBase
+  id: LPPClothingMaskShemagNPZ
+  noSpawn: true
+  name: урбан шемаг
+  components:
+  - type: Sprite
+    sprite: _LostParadise/Clothing/Neck/shemags/NPZup.rsi
+  - type: Clothing
+    sprite: _LostParadise/Clothing/Neck/shemags/NPZup.rsi
+

Resources/Prototypes/_LostParadise/Entities/Clothing/OuterClothing/detectivehardsuit.yml

@@ -18,11 +18,11 @@
   - type: Armor
     modifiers:
       coefficients:
-        Blunt: 0.95
-        Slash: 0.95
-        Piercing: 0.8
+        Blunt: 0.8
+        Slash: 0.8
+        Piercing: 0.65
         Caustic: 0.7
-        Heat: 0.85
+        Heat: 0.8
   - type: ClothingSpeedModifier
     walkModifier: 0.95
     sprintModifier: 0.90

Resources/Prototypes/_LostParadise/Entities/Clothing/Shoes/magboots.yml

@@ -72,3 +72,27 @@
     - HighRiskItem
   - type: StaticPrice
     price: 450
+
+- type: entity
+  parent: ClothingShoesBootsMag
+  id: LPPClothingShoesBootsMagNPZ
+  name: магитные сапоги НПЗ
+  description: Стандартизированные магнитные сапоги от военно-исследовательских сил Независимого Правительства Земли.
+  components:
+  - type: Sprite
+    sprite: _LostParadise/Clothing/Shoes/Boots/NPZmagboots.rsi
+    state: icon
+  - type: Clothing
+    sprite: _LostParadise/Clothing/Shoes/Boots/NPZmagboots.rsi
+  - type: Magboots
+    toggleAction: ActionToggleMagbootsAdvanced
+  - type: ClothingSpeedModifier
+    walkModifier: 0.95
+    sprintModifier: 0.95
+    enabled: false
+  - type: NoSlip
+  - type: Tag
+    tags:
+    - WhitelistChameleon
+  - type: StaticPrice
+    price: 450

Resources/Prototypes/_LostParadise/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml

@@ -218,3 +218,60 @@
     startingCharge: 4000
   - type: Item
     size: Large
+
+- type: entity
+  name: гибридный модуль S.O.L.E.I.L.
+  parent: BaseWeaponBatterySmall
+  id: LPPWeaponEnergyGunSoleil
+  description: Прототип гибридного лазерного "пистолета", представляющего из себя устройство, что цепляется на локоть, имеет летальный и нелетальный режимы стрельбы.
+  components:
+  - type: Sprite
+    sprite: _LostParadise/Objects/Weapons/Guns/Battery/soleil.rsi
+    layers:
+    - state: base
+      map: ["enum.GunVisualLayers.Base"]
+    - state: mode-disabler
+      shader: unshaded
+      map: [ "Firemode" ]
+    - state: mag-unshaded-4
+      map: ["enum.GunVisualLayers.MagUnshaded"]
+      shader: unshaded
+  - type: Clothing
+    sprite: _LostParadise/Objects/Weapons/Guns/Battery/soleil.rsi
+  - type: Gun
+    soundGunshot:
+      path: /Audio/DeltaV/Weapons/Guns/Gunshots/laser.ogg
+    soundEmpty:
+      path: /Audio/DeltaV/Weapons/Guns/Empty/dry_fire.ogg
+  - type: Battery
+    maxCharge: 750
+    startingCharge: 750
+  - type: ProjectileBatteryAmmoProvider
+    proto: BulletDisabler
+    fireCost: 50
+  - type: EnergyGun
+    fireModes:
+    - proto: BulletDisabler
+      fireCost: 50
+      name: disable
+      state: disabler
+    - proto: BulletEnergyGunLaser
+      fireCost: 75
+      name: lethal
+      state: lethal
+  - type: MagazineVisuals
+    magState: mag
+    steps: 5
+    zeroVisible: true
+  - type: Appearance
+  - type: GenericVisualizer
+    visuals:
+      enum.EnergyGunFireModeVisuals.State:
+        Firemode:
+          Disabler: { state: mode-disabler }
+          Lethal: { state: mode-lethal }
+  - type: Tag
+    tags:
+    - Sidearm
+  - type: StaticPrice
+    price: 750

Resources/Textures/Clothing/Head/Hardsuits/cybersun.rsi/meta.json

@@ -14,51 +14,67 @@
       "name": "icon-flash"
     },
     {
-      "name": "off-equipped-HELMET"
+      "name": "off-equipped-HELMET",
       "directions": 4
     },
     {
-      "name": "off-equipped-HELMET-vulpkanin"
+      "name": "on-equipped-HELMET",
       "directions": 4
     },
     {
-      "name": "off-equipped-HELMET-tajaran"
+      "name": "off-inhand-left",
       "directions": 4
     },
     {
-      "name": "off-equipped-HELMET-shark
+      "name": "on-inhand-left",
       "directions": 4
     },
     {
-      "name": "off-equipped-HELMET-reptilian"
+      "name": "off-inhand-right",
       "directions": 4
     },
     {
-      "name": "off-equipped-HELMET-harpy"
+      "name": "on-inhand-right",
       "directions": 4
     },
     {
-      "name": "on-equipped-HELMET"
+      "name": "off-equipped-HELMET-harpy",
       "directions": 4
     },
     {
-      "name": "on-equipped-HELMET-vulpkanin"
+      "name": "on-equipped-HELMET-harpy",
       "directions": 4
     },
     {
-      "name": "on-equipped-HELMET-tajaran"
+      "name": "off-equipped-HELMET-tajaran",
       "directions": 4
     },
     {
-      "name": "on-equipped-HELMET-shark"
+      "name": "on-equipped-HELMET-tajaran",
       "directions": 4
     },
     {
-      "name": "on-equipped-HELMET-reptilian"
+      "name": "off-equipped-HELMET-shark",
       "directions": 4
     },
     {
-      "name": "on-equipped-HELMET-harpy"
+      "name": "on-equipped-HELMET-shark",
+      "directions": 4
+    },
+    {
+      "name": "off-equipped-HELMET-vulpkanin",
+      "directions": 4
+    },
+    {
+      "name": "on-equipped-HELMET-vulpkanin",
+      "directions": 4
+    },
+    {
+      "name": "off-equipped-HELMET-reptilian",
+      "directions": 4
+    },
+    {
+      "name": "on-equipped-HELMET-reptilian",
       "directions": 4
     }
   ]

Resources/Textures/Clothing/Head/Hardsuits/piratecaptainhelm.rsi/meta.json

@@ -17,6 +17,14 @@
         {
             "name": "equipped-HELMET-vox",
             "directions": 4
+        },
+        {
+            "name": "equipped-HELMET-shark",
+            "directions": 4
+        },
+        {
+            "name": "equipped-HELMET-vulpkanin",
+            "directions": 4
         }
     ]
 }

Resources/Textures/Clothing/Head/Hardsuits/pirateeva.rsi/meta.json

@@ -17,6 +17,10 @@
         {
             "name": "equipped-HELMET-vox",
             "directions": 4
+        },
+        {
+            "name": "equipped-HELMET-vulpkanin",
+            "directions": 4
         }
     ]
 }

Resources/Textures/Clothing/Head/Hardsuits/wizard.rsi/meta.json

@@ -36,6 +36,14 @@
     {
       "name": "on-equipped-HELMET-vox",
       "directions": 4
+    },
+    {
+      "name": "off-equipped-HELMET-reptilian",
+      "directions": 4
+    },
+    {
+      "name": "on-equipped-HELMET-reptilian",
+      "directions": 4
     }
   ]
 }

Resources/Textures/Clothing/OuterClothing/Hardsuits/wizard.rsi/meta.json

@@ -25,6 +25,22 @@
     {
       "name": "inhand-right",
       "directions": 4
+    },
+    {
+      "name": "equipped-OUTERCLOTHING-shark",
+      "directions": 4
+    },
+    {
+      "name": "equipped-OUTERCLOTHING-tajaran",
+      "directions": 4
+    },
+    {
+      "name": "equipped-OUTERCLOTHING-vulpkanin",
+      "directions": 4
+    },
+    {
+      "name": "equipped-OUTERCLOTHING-reptilian",
+      "directions": 4
     }
   ]
 }

Resources/Textures/DeltaV/Clothing/Head/Hardsuits/Combat/advanced.rsi/meta.json

@@ -29,10 +29,6 @@
       "name": "on-equipped-HELMET-vulpkanin",
       "directions": 4
     },
-    {
-      "name": "off-equipped-HELMET-vulpkanin",
-      "directions": 4
-    },
     {
       "name": "on-equipped-HELMET-shark",
       "directions": 4

Resources/Textures/DeltaV/Clothing/Head/Hardsuits/Combat/hos.rsi/meta.json

@@ -52,14 +52,6 @@
         {
             "name": "on-equipped-HELMET-shark",
             "directions": 4
-        },
-        {
-            "name": "off-equipped-HELMET-reptilian",
-            "directions": 4
-        },
-        {
-            "name": "on-equipped-HELMET-reptilian",
-            "directions": 4
         }
     ]
 }

Resources/Textures/Nyanotrasen/Clothing/Head/ReverseEngineering/juggernaut.rsi/meta.json

@@ -13,6 +13,22 @@
     {
       "name": "equipped-HELMET",
       "directions": 4
+    },
+    {
+      "name": "equipped-HELMET-tajaran",
+      "directions": 4
+    },
+    {
+      "name": "equipped-HELMET-shark",
+      "directions": 4
+    },
+    {
+      "name": "equipped-HELMET-vulpkanin",
+      "directions": 4
+    },
+    {
+      "name": "equipped-HELMET-reptilian",
+      "directions": 4
     }
   ]
 }

Resources/Textures/Nyanotrasen/Clothing/Head/ReverseEngineering/syndicate.rsi/meta.json

@@ -24,6 +24,38 @@
     {
       "name": "on-equipped-HELMET",
       "directions": 4
+    },
+    {
+      "name": "off-equipped-HELMET-shark",
+      "directions": 4
+    },
+    {
+      "name": "on-equipped-HELMET-shark",
+      "directions": 4
+    },
+    {
+      "name": "off-equipped-HELMET-tajaran",
+      "directions": 4
+    },
+    {
+      "name": "on-equipped-HELMET-tajaran",
+      "directions": 4
+    },
+    {
+      "name": "off-equipped-HELMET-vulpkanin",
+      "directions": 4
+    },
+    {
+      "name": "on-equipped-HELMET-vulpkanin",
+      "directions": 4
+    },
+    {
+      "name": "off-equipped-HELMET-reptilian",
+      "directions": 4
+    },
+    {
+      "name": "on-equipped-HELMET-reptilian",
+      "directions": 4
     }
   ]
 }