From ea6d469fca7410b088e623d0a50a7e7b14c96777 Mon Sep 17 00:00:00 2001 From: KoishiVibe Date: Tue, 19 Mar 2024 09:36:41 -0500 Subject: [PATCH] all the lore!!! --- code/modules/clothing/gloves/marine_gloves.dm | 12 ++++++------ code/modules/clothing/suits/armor.dm | 6 +++--- code/modules/clothing/suits/marine_armor.dm | 15 +++++++-------- code/modules/clothing/under/marine_uniform.dm | 10 +++++----- 4 files changed, 21 insertions(+), 22 deletions(-) diff --git a/code/modules/clothing/gloves/marine_gloves.dm b/code/modules/clothing/gloves/marine_gloves.dm index bdbfc1c0b5..f12876f389 100644 --- a/code/modules/clothing/gloves/marine_gloves.dm +++ b/code/modules/clothing/gloves/marine_gloves.dm @@ -3,7 +3,7 @@ /obj/item/clothing/gloves/marine name = "marine combat gloves" - desc = "Standard issue marine tactical gloves. It reads: 'knit by Marine Widows Association'." + desc = "Standard USCMC issue combat gloves, reinforced against small sharp objects, and even insulated from electric shock. Very uncomfortable." icon_state = "black" item_state = "black" siemens_coefficient = 0 @@ -47,14 +47,14 @@ /obj/item/clothing/gloves/marine/brown name = "marine brown combat gloves" - desc = "Standard issue marine tactical gloves. It reads: 'knit by Marine Widows Association'. These are brown instead of the classic black." + desc = "USCMC issue combat gloves, now in brown rather than black, reinforced against small sharp objects, and even insulated from electric shock. Very uncomfortable." icon_state = "brown" item_state = "brown" adopts_squad_color = FALSE /obj/item/clothing/gloves/marine/medical name = "marine medical combat gloves" - desc = "Standard issue marine sterile gloves, offers regular protection whilst offering the user a better grip when performing medical work." + desc = "Special USCMC issue to hospital corpsmen or other field medical workers. Offers protection from shock and cuts while also improving one's grip on medical tools. Unlike the regular gloves, these are relatively comfortable to wear." icon_state = "latex" item_state = "lgloves" adopts_squad_color = FALSE @@ -116,7 +116,7 @@ /obj/item/clothing/gloves/marine/veteran name = "armored gloves" - desc = "Non-standard kevlon fiber gloves. They're insulated and heavily armored." + desc = "Non-standard para-aramid fiber gloves. They're insulated and heavily armored." icon_state = "veteran" item_state = "veteran" siemens_coefficient = 0 @@ -135,7 +135,7 @@ /obj/item/clothing/gloves/marine/veteran/insulated name = "insulated armored gloves" - desc = "Non-standard kevlon fiber gloves. These are apparently ESPECIALLY insulated." + desc = "Non-standard para-aramid fiber gloves. These are apparently ESPECIALLY insulated." icon_state = "insulated" item_state = "insulated" @@ -143,7 +143,7 @@ name = "\improper WY PMC gloves" icon_state = "pmc" item_state = "pmc" - desc = "Standard issue kevlon fiber gloves manufactured for and by Weyland-Yutani PMC dispatch division. They are insulated against electrical shock." + desc = "Standard issue venlar protected gloves manufactured for and by Weyland-Yutani for their PMC teams. Features a special polymer that insulates from electric shock." /obj/item/clothing/gloves/marine/veteran/pmc/commando name = "\improper M5X gauntlets" diff --git a/code/modules/clothing/suits/armor.dm b/code/modules/clothing/suits/armor.dm index 82d461c5ca..f9edccf774 100644 --- a/code/modules/clothing/suits/armor.dm +++ b/code/modules/clothing/suits/armor.dm @@ -28,7 +28,7 @@ /obj/item/clothing/suit/armor/vest name = "armored vest" - desc = "An armored vest that protects against some damage." + desc = "Generic venlar bulletproof vest found in the hands of various private sector security types." icon_state = "armor" item_state = "armor" blood_overlay_type = "armor" @@ -58,7 +58,7 @@ /obj/item/clothing/suit/armor/vest/pilot name = "\improper M70 flak jacket" - desc = "A flak jacket used by dropship pilots to protect themselves while flying in the cockpit. Excels in protecting the wearer against high-velocity solid projectiles." + desc = "Venlar flak jacket worn by combat support personnel such as dropship crew, or occasionally by smartgunners. Despite the name it's actually better at stopping ballistics..." icon = 'icons/obj/items/clothing/cm_suits.dmi' icon_state = "pilot" blood_overlay_type = "armor" @@ -118,7 +118,7 @@ /obj/item/clothing/suit/armor/vest/security name = "Wey-Yu security armor" - desc = "An armored vest that protects against some damage. This one has a Weyland-Yutani corporate badge." + desc = "Generic venlar bulletproof vest found in the hands of various private sector security types. This one has a Weyland-Yutani corporate badge." icon_state = "armorsec" item_state = "armor" flags_armor_protection = BODY_FLAG_CHEST|BODY_FLAG_GROIN diff --git a/code/modules/clothing/suits/marine_armor.dm b/code/modules/clothing/suits/marine_armor.dm index 15c3bef21f..0ac2106e9d 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. \nHas some extra pouches on the sides for storage." 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 @@ -450,7 +450,7 @@ /obj/item/clothing/suit/storage/marine/tanker name = "\improper M3 pattern tanker armor" - desc = "A modified and refashioned suit of M3 Pattern armor designed to be worn by the loader of a USCM vehicle crew. While the suit is a bit more encumbering to wear with the crewman uniform, it offers the loader a degree of protection that would otherwise not be enjoyed." + desc = "Armored vest sometimes worn by USCMC armor crews. More bulky than a flak vest or service jacket, but substantially improved protection should the wearer need to dismount." icon_state = "tanker" uniform_restricted = list(/obj/item/clothing/under/marine/officer/tanker) specialty = "M3 pattern tanker" @@ -570,10 +570,9 @@ 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." - specialty = "\improper M3-EOD pattern" + name = "\improper M3-H pattern heavy armor" + 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_melee = CLOTHING_ARMOR_MEDIUMHIGH diff --git a/code/modules/clothing/under/marine_uniform.dm b/code/modules/clothing/under/marine_uniform.dm index 6420d724e7..ea73409af6 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" @@ -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) @@ -451,7 +451,7 @@ /obj/item/clothing/under/marine/veteran/marsoc name = "SOF Uniform" - desc = "A black uniform for elite Marine personnel. Designed to be comfortable and help blend into dark enviorments." + desc = "MARSOC standard uniform, in a dark camouflage pattern. Venlar liners provide slight protection from ballistics or blades." flags_jumpsuit = UNIFORM_SLEEVE_ROLLABLE icon_state = "marsoc" worn_state = "marsoc"