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.

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

changes pyro and GL armour to be the standard medium+ light range #5970

Merged
merged 3 commits into from
Apr 7, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions code/modules/clothing/suits/marine_armor/_marine_armor.dm
Original file line number Diff line number Diff line change
Expand Up @@ -628,6 +628,7 @@
slowdown = SLOWDOWN_ARMOR_HEAVY
specialty = "M3-G4 grenadier"
unacidable = TRUE
light_range = 5

/obj/item/clothing/suit/storage/marine/M3T
name = "\improper M3-T light armor"
Expand Down
4 changes: 3 additions & 1 deletion code/modules/clothing/suits/marine_armor/spec_fire.dm
Drulikar marked this conversation as resolved.
Show resolved Hide resolved
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,10 @@
name = "\improper M35 pyrotechnician armor"
desc = "A custom set of M35 armor designed for use by USCM Pyrotechnicians."
icon_state = "pyro_armor"
armor_bio = CLOTHING_ARMOR_MEDIUMHIGH
slowdown = SLOWDOWN_ARMOR_MEDIUM
armor_internaldamage = CLOTHING_ARMOR_MEDIUMHIGH
armor_bio = CLOTHING_ARMOR_MEDIUMHIGH
light_range = 5
fire_intensity_resistance = BURN_LEVEL_TIER_1
max_heat_protection_temperature = FIRESUIT_MAX_HEAT_PROT
flags_armor_protection = BODY_FLAG_CHEST|BODY_FLAG_GROIN|BODY_FLAG_ARMS|BODY_FLAG_LEGS|BODY_FLAG_FEET
Expand Down
Loading