Skip to content

Commit

Permalink
Honk Fix
Browse files Browse the repository at this point in the history
  • Loading branch information
Max-023 committed Sep 16, 2024
1 parent 1b8b2b9 commit 9a07a27
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 10 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -672,14 +672,14 @@
//------------ESSENTIAL SETS---------------
/obj/effect/essentials_set/random/uscm_light_armor
spawned_gear_list = list(
/obj/item/clothing/suit/storage/marine/light/padless_lines,
/obj/item/clothing/suit/storage/marine/light/smooth,
/obj/item/clothing/suit/marine/light/padless_lines,
/obj/item/clothing/suit/marine/light/smooth,
)

/obj/effect/essentials_set/random/uscm_heavy_armor
spawned_gear_list = list(
/obj/item/clothing/suit/storage/marine/heavy/padless_lines,
/obj/item/clothing/suit/storage/marine/heavy/smooth,
/obj/item/clothing/suit/marine/heavy/padless_lines,
/obj/item/clothing/suit/marine/heavy/smooth,
)

//------------MARINE CIVILIAN CLOTHING---------------
Expand Down
8 changes: 2 additions & 6 deletions code/modules/clothing/suits/marine_armor/_marine_armor.dm
Original file line number Diff line number Diff line change
Expand Up @@ -751,7 +751,7 @@
desc = "A lighter, cut down version of the standard M3 pattern armor. It sacrifices durability for less weight."
specialty = "\improper M3-L pattern light"
icon_state = "L1"
armor_variation = 6
armor_variation = 3
slowdown = SLOWDOWN_ARMOR_LIGHT
armor_melee = CLOTHING_ARMOR_MEDIUMLOW
armor_bullet = CLOTHING_ARMOR_MEDIUMLOW
Expand All @@ -776,7 +776,7 @@
desc = "M3 armor vest with a rheological liner behind the chestplate, additional armor over the limbs to improve protection ballistic and blast protections. \nMarginal improvement in other areas, and the mass of the extra plates degrades agility, especially in null-gee."
specialty = "\improper M3-H pattern"
icon_state = "H1"
armor_variation = 6
armor_variation = 3
armor_melee = CLOTHING_ARMOR_MEDIUMHIGH
armor_bullet = CLOTHING_ARMOR_HIGHPLUS
armor_bomb = CLOTHING_ARMOR_HIGHPLUS
Expand All @@ -786,10 +786,6 @@
slowdown = SLOWDOWN_ARMOR_LOWHEAVY
movement_compensation = SLOWDOWN_ARMOR_MEDIUM

/obj/item/clothing/suit/marine/heavy/padless
icon_state = "H1"
armor_variation = 0

/obj/item/clothing/suit/marine/heavy/padless_lines
icon_state = "H2"
armor_variation = 0
Expand Down

0 comments on commit 9a07a27

Please sign in to comment.