Private Security Hardsuit and New Merc Loadout Options (#1445)

* phase 1

* Suit and extra loadout options for merc

* inhand update

* Update mercenary_loadout_groups.yml

* Update hardsuit-helmets.yml

---------

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

Resources/Prototypes/Entities/Structures/Machines/lathe.yml

@@ -370,6 +370,7 @@
       - ClothingOuterHardsuitRd # Frontier
       - ClothingOuterHardsuitLuxury # Frontier
       - ClothingOuterHardsuitMercenary # Frontier
+      - ClothingOuterHardsuitPrivateSecurity # Frontier
       - ClothingOuterHardsuitScaf # Frontier
       - ClothingOuterHardsuitPilot # Frontier
       - ClothingOuterHardsuitMaximPrototype # Frontier

Resources/Prototypes/_NF/Catalog/Fills/Lockers/suit_storage.yml

@@ -80,6 +80,22 @@
   - type: AccessReader
     access: [["Captain"], ["Mercenary"]]
 
+- type: entity
+  id: SuitStoragePrivateSecurity
+  parent: SuitStorageBase
+  suffix: Private Security
+  components:
+  - type: StorageFill
+    contents:
+        - id: AirTankFilled
+        - id: ClothingOuterHardsuitPrivateSecurity
+        - id: ClothingMaskGasSecurity
+        - id: JetpackMiniFilled
+        - id: HandheldGPSBasic
+#        - id: ClothingShoesBootsMagCombat # Frontier - Not adding this to the suit storage so it wont be abused, exists only on role spawn.
+  - type: AccessReader
+    access: [["Captain"], ["Mercenary"]]
+
 #SCAF hardsuit
 - type: entity
   id: SuitStorageScaf

Resources/Prototypes/_NF/Entities/Clothing/Head/hardsuit-helmets.yml

@@ -11,6 +11,7 @@
   name: mercenary hardsuit helmet
   description: Lightly armored hardsuit helmet for mercenary needs.
   components:
+  - type: BreathMask
   - type: Sprite
     sprite: _NF/Clothing/Head/Hardsuits/mercenary.rsi
   - type: Clothing
@@ -27,6 +28,19 @@
         Slash: 0.9
         Piercing: 0.9
         Heat: 0.9
+
+- type: entity
+  parent: ClothingHeadHelmetHardsuitMercenary
+  id: ClothingHeadHelmetHardsuitPrivateSecurity
+  name: private security hardsuit helmet
+  description: Lightly armored hardsuit helmet for private security needs.
+  components:
+  - type: Sprite
+    sprite: _NF/Clothing/Head/Hardsuits/private_security.rsi
+  - type: Clothing
+    sprite: _NF/Clothing/Head/Hardsuits/private_security.rsi
+  - type: PointLight
+    color: "#ffff00"
 
 #Pilot Hardsuit
 - type: entity

Resources/Prototypes/_NF/Entities/Clothing/OuterClothing/hardsuits.yml

@@ -29,6 +29,19 @@
   - type: HeldSpeedModifier
   - type: ToggleableClothing
     clothingPrototype: ClothingHeadHelmetHardsuitMercenary
+
+- type: entity
+  parent: ClothingOuterHardsuitMercenary
+  id: ClothingOuterHardsuitPrivateSecurity # stats are of merc hardsuit
+  name: private security hardsuit
+  description: A special suit that protects from the danger of space, employed by private security forces.
+  components:
+  - type: Sprite
+    sprite: _NF/Clothing/OuterClothing/Hardsuits/private_security.rsi
+  - type: Clothing
+    sprite: _NF/Clothing/OuterClothing/Hardsuits/private_security.rsi
+  - type: ToggleableClothing
+    clothingPrototype: ClothingHeadHelmetHardsuitPrivateSecurity
 
 # Pilot Hardsuit - Spationaut stats
 - type: entity

Resources/Prototypes/_NF/Loadouts/Jobs/Mercenary/belt.yml

@@ -17,3 +17,13 @@
   id: MercenaryClothingBeltMilitaryWebbing
   equipment:
     belt: ClothingBeltMilitaryWebbing
+
+- type: loadout
+  id: MercenaryClothingBeltSecurity
+  equipment: MercenaryClothingBeltSecurity
+  price: 500
+
+- type: startingGear
+  id: MercenaryClothingBeltSecurity
+  equipment:
+    belt: ClothingBeltSecurityFilled

Resources/Prototypes/_NF/Loadouts/Jobs/Mercenary/face.yml

@@ -7,3 +7,13 @@
   id: MercenaryClothingMaskGasMercenary
   equipment:
     mask: ClothingMaskGasMercenary
+
+- type: loadout
+  id: MercenaryClothingMaskGasSecurity
+  equipment: MercenaryClothingMaskGasSecurity
+  price: 0
+
+- type: startingGear
+  id: MercenaryClothingMaskGasSecurity
+  equipment:
+    mask: ClothingMaskGasSecurity

Resources/Prototypes/_NF/Loadouts/Jobs/Mercenary/jumpsuit.yml

@@ -18,6 +18,26 @@
   equipment:
     jumpsuit: ClothingUniformJumpskirtMercenary
 
+- type: loadout
+  id: MercenaryClothingUniformJumpsuitPrivateSec
+  equipment: MercenaryClothingUniformJumpsuitPrivateSec
+  price: 0
+
+- type: startingGear
+  id: MercenaryClothingUniformJumpsuitPrivateSec
+  equipment:
+    jumpsuit: ClothingUniformJumpsuitPrivateSec
+
+- type: loadout
+  id: MercenaryClothingUniformJumpskirtPrivateSec
+  equipment: MercenaryClothingUniformJumpskirtPrivateSec
+  price: 0
+
+- type: startingGear
+  id: MercenaryClothingUniformJumpskirtPrivateSec
+  equipment:
+    jumpsuit: ClothingUniformJumpskirtPrivateSec
+
 # T3 "Military"
 - type: loadout
   id: MercenaryClothingUniformJumpsuitMilitaryTurtleneckMercenary

Resources/Prototypes/_NF/Loadouts/mercenary_loadout_groups.yml

@@ -4,6 +4,8 @@
   loadouts: #First Section: Role specific freebies/discounts/rewards
   - MercenaryClothingUniformJumpsuitMercenary
   - MercenaryClothingUniformJumpskirtMercenary
+  - MercenaryClothingUniformJumpsuitPrivateSec
+  - MercenaryClothingUniformJumpskirtPrivateSec
   - MercenaryClothingUniformJumpsuitMilitaryTurtleneckMercenary
   - MercenaryClothingUniformJumpsuitMilitaryTurtleneckMercenaryMedic
   - MercenaryClothingUniformJumpsuitMilitaryTurtleneckMercenaryCaptain
@@ -176,6 +178,49 @@
   - MercenaryClothingBackpackDuffelMercenary
   - MercenaryClothingBackpackSatchelMercenary
   - MercenaryClothingBackpackMessengerMercenary
+  - SecurityBackpack
+  - SecuritySatchel
+  - SecurityDuffel
+  - ContractorClothingBackpack
+  - ContractorClothingBackpackDuffel
+  - ContractorClothingBackpackSatchel
+  - ContractorClothingBackpackMessenger
+  - PilotClothingBackpackPilot
+  - PilotClothingBackpackDuffelPilot
+  - PilotClothingBackpackSatchelPilot
+  - PilotClothingBackpackMessengerPilot
+  - ContractorClothingBackpackCaptain
+  - ContractorClothingBackpackDuffelCaptain
+  - ContractorClothingBackpackSatchelCaptain
+  - ContractorClothingBackpackMessengerCaptain
+  - ContractorClothingBackpackSalvage
+  - ContractorClothingBackpackDuffelSalvage
+  - ContractorClothingBackpackSatchelSalvage
+  - ContractorClothingBackpackMessengerSalvage
+  - ContractorClothingBackpackCargo
+  - ContractorClothingBackpackDuffelCargo
+  - ContractorClothingBackpackSatchelCargo
+  - ContractorClothingBackpackMessengerCargo
+  - ContractorClothingBackpackHydroponics
+  - ContractorClothingBackpackDuffelHydroponics
+  - ContractorClothingBackpackSatchelHydroponics
+  - ContractorClothingBackpackMessengerHydroponics
+  - ContractorClothingBackpackScience
+  - ContractorClothingBackpackDuffelScience
+  - ContractorClothingBackpackSatchelScience
+  - ContractorClothingBackpackMessengerScience
+  - ContractorClothingBackpackMedical
+  - ContractorClothingBackpackDuffelMedical
+  - ContractorClothingBackpackSatchelMedical
+  - ContractorClothingBackpackMessengerMedical
+  - ContractorClothingBackpackChemistry
+  - ContractorClothingBackpackDuffelChemistry
+  - ContractorClothingBackpackSatchelChemistry
+  - ContractorClothingBackpackMessengerChemistry
+  - MercenaryClothingBackpackMercenary
+  - MercenaryClothingBackpackDuffelMercenary
+  - MercenaryClothingBackpackSatchelMercenary
+  - MercenaryClothingBackpackMessengerMercenary
   - ContractorClothingBackpack
   - ContractorClothingBackpackDuffel
   - ContractorClothingBackpackSatchel
@@ -392,6 +437,8 @@
   - MercenaryClothingHeadHelmetMercenary
   - MercenaryClothingHeadBandMercenary
   - MercenaryClothingHeadHatBeretMercenary
+  - SecurityHelmet
+  - SecurityBeret
   - ContractorClothingHeadHelmetEVALarge
   - ContractorClothingHeadBandBlack
   - ContractorClothingHeadBandBlue
@@ -555,6 +602,7 @@
   minLimit: 0
   loadouts:
   - MercenaryClothingMaskGasMercenary
+  - MercenaryClothingMaskGasSecurity
   - ContractorClothingMaskBreath
   - ContractorClothingMaskBreathMedical
   - ContractorClothingMaskSterile
@@ -575,6 +623,7 @@
   loadouts:
   - MercenaryClothingBeltMercenaryWebbing
   - MercenaryClothingBeltMilitaryWebbing
+  - MercenaryClothingBeltSecurity
   - ContractorClothingBeltPlant
   - ContractorClothingBeltPlantFilled
   - ContractorClothingBeltChef

Resources/Prototypes/_NF/Recipes/Lathes/eva.yml

@@ -262,6 +262,18 @@
     Durathread: 2000
     Silver: 2000
     Gold: 1000
+
+- type: latheRecipe
+  id: ClothingOuterHardsuitPrivateSecurity
+  result: ClothingOuterHardsuitPrivateSecurity  
+  category: EVASuits
+  completetime: 4
+  materials:
+    Glass: 500
+    Plasteel: 2000
+    Durathread: 2000
+    Silver: 2000
+    Gold: 1000
 
 - type: latheRecipe
   id: ClothingOuterHardsuitBrigmedic

Resources/Prototypes/_NF/Research/arsenal.yml

@@ -12,6 +12,7 @@
   recipeUnlocks:
   - ClothingOuterHardsuitMercenary
   - ClothingOuterHardsuitPirateEVA
+  - ClothingOuterHardsuitPrivateSecurity
   technologyPrerequisites:
   - AdvancedRiotControl
   - HardsuitsAdvanced

Resources/Textures/_NF/Clothing/Head/Hardsuits/private_security.rsi/meta.json

@@ -0,0 +1,25 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Taken from cev-eris at commit https://github.com/discordia-space/CEV-Eris/commit/a75dee2e6d236612dbd403dd5f8687ca930c01f1, modified and recolored by MagnusCrowe",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "icon"
+    },
+    {
+      "name": "icon-flash"
+    },
+    {
+      "name": "off-equipped-HELMET",
+      "directions": 4
+    },
+    {
+      "name": "on-equipped-HELMET",
+      "directions": 4
+    }
+  ]
+}

Resources/Textures/_NF/Clothing/OuterClothing/Hardsuits/private_security.rsi/meta.json

@@ -0,0 +1,26 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Taken from cev-eris at commit https://github.com/discordia-space/CEV-Eris/commit/760f0be7af33a31f5a08a3291864e91539d0ebb7, modified and recolored by MagnusCrowe",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "icon"
+    },
+    {
+      "name": "equipped-OUTERCLOTHING",
+      "directions": 4
+    },
+    {
+      "name": "inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "inhand-right",
+      "directions": 4
+    }
+  ]
+}