Skip to content

Commit

Permalink
Buffs MP and Officer Armor's Bullet Armour (#6838)
Browse files Browse the repository at this point in the history
# 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:
  • Loading branch information
MistChristmas committed Aug 3, 2024
1 parent 52a60e8 commit 6d1335d
Showing 1 changed file with 3 additions and 5 deletions.
8 changes: 3 additions & 5 deletions code/modules/clothing/suits/marine_armor/_marine_armor.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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")
Expand Down

0 comments on commit 6d1335d

Please sign in to comment.