Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Buffs MP and Officer Armor's Bullet Armour #6838

Merged
merged 7 commits into from
Aug 3, 2024
Merged

Buffs MP and Officer Armor's Bullet Armour #6838

Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
9c96bee
Buffs MP and Officer Armor's Bullet Armour
MistChristmas Aug 1, 2024
ae94513
Dropped down MP bullet armor to medium
MistChristmas Aug 1, 2024
059f203
Merge branch 'cmss13-devs:master' into master
MistChristmas Aug 1, 2024
d2bb431
Reverts changes to General Armor
MistChristmas Aug 2, 2024
b62055d
Merge branch 'cmss13-devs:master' into master
MistChristmas Aug 2, 2024
36c51d1
Merge branch 'master' of https://github.com/MistChristmas/cmss13
MistChristmas Aug 2, 2024
81c1d92
Merge branch 'cmss13-devs:master' into master
MistChristmas Aug 3, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 4 additions & 6 deletions code/modules/clothing/suits/marine_armor/_marine_armor.dm
View file
Open in desktop
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_MEDIUMHIGH
Drulikar marked this conversation as resolved.
Show resolved Hide resolved
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 All @@ -309,7 +307,7 @@
name = "\improper M3 pattern general officer armor"
desc = "A well-crafted suit of M3 Pattern Armor with a gold shine. It looks very expensive, but shockingly fairly easy to carry and wear."
icon_state = "general"
armor_bullet = CLOTHING_ARMOR_MEDIUMHIGH
armor_bullet = CLOTHING_ARMOR_HIGH
MistChristmas marked this conversation as resolved.
Show resolved Hide resolved
armor_bio = CLOTHING_ARMOR_MEDIUM
uniform_restricted = list(/obj/item/clothing/under/marine/officer/general)
specialty = "M3 pattern general"
Expand Down
Loading