Merge pull request #1612 from FutureExalt/master

new outer clothing options for secoffs, warden, and detective

Resources/Prototypes/Catalog/VendingMachines/Inventories/detdrobe.yml

@@ -19,4 +19,4 @@
     ClothingHandsGlovesColorBlack: 2
     ClothingHandsGlovesLatex: 2
     ClothingHeadsetSecurity: 2
-    ClothingNeckScarfStripedBlack: 2
+    ClothingNeckScarfStripedBlack: 2

Resources/Prototypes/Entities/Clothing/OuterClothing/coats.yml

@@ -468,3 +468,25 @@
     sprite: Clothing/OuterClothing/Coats/expensive_coat.rsi
   - type: Clothing
     sprite: Clothing/OuterClothing/Coats/expensive_coat.rsi
+
+- type: entity
+  parent: ClothingOuterArmorBasic
+  id: ClothingOuterCoatFieldBomber
+  name: field bomber
+  description: A red bomber jacket, worn open with the sleeves pushed up. The Nanotrasen logo on the front and the shield on the back are sewn with special high-vis thread.
+  components:
+  - type: Sprite
+    sprite: _NF/Clothing/OuterClothing/Coats/field_bomber.rsi
+  - type: Clothing
+    sprite: _NF/Clothing/OuterClothing/Coats/field_bomber.rsi #imp
+
+- type: entity
+  parent: ClothingOuterCoatDetective
+  id: ClothingOuterCoatFieldJacket
+  name: field jacket
+  description: A soft black suit jacket with loose cuffs. The white logos mark the wearer as Nanotrasen security.
+  components:
+  - type: Sprite
+    sprite: _NF/Clothing/OuterClothing/Coats/field_jacket.rsi
+  - type: Clothing
+    sprite: _NF/Clothing/OuterClothing/Coats/field_jacket.rsi #imp

Resources/Prototypes/Loadouts/loadout_groups.yml

@@ -1405,6 +1405,7 @@
   - ArmorVestSlim #imp
   - ArmorVestCompact #imp
   - WardenWinterCoatUnarmored
+  - ClothingOuterCoatFieldBomber #imp
 
 - type: loadoutGroup
   id: WardenPDA
@@ -1473,6 +1474,7 @@
   - ArmorVestSlim
   - ArmorVestCompact #imp
   - SecurityOfficerWintercoat
+  - ClothingOuterCoatFieldBomber #imp
 
 - type: loadoutGroup
   id: SecurityShoes
@@ -1532,6 +1534,7 @@
   - DetectiveArmorVest
   - DetectiveCoatGrey
   - DetectiveCoat
+  - ClothingOuterCoatFieldJacket #imp
 
 - type: loadoutGroup
   id: DetectiveShoes

Resources/Prototypes/_Impstation/Loadouts/Jobs/Security/detective.yml

@@ -16,4 +16,9 @@
 - type: loadout
   id: ClothingUniformDetectiveSuitSkirt
   equipment:
-    jumpsuit: ClothingUniformDetectiveSuitSkirt #imp
+    jumpsuit: ClothingUniformDetectiveSuitSkirt #imp
+
+- type: loadout
+  id: ClothingOuterCoatFieldJacket
+  equipment:
+    outerClothing: ClothingOuterCoatFieldJacket #imp

Resources/Prototypes/_Impstation/Loadouts/Jobs/Security/security_officer.yml

@@ -2,3 +2,7 @@
   id: ArmorVestCompact
   equipment:
     outerClothing: ClothingOuterArmorBasicCompact
+- type: loadout
+  id: ClothingOuterCoatFieldBomber
+  equipment:
+    outerClothing: ClothingOuterCoatFieldBomber #imp

Resources/Textures/_NF/Clothing/OuterClothing/Coats/field_bomber.rsi/meta.json

@@ -0,0 +1,26 @@
+{
+  "version": 1,
+  "license": "CC0-1.0",
+  "copyright": "Ported from Frontier Station 14. Edited by sha-seng and hilda., original sprites by Imaginos16 from tgstation. Licensed under CC-BY-SA 3.0.",
+  "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/_NF/Clothing/OuterClothing/Coats/field_jacket.rsi/meta.json

@@ -0,0 +1,26 @@
+{
+  "version": 1,
+  "license": "CC0-1.0",
+  "copyright": "Ported from Frontier Station 14. Edited by sha-seng and hilda., original sprites by Imaginos16 from tgstation. Licensed under CC-BY-SA 3.0.",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "icon"
+    },
+    {
+      "name": "equipped-OUTERCLOTHING",
+      "directions": 4
+    },
+    {
+      "name": "inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "inhand-right",
+      "directions": 4
+    }
+  ]
+}