diff --git a/code/modules/clothing/suits/marine_armor.dm b/code/modules/clothing/suits/marine_armor.dm index 15c3bef21f..439a022470 100644 --- a/code/modules/clothing/suits/marine_armor.dm +++ b/code/modules/clothing/suits/marine_armor.dm @@ -32,7 +32,7 @@ /obj/item/clothing/suit/storage/marine name = "\improper M3 pattern marine armor" - desc = "A standard Colonial Marines M3 Pattern Chestplate. Protects the chest from ballistic rounds, bladed objects and accidents. It has a small leather pouch strapped to it for limited storage." + desc = "Standard USCMC issue M3 Pattern Personal Armor. Composite ballistic armor, integral biomonitoring system, and brackets for the IMP system as well as the TNR Shoulder Lamp." icon = 'icons/obj/items/clothing/cm_suits.dmi' icon_state = "1" item_state = "marine_armor" //Make unique states for Officer & Intel armors. @@ -376,7 +376,7 @@ /obj/item/clothing/suit/storage/marine/smartgunner name = "\improper M56 combat harness" - desc = "A heavy protective vest designed to be worn with the M56 Smartgun System. \nIt has specially designed straps and reinforcement to carry the Smartgun and accessories." + desc = "Lightweight vest composed of ballistic micromesh and a ceramic composite chestplate. Also contains the computers, straps, and bracing required for operating the M56 Smartgun itself." icon_state = "8" item_state = "armor" armor_laser = CLOTHING_ARMOR_LOW @@ -440,7 +440,7 @@ /obj/item/clothing/suit/storage/marine/leader name = "\improper B12 pattern marine armor" - desc = "A lightweight suit of carbon fiber body armor built for quick movement. Designed in a lovely forest green. Use it to toggle the built-in flashlight." + desc = "Semi-experimental body armor system similar to M3, incorporating primarily carbon fiber instead of boron carbide. \nDesigned in a lovely olive green, slightly improved protection against blunt impact and biological hazards." icon_state = "7" armor_melee = CLOTHING_ARMOR_MEDIUMHIGH armor_bomb = CLOTHING_ARMOR_MEDIUM @@ -570,9 +570,8 @@ flags_atom = NO_SNOW_TYPE|NO_NAME_OVERRIDE /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_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." + name = "\improper M3-H pattern heavy armor" + desc = "M3 armor vest with a rhealogical liner behind the chestplate, additional armor over the limbs to improve protection ballistic and blast protections. \nMarginal improvement in other areas, and the mass degrades agility." specialty = "\improper M3-EOD pattern" icon_state = "H1" armor_variation = 6 diff --git a/code/modules/clothing/under/marine_uniform.dm b/code/modules/clothing/under/marine_uniform.dm index 6420d724e7..3d107aa96e 100644 --- a/code/modules/clothing/under/marine_uniform.dm +++ b/code/modules/clothing/under/marine_uniform.dm @@ -4,7 +4,7 @@ /obj/item/clothing/under/marine name = "\improper USCM uniform" - desc = "Standard-issue Marine uniform. They have shards of light Kevlar to help protect against stabbing weapons and bullets." + desc = "Standard-issue Marine uniform, with venlar armor inserts at critical areas to protect from blades and ballistics." siemens_coefficient = 0.9 icon_state = "marine_jumpsuit" worn_state = "marine_jumpsuit" @@ -53,7 +53,7 @@ /obj/item/clothing/under/marine/medic name = "\improper USCM corpsman uniform" - desc = "Standard-issue Marine hospital corpsman fatigues. They have shards of light Kevlar to help protect against stabbing weapons and bullets." + desc = "Standard-issue Marine hospital corpsman fatigues with venlar armor inserts at critical areas to protect from blades and ballistics." icon_state = "marine_medic" worn_state = "marine_medic" specialty = "USCM Hospital Corpsman" @@ -139,7 +139,7 @@ /obj/item/clothing/under/marine/officer name = "marine officer uniform" - desc = "Softer than silk. Lighter than feather. More protective than Kevlar. Fancier than a regular jumpsuit, too. It has shards of light Kevlar to help protect against stabbing weapons and bullets." + desc = "Very comfortable, but unfortunately has the same actual protective fragmentation weave as the standard uniform. Special padding protects against chafing after long hours seated at a console." icon_state = "officertanclothes" item_state = "officertanclothes" worn_state = "officertanclothes" @@ -176,7 +176,7 @@ /obj/item/clothing/under/marine/officer/pilot name = "pilot officer bodysuit" - desc = "A bodysuit worn by pilot officers of the USCM, and is meant for survival in inhospitable conditions. Fly the marines onwards to glory. It has shards of light Kevlar to help protect against stabbing weapons and bullets." + desc = "A bodysuit worn by pilot officers of the USCM, good for operating express elevators to hell. Some armor protection provided by the venlar armor weave against shrapnel and ballistics." icon_state = "pilot_flightsuit" item_state = "pilot_flightsuit" worn_state = "pilot_flightsuit" @@ -206,7 +206,7 @@ /obj/item/clothing/under/marine/officer/tanker name = "vehicle crewman uniform" - desc = "A uniform worn by vehicle crewmen of the USCM. Do the corps proud. It has shards of light Kevlar to help protect against stabbing weapons and bullets." + desc = "Armored vehicle crew uniform worn by tankers and cav crew of the USCMC. Shrapnel protection provided by venlar panels, badassery hinges on how well the operator works their vehicle. Do the Corps proud." icon_state = "marine_tanker" worn_state = "marine_tanker" suit_restricted = list(/obj/item/clothing/suit/storage/marine/tanker, /obj/item/clothing/suit/storage/jacket/marine/service/tanker)