From 6d1335d99ebdd09a0c437e9a46e82e522904a5a2 Mon Sep 17 00:00:00 2001
From: Chris <TheIrishGamingLeprechaun@gmail.com>
Date: Sat, 3 Aug 2024 02:34:44 +0100
Subject: [PATCH] Buffs MP and Officer Armor's Bullet Armour (#6838)

# About the pull request
Small simple change, some additional clean
MPs and derived Officer Armour now gets Medium Bullet Armour (20)
Instead of Low (10).
Also removed some redundant armour variables that clarified it was the
same level already being derived from.
Also moved icon_state of Warden and Chief MP around to be in the same
order as most others.
<!-- Remove this text and explain what the purpose of your PR is.

Mention if you have tested your changes. If you changed a map, make sure
you used the mapmerge tool.
If this is an Issue Correction, you can type "Fixes Issue #169420" to
link the PR to the corresponding Issue number #169420.

Remember: something that is self-evident to you might not be to others.
Explain your rationale fully, even if you feel it goes without saying.
-->

# Explain why it's good for the game
MP and Officer Armor is already limited and restricted to certain roles,
it shouldn't be worse than standard.
And MPs gear should lean toward human threat rather than anything else.
# Testing Photographs and Procedure
<details>
<summary>Screenshots & Videos</summary>

Put screenshots and videos here with an empty line between the
screenshots and the `<details>` tags.

</details>


# Changelog
:cl: MistChristmas
balance: Buffed MP and Officer Armor's Bullet Armour.
/:cl:
---
 code/modules/clothing/suits/marine_armor/_marine_armor.dm | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/code/modules/clothing/suits/marine_armor/_marine_armor.dm b/code/modules/clothing/suits/marine_armor/_marine_armor.dm
index 8a8d5934b506..3d89ecb7cabb 100644
--- a/code/modules/clothing/suits/marine_armor/_marine_armor.dm
+++ b/code/modules/clothing/suits/marine_armor/_marine_armor.dm
@@ -254,7 +254,7 @@
 	desc = "A standard Colonial Marines M2 Pattern Chestplate. Protects the chest from ballistic rounds, bladed objects and accidents. It has a small leather pouch strapped to it for limited storage."
 	icon_state = "mp_armor"
 	armor_melee = CLOTHING_ARMOR_MEDIUMHIGH
-	armor_bullet = CLOTHING_ARMOR_LOW
+	armor_bullet = CLOTHING_ARMOR_MEDIUM
 	armor_laser = CLOTHING_ARMOR_LOW
 	armor_energy = CLOTHING_ARMOR_LOW
 	armor_bomb = CLOTHING_ARMOR_MEDIUM
@@ -287,19 +287,17 @@
 	black_market_value = 20
 
 /obj/item/clothing/suit/storage/marine/MP/warden
-	icon_state = "warden"
 	name = "\improper M3 pattern warden MP armor"
 	desc = "A well-crafted suit of M3 Pattern Armor typically distributed to Wardens. Useful for letting your men know who is in charge."
-	armor_bio = CLOTHING_ARMOR_MEDIUMLOW
-	armor_rad = CLOTHING_ARMOR_MEDIUMLOW
+	icon_state = "warden"
 	uniform_restricted = list(/obj/item/clothing/under/marine/warden)
 	specialty = "M3 pattern warden MP"
 	item_state_slots = list(WEAR_JACKET = "warden")
 
 /obj/item/clothing/suit/storage/marine/MP/WO
-	icon_state = "warrant_officer"
 	name = "\improper M3 pattern chief MP armor"
 	desc = "A well-crafted suit of M3 Pattern Armor typically distributed to Chief MPs. Useful for letting your men know who is in charge."
+	icon_state = "warrant_officer"
 	uniform_restricted = list(/obj/item/clothing/under/marine/officer/warrant)
 	specialty = "M3 pattern chief MP"
 	item_state_slots = list(WEAR_JACKET = "warrant_officer")