From 912a8e040b61de3a89a325d879e088280c74ccbc Mon Sep 17 00:00:00 2001 From: IroquoisLou Date: Sat, 31 Aug 2024 01:01:02 +0100 Subject: [PATCH 1/2] EOD changes --- code/modules/clothing/suits/marine_armor/_marine_armor.dm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/code/modules/clothing/suits/marine_armor/_marine_armor.dm b/code/modules/clothing/suits/marine_armor/_marine_armor.dm index 0ba339433fc2..04991eada9f3 100644 --- a/code/modules/clothing/suits/marine_armor/_marine_armor.dm +++ b/code/modules/clothing/suits/marine_armor/_marine_armor.dm @@ -544,9 +544,9 @@ armor_melee = CLOTHING_ARMOR_MEDIUMHIGH armor_bullet = CLOTHING_ARMOR_HIGHPLUS armor_bomb = CLOTHING_ARMOR_HIGHPLUS - armor_bio = CLOTHING_ARMOR_MEDIUMHIGH - armor_rad = CLOTHING_ARMOR_MEDIUM - armor_energy = CLOTHING_ARMOR_MEDIUMLOW + armor_bio = CLOTHING_ARMOR_HIGH + armor_rad = CLOTHING_ARMOR_MEDIUMHIGH + armor_energy = CLOTHING_ARMOR_MEDIUMHIGH armor_internaldamage = CLOTHING_ARMOR_MEDIUMHIGH storage_slots = 2 slowdown = SLOWDOWN_ARMOR_LOWHEAVY From 16f06b45e89e93fd8842567b44d5d344f613f9c2 Mon Sep 17 00:00:00 2001 From: IroquoisLou Date: Sat, 31 Aug 2024 15:21:38 +0100 Subject: [PATCH 2/2] description --- code/modules/clothing/suits/marine_armor/_marine_armor.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/clothing/suits/marine_armor/_marine_armor.dm b/code/modules/clothing/suits/marine_armor/_marine_armor.dm index 04991eada9f3..919d84817174 100644 --- a/code/modules/clothing/suits/marine_armor/_marine_armor.dm +++ b/code/modules/clothing/suits/marine_armor/_marine_armor.dm @@ -536,7 +536,7 @@ // M3-EOD pattern heavy armor /obj/item/clothing/suit/storage/marine/heavy name = "\improper M3-EOD pattern heavy armor" - desc = "A heavier version of the standard M3 pattern armor, the armor is primarily designed to withstand ballistic, explosive, and internal damage, with the drawback of increased bulk and thus reduced movement speed, alongside little additional protection from standard blunt force impacts and biological threats." + desc = "A heavier version of the standard M3 pattern armor, the armor is primarily designed to withstand ballistic, biological, explosive, and internal damage, with the drawback of increased bulk and thus reduced movement speed, alongside little additional protection from standard blunt force impacts." desc_lore = "This configuration of the iconic armor was developed during the Canton War in 2160 between the UPP and USCM - Designed in response to a need for higher protection for ComTechs assigned as EODs during the conflict, this is the pinnacle of protection for your average marine. The shoulders and kneepads have both been expanded upon heavily, covering up the arteries on each limb. A special spall liner was developed for this suit, with the same technology being used in the M70 Flak Jacket being developed at the same time." specialty = "\improper M3-EOD pattern" icon_state = "H1"