From 9a07a270f7bd7470ee237aa376a90e42f797380f Mon Sep 17 00:00:00 2001 From: Max-023 Date: Sun, 15 Sep 2024 20:27:31 -0400 Subject: [PATCH] Honk Fix --- .../vending/vendor_types/squad_prep/squad_prep.dm | 8 ++++---- code/modules/clothing/suits/marine_armor/_marine_armor.dm | 8 ++------ 2 files changed, 6 insertions(+), 10 deletions(-) diff --git a/code/game/machinery/vending/vendor_types/squad_prep/squad_prep.dm b/code/game/machinery/vending/vendor_types/squad_prep/squad_prep.dm index 9f1edb13d5..e67b4dbd87 100644 --- a/code/game/machinery/vending/vendor_types/squad_prep/squad_prep.dm +++ b/code/game/machinery/vending/vendor_types/squad_prep/squad_prep.dm @@ -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--------------- diff --git a/code/modules/clothing/suits/marine_armor/_marine_armor.dm b/code/modules/clothing/suits/marine_armor/_marine_armor.dm index fa0f621d1b..00e0923596 100644 --- a/code/modules/clothing/suits/marine_armor/_marine_armor.dm +++ b/code/modules/clothing/suits/marine_armor/_marine_armor.dm @@ -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 @@ -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 @@ -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