NCR Uniform Additions

Resources/Prototypes/_Nuclear14/Entities/Clothing/Head/hats.yml

@@ -417,6 +417,19 @@
     perceptionModifier: 1
     charismaModifier: 1
 
+- type: entity
+  parent: ClothingHeadBase
+  id: N14ClothingHeadHatNCRCampaignHat
+  name: NCR campaign hat
+  description: A khaki-colored campaign hat with the badge of the New California Republic affixed to it.
+  components:
+  - type: Sprite
+    sprite: _Nuclear14/Clothing/Head/FalloutHats/ncrcampaignhat.rsi
+  - type: Clothing
+    sprite: _Nuclear14/Clothing/Head/FalloutHats/ncrcampaignhat.rsi
+  - type: ClothingSpecialModifier
+    charismaModifier: 2
+
 # Tribal
 - type: entity
   parent: ClothingHeadBase

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

@@ -261,6 +261,72 @@
   - type: Clothing
     sprite: _Nuclear14/Clothing/Head/FalloutHelmets/ncrhelmet2.rsi
 
+- type: entity
+  parent: N14ClothingHeadHatBaseHelmetMetal
+  id: N14ClothingHeadHatNCRHelmetMetalWinterCadet
+  name: NCR winter cadet helmet
+  description: A rounded NCR helmet offering some protection. This one is covered in a white camo and has cadet markings painted on.
+  components:
+  - type: Sprite
+    sprite: _Nuclear14/Clothing/Head/FalloutHelmets/ncrcadethelmet.rsi
+  - type: Clothing
+    sprite: _Nuclear14/Clothing/Head/FalloutHelmets/ncrcadethelmet.rsi
+
+- type: entity
+  parent: N14ClothingHeadHatBaseHelmetMetal
+  id: N14ClothingHeadHatNCRHelmetMetalWinterNetting
+  name: NCR winter helmet w/ netting
+  description: A rounded NCR helmet offering some protection. This one is covered in winter camo and some makeshift netting.
+  components:
+  - type: Sprite
+    sprite: _Nuclear14/Clothing/Head/FalloutHelmets/ncrhelmet1netting.rsi
+  - type: Clothing
+    sprite: _Nuclear14/Clothing/Head/FalloutHelmets/ncrhelmet1netting.rsi
+
+- type: entity
+  parent: N14ClothingHeadHatBaseHelmetMetal
+  id: N14ClothingHeadHatNCRHelmetMetalWinterRainCover
+  name: NCR winter helmet w/ rain cover
+  description: A rounded NCR helmet offering some protection. This one is covered in winter camo and has a rain cover stretched over the top.
+  components:
+  - type: Sprite
+    sprite: _Nuclear14/Clothing/Head/FalloutHelmets/ncrhelmet1raincover.rsi
+  - type: Clothing
+    sprite: _Nuclear14/Clothing/Head/FalloutHelmets/ncrhelmet1raincover.rsi
+
+- type: entity
+  parent: N14ClothingHeadHatBaseHelmetMetal
+  id: N14ClothingHeadHatNCRHelmetMetalWinterLieutenant
+  name: NCR winter lieutenant helmet
+  description: A rounded NCR helmet offering some protection. This one has a first lieutenant insiginia attached to the camoflauge cover.
+  components:
+  - type: Sprite
+    sprite: _Nuclear14/Clothing/Head/FalloutHelmets/ncrlieutenanthelmet.rsi
+  - type: Clothing
+    sprite: _Nuclear14/Clothing/Head/FalloutHelmets/ncrlieutenanthelmet.rsi
+
+- type: entity
+  parent: N14ClothingHeadHatBaseHelmetMetal
+  id: N14ClothingHeadHatNCRHelmetMetalWinterSecondLieutenant
+  name: NCR winter second lieutenant helmet
+  description: A rounded NCR helmet offering some protection. This one has a second lieutenant insiginia attached to the camoflauge cover.
+  components:
+  - type: Sprite
+    sprite: _Nuclear14/Clothing/Head/FalloutHelmets/ncrsecondlieutenanthelmet.rsi
+  - type: Clothing
+    sprite: _Nuclear14/Clothing/Head/FalloutHelmets/ncrsecondlieutenanthelmet.rsi
+
+- type: entity
+  parent: N14ClothingHeadHatBaseHelmetMetal
+  id: N14ClothingHeadHatNCRHelmetMetalWinterSergeant
+  name: NCR winter sergeant helmet
+  description: A rounded NCR helmet offering some protection. This one has a sergeant insiginia attached to the camoflauge cover.
+  components:
+  - type: Sprite
+    sprite: _Nuclear14/Clothing/Head/FalloutHelmets/ncrsergeanthelmet.rsi
+  - type: Clothing
+    sprite: _Nuclear14/Clothing/Head/FalloutHelmets/ncrsergeanthelmet.rsi
+
 - type: entity
   parent: N14ClothingHeadHatBaseHelmetMetal
   id: N14ClothingHeadHatNCRHelmetMetalDesert

Resources/Prototypes/_Nuclear14/Entities/Clothing/OuterClothing/falloutarmor.yml

@@ -487,6 +487,46 @@
         Heat: 0.7
   - type: ExplosionResistance
     damageCoefficient: 0.9
+
+- type: entity
+  parent: ClothingOuterBase
+  id: N14ClothingOuterNCRCFvest
+  name: NCR CF kevlar vest
+  description: A light ballistic plate inside a nylon vest. This one is in the colors of NCR Correctional Facility staff.
+  components:
+  - type: Sprite
+    sprite: _Nuclear14/Clothing/OuterClothing/Armor/ncrcorrectionskevlarvest.rsi
+  - type: Clothing
+    sprite: _Nuclear14/Clothing/OuterClothing/Armor/ncrcorrectionskevlarvest.rsi
+  - type: Armor
+    modifiers:
+      coefficients:
+        Blunt: 0.8
+        Slash: 0.8
+        Piercing: 0.65
+        Heat: 0.7
+  - type: ExplosionResistance
+    damageCoefficient: 0.9
+
+- type: entity
+  parent: ClothingOuterBase
+  id: N14ClothingOuterNCRkevlarvest
+  name: NCR kevlar vest
+  description: A light ballistic plate inside a nylon vest. This one is in the colors of the NCRA.
+  components:
+  - type: Sprite
+    sprite: _Nuclear14/Clothing/OuterClothing/Armor/ncrkevlarvest.rsi
+  - type: Clothing
+    sprite: _Nuclear14/Clothing/OuterClothing/Armor/ncrkevlarvest.rsi
+  - type: Armor
+    modifiers:
+      coefficients:
+        Blunt: 0.8
+        Slash: 0.8
+        Piercing: 0.65
+        Heat: 0.7
+  - type: ExplosionResistance
+    damageCoefficient: 0.9
 
 - type: entity
   parent: ClothingOuterBase
@@ -1096,4 +1136,4 @@
         Blunt: 0.75
         Slash: 0.75
         Piercing: 0.75
-        Heat: 0.9
+        Heat: 0.9

Resources/Prototypes/_Nuclear14/Entities/Clothing/Uniform/falloutjumpsuits.yml

@@ -524,6 +524,28 @@
   - type: Clothing
     sprite: _Nuclear14/Clothing/Uniforms/FalloutSuits/rangerveteranred.rsi
 
+- type: entity
+  parent: ClothingUniformBase
+  id: N14ClothingUniformNCRCFUniform
+  name: NCR CF uniform
+  description: The standard uniform of NCR Correctional Facility staff.
+  components:
+  - type: Sprite
+    sprite: _Nuclear14/Clothing/Uniforms/FalloutSuits/ncrcorrectionsuniform.rsi
+  - type: Clothing
+    sprite: _Nuclear14/Clothing/Uniforms/FalloutSuits/ncrcorrectionsuniform.rsi
+
+- type: entity
+  parent: ClothingUniformBase
+  id: N14ClothingUniformNCRDressUniform
+  name: NCR dress uniform
+  description: The universal dress uniform of the New California Republic. This one seems to be in remarkable condition, its even ironed!
+  components:
+  - type: Sprite
+    sprite: _Nuclear14/Clothing/Uniforms/FalloutSuits/ncrdressuniform.rsi
+  - type: Clothing
+    sprite: _Nuclear14/Clothing/Uniforms/FalloutSuits/ncrdressuniform.rsi
+
 #midwest BoS
 
 - type: entity

Resources/Prototypes/_Nuclear14/Roles/Jobs/NCR/ncr_cadet.yml

@@ -26,6 +26,7 @@
     jumpsuit: N14ClothingUniformNCRSnow
     shoes: N14ClothingBootsLeather
     pocket1: NCRtrooperloadoutkits
+    pocket2: N14ClothingHeadHatNCRHelmetMetalWinterCadet
     id: N14IDNCRDogtag
   innerClothingSkirt: N14ClothingUniformNCRSnow #placeholder
   satchel: N14ClothingBackpackSatchelNCRFilled

Resources/Prototypes/_Nuclear14/Roles/Jobs/NCR/ncr_ws.yml

@@ -25,7 +25,7 @@
 - type: startingGear
   id: NCRWSGear
   equipment:
-    head: N14ClothingHeadHatNCRHelmetMetalSnow
+    head: N14ClothingHeadHatNCRHelmetMetalWinterNetting
     back: N14ClothingBackpackNCRFilled
     jumpsuit: N14ClothingUniformNCRSnow
     shoes: N14ClothingBootsLeather

Resources/Textures/_Nuclear14/Clothing/Head/FalloutHats/ncrcampaignhat.rsi/meta.json

@@ -0,0 +1,18 @@
+{
+  "version": 1,
+  "license": null,
+  "copyright": "Taken from Big-Iron at https://github.com/Foundation-19/Big-Iron/blob/90005a084e583e29a2f82dea22eaa01733e6dd5e/icons/mob/clothing/head.dmi, https://github.com/Foundation-19/Big-Iron/blob/f70aa6dcd6bcaa06df4d22a34fae3f7f743c3a63/icons/fallout/clothing/hats.dmi",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "equipped-HELMET",
+      "directions": 4
+    },
+    {
+      "name": "icon"
+    }
+  ]
+}

Resources/Textures/_Nuclear14/Clothing/Head/FalloutHelmets/ncrcadethelmet.rsi/meta.json

@@ -0,0 +1,26 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Taken from Nukapop13 at commit https://github.com/SeeminglyTypicalUsername/Nukapop13/commit/fbb54ee986f6f321767cbe227dfbf1a9254a0a7a",
+  "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/_Nuclear14/Clothing/Head/FalloutHelmets/ncrhelmet1netting.rsi/meta.json

@@ -0,0 +1,26 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Taken from Nukapop13 at commit https://github.com/SeeminglyTypicalUsername/Nukapop13/commit/fbb54ee986f6f321767cbe227dfbf1a9254a0a7aTaken from Nukapop13 at commit https://github.com/SeeminglyTypicalUsername/Nukapop13/commit/fbb54ee986f6f321767cbe227dfbf1a9254a0a7a. Additional addons modifed from CM13 sprites found at https://github.com/cmss13-devs/cmss13.",
+  "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/_Nuclear14/Clothing/Head/FalloutHelmets/ncrhelmet1raincover.rsi/meta.json

@@ -0,0 +1,26 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Taken from Nukapop13 at commit https://github.com/SeeminglyTypicalUsername/Nukapop13/commit/fbb54ee986f6f321767cbe227dfbf1a9254a0a7a. Additional addons modifed from CM13 sprites found at https://github.com/cmss13-devs/cmss13.",
+  "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/_Nuclear14/Clothing/Head/FalloutHelmets/ncrlieutenanthelmet.rsi/meta.json

@@ -0,0 +1,26 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Taken from Nukapop13 at commit https://github.com/SeeminglyTypicalUsername/Nukapop13/commit/fbb54ee986f6f321767cbe227dfbf1a9254a0a7a",
+  "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/_Nuclear14/Clothing/Head/FalloutHelmets/ncrlieutenanthelmet2.rsi/meta.json

@@ -0,0 +1,26 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Taken from Nukapop13 at commit https://github.com/SeeminglyTypicalUsername/Nukapop13/commit/fbb54ee986f6f321767cbe227dfbf1a9254a0a7a",
+  "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/_Nuclear14/Clothing/Head/FalloutHelmets/ncrlieutenanthelmet3.rsi/meta.json

@@ -0,0 +1,26 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Taken from Nukapop13 at commit https://github.com/SeeminglyTypicalUsername/Nukapop13/commit/fbb54ee986f6f321767cbe227dfbf1a9254a0a7a",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "icon"
+    },
+    {
+      "name": "equipped-HELMET",
+      "directions": 4
+    },
+    {
+      "name": "inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "inhand-right",
+      "directions": 4
+    }
+  ]
+}