последние подготовления к NPZ (#239)

* последние подготовления к NPZ

* fix

* Update glasses.yml

---------

Co-authored-by: Evgencheg <[email protected]>

Resources/Prototypes/Entities/Clothing/Head/helmets.yml

@@ -45,8 +45,16 @@
   components:
   - type: Sprite
     sprite: Clothing/Head/Helmets/swat.rsi
+    layers:
+    - state: icon
+      map: [ "unfoldedLayer" ]
+      visible: false
+    - state: icon-open
+      map: ["foldedLayer"]
+      visible: true
   - type: Clothing
     sprite: Clothing/Head/Helmets/swat.rsi
+    equippedPrefix: open
   - type: Armor #This is intentionally not spaceproof, when the time comes to port the values from SS13 this should be buffed from what it was.
     modifiers:
       coefficients:
@@ -56,12 +64,22 @@
         Heat: 0.80
         Radiation: 0.80
         Caustic: 0.95
+  - type: Item
+    heldPrefix: open
   - type: ExplosionResistance
     damageCoefficient: 0.75
+  - type: Foldable
+    folded: true
+    canFoldInsideContainer: true
+    unfoldVerbText: fold-zip-verb
+    foldVerbText: fold-unzip-verb
+  - type: FoldableClothing
+    foldedEquippedPrefix: open
+    foldedHeldPrefix: open
 
 #Syndicate SWAT Helmet
 - type: entity
-  parent: ClothingHeadHelmetSwat
+  parent: ClothingHeadBase
   id: ClothingHeadHelmetSwatSyndicate
   name: SWAT helmet
   suffix: Syndicate
@@ -71,6 +89,17 @@
     sprite: Clothing/Head/Helmets/swat_syndicate.rsi
   - type: Clothing
     sprite: Clothing/Head/Helmets/swat_syndicate.rsi
+  - type: Armor #This is intentionally not spaceproof, when the time comes to port the values from SS13 this should be buffed from what it was.
+    modifiers:
+      coefficients:
+        Blunt: 0.80
+        Slash: 0.80
+        Piercing: 0.80
+        Heat: 0.80
+        Radiation: 0.80
+        Caustic: 0.95
+  - type: ExplosionResistance
+    damageCoefficient: 0.75
 
 #Light Riot Helmet
 - type: entity

Resources/Prototypes/_LostParadise/Entities/Clothing/Eyes/Glasses/glasses.yml

@@ -90,3 +90,17 @@
     sprite: _LostParadise/Clothing/Eyes/Glasses/LPPCASglasses.rsi
   - type: FlashImmunity
   - type: EyeProtection
+
+- type: entity
+  parent: [ClothingEyesBase, LPPShowSecurityIcons]
+  id: LPPClothingEyesGlassesAviatorNPZ
+  name: NPZ aviators
+  description: Only for the most coolest guys in this sector.
+  components:
+  - type: Sprite
+    sprite: _LostParadise/Clothing/Eyes/Glasses/NPZaviators.rsi
+  - type: Clothing
+    sprite: _LostParadise/Clothing/Eyes/Glasses/NPZaviators.rsi
+  - type: FlashImmunity
+  - type: EyeProtection
+    protectionTime: 5

Resources/Prototypes/_LostParadise/Entities/Clothing/Head/helmet.yml

@@ -144,3 +144,14 @@
         Slash: 0.9
         Piercing: 0.9
         Heat: 0.9
+
+- type: entity
+  parent: LPPClothingHeadUrbanHelmetPG
+  id: LPPClothingHeadHelmetNPZAssault
+  name: NPZ assault helmet
+  description: Robust helmet with additional armor on neck, pretty good for asaults.
+  components:
+  - type: Sprite
+    sprite: _LostParadise/Clothing/Head/Helmets/NPZ/NPZassault.rsi
+  - type: Clothing
+    sprite: _LostParadise/Clothing/Head/Helmets/NPZ/NPZassault.rsi

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

@@ -252,3 +252,23 @@
         Heat: 0.65
   - type: ExplosionResistance
     damageCoefficient: 0.7
+
+- type: entity
+  parent: ClothingOuterStorageBase
+  id: LPPClothingOuterNPZRepresentative
+  name: NPZ Representative coat
+  description: Leather trench coat with a bulletproof vest, it screams- "Stylish!".
+  components:
+  - type: Sprite
+    sprite: _LostParadise/Clothing/OuterClothing/Coats/NPZreprcoat.rsi
+  - type: Clothing
+    sprite: _LostParadise/Clothing/OuterClothing/Coats/NPZreprcoat.rsi
+  - type: Armor
+    modifiers:
+      coefficients:
+        Blunt: 0.65
+        Slash: 0.65
+        Piercing: 0.65
+        Heat: 0.65
+  - type: ExplosionResistance
+    damageCoefficient: 0.7

Resources/Prototypes/_LostParadise/Entities/Clothing/Uniforms/jumpsuitsnpz.yml

@@ -42,3 +42,25 @@
     modifiers:
       coefficients:
         Heat: 0.9
+
+- type: entity
+  parent: ClothingUniformBase
+  id: LPPClothingUniformJumpsuitRepresentativePNZ
+  name: NPZ Representative suit
+  description: Washed jeans with the most expensive shirt that you can find on the market, are you compensating for something?
+  components:
+  - type: Sprite
+    sprite: _LostParadise/Clothing/Uniforms/NPZ/representive.rsi
+  - type: Clothing
+    sprite: _LostParadise/Clothing/Uniforms/NPZ/representive.rsi
+
+- type: entity
+  parent: ClothingUniformBase
+  id: LPPClothingUniformJumpsuitCamoNPZ
+  name: NPZ urban camo
+  description: No, this is not a reference to some fanatics from Chernobyl.
+  components:
+  - type: Sprite
+    sprite: _LostParadise/Clothing/Uniforms/NPZ/solider.rsi
+  - type: Clothing
+    sprite: _LostParadise/Clothing/Uniforms/NPZ/solider.rsi

Resources/Prototypes/_LostParadise/Entities/Objects/Weapons/Guns/Rifles/LPPrifles.yml

@@ -96,7 +96,7 @@
 
 - type: entity
   name: HM-10
-  parent: BaseWeaponRifle
+  parent: BaseWeaponSubMachineGun
   id: LPPWeaponRifleHM10
   description: The old-style special forces assault rifle is not so relevant now, but it is still better than standard modern analogues. Uses .30 caliber rifle cartridges.
   components:
@@ -130,6 +130,8 @@
         whitelist:
           tags:
             - CartridgeLightRifle
+  - type: Clothing
+    sprite: _LostParadise/Objects/Weapons/Guns/Rifles/old-rifle.rsi
   - type: ContainerContainer
     containers:
       gun_magazine: !type:ContainerSlot

Resources/Prototypes/_LostParadise/Entities/Objects/Weapons/Melee/knife.yml

@@ -54,3 +54,42 @@
     - Belt
   - type: StaminaDamageOnHit
     damage: 15
+
+- type: entity
+  name: Jagdkommando
+  parent: BaseKnife
+  id: LPPKnifeJagdkommando
+  description: Favourite knife of most elite special groups, be cautios to use- your combat equipment might get a bit bloody after pulling this knife out of your enemy.
+  components:
+  - type: Tag
+    tags:
+    - CombatKnife
+    - Knife
+  - type: Sprite
+    sprite: _LostParadise/Objects/Weapons/Melee/jagdkommando.rsi
+    state: icon
+  - type: MeleeWeapon
+    attackRate: 2
+    damage:
+      types:
+        Piercing: 14
+    heavyStaminaCost: 2
+    angle: 2
+  - type: Item
+    size: Small
+    sprite: _LostParadise/Objects/Weapons/Melee/jagdkommando.rsi
+  - type: DisarmMalus
+    malus: 0.225
+  - type: ThrowingAngle
+    angle: 1
+  - type: MeleeChemicalInjector
+    solution: melee
+  - type: RefillableSolution
+    solution: melee
+  - type: InjectableSolution
+    solution: melee
+  - type: SolutionInjectOnEmbed
+    transferAmount: 3
+    solution: melee
+  - type: SolutionTransfer
+    maxTransferAmount: 3

Resources/Textures/Clothing/Head/Helmets/swat.rsi/meta.json

@@ -10,12 +10,15 @@
     {
       "name": "icon"
     },
+    {
+      "name": "icon-open"
+    },
     {
       "name": "equipped-HELMET",
       "directions": 4
     },
     {
-      "name": "equipped-HELMET-vox",
+      "name": "open-equipped-HELMET",
       "directions": 4
     },
     {
@@ -25,6 +28,14 @@
     {
       "name": "inhand-right",
       "directions": 4
+    },
+    {
+      "name": "open-inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "open-inhand-right",
+      "directions": 4
     }
   ]
 }

Resources/Textures/_LostParadise/Clothing/Eyes/Glasses/NPZaviators.rsi/meta.json

@@ -0,0 +1,26 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Sprited by MegaDaimond",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "icon"
+    },
+    {
+      "name": "equipped-EYES",
+      "directions": 4
+    },
+    {
+      "name": "inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "inhand-right",
+      "directions": 4
+    }
+  ]
+}

Resources/Textures/_LostParadise/Clothing/Head/Hats/upgberet.rsi/meta.json

@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Resprited by Insulgon",
+  "copyright": "Resprited by MegaDaimond",
   "size": {
     "x": 32,
     "y": 32
@@ -13,10 +13,6 @@
     {
       "name": "equipped-HELMET",
       "directions": 4
-    },
-    {
-      "name": "equipped-HELMET-hamster",
-      "directions": 4
     }
   ]
 }

Resources/Textures/_LostParadise/Clothing/Head/Helmets/NPZ/NPZassault.rsi/meta.json

@@ -0,0 +1,26 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Sprited by MegaDaimond",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "icon"
+    },
+    {
+      "name": "equipped-HELMET",
+      "directions": 4
+    },
+    {
+      "name": "inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "inhand-right",
+      "directions": 4
+    }
+  ]
+}

Resources/Textures/_LostParadise/Clothing/OuterClothing/Armor/upgbulletproof.rsi/meta.json

@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/2fea0a59470c476cf3f927833d3918d89cbe6af8",
+  "copyright": "Sprited by MegaDaimond",
   "size": {
     "x": 32,
     "y": 32

Resources/Textures/_LostParadise/Clothing/OuterClothing/Coats/NPZreprcoat.rsi/meta.json

@@ -0,0 +1,26 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/d90c7e5de6f6d94596c164da78dbc8d3cd35bb99 and modified by Flareguy. Vox state taken from vgstation13 at https://github.com/vgstation-coders/vgstation13/blob//icons/mob/species/vox/suit.dmi and modified by Flareguy",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "icon"
+    },
+    {
+      "name": "equipped-OUTERCLOTHING",
+      "directions": 4
+    },
+    {
+      "name": "inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "inhand-right",
+      "directions": 4
+    }
+  ]
+}

Resources/Textures/_LostParadise/Clothing/Uniforms/NPZ/representive.rsi/meta.json

@@ -0,0 +1,26 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/5ea6d8b4422027d0c22cb415d1f05a08bf39aaa0 resprited by MegaDaimond",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "icon"
+    },
+    {
+      "name": "equipped-INNERCLOTHING",
+      "directions": 4
+    },
+    {
+      "name": "inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "inhand-right",
+      "directions": 4
+    }
+  ]
+}

Resources/Textures/_LostParadise/Clothing/Uniforms/NPZ/solider.rsi/meta.json

@@ -0,0 +1,26 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Sprited by MegaDaimond",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "icon"
+    },
+    {
+      "name": "equipped-INNERCLOTHING",
+      "directions": 4
+    },
+    {
+      "name": "inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "inhand-right",
+      "directions": 4
+    }
+  ]
+}