Major-ish™ armor rebalance, adds basic security armor and removes Kevlar armor (#17825)

* adds basic armor vest & changes sec backpack sprites to tg * el armor de dode * abcd * el fixe * boner balls * armor rebalance * dode
2023-07-05 18:03:15 -05:00
parent 7534dc3602
commit 763a8af375
37 changed files with 272 additions and 237 deletions
--- a/Resources/Prototypes/Entities/Clothing/Head/hardsuit-helmets.yml
+++ b/Resources/Prototypes/Entities/Clothing/Head/hardsuit-helmets.yml
@@ -1,4 +1,6 @@
 #When adding new hardsuits, please try to keep the organization consistent with hardsuit.yml (if possible.)
+#For now, since locational damage is not a thing, all "combat" hardsuits (with the exception of the deathsquad hardsuit) have the equvilent of a helmet in terms of armor. This is so people don't need to wear both regular, on-station helmets and hardsuits to get full protection.
+#Generally, unless you're adding something like caustic damage, you should probably avoid messing with armor outside of the above scenario.

 #CREW HARDSUITS
 #Standard Hardsuit
@@ -13,15 +15,6 @@
    sprite: Clothing/Head/Hardsuits/basic.rsi
  - type: Clothing
    sprite: Clothing/Head/Hardsuits/basic.rsi
-  - type: Armor
-    modifiers:
-      coefficients:
-        Blunt: 0.9
-        Slash: 0.9
-        Piercing: 0.9
-        Heat: 0.9
-        Radiation: 0.9
-        Caustic: 0.9

 #Atmospherics Hardsuit
 - type: entity
@@ -60,14 +53,6 @@
  - type: PressureProtection
    highPressureMultiplier: 0.08
    lowPressureMultiplier: 10000
-  - type: Armor
-    modifiers:
-      coefficients:
-        Blunt: 0.90
-        Slash: 0.90
-        Piercing: 0.95
-        Heat: 0.6
-        Radiation: 0.5
  - type: TemperatureProtection
    coefficient: 0.005

@@ -139,12 +124,6 @@
  - type: PressureProtection
    highPressureMultiplier: 0.525
    lowPressureMultiplier: 10000
-  - type: Armor
-    modifiers:
-      coefficients:
-        Blunt: 0.8
-        Slash: 0.8
-        Piercing: 0.8
  - type: PointLight
    radius: 7
    energy: 3
@@ -169,9 +148,10 @@
  - type: Armor
    modifiers:
      coefficients:
-        Blunt: 0.8
-        Slash: 0.8
-        Piercing: 0.8
+        Blunt: 0.9
+        Slash: 0.9
+        Piercing: 0.9
+        Heat: 0.9

 #Brigmedic Hardsuit
 - type: entity
@@ -220,9 +200,10 @@
  - type: Armor
    modifiers:
      coefficients:
-        Blunt: 0.8
-        Slash: 0.8
-        Piercing: 0.8
+        Blunt: 0.9
+        Slash: 0.9
+        Piercing: 0.9
+        Heat: 0.9

 #Captain's Hardsuit
 - type: entity
@@ -314,9 +295,10 @@
  - type: Armor
    modifiers:
      coefficients:
-        Blunt: 0.8
-        Slash: 0.8
-        Piercing: 0.8
+        Blunt: 0.9
+        Slash: 0.9
+        Piercing: 0.9
+        Heat: 0.9

 #ANTAG HARDSUITS
 #Blood-red Hardsuit
@@ -339,11 +321,10 @@
  - type: Armor
    modifiers:
      coefficients:
-        Blunt: 0.8
-        Slash: 0.8
-        Piercing: 0.8
-        Heat: 0.8
-        Radiation: 0.5
+        Blunt: 0.9
+        Slash: 0.9
+        Piercing: 0.9
+        Heat: 0.9

 #Cybersun Juggernaut Hardsuit
 - type: entity
@@ -360,6 +341,13 @@
  - type: PressureProtection
    highPressureMultiplier: 0.3
    lowPressureMultiplier: 1000
+  - type: Armor
+    modifiers:
+      coefficients:
+        Blunt: 0.9
+        Slash: 0.9
+        Piercing: 0.9
+        Heat: 0.9

 #Syndicate Elite Hardsuit
 - type: entity
@@ -383,11 +371,10 @@
  - type: Armor
    modifiers:
      coefficients:
-        Blunt: 0.8
-        Slash: 0.8
-        Piercing: 0.8
-        Heat: 0.2
-        Radiation: 0.5
+        Blunt: 0.9
+        Slash: 0.9
+        Piercing: 0.9
+        Heat: 0.9

 #Syndicate Commander Hardsuit
 - type: entity
@@ -409,11 +396,10 @@
  - type: Armor
    modifiers:
      coefficients:
-        Blunt: 0.6
-        Slash: 0.6
-        Piercing: 0.6
-        Heat: 0.8
-        Radiation: 0.5
+        Blunt: 0.9
+        Slash: 0.9
+        Piercing: 0.9
+        Heat: 0.9

 #Wizard Hardsuit
 - type: entity
@@ -432,6 +418,13 @@
  - type: PressureProtection
    highPressureMultiplier: 0.27
    lowPressureMultiplier: 1000
+  - type: Armor
+    modifiers:
+      coefficients:
+        Blunt: 0.9
+        Slash: 0.9
+        Piercing: 0.9
+        Heat: 0.9

 #Organic Space Suit
 - type: entity
@@ -498,6 +491,13 @@
    sprite: Clothing/Head/Hardsuits/ERThelmets/ertleader.rsi
  - type: PointLight
    color: "#addbff"
+  - type: Armor
+    modifiers:
+      coefficients:
+        Blunt: 0.9
+        Slash: 0.9
+        Piercing: 0.9
+        Heat: 0.9

 #ERT Engineer Hardsuit
 - type: entity
@@ -512,6 +512,13 @@
    sprite: Clothing/Head/Hardsuits/ERThelmets/ertengineer.rsi
  - type: PointLight
    color: "#f4ffad"
+  - type: Armor
+    modifiers:
+      coefficients:
+        Blunt: 0.9
+        Slash: 0.9
+        Piercing: 0.9
+        Heat: 0.9

 #ERT Medical Hardsuit
 - type: entity
@@ -540,6 +547,13 @@
    sprite: Clothing/Head/Hardsuits/ERThelmets/ertsecurity.rsi
  - type: PointLight
    color: "#ffadc6"
+  - type: Armor
+    modifiers:
+      coefficients:
+        Blunt: 0.9
+        Slash: 0.9
+        Piercing: 0.9
+        Heat: 0.9

 #ERT Janitor Hardsuit
 - type: entity
@@ -592,10 +606,7 @@
        Blunt: 0.9
        Slash: 0.9
        Piercing: 0.9
-        Heat: 0.1
-        Shock: 0.1
-        Cold: 0.2
-        Radiation: 0.2
+        Heat: 0.9

 #Deathsquad Hardsuit
 - type: entity
@@ -612,6 +623,15 @@
  - type: PressureProtection
    highPressureMultiplier: 0.08
    lowPressureMultiplier: 1000
+  - type: Armor
+    modifiers:
+      coefficients:
+        Blunt: 0.80
+        Slash: 0.80
+        Piercing: 0.80
+        Heat: 0.80
+        Radiation: 0.80
+        Caustic: 0.95

 #MISC. HARDSUITS
 #Clown Hardsuit
@@ -628,9 +648,3 @@
    sprite: Clothing/Head/Hardsuits/clown.rsi
    equipSound: /Audio/Mecha/mechmove03.ogg
    unequipSound: /Audio/Effects/Emotes/parp1.ogg
-  - type: Armor
-    modifiers:
-      coefficients:
-        Blunt: 0.95
-        Slash: 0.95
-        Piercing: 0.95
--- a/Resources/Prototypes/Entities/Clothing/Head/helmets.yml
+++ b/Resources/Prototypes/Entities/Clothing/Head/helmets.yml
@@ -1,3 +1,6 @@
+#These are intentionally all very mediocre as locational damage does not exist yet. Without it, armor values will stack in a way that makes it really god damn hard to determine how effective something is, along with making players extremely tanky.
+#When it DOES exist, the values here should be totally reworked - probably just port them from SS13.
+
 #Basic Helmet (Security Helmet)
 - type: entity
  parent: ClothingHeadBase
@@ -9,13 +12,13 @@
    sprite: Clothing/Head/Helmets/security.rsi
  - type: Clothing
    sprite: Clothing/Head/Helmets/security.rsi
-  - type: Armor
+  - type: Armor #Values seem to let the user survive one extra hit if attacked consistently.
    modifiers:
      coefficients:
-        Blunt: 0.8
-        Slash: 0.8
+        Blunt: 0.9
+        Slash: 0.9
        Piercing: 0.9
-        Heat: 0.8
+        Heat: 0.9
  - type: Tag
    tags:
    - WhitelistChameleon
@@ -43,14 +46,15 @@
    sprite: Clothing/Head/Helmets/swat.rsi
  - type: Clothing
    sprite: Clothing/Head/Helmets/swat.rsi
-  - type: Armor #In SS13 this has 100% acid (caustic) protection, however it would be probably be silly to give this to a helmet without locational damage existing yet.
+  - 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.70
-        Slash: 0.70
+        Blunt: 0.80
+        Slash: 0.80
        Piercing: 0.80
        Heat: 0.80
        Radiation: 0.80
+        Caustic: 0.95
  - type: ExplosionResistance
    damageCoefficient: 0.75

@@ -82,9 +86,9 @@
  - type: Armor
    modifiers:
      coefficients:
-        Blunt: 0.70
-        Slash: 0.80
-        Piercing: 0.85
+        Blunt: 0.8
+        Slash: 0.8
+        Piercing: 0.95

 #Bombsuit Helmet
 - type: entity
@@ -103,9 +107,9 @@
  - type: Armor
    modifiers:
      coefficients:
-        Blunt: 0.5
-        Slash: 0.8
-        Piercing: 0.8
+        Blunt: 0.90
+        Slash: 0.90
+        Piercing: 0.95

 #Cult Helmet
 - type: entity
@@ -122,10 +126,10 @@
  - type: Armor
    modifiers:
      coefficients:
-        Blunt: 0.8
+        Blunt: 0.9
        Slash: 0.8
        Piercing: 0.9
-        Heat: 0.8
+        Heat: 0.9

 #SCAF Helmet
 - type: entity
@@ -142,8 +146,8 @@
  - type: Armor
    modifiers:
      coefficients:
-        Blunt: 0.8
-        Slash: 0.8
+        Blunt: 0.9
+        Slash: 0.9
        Piercing: 0.8
  - type: Tag
    tags:
@@ -224,11 +228,10 @@
  - type: Armor
    modifiers:
      coefficients:
-        Blunt: 0.90
-        Slash: 0.90
+        Blunt: 0.95
+        Slash: 0.95
        Piercing: 0.95
-        Heat: 0.65
-        Radiation: 1
+        Heat: 0.80
  - type: IdentityBlocker
  - type: Tag
    tags:
@@ -253,11 +256,7 @@
  - type: Armor
    modifiers:
      coefficients:
-        Blunt: 1
-        Slash: 1
-        Piercing: 1
        Heat: 0.4
-        Radiation: 1
  - type: PressureProtection
    highPressureMultiplier: 0.25
    lowPressureMultiplier: 1
@@ -278,7 +277,7 @@
    sprite: Clothing/Head/Helmets/linghelmet.rsi
  - type: Clothing
    sprite: Clothing/Head/Helmets/linghelmet.rsi
-  - type: Armor
+  - type: Armor #admeme item so it should be fine being overpowered while helmets are still intentionally kneecapped.
    modifiers:
      coefficients:
        Blunt: 0.5
--- a/Resources/Prototypes/Entities/Clothing/OuterClothing/armor.yml
+++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/armor.yml
@@ -1,7 +1,84 @@
 # Numbers for armor here largely taken from /tg/.
+# NOTE: Half of the kind of armor you're probably thinking of is in vests.yml. These should probably be merged some day.

+#Basic armor vest
 - type: entity
  parent: ClothingOuterBase
+  id: ClothingOuterArmorBasic
+  name: armor vest
+  description: A standard Type I armored vest that provides decent protection against most types of damage.
+  components:
+  - type: Sprite
+    sprite: Clothing/OuterClothing/Armor/security.rsi
+  - type: Clothing
+    sprite: Clothing/OuterClothing/Armor/security.rsi
+  - type: Armor #Based on /tg/ but slightly compensated to fit the fact that armor stacks in SS14.
+    modifiers:
+      coefficients:
+        Blunt: 0.70
+        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
+  - type: ExplosionResistance
+    damageCoefficient: 0.90
+
+#Alternate / slim basic armor vest
+- type: entity
+  parent: ClothingOuterArmorBasic
+  id: ClothingOuterArmorBasicSlim
+  name: armor vest
+  suffix: slim
+  description: A slim Type I armored vest that provides decent protection against most types of damage.
+  components:
+  - type: Sprite
+    sprite: Clothing/OuterClothing/Armor/security_slim.rsi
+  - type: Clothing
+    sprite: Clothing/OuterClothing/Armor/security_slim.rsi
+
+- type: entity
+  parent: ClothingOuterBaseLarge
+  id: ClothingOuterArmorRiot
+  name: riot suit
+  description: A suit of semi-flexible polycarbonate body armor with heavy padding to protect against melee attacks. Perfect for fighting delinquents around the station.
+  components:
+  - type: Sprite
+    sprite: Clothing/OuterClothing/Armor/riot.rsi
+  - type: Clothing
+    sprite: Clothing/OuterClothing/Armor/riot.rsi
+  - type: Armor
+    modifiers:
+      coefficients:
+        Blunt: 0.4
+        Slash: 0.4
+        Piercing: 0.7
+        Heat: 0.9
+        Caustic: 0.9
+  - type: ExplosionResistance
+    damageCoefficient: 0.9
+  - type: GroupExamine
+
+- type: entity
+  parent: ClothingOuterArmorBasic
+  id: ClothingOuterArmorBulletproof
+  name: bulletproof vest
+  description: A Type III heavy bulletproof vest that excels in protecting the wearer against traditional projectile weaponry and explosives to a minor extent.
+  components:
+  - type: Sprite
+    sprite: Clothing/OuterClothing/Armor/bulletproof.rsi
+  - type: Clothing
+    sprite: Clothing/OuterClothing/Armor/bulletproof.rsi
+  - type: Armor
+    modifiers:
+      coefficients:
+        Blunt: 0.9
+        Slash: 0.9
+        Piercing: 0.4
+        Heat: 0.9
+  - type: ExplosionResistance
+    damageCoefficient: 0.80
+
+- type: entity
+  parent: ClothingOuterArmorBasic
  id: ClothingOuterArmorReflective
  name: reflective vest
  description: An armored vest with advanced shielding to protect against energy weapons.
@@ -18,24 +95,6 @@
        Piercing: 0.9
        Heat: 0.4 # this technically means it protects against fires pretty well? -heat is just for lasers and stuff, not atmos temperature

- type: entity
-  parent: ClothingOuterBase
-  id: ClothingOuterArmorBulletproof
-  name: bulletproof vest
-  description: An armored vest with heavy plates to protect against ballistic projectiles.
-  components:
-  - type: Sprite
-    sprite: Clothing/OuterClothing/Armor/bulletproof.rsi
-  - type: Clothing
-    sprite: Clothing/OuterClothing/Armor/bulletproof.rsi
-  - type: Armor
-    modifiers:
-      coefficients:
-        Blunt: 0.9
-        Slash: 0.9
-        Piercing: 0.4
-        Heat: 0.9
-
 - type: entity
  parent: ClothingOuterBaseLarge
  id: ClothingOuterArmorCult
@@ -120,28 +179,6 @@
  - type: Clothing
    sprite: Clothing/OuterClothing/Armor/magusred.rsi

- type: entity
-  parent: ClothingOuterBaseLarge
-  id: ClothingOuterArmorRiot
-  name: riot suit
-  description: An armored vest with heavy padding to protect against melee attacks, perfect for fighting delinquents around the station.
-  components:
-  - type: Sprite
-    sprite: Clothing/OuterClothing/Armor/riot.rsi
-  - type: Clothing
-    sprite: Clothing/OuterClothing/Armor/riot.rsi
-  - type: Armor
-    modifiers:
-      coefficients:
-        Blunt: 0.4
-        Slash: 0.4
-        Piercing: 0.7
-        Heat: 0.9
-        Caustic: 0.9
-  - type: ExplosionResistance
-    damageCoefficient: 0.9
-  - type: GroupExamine
-
 - type: entity
  parent: ClothingOuterBaseLarge
  id: ClothingOuterArmorScaf
--- a/Resources/Prototypes/Entities/Clothing/OuterClothing/coats.yml
+++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/coats.yml
@@ -22,13 +22,13 @@
  - type: StorageFill
    contents:
    - id: SmokingPipeFilledTobacco
-  - type: Armor
+  - type: Armor #same as regular sec armor
    modifiers:
      coefficients:
-        Blunt: 0.8
-        Slash: 0.8
-        Piercing: 0.6
-        Heat: 0.9
+        Blunt: 0.70
+        Slash: 0.70
+        Piercing: 0.70
+        Heat: 0.80

 - type: entity
  parent: ClothingOuterStorageBase
@@ -45,7 +45,7 @@
  parent: ClothingOuterStorageBase
  id: ClothingOuterCoatHoSTrench
  name: head of security's armored trenchcoat
-  description: This trenchcoat was specifically designed for asserting superior authority.
+  description: A greatcoat enhanced with a special alloy for some extra protection and style for those with a commanding presence.
  components:
  - type: Sprite
    sprite: Clothing/OuterClothing/Coats/hos_trenchcoat.rsi
@@ -54,10 +54,13 @@
  - type: Armor
    modifiers:
      coefficients:
-        Blunt: 0.7
-        Slash: 0.7
-        Piercing: 0.4
-        Heat: 0.7
+        Blunt: 0.70
+        Slash: 0.70
+        Piercing: 0.70
+        Heat: 0.70
+        Caustic: 0.75 #not the full 90% from ss13 because of the head
+  - type: ExplosionResistance
+    damageCoefficient: 0.90

 - type: entity
  parent: ClothingOuterStorageBase
@@ -212,10 +215,12 @@
  - type: Armor
    modifiers:
      coefficients:
-        Blunt: 0.8
-        Slash: 0.8
-        Piercing: 0.4
-        Heat: 0.8
+        Blunt: 0.70
+        Slash: 0.70
+        Piercing: 0.70
+        Heat: 0.70
+  - type: ExplosionResistance
+    damageCoefficient: 0.90

 - type: entity
  parent: ClothingOuterStorageBase
--- a/Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml
+++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml
@@ -20,7 +20,7 @@
        Piercing: 0.9
        Heat: 0.9
        Radiation: 0.9
-        Caustic: 0.9
+        Caustic: 0.85
  - type: ExplosionResistance
    damageCoefficient: 0.9
  - type: ClothingSpeedModifier
@@ -53,8 +53,8 @@
        Slash: 0.9
        Piercing: 0.9
        Heat: 0.4
-        Radiation: 0.25
-        Caustic: 0.85
+        Radiation: 0.75
+        Caustic: 0.50
  - type: TemperatureProtection
    coefficient: 0.001
  - type: ExplosionResistance
@@ -83,11 +83,12 @@
    modifiers:
      coefficients:
        Blunt: 0.9
-        Slash: 0.85
-        Piercing: 0.85
+        Slash: 0.9
+        Piercing: 0.95
        Heat: 0.7
-        Radiation: 0.35
-        Caustic: 0.85
+        Shock: 0.8
+        Caustic: 0.75        
+        Radiation: 0.25
  - type: ExplosionResistance
    damageCoefficient: 0.2
  - type: ToggleableClothing
@@ -117,8 +118,8 @@
        Slash: 0.9
        Piercing: 0.95
        Heat: 0.9
-        Radiation: 0.5
-        Caustic: 0.9
+        Radiation: 0.75 #salv is supposed to have radiation hazards in the future
+        Caustic: 0.85
  - type: ToggleableClothing
    clothingPrototype: ClothingHeadHelmetHardsuitSpatio

@@ -146,7 +147,7 @@
        Slash: 0.7
        Piercing: 0.7
        Heat: 0.85
-        Radiation: 0.5
+        Radiation: 0.50
        Caustic: 0.75
  - type: ExplosionResistance
    damageCoefficient: 0.3
@@ -177,7 +178,6 @@
        Slash: 0.6
        Piercing: 0.6
        Heat: 0.8
-        Radiation: 0.25
        Caustic: 0.75
  - type: ExplosionResistance
    damageCoefficient: 0.4
@@ -208,7 +208,6 @@
        Slash: 0.8
        Piercing: 0.75
        Heat: 0.9
-        Radiation: 0.30
        Caustic: 0.2
  - type: ToggleableClothing
    clothingPrototype: ClothingHeadHelmetHardsuitBrigmedic
@@ -234,7 +233,7 @@
        Slash: 0.6
        Piercing: 0.6
        Heat: 0.8
-        Radiation: 0.25
+        Caustic: 0.75
  - type: ExplosionResistance
    damageCoefficient: 0.4
  - type: ToggleableClothing
@@ -264,7 +263,7 @@
        Slash: 0.8
        Piercing: 0.75
        Heat: 0.3
-        Radiation: 0.1
+        Radiation: 0.50
        Caustic: 0.6
  - type: ExplosionResistance
    damageCoefficient: 0.5
@@ -296,7 +295,7 @@
        Piercing: 0.8
        Heat: 0.4
        Radiation: 0.0
-        Caustic: 0.85
+        Caustic: 0.75
  - type: ExplosionResistance
    damageCoefficient: 0.2
  - type: ToggleableClothing
@@ -323,7 +322,6 @@
    modifiers:
      coefficients:
        Heat: 0.90
-        Radiation: 0.25
        Caustic: 0.1
  - type: ToggleableClothing
    clothingPrototype: ClothingHeadHelmetHardsuitMedical
@@ -423,7 +421,7 @@
        Slash: 0.6
        Piercing: 0.5
        Heat: 0.4
-        Radiation: 0.20
+        Radiation: 0.50
        Caustic: 0.75
  - type: ExplosionResistance
    damageCoefficient: 0.5
@@ -454,7 +452,7 @@
        Slash: 0.2
        Piercing: 0.2
        Heat: 0.5
-        Radiation: 0.1
+        Radiation: 0.25
        Caustic: 0.35
  - type: ExplosionResistance
    damageCoefficient: 0.8
@@ -487,7 +485,7 @@
        Slash: 0.5
        Piercing: 0.4
        Heat: 0.2
-        Radiation: 0.20
+        Radiation: 0.25
        Caustic: 0.5
  - type: ExplosionResistance
    damageCoefficient: 0.3
@@ -518,7 +516,7 @@
        Slash: 0.4
        Piercing: 0.3
        Heat: 0.3
-        Radiation: 0.20
+        Radiation: 0.25
        Caustic: 0.4
  - type: ExplosionResistance
    damageCoefficient: 0.5
@@ -549,7 +547,7 @@
        Slash: 0.6
        Piercing: 0.4
        Heat: 0.25
-        Radiation: 0.20
+        Radiation: 0.25
        Caustic: 0.75
  - type: ExplosionResistance
    damageCoefficient: 0.5
@@ -580,7 +578,6 @@
        Slash: 0.95
        Piercing: 1
        Heat: 0.5
-        Radiation: 0.3
  - type: ExplosionResistance
    damageCoefficient: 0.2
  - type: ToggleableClothing
@@ -609,7 +606,7 @@
        Slash: 0.8
        Piercing: 0.9
        Heat: 0.4
-        Radiation: 0.2
+        Caustic: 0.75
  - type: ExplosionResistance
    damageCoefficient: 0.7
  - type: ToggleableClothing
@@ -639,7 +636,7 @@
        Slash: 0.8
        Piercing: 0.85
        Heat: 0.4
-        Radiation: 0.2
+        Caustic: 0.75
  - type: ExplosionResistance
    damageCoefficient: 0.6
  - type: ToggleableClothing
@@ -737,7 +734,7 @@
        Slash: 0.2
        Piercing: 0.2
        Heat: 0.2
-        Radiation: 0.2
+        Radiation: 0.1
        Caustic: 0.2
  - type: ExplosionResistance
    damageCoefficient: 0.2
@@ -800,6 +797,7 @@
        Blunt: 0.9
        Slash: 0.9
        Piercing: 0.9
+        Caustic: 0.85
  - type: ExplosionResistance
    damageCoefficient: 0.9
  - type: Construction
--- a/Resources/Prototypes/Entities/Clothing/OuterClothing/vests.yml
+++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/vests.yml
@@ -1,23 +1,4 @@
- type: entity
-  parent: ClothingOuterStorageBase #web vest so it should have some pockets for ammo
-  id: ClothingOuterVestWebMerc
-  name: merc web vest
-  description: A high-quality armored vest made from a hard synthetic material. It's surprisingly flexible and light, despite formidable armor plating.
-  components:
-  - type: Sprite
-    sprite: Clothing/OuterClothing/Vests/mercwebvest.rsi
-  - type: Clothing
-    sprite: Clothing/OuterClothing/Vests/mercwebvest.rsi
-  - type: Armor
-    modifiers:
-      coefficients:
-        Blunt: 0.7 #slightly better overall protection but slightly worse than kevlar against bullets seems sensible
-        Slash: 0.7
-        Piercing: 0.5
-        Heat: 0.9
-  - type: ExplosionResistance
-    damageCoefficient: 0.9
-    
+#Web vest
 - type: entity
  parent: ClothingOuterStorageBase
  id: ClothingOuterVestWeb
@@ -38,28 +19,30 @@
  - type: ExplosionResistance
    damageCoefficient: 0.9

+#Mercenary web vest
 - type: entity
-  parent: ClothingOuterBase
-  id: ClothingOuterVestKevlar
-  name: kevlar vest
-  description: An armor vest made of synthetic fibers.
+  parent: ClothingOuterStorageBase #web vest so it should have some pockets for ammo
+  id: ClothingOuterVestWebMerc
+  name: merc web vest
+  description: A high-quality armored vest made from a hard synthetic material. It's surprisingly flexible and light, despite formidable armor plating.
  components:
  - type: Sprite
-    sprite: Clothing/OuterClothing/Vests/kevlar.rsi
+    sprite: Clothing/OuterClothing/Vests/mercwebvest.rsi
  - type: Clothing
-    sprite: Clothing/OuterClothing/Vests/kevlar.rsi
+    sprite: Clothing/OuterClothing/Vests/mercwebvest.rsi
  - type: Armor
    modifiers:
      coefficients:
-        Blunt: 0.9
-        Slash: 0.9
-        Piercing: 0.4
+        Blunt: 0.7 #slightly better overall protection but slightly worse than bulletproof armor against bullets seems sensible
+        Slash: 0.7
+        Piercing: 0.5
        Heat: 0.9
  - type: ExplosionResistance
    damageCoefficient: 0.9

+#Detective's vest
 - type: entity
-  parent: ClothingOuterBase
+  parent: ClothingOuterArmorBasic
  id: ClothingOuterVestDetective
  name: detective's vest
  description: A hard-boiled private investigator's armored vest.
@@ -68,16 +51,8 @@
    sprite: Clothing/OuterClothing/Vests/detvest.rsi
  - type: Clothing
    sprite: Clothing/OuterClothing/Vests/detvest.rsi
-  - type: Armor
-    modifiers:
-      coefficients:
-        Blunt: 0.8
-        Slash: 0.8
-        Piercing: 0.75
-        Heat: 0.9
-  - type: ExplosionResistance
-    damageCoefficient: 0.9

+#Hazard vest
 - type: entity
  parent: ClothingOuterBase
  id: ClothingOuterVestHazard
@@ -89,6 +64,7 @@
  - type: Clothing
    sprite: Clothing/OuterClothing/Vests/hazard.rsi

+#(Bartender) vest
 - type: entity
  parent: ClothingOuterBase
  id: ClothingOuterVest
--- a/Resources/Prototypes/Entities/Clothing/OuterClothing/wintercoats.yml
+++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/wintercoats.yml
@@ -16,7 +16,7 @@
    modifiers:
      coefficients:
        Slash: 0.95
-        Heat: 0.75
+        Heat: 0.90

 - type: entity
  parent: ClothingOuterWinterCoat
@@ -102,7 +102,7 @@
    modifiers:
      coefficients:
        Slash: 0.95
-        Heat: 0.75
+        Heat: 0.90
        Caustic: 0.75

 - type: entity
@@ -118,7 +118,7 @@
    modifiers:
      coefficients:
        Slash: 0.95
-        Heat: 0.75
+        Heat: 0.90
        Caustic: 0.75

 - type: entity
@@ -154,7 +154,7 @@
    modifiers:
      coefficients:
        Slash: 0.95
-        Heat: 0.75
+        Heat: 0.90
        Caustic: 0.9

 - type: entity
@@ -200,7 +200,7 @@
    modifiers:
      coefficients:
        Slash: 0.95
-        Heat: 0.75
+        Heat: 0.9
        Caustic: 0.9

 - type: entity
@@ -216,7 +216,7 @@
    modifiers:
      coefficients:
        Slash: 0.95
-        Heat: 0.75
+        Heat: 0.90
        Caustic: 0.9

 - type: entity
@@ -278,7 +278,7 @@
    modifiers:
      coefficients:
        Slash: 0.95
-        Heat: 0.75
+        Heat: 0.90
        Caustic: 0.9

 - type: entity
@@ -304,7 +304,7 @@
    modifiers:
      coefficients:
        Slash: 0.95
-        Heat: 0.75
+        Heat: 0.90
        Caustic: 0.9

 - type: entity
@@ -330,7 +330,7 @@
    modifiers:
      coefficients:
        Slash: 0.95
-        Heat: 0.75
+        Heat: 0.90
        Caustic: 0.9

 - type: entity
@@ -342,14 +342,13 @@
  - type: Sprite
    sprite: Clothing/OuterClothing/WinterCoats/coatwarden.rsi
  - type: Clothing
-    sprite: Clothing/OuterClothing/WinterCoats/coatwarden.rsi
  - type: Armor
    modifiers:
      coefficients:
-        Blunt: 0.8
-        Slash: 0.8
-        Piercing: 0.6 #slightly less bulletproof than wardens normal coat
-        Heat: 0.75
+        Blunt: 0.70
+        Slash: 0.70
+        Piercing: 0.8 #slightly less bulletproof then warden's normal coat
+        Heat: 0.70

 - type: entity
  parent: ClothingOuterWinterCoat