From 1dfbf95f75dcb7274f70bc50e337ee035492a7f4 Mon Sep 17 00:00:00 2001
From: silicons <2003111+silicons@users.noreply.github.com>
Date: Tue, 20 May 2025 12:03:00 -0900
Subject: [PATCH] melee refactor atomization - armor rebalancing (#7166)

---
 code/datums/armor/antagonist/agent.dm        | 14 ++-
 code/datums/armor/antagonist/alien.dm        | 24 +++--
 code/datums/armor/antagonist/changeling.dm   | 11 ++-
 code/datums/armor/antagonist/cult.dm         | 33 +++++--
 code/datums/armor/antagonist/technomancer.dm | 16 +++-
 code/datums/armor/antagonist/wizard.dm       |  7 +-
 code/datums/armor/clothing/armor.dm          | 38 +++++---
 code/datums/armor/clothing/gloves.dm         | 11 +++
 code/datums/armor/clothing/head.dm           | 24 ++++-
 code/datums/armor/clothing/shoes.dm          | 16 +++-
 code/datums/armor/clothing/suit.dm           |  4 +
 code/datums/armor/clothing/uniform.dm        | 11 ++-
 code/datums/armor/core.dm                    |  5 +
 code/datums/armor/military.dm                |  8 +-
 code/datums/armor/misc.dm                    |  2 +
 code/datums/armor/objects/doors.dm           | 20 ++--
 code/datums/armor/objects/standard.dm        | 14 +--
 code/datums/armor/objects/windows.dm         |  6 +-
 code/datums/armor/outsider/autolok.dm        |  9 +-
 code/datums/armor/outsider/merc.dm           | 11 ++-
 code/datums/armor/outsider/oricon.dm         |  5 +
 code/datums/armor/outsider/pirate.dm         | 20 +++-
 code/datums/armor/outsider/vintage.dm        | 11 ++-
 code/datums/armor/species/phoronoid.dm       |  9 +-
 code/datums/armor/species/skrell.dm          |  7 +-
 code/datums/armor/species/teshari.dm         |  2 +
 code/datums/armor/species/vox.dm             | 11 ++-
 code/datums/armor/species/zaddat.dm          | 10 ++
 code/datums/armor/station/armor.dm           | 97 ++++++++++++++------
 code/datums/armor/station/cargo.dm           | 23 +++--
 code/datums/armor/station/centcom.dm         | 48 +++++++---
 code/datums/armor/station/civilian.dm        | 20 +++-
 code/datums/armor/station/engineering.dm     | 42 +++++----
 code/datums/armor/station/exploration.dm     | 29 ++++--
 code/datums/armor/station/medical.dm         | 38 +++++---
 code/datums/armor/station/science.dm         | 22 +++--
 code/datums/armor/station/security.dm        | 38 ++++++--
 code/datums/armor/unsorted.dm                |  5 +
 38 files changed, 534 insertions(+), 187 deletions(-)

diff --git a/code/datums/armor/antagonist/agent.dm b/code/datums/armor/antagonist/agent.dm
index 0d283e1a62c..3653425c197 100644
--- a/code/datums/armor/antagonist/agent.dm
+++ b/code/datums/armor/antagonist/agent.dm
@@ -1,13 +1,21 @@
 /datum/armor/agent/jumpsuit
 	melee = 0.1
+	melee_tier = 3.5
 	bio = 0.1
 	rad = 0.1
+	fire = 0.4
+	acid = 0.5
 
 /datum/armor/agent/space
-	melee = 0.6
-	bullet = 0.5
+	melee = 0.45
+	melee = 4.5
+	bullet = 0.45
+	bullet_tier = 4.5
 	laser = 0.45
+	laser_tier = 4.5
 	energy = 0.2
 	bomb = 0.3
 	bio = 0.3
-	rad = 0.3
+	rad = 0.8
+	fire = 0.7
+	acid = 0.9
diff --git a/code/datums/armor/antagonist/alien.dm b/code/datums/armor/antagonist/alien.dm
index 933ccbdf7d5..b51e24c752a 100644
--- a/code/datums/armor/antagonist/alien.dm
+++ b/code/datums/armor/antagonist/alien.dm
@@ -1,19 +1,27 @@
 /datum/armor/alien
 
-/datum/armor/alien/light
-
 /datum/armor/alien/medium
-	melee = 0.5
-	bullet = 0.5
-	laser = 0.5
+	melee = 0.35
+	melee_tier = 4.5
+	bullet = 0.35
+	bullet_tier = 4.5
+	laser = 0.35
+	laser_tier = 4.5
 	energy = 0.5
 	bomb = 0.5
 	rad = 0.4
+	fire = 0.7
+	acid = 0.9
 
 /datum/armor/alien/heavy
-	melee = 0.7
-	bullet = 0.7
-	laser = 0.7
+	melee = 0.45
+	melee_tier = 4.5
+	bullet = 0.45
+	bullet_tier = 4.5
+	laser = 0.45
+	laser_tier = 4.5
 	energy = 0.7
 	bomb = 0.7
 	rad = 0.5
+	fire = 0.7
+	acid = 0.9
diff --git a/code/datums/armor/antagonist/changeling.dm b/code/datums/armor/antagonist/changeling.dm
index e1f44ebed22..144b4f59a9b 100644
--- a/code/datums/armor/antagonist/changeling.dm
+++ b/code/datums/armor/antagonist/changeling.dm
@@ -1,8 +1,13 @@
 /datum/armor/changeling/chitin
-	melee = 0.75
-	bullet = 0.6
-	laser = 0.6
+	melee = 0.45
+	melee_tier = 4.25
+	bullet = 0.45
+	bullet_tier = 4.25
+	laser = 0.45
+	laser_tier = 4.25
 	energy = 0.4
 	bomb = 0.65
 	bio = 0.8
 	rad = 0.9
+	fire = 0.5
+	acid = 0.9
diff --git a/code/datums/armor/antagonist/cult.dm b/code/datums/armor/antagonist/cult.dm
index 59ee59d6a80..151ffe2a27d 100644
--- a/code/datums/armor/antagonist/cult.dm
+++ b/code/datums/armor/antagonist/cult.dm
@@ -1,27 +1,42 @@
 /datum/armor/cult/robes
 	melee = 0.5
-	bullet = 0.3
-	laser = 0.5
+	melee_tier = 3
+	bullet = 0.35
+	bullet_tier = 3
+	laser = 0.3
+	laser_tier = 4
 	energy = 0.6
 	bomb = 0.5
 	bio = 0.2
 	rad = 0.3
+	fire = 0.5
+	acid = 0.75
 
 /datum/armor/cult/space
-	melee = 0.65
-	bullet = 0.5
-	laser = 0.4
+	melee = 0.4
+	melee_tier = 4
+	bullet = 0.3
+	bullet_tier = 4
+	laser = 0.5
+	laser_tier = 4
 	energy = 0.6
 	bomb = 0.5
-	bio = 0.2
-	rad = 0.3
+	bio = 0.7
+	rad = 0.75
+	fire = 0.75
+	acid = 0.75
 
 // he's got that drip
 /datum/armor/cult/coat
 	melee = 0.4
-	bullet = 0.45
-	laser = 0.4
+	melee_tier = 3
+	bullet = 0.3
+	bullet_tier = 3
+	laser = 0.45
+	laser_tier = 3
 	energy = 0.3
 	bomb = 0.3
 	bio = 0.7
 	rad = 0.4
+	fire = 0.35
+	acid = 0.75
diff --git a/code/datums/armor/antagonist/technomancer.dm b/code/datums/armor/antagonist/technomancer.dm
index 55de3709996..b59197110e7 100644
--- a/code/datums/armor/antagonist/technomancer.dm
+++ b/code/datums/armor/antagonist/technomancer.dm
@@ -1,14 +1,24 @@
 /datum/armor/technomancer/jumpsuit
 	melee = 0.2
+	melee_tier = 3.75
 	bullet = 0.1
+	bullet_tier = 3.75
 	laser = 0.1
-	rad = 0.3
+	laser_tier = 3.75
+	rad = 0.5
+	fire = 0.8
+	acid = 0.9
 
 /datum/armor/technomancer/standard
 	melee = 0.5
+	melee_tier = 3.75
 	bullet = 0.2
-	laser = 0.3
+	bullet_tier = 3.75
+	laser = 0.4
+	laser_tier = 3.75
 	energy = 0.3
 	bomb = 0.2
 	bio = 0.3
-	rad = 0.4
+	rad = 0.5
+	fire = 0.8
+	acid = 0.9
diff --git a/code/datums/armor/antagonist/wizard.dm b/code/datums/armor/antagonist/wizard.dm
index e29a48874f3..b300f405a3b 100644
--- a/code/datums/armor/antagonist/wizard.dm
+++ b/code/datums/armor/antagonist/wizard.dm
@@ -1,11 +1,16 @@
 /datum/armor/wizard
 	melee = 0.4
+	melee_tier = 3
 	bullet = 0.2
+	bullet_tier = 4
 	laser = 0.2
+	laser_tier = 4
 	energy = 0.2
 	bomb = 0.35
 	bio = 1.0
 	rad = 0.6
+	fire = 0.95
+	acid = 0.7
 
 /datum/armor/wizard/beserk
-	melee = 0.7
+	melee_tier = 4.75
diff --git a/code/datums/armor/clothing/armor.dm b/code/datums/armor/clothing/armor.dm
index a88d4457363..cd18dc657a2 100644
--- a/code/datums/armor/clothing/armor.dm
+++ b/code/datums/armor/clothing/armor.dm
@@ -1,16 +1,22 @@
 /datum/armor/general
 
 /datum/armor/general/medieval
-	melee = 0.75
+	melee = 0.45
+	melee_tier = 4.5
 	bullet = 0.25
+	bullet_tier = 3.75
 	laser = 0.1
+	laser_tier = 4
 	energy = 0.05
 	bomb = 0.2
 	bio = 0.2
 	rad = 0.2
+	fire = 0.7
+	acid = 0.5
 
 /datum/armor/general/medieval/light
 	melee = 0.4
+	melee_tier = 3.75
 
 /datum/armor/general/medieval/mesh
 	melee = 0.55
@@ -22,6 +28,8 @@
 	energy = 0.1
 	bio = 0.6
 	rad = 1.0
+	fire = 0.7
+	acid = 0.7
 
 /datum/armor/general/biosuit
 	melee = 0.1
@@ -30,6 +38,8 @@
 	energy = 0.05
 	bio = 1.0
 	rad = 0.3
+	fire = 0.3
+	acid = 0.9
 
 /datum/armor/general/biosuit/anomaly
 	rad = 1.0
@@ -38,32 +48,38 @@
 	bio = 1.0
 
 /datum/armor/general/space
-	melee = 0.2
-	bullet = 0.05
-	laser = 0.1
-	energy = 0.1
-	bomb = 0.15
+	melee = 0.25
+	bullet = 0.1
+	laser = 0.2
+	energy = 0.15
+	bomb = 0.2
 	bio = 1.0
 	rad = 0.2
+	fire = 0.4
+	acid = 0.5
 
 /datum/armor/general/space/armored
 	melee = 0.4
+	melee_tier = 3.25
 	bullet = 0.15
+	bullet_tier = 3.5
 	laser = 0.25
+	laser_tier = 3.75
 	energy = 0.15
 	bomb = 0.35
 
 /datum/armor/general/bone
-	melee = 0.25
-	bullet = 0.05
-	laser = 0.05
+	melee = 0.45
+	bullet = 0.2
+	laser = 0.2
 	energy = 0
 
 /datum/armor/general/samurai
 	melee = 0.7
 	melee_soak = 5
-	bullet = 0.05
-	laser = 0.05
+	melee_deflect = 5
+	bullet = 0.1
+	laser = 0.1
 
 /datum/armor/general/utilitarian_military
 	melee = 0.15
diff --git a/code/datums/armor/clothing/gloves.dm b/code/datums/armor/clothing/gloves.dm
index f8378191b63..2a034c183f4 100644
--- a/code/datums/armor/clothing/gloves.dm
+++ b/code/datums/armor/clothing/gloves.dm
@@ -2,13 +2,24 @@
 
 /datum/armor/gloves/combat
 	melee = 0.3
+	melee_tier = 3.5
 	bullet = 0.1
+	bullet_tier = 3.5
 	laser = 0.1
+	laser_tier = 4
 	energy = 0.15
 	bomb = 0.2
+	fire = 0.7
+	acid = 0.6
 
 /datum/armor/gloves/padded
 	melee = 0.1
+	melee_tier = 3
 	bullet = 0.1
+	bullet_tier = 3
 	laser = 0.1
+	laser_tier = 3
 	energy = 0.05
+	bomb = 0.2
+	fire = 0.7
+	acid = 0.8
diff --git a/code/datums/armor/clothing/head.dm b/code/datums/armor/clothing/head.dm
index 425fb42ec5d..e9f49a225ba 100644
--- a/code/datums/armor/clothing/head.dm
+++ b/code/datums/armor/clothing/head.dm
@@ -2,34 +2,54 @@
 
 /datum/armor/head/hardhat
 	melee = 0.35
-	bullet = 0.1
+	melee_tier = 3.5
+	bullet = 0.2
+	bullet_tier = 2
 	laser = 0.2
+	laser_tier = 2.5
 	energy = 0.1
 	bomb = 0.2
 	bio = 0.1
 	rad = 0.2
+	fire = 0.7
+	acid = 0.7
 
 /datum/armor/head/augment_helmet
 	melee = 0.8
+	melee_tier = 3
 	bullet = 0.6
+	bullet_tier = 3
 	laser = 0.5
+	laser_tier = 3
 	energy = 0.25
 	bomb = 0.5
 	bio = 1.0
-	rad = 0
+	rad = 0.2
+	fire = 0.7
+	acid = 0.6
 
 /datum/armor/head/eraticator_helmet
 	melee = 0.1
+	melee_tier = 3
 	bullet = 0.8
+	bullet_tier = 3
 	laser = 0.1
+	laser_tier = 3
 	energy = 0.1
 	bomb = 0
 	bio = 0
 	rad = 0
+	fire = 0.3
+	acid = 0.3
 
 /datum/armor/head/duraskull_mask
 	melee = 0.4
+	melee_tier = 4
 	bullet = 0.4
+	bullet_tier = 3
 	laser = 0.5
+	laser_tier = 3
 	energy = 0.1
 	bomb = 0.25
+	fire = 0.3
+	acid = 0.5
diff --git a/code/datums/armor/clothing/shoes.dm b/code/datums/armor/clothing/shoes.dm
index 3bd30f5c0ef..a21d53792e6 100644
--- a/code/datums/armor/clothing/shoes.dm
+++ b/code/datums/armor/clothing/shoes.dm
@@ -1,17 +1,25 @@
 /datum/armor/shoes/boots
-	melee = 0.3
+	melee = 0.25
+	melee_tier = 4
 	bullet = 0.1
 	laser = 0.1
 	energy = 0.15
 	bomb = 0.2
 	bio = 0.75
 	rad = 0.2
+	fire = 0.7
+	acid = 0.7
 
 /datum/armor/shoes/boots/swat
-	melee = 0.8
-	bullet = 0.6
-	laser = 0.5
+	melee = 0.4
+	melee_tier = 4
+	bullet = 0.3
+	bullet_tier = 4
+	laser = 0.4
+	laser_tier = 4
 	energy = 0.25
 	bomb = 0.5
 	bio = 0.5
 	rad = 0.4
+	fire = 0.7
+	acid = 0.7
diff --git a/code/datums/armor/clothing/suit.dm b/code/datums/armor/clothing/suit.dm
index e215cd3847f..52e882693fa 100644
--- a/code/datums/armor/clothing/suit.dm
+++ b/code/datums/armor/clothing/suit.dm
@@ -2,6 +2,10 @@
 
 /datum/armor/suit/labcoat
 	bio = 0.5
+	fire = 0.5
+	acid = 0.5
 
 /datum/armor/suit/labcoat/viro
 	bio = 0.8
+	fire = 0.3
+	acid = 0.7
diff --git a/code/datums/armor/clothing/uniform.dm b/code/datums/armor/clothing/uniform.dm
index 3f3b2872504..01b341e9063 100644
--- a/code/datums/armor/clothing/uniform.dm
+++ b/code/datums/armor/clothing/uniform.dm
@@ -1,8 +1,13 @@
 /datum/armor/uniform/utility
-	melee = 0
-	bullet = 0
-	laser = 0
+	melee = 0.1
+	melee_tier = 1
+	bullet = 0.1
+	bullet_tier = 1
+	laser = 0.1
+	laser_tier = 1
 	energy = 0
 	bomb = 0.1
 	bio = 0.1
 	rad = 0.1
+	fire = 0.2
+	acid = 0.2
diff --git a/code/datums/armor/core.dm b/code/datums/armor/core.dm
index dda85791d8e..75dd0acdaa6 100644
--- a/code/datums/armor/core.dm
+++ b/code/datums/armor/core.dm
@@ -2,9 +2,14 @@
 
 /datum/armor/invulnerable
 	melee = 1.0
+	melee_tier = 10
 	bullet = 1.0
+	bullet_tier = 10
 	laser = 1.0
+	laser_tier = 10
 	energy = 1.0
 	bomb = 1.0
 	bio = 1.0
 	rad = 1.0
+	fire = 1.0
+	acid = 1.0
diff --git a/code/datums/armor/military.dm b/code/datums/armor/military.dm
index 481a4bcbf97..f8738d4585e 100644
--- a/code/datums/armor/military.dm
+++ b/code/datums/armor/military.dm
@@ -1,10 +1,12 @@
 /datum/armor/military/jumpsuit
 	melee = 0.2
-	melee_tier = MELEE_TIER_DEFAULT
+	melee_tier = 2
 	bullet = 0.1
-	bullet_tier = BULLET_TIER_DEFAULT
+	bullet_tier = 2
 	laser = 0.1
-	laser_tier = LASER_TIER_DEFAULT
+	laser_tier = 2
 	energy = 0.2
 	bomb = 0.2
 	bio = 0.2
+	fire = 0.2
+	acid = 0.2
diff --git a/code/datums/armor/misc.dm b/code/datums/armor/misc.dm
index a2364286c17..37884c825d0 100644
--- a/code/datums/armor/misc.dm
+++ b/code/datums/armor/misc.dm
@@ -2,8 +2,10 @@
 
 /datum/armor/misc/bucket
 	melee = 0.1
+	melee_tier = 2
 
 /datum/armor/misc/weeping_angel
 	melee = 0.5
 	melee_soak = 7
 	melee_deflect = 18
+	melee_tier = 4
diff --git a/code/datums/armor/objects/doors.dm b/code/datums/armor/objects/doors.dm
index a40611402b0..963f281755a 100644
--- a/code/datums/armor/objects/doors.dm
+++ b/code/datums/armor/objects/doors.dm
@@ -1,36 +1,40 @@
 /datum/armor/door
 	melee_deflect = 5
-	melee_tier = ARMOR_BARELY_BEATS(MELEE_TIER_LIGHT)
+	melee_tier = 2.5
 	melee_soak = 5
 	melee = 0.2
+	bullet = 0.3
+	bullet_tier = 2.75
+	laser = 0.3
+	laser_tier = 2.75
 
 /datum/armor/door/airlock
 	melee_deflect = 17
-	melee_tier = ARMOR_BARELY_BEATS(MELEE_TIER_MEDIUM)
+	melee_tier = 3.25
 	melee_soak = 5
 	melee = 0.5
 
 /datum/armor/door/airlock/vault
 	melee_deflect = 29
-	melee_tier = ARMOR_BARELY_BEATS(MELEE_TIER_HEAVY)
+	melee_tier = 4.25
 
 /datum/armor/door/airlock/light
 	melee = 0.25
 
 /datum/armor/door/blast_door
-	melee_deflect = 17
-	melee_tier = ARMOR_BARELY_BEATS(MELEE_TIER_MEDIUM)
+	melee_deflect = 14
+	melee_tier = 4
 	melee_soak = 5
 	melee = 0.5
 
 /datum/armor/door/windoor
 	melee_deflect = 5
-	melee_tier = ARMOR_BARELY_BEATS(MELEE_TIER_LIGHT)
+	melee_tier = 2
 	melee_soak = 0
-	melee = 0.8
+	melee = 0.7
 
 /datum/armor/door/windoor/reinforced
 	melee_deflect = 17
-	melee_tier = ARMOR_BARELY_BEATS(MELEE_TIER_MEDIUM)
+	melee_tier = 3.5
 	melee_soak = 5
 	melee = 0.5
diff --git a/code/datums/armor/objects/standard.dm b/code/datums/armor/objects/standard.dm
index 35937b8b39f..91e0824217a 100644
--- a/code/datums/armor/objects/standard.dm
+++ b/code/datums/armor/objects/standard.dm
@@ -3,20 +3,20 @@
 
 /datum/armor/object/default
 	melee_deflect = 5
-	melee_tier = ARMOR_BARELY_BEATS(MELEE_TIER_LIGHT)
-	melee = 0.1
+	melee = 0.235
+	melee_tier = 2.75
 
 /datum/armor/object/light
 	melee_deflect = 5
-	melee_tier = ARMOR_BARELY_BEATS(MELEE_TIER_LIGHT)
-	melee = 0.1
+	melee = 0.235
+	melee_tier = 2.25
 
 /datum/armor/object/medium
 	melee_deflect = 10
-	melee_tier = ARMOR_BARELY_BEATS(MELEE_TIER_MEDIUM)
 	melee = 0.25
+	melee_tier = 3.325
 
 /datum/armor/object/heavy
-	melee_deflect = 18
-	melee_tier = ARMOR_BARELY_BEATS(MELEE_TIER_HEAVY)
+	melee_deflect = 14
 	melee = 0.4
+	melee_tier = 4.5
diff --git a/code/datums/armor/objects/windows.dm b/code/datums/armor/objects/windows.dm
index 841f8814178..53472a6a353 100644
--- a/code/datums/armor/objects/windows.dm
+++ b/code/datums/armor/objects/windows.dm
@@ -1,10 +1,10 @@
 /datum/armor/window
-	melee_tier = ARMOR_BARELY_BEATS(MELEE_TIER_LIGHT)
 	melee = 0.1
+	melee_tier = 2
 	bomb = -1
 
 /datum/armor/window/reinforced
 	melee_deflect = 6
 	melee_soak = 0
-	melee_tier = ARMOR_BARELY_BEATS(MELEE_TIER_MEDIUM)
-	melee = 0.2
+	melee_tier = 3
+	melee = 0.3
diff --git a/code/datums/armor/outsider/autolok.dm b/code/datums/armor/outsider/autolok.dm
index 8d2e5d29ec6..26767462d3f 100644
--- a/code/datums/armor/outsider/autolok.dm
+++ b/code/datums/armor/outsider/autolok.dm
@@ -2,9 +2,14 @@
 
 /datum/armor/autolok/space
 	melee = 0.15
+	melee_tier = 3.5
 	bullet = 0.05
+	bullet_tier = 3.5
 	laser = 0.05
-	energy = 0.05
-	bomb = 0.05
+	laser_tier = 3.5
+	energy = 0.1
+	bomb = 0.15
 	bio = 1.0
 	rad = 0.8
+	fire = 0.5
+	acid = 0.5
diff --git a/code/datums/armor/outsider/merc.dm b/code/datums/armor/outsider/merc.dm
index a7a2c0c42df..12408133d08 100644
--- a/code/datums/armor/outsider/merc.dm
+++ b/code/datums/armor/outsider/merc.dm
@@ -1,11 +1,16 @@
 /datum/armor/merc/space
-	melee = 0.6
-	bullet = 0.5
+	melee = 0.5
+	melee_tier = 4
+	bullet = 0.4
+	bullet_tier = 4
 	laser = 0.3
-	energy = 0.15
+	laser_tier = 4
+	energy = 0.2
 	bomb = 0.35
 	bio = 1.0
 	rad = 0.6
+	fire = 0.7
+	acid = 0.7
 
 /datum/armor/merc/space/ghostrider
 	melee = 0.4
diff --git a/code/datums/armor/outsider/oricon.dm b/code/datums/armor/outsider/oricon.dm
index e2494095322..3b8846cb158 100644
--- a/code/datums/armor/outsider/oricon.dm
+++ b/code/datums/armor/outsider/oricon.dm
@@ -2,9 +2,14 @@
 
 /datum/armor/oricon/peacekeeper
 	melee = 0.5
+	melee_tier = 3.5
 	bullet = 0.5
+	bullet_tier = 4
 	laser = 0.5
+	laser_tier = 4
 	energy = 0.25
 	bomb = 0.3
 	bio = 0.1
 	rad = 0.1
+	fire = 0.3
+	acid = 0.3
diff --git a/code/datums/armor/outsider/pirate.dm b/code/datums/armor/outsider/pirate.dm
index 59b2f602e3e..52e6f7f7dd9 100644
--- a/code/datums/armor/outsider/pirate.dm
+++ b/code/datums/armor/outsider/pirate.dm
@@ -2,24 +2,42 @@
 
 /datum/armor/pirate/space
 	melee = 0.5
+	melee_tier = 4
 	bullet = 0.2
+	bullet_tier = 4
 	laser = 0.3
-	energy = 0.05
+	laser_tier = 4
+	energy = 0.1
 	bomb = 0.2
 	bio = 1.0
 	rad = 0.7
+	fire = 0.5
+	acid = 0.5
 
 /datum/armor/pirate/light
 	melee = 0.3
+	melee_tier = 3.75
 	bullet = 0.3
+	bullet_tier = 3.75
 	laser = 0.4
+	laser_tier = 3.35
 	energy = 0.1
+	bomb = 0.1
+	bio = 0.3
+	rad = 0.3
+	fire = 0.3
+	acid = 0.6
 
 /datum/armor/pirate/medium
 	melee = 0.6
+	melee_tier = 3.75
 	bullet = 0.5
+	bullet_tier = 3.75
 	laser = 0.3
+	laser_tier = 4
 	energy = 0.15
 	bomb = 0.3
 	bio = 0.3
 	rad = 0.3
+	fire = 0.5
+	acid = 0.5
diff --git a/code/datums/armor/outsider/vintage.dm b/code/datums/armor/outsider/vintage.dm
index 7ae6f7bd156..b435485db10 100644
--- a/code/datums/armor/outsider/vintage.dm
+++ b/code/datums/armor/outsider/vintage.dm
@@ -2,8 +2,11 @@
 
 /datum/armor/vintage/space
 	melee = 0.3
+	melee_tier = 3.5
 	bullet = 0.15
+	bullet_tier = 3.5
 	laser = 0.15
+	laser_tier = 3.5
 	energy = 0.1
 	bomb = 0.2
 	bio = 1.0
@@ -25,9 +28,12 @@
 	laser = 0.35
 
 /datum/armor/vintage/space/officer
-	melee = 0.6
+	melee = 0.5
+	melee_tier = 3.75
 	bullet = 0.45
+	bullet_tier = 3.75
 	laser = 0.45
+	laser_tier = 3.75
 	energy = 0.25
 	bomb = 0.6
 	rad = 0.7
@@ -40,6 +46,9 @@
 
 /datum/armor/vintage/space/merc
 	melee = 0.55
+	melee_tier = 3.75
 	bullet = 0.45
+	bullet_tier = 3.75
 	laser = 0.45
+	laser_tier = 3.75
 	bomb = 0.5
diff --git a/code/datums/armor/species/phoronoid.dm b/code/datums/armor/species/phoronoid.dm
index d80d707c717..ee3f7517dba 100644
--- a/code/datums/armor/species/phoronoid.dm
+++ b/code/datums/armor/species/phoronoid.dm
@@ -1,11 +1,16 @@
 /datum/armor/phoronoid
-	melee = 0.4
+	melee = 0.35
+	melee_tier = 3.5
 	bullet = 0.15
+	bullet_tier = 3.5
 	laser = 0.25
+	laser_tier = 3.5
 	energy = 0.2
-	bomb = 0.4
+	bomb = 0.5
 	bio = 1.0
 	rad = 1.0
+	fire = 0.7
+	acid = 0.5
 
 /datum/armor/phoronoid/head
 	melee = 0.45
diff --git a/code/datums/armor/species/skrell.dm b/code/datums/armor/species/skrell.dm
index 7356fb7f74a..9b350981c28 100644
--- a/code/datums/armor/species/skrell.dm
+++ b/code/datums/armor/species/skrell.dm
@@ -3,9 +3,12 @@
 /datum/armor/skrell/space
 
 /datum/armor/skrell/space/light
-	melee = 0.2
-	bullet = 0.2
+	melee = 0.1
+	melee_tier = 4
+	bullet = 0.1
+	bullet_tier = 4
 	laser = 0.2
+	laser_tier = 4
 	energy = 0.5
 	bomb = 0.5
 	bio = 1.0
diff --git a/code/datums/armor/species/teshari.dm b/code/datums/armor/species/teshari.dm
index b90819b1635..e2e2a80d66b 100644
--- a/code/datums/armor/species/teshari.dm
+++ b/code/datums/armor/species/teshari.dm
@@ -2,3 +2,5 @@
 
 /datum/armor/teshari/hood_cloak
 	bio = 0.2
+	fire = 0.3
+	acid = 0.5
diff --git a/code/datums/armor/species/vox.dm b/code/datums/armor/species/vox.dm
index efd8f85e4d4..67b834ce0cb 100644
--- a/code/datums/armor/species/vox.dm
+++ b/code/datums/armor/species/vox.dm
@@ -3,13 +3,18 @@
 /datum/armor/vox/space
 
 /datum/armor/vox/space/armored
-	melee = 0.6
-	bullet = 0.5
-	laser = 0.4
+	melee = 0.5
+	melee_tier = 4
+	bullet = 0.4
+	bullet_tier = 4
+	laser = 0.35
+	laser_tier = 4
 	energy = 0.2
 	bomb = 0.3
 	bio = 1.0
 	rad = 0.5
+	fire = 0.7
+	acid = 0.5
 
 /datum/armor/vox/scrap
 	melee = 0.6
diff --git a/code/datums/armor/species/zaddat.dm b/code/datums/armor/species/zaddat.dm
index e7e40fb57aa..b01c0203cf9 100644
--- a/code/datums/armor/species/zaddat.dm
+++ b/code/datums/armor/species/zaddat.dm
@@ -1,3 +1,13 @@
 /datum/armor/zaddat
+	melee = 0.1
+	melee_tier = 3.75
+	bullet = 0.1
+	bullet_tier = 3.75
+	laser = 0.1
+	laser_tier = 3.75
+	energy = 0.2
+	bomb = 0.35
 	bio = 1.0
 	rad = 1.0
+	fire = 0.7
+	acid = 0.7
diff --git a/code/datums/armor/station/armor.dm b/code/datums/armor/station/armor.dm
index 5c6080a7e2a..ce756810173 100644
--- a/code/datums/armor/station/armor.dm
+++ b/code/datums/armor/station/armor.dm
@@ -1,50 +1,69 @@
 /datum/armor/station/padded
-	melee = 0.1
+	melee = 0.15
 	bullet = 0.05
 	laser = 0.05
 	energy = 0.05
 
 /datum/armor/station/light
 	melee = 0.35
-	bullet = 0.25
-	laser = 0.25
+	melee_tier = 3.25
+	bullet = 0.3
+	bullet_tier = 3.25
+	laser = 0.3
+	laser_tier = 3.25
 	energy = 0.1
 	bomb = 0.1
 	bio = 0.1
 	rad = 0.1
 
 /datum/armor/station/medium
-	melee = 0.2
-	bullet = 0.45
-	laser = 0.30
+	melee = 0.3
+	melee_tier = 3.5
+	bullet = 0.35
+	bullet_tier = 3.5
+	laser = 0.3
+	laser_tier = 3.5
 	energy = 0.1
 	bomb = 0.1
 	bio = 0.1
 	rad = 0.1
+	fire = 0.3
+	acid = 0.4
 
 /datum/armor/station/mediumtreated
-	melee = 0.2
-	bullet = 0.30
-	laser = 0.45
+	melee = 0.3
+	melee_tier = 3.75
+	bullet = 0.35
+	bullet_tier = 3.75
+	laser = 0.3
+	laser_tier = 3.75
 	energy = 0.1
 	bomb = 0.1
 	bio = 0.1
 	rad = 0.1
+	fire = 0.3
+	acid = 0.4
 
 /datum/armor/station/heavy
 	melee = 0.2
-	bullet = 0.6
+	melee_tier = 4
+	bullet = 0.4
+	bullet_tier = 4
 	bullet_soak = 3
-	laser = 0.25
+	laser = 0.2
+	laser_tier = 4
 	energy = 0.1
-	bomb = 0.1
-	bio = 0.1
-	rad = 0.1
+	bomb = 0.2
+	bio = 0.2
+	rad = 0.2
+	fire = 0.5
+	acid = 0.3
 
 /datum/armor/station/ballistic //Vests (chest/lowertorso) using this tier need to have a slowdown of 0.65 or similar.
 	melee = 0.2
-	bullet = 0.7
-	bullet_soak = 4
+	bullet = 0.5
+	bullet_tier = 4.75
+	bullet_soak = 2
 	laser = 0.2
 	energy = 0.1
 	bomb = 0.1
@@ -54,8 +73,9 @@
 /datum/armor/station/ablative //Vests (chest/lowertorso) using this tier need to have a slowdown of 0.65 or similar.
 	melee = 0.2
 	bullet = 0.2
-	laser = 0.7
-	laser_soak = 5
+	laser = 0.5
+	laser_tier = 4.75
+	laser_soak = 2
 	energy = 0.4
 	bomb = 0.1
 	bio = 0.1
@@ -63,6 +83,7 @@
 
 /datum/armor/station/stab
 	melee = 0.5
+	melee_tier = 4
 	melee_soak = 2
 	bullet = 0.2
 	laser = 0.1
@@ -72,8 +93,9 @@
 	rad = 0
 
 /datum/armor/station/riot //Vests (chest/lowertorso) using this tier need to have a slowdown of 0.65 or similar.
-	melee = 0.8
-	melee_soak = 5
+	melee = 0.5
+	melee_soak = 3
+	melee_tier = 4.75
 	bullet = 0.2
 	laser = 0.2
 	energy = 0.6
@@ -83,9 +105,12 @@
 
 /datum/armor/station/combat
 	melee = 0.35
+	melee_tier = 4
 	bullet = 0.5
+	bullet_tier = 4
 	bullet_soak = 2
 	laser = 0.5
+	laser_tier = 4
 	laser_soak = 2
 	energy = 0.1
 	bomb = 0.2
@@ -94,8 +119,11 @@
 
 /datum/armor/station/tactical
 	melee = 0.45
+	melee_tier = 4
 	bullet = 0.45
+	bullet_tier = 4
 	laser = 0.45
+	laser_tier = 4
 	energy = 0.45
 	bomb = 0.3
 	bio = 0.1
@@ -112,31 +140,44 @@
 
 //Voidsuits
 
-//mediumtreated but with more melee. Voidsuits tend to be heavier as well (fuck you major hardy trait)
 /datum/armor/station/secsuit
 	melee = 0.5
-	bullet = 0.35
-	laser = 0.5
-	energy = 0.1
-	bomb = 0.1
+	melee_tier = 3.75
+	bullet = 0.3
+	bullet_tier = 4
+	laser = 0.45
+	laser_tier = 4
+	energy = 0.2
+	bomb = 0.2
 	bio = 0.1
 	rad = 0.1
-
+	fire = 0.5
+	acid = 0.7
 
 /datum/armor/station/secsuitriot
 	melee = 0.6
-	bullet = 0.3
-	laser = 0.3
+	melee_tier = 4.5
+	bullet = 0.35
+	bullet_tier = 3.75
+	laser = 0.35
+	laser_tier = 3.75
 	energy = 0.1
 	bomb = 0.1
 	bio = 0.1
 	rad = 0.1
+	fire = 0.5
+	acid = 0.7
 
 /datum/armor/station/hossuit
 	melee = 0.6
+	melee_tier = 4
 	bullet = 0.4
+	bullet_tier = 4.25
 	laser = 0.5
+	laser_tier = 4.25
 	energy = 0.2
 	bomb = 0.3
 	bio = 1.0
 	rad = 0.1
+	fire = 0.5
+	acid = 0.7
diff --git a/code/datums/armor/station/cargo.dm b/code/datums/armor/station/cargo.dm
index d49da2f68bd..a76dd35e081 100644
--- a/code/datums/armor/station/cargo.dm
+++ b/code/datums/armor/station/cargo.dm
@@ -4,28 +4,39 @@
 
 /datum/armor/cargo/mining/coat
 	melee = 0.3
+	bullet = 0.25
+	bullet_tier = 2.15
+	laser = 0.25
+	laser_tier = 2.15
 	bomb = 0.2
 	bio = 0.1
 	rad = 0.3
 
 /datum/armor/cargo/mining/soft
 	melee = 0.5
-	bullet = 0.1
-	laser = 0.1
+	bullet = 0.2
+	laser = 0.2
 	bomb = 0.55
 	bio = 0.5
 	rad = 0.65
+	fire = 0.7
+	acid = 0.7
 
 /datum/armor/cargo/mining/space
-	melee = 0.5
-	bullet = 0.1
+	melee = 0.375
+	melee_tier = 3.75
+	bullet = 0.2
+	bullet_tier = 3.5
 	laser = 0.2
+	laser_tier = 3.5
 	energy = 0.1
 	bomb = 0.55
 	bio = 1.0
 	rad = 0.65
+	fire = 0.7
+	acid = 0.7
 
 /datum/armor/cargo/mining/space/armored
-	melee = 0.55
-	bullet = 0.25
+	melee = 0.45
+	bullet = 0.35
 	laser = 0.35
diff --git a/code/datums/armor/station/centcom.dm b/code/datums/armor/station/centcom.dm
index 510708d6f66..b9cbf66f85c 100644
--- a/code/datums/armor/station/centcom.dm
+++ b/code/datums/armor/station/centcom.dm
@@ -2,39 +2,57 @@
 
 /datum/armor/centcom/jumpsuit
 	melee = 0.1
+	melee_tier = 4
 	bullet = 0.1
+	bullet_tier = 4
 	laser = 0.1
+	laser_tier = 4
 	energy = 0.1
 	bomb = 0.1
+	rad = 0.25
+	fire = 0.3
+	acid = 0.3
 
 /datum/armor/centcom/jumpsuit/ert
 
 /datum/armor/centcom/coat
-	melee = 0.4
-	bullet = 0.45
-	laser = 0.45
+	melee = 0.35
+	bullet = 0.35
+	laser = 0.35
 	energy = 0.35
-	bomb = 0.4
+	bomb = 0.55
 	bio = 0.55
 	rad = 0.55
+	fire = 0.5
+	acid = 0.7
 
 /datum/armor/centcom/ert
-	melee = 0.65
-	bullet = 0.5
-	laser = 0.65
+	melee = 0.5
+	melee_tier = 4.25
+	bullet = 0.4
+	bullet_tier = 4.5
+	laser = 0.5
+	laser_tier = 4.5
 	energy = 0.35
-	bomb = 0.4
-	bio = 0.2
-	rad = 0.2
+	bomb = 0.65
+	bio = 0.45
+	rad = 0.45
+	fire = 0.7
+	acid = 0.7
 
 /datum/armor/centcom/ert/paracausal
 	energy = 0.6
 
 /datum/armor/centcom/deathsquad
-	melee = 0.8
-	bullet = 0.65
-	laser = 0.65
-	energy = 0.45
-	bomb = 0.5
+	melee = 0.5
+	melee_tier = 5
+	bullet = 0.5
+	bullet_tier = 6
+	laser = 0.5
+	laser_tier = 6
+	energy = 0.5
+	bomb = 0.75
 	bio = 1.0
 	rad = 1.0
+	fire = 0.85
+	acid = 0.8
diff --git a/code/datums/armor/station/civilian.dm b/code/datums/armor/station/civilian.dm
index 5c2767828de..6d797db2e35 100644
--- a/code/datums/armor/station/civilian.dm
+++ b/code/datums/armor/station/civilian.dm
@@ -1,13 +1,23 @@
 /datum/armor/civilian/jumpsuit/janitor
 	bio = 0.3
 	rad = 0.1
+	fire = 0.2
+	acid = 0.3
 
 /datum/armor/civilian/coat
-	bio = 0.15
+	bio = 0.25
+	fire = 0.2
+	acid = 0.3
 
 /datum/armor/civilian/coat/durathread
-	melee = 0.2
+	melee = 0.1
+	melee_tier = 4
 	bullet = 0.1
-	laser = 0.2
-	energy = 0.05
-	bomb = 0.1
+	bullet_tier = 4
+	laser = 0.15
+	laser_tier = 4
+	energy = 0.15
+	bomb = 0.2
+	bio = 0.3
+	fire = 0.7
+	acid = 0.7
diff --git a/code/datums/armor/station/engineering.dm b/code/datums/armor/station/engineering.dm
index 6fa4947103d..70f76a76147 100644
--- a/code/datums/armor/station/engineering.dm
+++ b/code/datums/armor/station/engineering.dm
@@ -1,43 +1,51 @@
 /datum/armor/engineering/jumpsuit
 	rad = 0.3
+	fire = 0.5
+	acid = 0.3
 
 /datum/armor/engineering/coat
 	bomb = 0.3
 	rad = 0.6
+	fire = 0.7
+	acid = 0.35
 
 /datum/armor/engineering/space
 	melee = 0.4
+	melee_tier = 3
 	bullet = 0.1
+	bullet_tier = 3
 	laser = 0.2
-	energy = 0.1
-	bomb = 0.35
+	laser_tier = 3
+	energy = 0.275
+	bomb = 0.45
 	bio = 1.0
 	rad = 1.0
+	fire = 0.8
+	acid = 0.75
 
 /datum/armor/engineering/space/hazmat
-	bomb = 0.5
-	melee = 0.3
-	rad = 1.0
+	bomb = 0.6
+	melee_tier = 3.5
+	bullet_tier = 3.2
+	laser_tier = 3.3
 
 /datum/armor/engineering/space/heavy
 	bomb = 0.7
-	rad = 1.0
+	melee_tier = 3.5
+	bullet_tier = 3.75
+	laser_tier = 3.75
 
 /datum/armor/engineering/space/salvage
-	melee = 0.5
-	bullet = 0.2
-	laser = 0.3
-	energy = 0.2
-	bomb = 0.4
-	bio = 1.0
-	rad = 1.0
+	melee_tier = 3.5
+	bullet = 0.3
+	laser = 0.35
+	energy = 0.35
 
 /datum/armor/engineering/space/atmos
-	melee = 0.3
 	rad = 0.5
-	laser = 0.15
 
 /datum/armor/engineering/space/atmos/heavy
-	melee = 0.4
 	rad = 0.75
-	laser = 0.25
+	melee_tier = 3.75
+	bullet_tier = 3.2
+	laser_tier = 3.5
diff --git a/code/datums/armor/station/exploration.dm b/code/datums/armor/station/exploration.dm
index 3f30feeb802..16416fa5e91 100644
--- a/code/datums/armor/station/exploration.dm
+++ b/code/datums/armor/station/exploration.dm
@@ -1,31 +1,46 @@
 /datum/armor/exploration/soft
 	melee = 0.35
+	melee_tier = 2.75
 	bullet = 0.2
+	bullet_tier = 2.75
 	laser = 0.25
+	laser_tier = 2.75
 	energy = 0.3
 	bomb = 0.2
 	bio = 0.5
 	rad = 0.45
+	fire = 0.7
+	acid = 0.4
 
 /datum/armor/exploration/space
-	melee = 0.4
+	melee = 0.3
+	melee_tier = 3.5
 	bullet = 0.2
+	bullet_tier = 3.5
 	laser = 0.25
-	energy = 0.25
+	laser_tier = 3.5
+	energy = 0.3
 	bomb = 0.35
 	bio = 0.7
 	rad = 0.7
+	fire = 0.7
+	acid = 0.7
 
 /datum/armor/exploration/space/pilot
-	melee = 0.3
+	melee = 0.2
+	melee_tier = 4.35
 	bullet = 0.1
-	laser = 0.25
+	bullet_tier = 4.35
+	laser = 0.175
+	laser_tier = 4.35
 	energy = 0.35
 	bomb = 0.35
 	bio = 1.0
 	rad = 0.9
+	fire = 0.9
+	acid = 0.75
 
 /datum/armor/exploration/space/pathfinder
-	melee = 0.5
-	bullet = 0.4
-	laser = 0.4
+	melee_tier = 3.75
+	bullet_tier = 3.75
+	laser_tier = 3.75
diff --git a/code/datums/armor/station/medical.dm b/code/datums/armor/station/medical.dm
index 7552393c5cc..20f4364afcd 100644
--- a/code/datums/armor/station/medical.dm
+++ b/code/datums/armor/station/medical.dm
@@ -1,29 +1,43 @@
 /datum/armor/medical/jumpsuit
 	bio = 0.4
+	fire = 0.15
+	acid = 0.35
 
 /datum/armor/medical/coat
 	bio = 0.6
+	fire = 0.3
+	acid = 0.3
 
 /datum/armor/medical/coat/field_medic
-	melee = 0.2
-	bullet = 0.1
-	laser = 0.1
+	melee = 0.25
+	melee_tier = 3
+	bullet = 0.4
+	bullet_tier = 1.35
+	laser = 0.4
+	laser_tier = 1.35
 	energy = 0.1
 	bomb = 0.05
 	bio = 0.65
 	rad = 0.1
+	fire = 0.3
+	acid = 0.3
 
 /datum/armor/medical/space
-	melee = 0.2
-	bullet = 0.05
-	laser = 0.2
-	energy = 0.05
-	bomb = 0.15
+	melee = 0.35
+	melee_tier = 3
+	bullet = 0.35
+	bullet_tier = 2.25
+	laser = 0.35
+	laser_tier = 2.25
+	energy = 0.15
+	bomb = 0.2
 	bio = 1.0
 	rad = 0.3
+	fire = 0.7
+	acid = 0.5
 
 /datum/armor/medical/space/upgraded
-	melee = 0.35
-	bullet = 0.15
-	laser = 0.2
-	rad = 1.0
+	melee_tier = 3.5
+	bullet_tier = 2.65
+	laser_tier = 2.65
+	rad = 0.75
diff --git a/code/datums/armor/station/science.dm b/code/datums/armor/station/science.dm
index fb8a65f9560..f063f597492 100644
--- a/code/datums/armor/station/science.dm
+++ b/code/datums/armor/station/science.dm
@@ -1,25 +1,35 @@
 /datum/armor/science/jumpsuit
 	bomb = 0.2
 	bio = 0.3
+	fire = 0.4
+	acid = 0.4
 
 /datum/armor/science/coat
+	melee = 0.1
+	melee_tier = 2
+	bullet = 0.1
+	bullet_tier = 1
+	laser = 0.1
+	laser_tier = 1
 	bomb = 0.3
 	bio = 0.4
+	fire = 0.4
+	acid = 0.4
 
 //Hazard Bypass Voidsuit
 /datum/armor/science/phase
 	melee = 0.15
 	melee_soak = 3
-	melee_tier = ARMOR_TIER_HIGH
+	melee_tier = 4
 	bullet = 0.3
 	bullet_soak = 1
-	bullet_tier = ARMOR_TIER_ABOVE
+	bullet_tier = 4
 	laser = 0.2
 	laser_soak = 2
-	laser_tier = ARMOR_TIER_HIGH
+	laser_tier = 4
 	energy = 0.3
 	bomb = 0.45
 	bio = 1.0
-	rad = 0.95
-	fire = 0.95
-	acid = 0.75
+	rad = 0.85
+	fire = 0.85
+	acid = 0.95
diff --git a/code/datums/armor/station/security.dm b/code/datums/armor/station/security.dm
index 05cf5b4cabe..2ae8d5be123 100644
--- a/code/datums/armor/station/security.dm
+++ b/code/datums/armor/station/security.dm
@@ -1,33 +1,53 @@
 /datum/armor/security/light_formalwear
-	melee = 0.15
-	bullet = 0.1
+	melee = 0.225
+	melee_tier = 3
+	bullet = 0.3
+	bullet_tier = 2
 	laser = 0.15
+	laser_tier = 2
 	energy = 0.1
 	bio = 0.1
+	fire = 0.3
+	acid = 0.5
 
 /datum/armor/security/hos
 	melee = 0.6
-	bullet = 0.45
+	melee_tier = 3
+	bullet = 0.385
+	bullet_tier = 3.5
 	laser = 0.45
+	laser_tier = 3.5
 	energy = 0.3
 	bomb = 0.2
 	bio = 0.2
 	rad = 0.2
+	fire = 0.4
+	acid = 0.5
 
 /datum/armor/security/hos/space
-	melee = 0.7
-	bullet = 0.5
-	laser = 0.5
+	melee = 0.45
+	melee_tier = 4
+	bullet = 0.35
+	bullet_tier = 4.25
+	laser = 0.375
+	laser_tier = 4
 	energy = 0.35
 	bomb = 0.5
 	bio = 1.0
 	rad = 0.5
+	fire = 0.7
+	acid = 0.9
 
 /datum/armor/security/bulky_kinetic
-	melee = 0.9
-	bullet = 0.8
-	laser = 0.2
+	melee = 0.55
+	melee_tier = 4
+	bullet = 0.45
+	bullet_tier = 4.25
+	laser = 0.1
+	laser_tier = 4
 	energy = 0.2
 	bomb = 0.5
 	bio = 0.5
 	rad = 0.5
+	fire = 0.3
+	acid = 0.3
diff --git a/code/datums/armor/unsorted.dm b/code/datums/armor/unsorted.dm
index 5e2d1bf86d7..e7d38c8b51e 100644
--- a/code/datums/armor/unsorted.dm
+++ b/code/datums/armor/unsorted.dm
@@ -1,8 +1,13 @@
 /datum/armor/thunderdome
 	melee = 0.5
+	melee_tier = 4
 	bullet = 0.5
+	bullet_tier = 4
 	laser = 0.5
+	laser_tier = 4
 	energy = 0.25
 	bomb = 0.3
 	bio = 0.3
 	rad = 0.3
+	fire = 0.7
+	acid = 0.7