Ajusted Merc and Nfsd gear

Resources/Prototypes/Catalog/Fills/Lockers/heads.yml

@@ -363,7 +363,7 @@
     - id: JetpackSecurityFilled
 #    - id: OxygenTankFilled # Frontier
     - id: AirTankFilled # Frontier
-    - id: ClothingShoesBootsMagCombatFilled # Frontier
+    - id: ClothingShoesBootsMagSecurityFilled # Frontier
 
 # No hardsuit locker
 - type: entity

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

@@ -174,7 +174,7 @@
         - id: ClothingOuterHardsuitSecurity
         - id: ClothingMaskBreath
         - id: JetpackSecurityFilled # Frontier
-        - id: ClothingShoesBootsMagCombatFilled # Frontier
+        - id: ClothingShoesBootsMagSecurityFilled # Frontier
   - type: AccessReader
     access: [["Security"]]
 
@@ -244,7 +244,7 @@
         - id: ClothingOuterHardsuitWarden
         - id: ClothingMaskBreath
         - id: JetpackSecurityFilled # Frontier
-        - id: ClothingShoesBootsMagCombatFilled # Frontier
+        - id: ClothingShoesBootsMagSecurityFilled # Frontier
   - type: AccessReader
     access: [["Armory"]]
 

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

@@ -35,7 +35,7 @@
     ClothingHeadHelmetJustice: 1
     ClothingShoesBootsCowboyBlack: 1 # Frontier
     ClothingHeadHatCowboyBlack: 1 # Frontier
-#    ClothingShoesBootsMagCombat: 1 # Frontier
+    ClothingShoesBootsMagSecurity: 1 # Frontier
   contrabandInventory:
     ClothingUniformJumpskirtOfLife: 1 # Frontier
     ClothingMaskClownSecurity: 1

Resources/Prototypes/Entities/Clothing/Masks/masks.yml

@@ -397,8 +397,8 @@
   - type: Armor
     modifiers:
       coefficients:
-        Blunt: 0.90
-        Slash: 0.90
+        Blunt: 0.95 # Frontier 0.90<0.95
+        Slash: 0.95 # Frontier 0.90<0.95
         Piercing: 0.95
         Heat: 0.95
   - type: PirateBountyItem # Frontier

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

@@ -3,7 +3,7 @@
 
 #Basic armor vest
 - type: entity
-  parent: [RecyclableItemClothArmor, ClothingOuterBaseMedium, AllowSuitStorageClothing, BaseC1Contraband] # Frontier: BaseRestrictedContraband<BaseC1Contraband, added RecyclableItemClothArmor
+  parent: [RecyclableItemClothArmor, ClothingOuterBaseMedium, AllowSuitStorageClothing, BaseC1Contraband, ClothingOuterStorageBase] # Frontier: BaseRestrictedContraband<BaseC1Contraband, added RecyclableItemClothArmor,ClothingOuterStorageBase
   id: ClothingOuterArmorBasic
   name: armor vest
   description: A standard Type I armored vest that provides decent protection against most types of damage.
@@ -19,7 +19,7 @@
         Slash: 0.70
         Piercing: 0.70 #Can save you, but bullets will still hurt. Will take about 10 shots from a Viper before critting, as opposed to 7 while unarmored and 16~ with a bulletproof vest.
         Heat: 0.80
-        Caustic: 0.9
+        Caustic: 0.9 # Frontier
   - type: ExplosionResistance
     damageCoefficient: 0.90
 
@@ -53,7 +53,7 @@
         Slash: 0.4
         Piercing: 0.7
         Heat: 0.9
-        Caustic: 0.9 # Frontier
+        Caustic: 0.9
   - type: ExplosionResistance
     damageCoefficient: 0.9
   - type: GroupExamine
@@ -204,16 +204,15 @@
   - type: Armor
     modifiers:
       coefficients:
-        Blunt: 0.6
-        Slash: 0.6
-        Piercing: 0.5
-        Heat: 0.7
+        Blunt: 0.2
+        Slash: 0.2
+        Piercing: 0.2
+        Heat: 0.5
+        Radiation: 0.5 # Frontier 0<0.5
         Caustic: 0.75
   - type: GroupExamine
   - type: ProtectedFromStepTriggers
     slots: WITHOUT_POCKET
-  - type: ExplosionResistance
-    damageCoefficient: 0.7
 
 - type: entity
   parent: ClothingOuterArmorHeavy
@@ -260,7 +259,7 @@
     sprite: Clothing/OuterClothing/Armor/magusred.rsi
 
 - type: entity
-  parent: [ClothingOuterBaseLarge, AllowSuitStorageClothing, BaseC1Contraband] # Frontier: BaseCommandContraband<BaseC1Contraband
+  parent: [ClothingOuterBaseLarge, AllowSuitStorageClothing, BaseC1Contraband, ClothingOuterArmorBasic] # Frontier: BaseCommandContraband<BaseC1Contraband added ClothingOuterArmorBasic
   id: ClothingOuterArmorCaptainCarapace
   name: "captain's carapace"
   description: "An armored chestpiece that provides protection whilst still offering maximum mobility and flexibility. Issued only to the captains of luxury vessels." # Frontier
@@ -269,19 +268,20 @@
     sprite: Clothing/OuterClothing/Armor/captain_carapace.rsi
   - type: Clothing
     sprite: Clothing/OuterClothing/Armor/captain_carapace.rsi
-  - type: Armor
-    modifiers:
-      coefficients:
-        Blunt: 0.7 # Frontier 0.5<0.7
-        Slash: 0.7 # Frontier 0.5<0.7
-        Piercing: 0.7 # Frontier 0.6<0.7
-        Heat: 0.8 # Frontier 0.5<0.8
-        Caustic: 0.9
-  - type: ClothingSpeedModifier
-    walkModifier: 1.0
-    sprintModifier: 1.0
-  - type: ExplosionResistance
-    damageCoefficient: 0.9 # Frontier 0.65<0.9
+  # - type: Armor # Frontier
+    # modifiers: # Frontier
+      # coefficients: # Frontier
+        # Blunt: 0.5 # Frontier
+        # Slash: 0.5 # Frontier
+        # Piercing: 0.6 # Frontier
+        # Heat: 0.5 # Frontier
+        # Caustic: 0.9 # Frontier
+  # - type: ClothingSpeedModifier # Frontier
+    # walkModifier: 1.0 # Frontier
+    # sprintModifier: 1.0 # Frontier
+#  - type: HeldSpeedModifier # Frontier
+  # - type: ExplosionResistance # Frontier
+    # damageCoefficient: 0.65 # Frontier
   - type: GroupExamine
 
 - type: entity

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

@@ -21,7 +21,7 @@
 
 #Mercenary web vest
 - type: entity
-  parent: [BaseC1Contraband, ClothingOuterStorageBase, AllowSuitStorageClothing] #web vest so it should have some pockets for ammo # Frontier: ClothingOuterVestWeb<ClothingOuterStorageBase, BaseMinorContraband<BaseC1Contraband
+  parent: [ClothingOuterArmorBasic, ClothingOuterVestWeb, BaseC1Contraband] #web vest so it should have some pockets for ammo # Frontier: BaseMinorContraband<BaseC1Contraband based on ClothingOuterArmorBasic
   id: ClothingOuterVestWebMercenary # Frontier - Merc to Mercenary
   name: mercenary web vest # Frontier - merc to mercenary
   description: A high-quality armored vest made from a hard synthetic material. It's surprisingly flexible and light, despite formidable armor plating.
@@ -30,16 +30,15 @@
     sprite: Clothing/OuterClothing/Vests/mercwebvest.rsi
   - type: Clothing
     sprite: Clothing/OuterClothing/Vests/mercwebvest.rsi
-  - type: Armor
-    modifiers:
-      coefficients:
-        Blunt: 0.75
-        Slash: 0.75
-        Piercing: 0.75 #Can save you, but bullets will still hurt. Will take about 10 shots from a Viper before critting, as opposed to 7 while unarmored and 16~ with a bulletproof vest.
-        Heat: 0.80
-        Caustic: 0.9
-  - type: ExplosionResistance
-    damageCoefficient: 0.90
+  # - type: Armor # Frontier
+    # modifiers: # Frontier
+      # coefficients: # Frontier
+        # Blunt: 0.7 #slightly better overall protection but slightly worse than bulletproof armor against bullets seems sensible # Frontier
+        # Slash: 0.7 # Frontier
+        # Piercing: 0.5 # Frontier
+        # Heat: 0.9 # Frontier
+  # - type: ExplosionResistance # Frontier
+    # damageCoefficient: 0.9 # Frontier
 
 #Detective's vest
 - type: entity

Resources/Prototypes/_NF/Alerts/magboots.yml

@@ -1,7 +1,7 @@
 - type: alert
-  id: MagbootsCombat
+  id: MagbootsSecurity
   icons:
-  - sprite: _NF/Clothing/Shoes/Boots/magboots-combat.rsi
+  - sprite: _NF/Clothing/Shoes/Boots/magboots-security.rsi
     state: icon-on
   name: alerts-magboots-name
   description: alerts-magboots-desc

Resources/Prototypes/_NF/Catalog/Fills/Crates/expeditions_loot.yml

@@ -376,7 +376,7 @@
   - type: StorageFill
     contents:
     - id: DoubleEmergencyAirTankFilled
-    - id: ClothingShoesBootsMagCombat
+    - id: ClothingShoesBootsMagSecurity
     - id: ClothingOuterHardsuitPrivateSecurity
     - id: ClothingMaskGasSecurity
     - id: JetpackMiniFilled

Resources/Prototypes/_NF/Catalog/Fills/Items/misc.yml

@@ -1,6 +1,6 @@
 - type: entity
-  id: ClothingShoesBootsMagCombatFilled
-  parent: [ClothingShoesBootsMagCombat, ClothingShoesBootsCombatFilled]
+  id: ClothingShoesBootsMagSecurityFilled
+  parent: [ClothingShoesBootsMagSecurity, ClothingShoesBootsCombatFilled]
 
 - type: entity
   id: ClothingShoesBootsMagNfsdFilled

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

@@ -234,7 +234,7 @@
         - id: ClothingOuterHardsuitPrivateSecurity
         - id: ClothingMaskGasSecurity
         - id: JetpackMiniFilled
-        - id: ClothingShoesBootsMagCombat
+        - id: ClothingShoesBootsMagSecurity
   - type: AccessReader
     access: [["Captain"], ["Mercenary"]]
 

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

@@ -1,5 +1,5 @@
 - type: entity
-  parent: [ ClothingOuterBaseLarge, BaseC2ContrabandUnredeemable ]
+  parent: [ BaseC2ContrabandUnredeemable , ClothingOuterArmorCaptainCarapace ]
   id: ClothingOuterArmorSrCarapace
   name: "station representative's carapace"
   description: "A premium armored chestpiece that provides above average protection for its size. It offers maximum mobility and flexibility thanks to the premium composite materials. Issued only to the station representative."
@@ -21,7 +21,6 @@
     sprintModifier: 1.0
   - type: ExplosionResistance
     damageCoefficient: 0.60
-  - type: GroupExamine
 
 # Syndicate armored bio suit
 - type: entity
@@ -52,7 +51,7 @@
     damageCoefficient: 0.60
 
 - type: entity
-  parent: [ ClothingOuterBaseLarge, BaseC2ContrabandUnredeemable ]
+  parent: [ BaseC2ContrabandUnredeemable, ClothingOuterArmorBasic ]
   id: ClothingOuterArmorNfsd
   name: nfsd armor
   description: get shot, maybe survive?
@@ -61,20 +60,6 @@
     sprite: _NF/Clothing/OuterClothing/Armor/nfsd_armor.rsi
   - type: Clothing
     sprite: _NF/Clothing/OuterClothing/Armor/nfsd_armor.rsi
-  - type: Armor
-    modifiers:
-      coefficients:
-        Blunt: 0.7
-        Slash: 0.7
-        Piercing: 0.65
-        Heat: 0.7
-        Caustic: 0.65
-  - type: ClothingSpeedModifier
-    walkModifier: 1.0
-    sprintModifier: 1.0
-  - type: ExplosionResistance
-    damageCoefficient: 0.60
-  - type: GroupExamine
 
 - type: entity
   parent: [ BaseC1Contraband, ClothingOuterVestWebMercenary ]

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

@@ -1,49 +1,19 @@
 - type: entity
   parent: [ClothingShoesBootsMag, ClothingShoesBootsCombat]
-  id: ClothingShoesBootsMagCombat
-  name: combat magboots
-  description: Combat magnetic boots, often used during extravehicular activity to ensure the user remains safely attached to the vehicle.
+  id: ClothingShoesBootsMagSecurity
+  name: security magboots
+  description: Security magnetic boots, often used during extravehicular activity to ensure the user remains safely attached to the vehicle.
   components:
   - type: Sprite
-    sprite: _NF/Clothing/Shoes/Boots/magboots-combat.rsi
+    sprite: _NF/Clothing/Shoes/Boots/magboots-security.rsi
     state: icon
   - type: Clothing
-    sprite: _NF/Clothing/Shoes/Boots/magboots-combat.rsi
+    sprite: _NF/Clothing/Shoes/Boots/magboots-security.rsi
   - type: Magboots
-    magbootsAlert: MagbootsCombat
-  - type: ClothingSpeedModifier
-    walkModifier: 0.95
-    sprintModifier: 0.9
-
-- type: entity
-  parent: ClothingShoesBootsMagCombat
-  id: ClothingShoesBootsMagNfsd
-  name: nfsd magboots
-  components:
-  - type: Sprite
-    sprite: _NF/Clothing/Shoes/Boots/magboots-nfsd.rsi
-    state: icon
-  - type: Clothing
-    sprite: _NF/Clothing/Shoes/Boots/magboots-nfsd.rsi
-  - type: Magboots
-    magbootsAlert: MagbootsNfsd
-
-- type: entity
-  parent: [BaseC3PirateContraband, ClothingShoesBootsMagCombat]
-  id: ClothingShoesBootsMagPirate
-  name: pirate magboots
-  description: Pirate magnetic boots, often used during extravehicular activity to ensure the user remains safely attached to the vehicle.
-  components:
-  - type: Sprite
-    sprite: _NF/Clothing/Shoes/Boots/magboots-pirate.rsi
-    state: icon
-  - type: Clothing
-    sprite: _NF/Clothing/Shoes/Boots/magboots-pirate.rsi
-  - type: Magboots
-    magbootsAlert: MagbootsPirate
+    magbootsAlert: MagbootsSecurity
 
 - type: entity
-  parent: ClothingShoesBootsMagCombat
+  parent: ClothingShoesBootsMagSecurity
   id: ClothingShoesBootsMagMercenary
   name: mercenary magboots
   description: Mercenary magnetic boots, often used during extravehicular activity to ensure the user remains safely attached to the vehicle.
@@ -70,3 +40,33 @@
   - type: Magboots
     magbootsAlert: MagbootsGaloshes
   - type: NoSlip
+
+- type: entity
+  parent: ClothingShoesBootsMagSecurity
+  id: ClothingShoesBootsMagNfsd
+  name: nfsd magboots
+  components:
+  - type: Sprite
+    sprite: _NF/Clothing/Shoes/Boots/magboots-nfsd.rsi
+    state: icon
+  - type: Clothing
+    sprite: _NF/Clothing/Shoes/Boots/magboots-nfsd.rsi
+  - type: Magboots
+    magbootsAlert: MagbootsNfsd
+  - type: ClothingSpeedModifier
+    walkModifier: 0.95
+    sprintModifier: 0.9
+
+- type: entity
+  parent: [BaseC3PirateContraband, ClothingShoesBootsMagNfsd]
+  id: ClothingShoesBootsMagPirate
+  name: pirate magboots
+  description: Pirate magnetic boots, often used during extravehicular activity to ensure the user remains safely attached to the vehicle.
+  components:
+  - type: Sprite
+    sprite: _NF/Clothing/Shoes/Boots/magboots-pirate.rsi
+    state: icon
+  - type: Clothing
+    sprite: _NF/Clothing/Shoes/Boots/magboots-pirate.rsi
+  - type: Magboots
+    magbootsAlert: MagbootsPirate

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

@@ -844,7 +844,7 @@
       - ClothingOuterHardsuitMercenary
       - ClothingOuterHardsuitPrivateSecurity
       - ClothingOuterHardsuitScaf
-      - ClothingShoesBootsMagCombat
+      - ClothingShoesBootsMagSecurity
       - ClothingShoesBootsMagMercenary
     ## Utilities
       - ForensicPad
@@ -1036,7 +1036,7 @@
       - ClothingOuterHardsuitMercenary
       - ClothingOuterHardsuitPrivateSecurity
       - ClothingOuterHardsuitScaf
-      - ClothingShoesBootsMagCombat
+      - ClothingShoesBootsMagSecurity
       - ClothingShoesBootsMagMercenary
     ## Utilities
       - PinpointerUniversalNF

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

@@ -378,9 +378,9 @@
   result: ClothingShoesBootsMagAdv
 
 - type: latheRecipe
-  id: ClothingShoesBootsMagCombat
+  id: ClothingShoesBootsMagSecurity
   parent: NFBaseMagBootsRecipe
-  result: ClothingShoesBootsMagCombat
+  result: ClothingShoesBootsMagSecurity
 
 - type: latheRecipe
   id: ClothingShoesBootsMagMercenary

Resources/Prototypes/_NF/Research/arsenal.yml

@@ -29,13 +29,13 @@
   id: MagnetsTechCombat
   name: research-technology-magnets-tech-combat
   icon:
-    sprite: _NF/Clothing/Shoes/Boots/magboots-combat.rsi
+    sprite: _NF/Clothing/Shoes/Boots/magboots-security.rsi
     state: icon
   discipline: Experimental
   tier: 1
   cost: 9000
   recipeUnlocks:
-  - ClothingShoesBootsMagCombat
+  - ClothingShoesBootsMagSecurity
   - ClothingShoesBootsMagMercenary
   technologyPrerequisites:
   - MagnetsTech