Skip to content

Commit

Permalink
desc
Browse files Browse the repository at this point in the history
  • Loading branch information
BeagleGaming1 committed Oct 6, 2023
1 parent 259d63f commit 95d4af5
Show file tree
Hide file tree
Showing 5 changed files with 13 additions and 16 deletions.
4 changes: 2 additions & 2 deletions code/modules/clothing/gloves/marine_gloves.dm
Original file line number Diff line number Diff line change
Expand Up @@ -205,8 +205,8 @@
flags_atom = NO_NAME_OVERRIDE|NO_SNOW_TYPE

/obj/item/clothing/gloves/marine/veteran/cbrn
name = "todo"
desc = "todo"
name = "\improper M3 MOPP gloves"
desc = "M3 MOPP gloves are made of treated venlar designed to protect the user’s hands against contamination whilst working in CBRN environments. Special care has been taken to give the user’s hands enough dexterity to fully service a rifle or utilize most handheld tools, while circular adhesive patterns on the fingers provide the user with enhanced grips. Standard CBRN protocol dictates that the gloves are expected to have a lifespan of maximum effectiveness of around twenty-four hours once exposed to moderate levels of contamination and that users are recommended to discard and replace them afterwards."
icon_state = "cbrn"
item_state = "cbrn"
armor_bio = CLOTHING_ARMOR_GIGAHIGHPLUS
Expand Down
8 changes: 4 additions & 4 deletions code/modules/clothing/head/helmet.dm
Original file line number Diff line number Diff line change
Expand Up @@ -1392,8 +1392,8 @@ GLOBAL_LIST_INIT(allowed_helmet_items, list(
built_in_visors = list()

/obj/item/clothing/head/helmet/marine/cbrn_hood
name = "todo"
desc = "todo"
name = "\improper M3 MOPP mask"
desc = "The M3 MOPP mask includes a full covering cowl that securely attaches to the MOPP suit. The mask filters out harmful particles in the air to allow the wearer to breathe safely in the field. Depending on the hostility of the contaminated area the mask’s filter will last an average of 12 hours or less."
icon_state = "cbrn_hood"
item_state = "cbrn_hood"
min_cold_protection_temperature = ICE_PLANET_MIN_COLD_PROT
Expand All @@ -1405,15 +1405,15 @@ GLOBAL_LIST_INIT(allowed_helmet_items, list(
armor_bomb = CLOTHING_ARMOR_MEDIUM
armor_bio = CLOTHING_ARMOR_HIGH
armor_rad = CLOTHING_ARMOR_HIGHPLUS
force = 0 //"The M3 MOPP mask would be a normal weapon if you were to hit someone with it."
throwforce = 0
flags_inventory = BLOCKSHARPOBJ
flags_marine_helmet = NO_FLAGS
flags_atom = NO_SNOW_TYPE|NO_NAME_OVERRIDE
flags_inv_hide = HIDEEARS|HIDEALLHAIR
built_in_visors = list()

/obj/item/clothing/head/helmet/marine/cbrn_hood/advanced
name = "todo"
desc = "todo"
armor_melee = CLOTHING_ARMOR_HIGH
armor_bullet = CLOTHING_ARMOR_MEDIUMHIGH
armor_bomb = CLOTHING_ARMOR_ULTRAHIGH
Expand Down
4 changes: 2 additions & 2 deletions code/modules/clothing/shoes/marine_shoes.dm
Original file line number Diff line number Diff line change
Expand Up @@ -158,8 +158,8 @@
update_icon()

/obj/item/clothing/shoes/veteran/pmc/commando/cbrn
name = "todo"
desc = "todo"
name = "\improper M3 MOPP boots"
desc = "M3 MOPP boots have been designed to protect the wearer from contact with any possible infection vectors or hazardous substances that may have contaminated the area of operations. This includes further enhancements in conjunction with the standard durability of M3 boots, reducing the probability of punctures or cuts as well as the effects of radiation."
icon_state = "cbrn"
item_state = "cbrn"
armor_rad = CLOTHING_ARMOR_GIGAHIGHPLUS
Expand Down
5 changes: 2 additions & 3 deletions code/modules/clothing/suits/marine_armor.dm
Original file line number Diff line number Diff line change
Expand Up @@ -1812,8 +1812,8 @@

//CBRN
/obj/item/clothing/suit/storage/marine/cbrn
name = "todo"
desc = "todo"
name = "\improper M3-M armor"
desc = "While lacking the appearance of the M3 pattern armor worn in regular service, this armor piece is still a derivative of it. It has been heavily modified to fit over the MOPP suit with additional padding and Venlar composite layers removed, so as not to restrict the wearer’s movement. However, with the reduction of composite layers, the personal protection offered is less than desired with complaints having been lodged since 2165."
icon_state = "cbrn"
item_state = "cbrn"
slowdown = SLOWDOWN_ARMOR_HEAVY
Expand All @@ -1832,7 +1832,6 @@
uniform_restricted = list(/obj/item/clothing/under/marine/cbrn)

/obj/item/clothing/suit/storage/marine/cbrn/advanced
name = "advanced M3-M Armor"
slowdown = SLOWDOWN_ARMOR_LOWHEAVY
armor_melee = CLOTHING_ARMOR_HIGH
armor_bullet = CLOTHING_ARMOR_MEDIUMHIGH
Expand Down
8 changes: 3 additions & 5 deletions code/modules/clothing/under/marine_uniform.dm
Original file line number Diff line number Diff line change
Expand Up @@ -955,9 +955,9 @@
worn_state = "rmc_uniform_lt"

/obj/item/clothing/under/marine/cbrn //CBRN MOPP suit
name = "todo"
desc = "todo"
desc_lore = "todo"
name = "\improper M3 MOPP suit"
desc = "M3 MOPP suits are specially designed and engineered to protect the wearer from unshielded exposure to any Chemical, Biological, Radiological, or Nuclear (CBRN) threats in the field. Despite somewhat resembling commonplace synthetic rubber HAZMAT suits, the Venlar composition provides a significantly more dense and durable baseline material, allowing for modifications without the loss of its air-tight nature. The wearer’s comfort has been significantly taken into consideration, with the suit providing sufficient freedom of movement for even delicate maneuvers and movements once it is donned. As the sealed environment retains many issues from the past, measures have been taken to significantly reduce the suit's passive heat absorption and increase internal absorbance through linings, as well as the capability to fully integrate with external cooling, air cycling, and other life support systems. Strips of M11 detector paper are included with each suit, designed to be slotted into the dominant arm of the wearer’s protective suit, the non-dominant wrist, and then back to the knee, providing at-a-glance warning signs across alternating sides of the body while working. The arm and knee markers are intended to be on the user's dominant The papers change color upon contact with harmful chemical agents, displaying a clear white initially and turning red when activated. The suit has a recommended lifespan of twenty-four hours once contact with a toxic environment is made, but depending on the severity this can be shortened to eight hours or less. Beyond that point, the accuracy of the detector papers deteriorates significantly, as does the protection of the suit itself."
desc_lore = "Since the outbreak of the New Earth Plague in 2157 and the subsequent Interstellar Commerce Commission (ICC) sanctioned decontamination of the colony and its 40 million inhabitants, the abandoned colony has been left under a strict quarantine blockade to prevent any potential scavengers from spreading what’s left of the highly-durable airborne flesh-eating bacteria. Following those events, the three major superpowers have been investing heavily in the development and procurement of CBRN equipment, in no small part due to the extensive damage that the plague and other similar bioweapons could do. The Marine 70’ upgrade package and the launch of the M3 pattern armor series saw the first M3-M prototypes approved for CBRN usage."
flags_atom = NO_NAME_OVERRIDE|NO_SNOW_TYPE
icon_state = "cbrn"
worn_state = "cbrn"
Expand Down Expand Up @@ -1095,8 +1095,6 @@
armor.hood_toggle()

/obj/item/clothing/under/marine/cbrn/advanced
name = "todo"
desc = "todo"
armor_melee = CLOTHING_ARMOR_MEDIUM
armor_bullet = CLOTHING_ARMOR_MEDIUMHIGH
armor_bomb = CLOTHING_ARMOR_HIGHPLUS
Expand Down

0 comments on commit 95d4af5

Please sign in to comment.