Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Adds MOPP M2 for ROLEPLAY #235

Merged
merged 3 commits into from
May 1, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions code/modules/clothing/gloves/marine_gloves.dm
Original file line number Diff line number Diff line change
Expand Up @@ -114,6 +114,12 @@
flags_item = MOB_LOCK_ON_EQUIP|NO_CRYO_STORE
adopts_squad_color = FALSE

/obj/item/clothing/gloves/marine/pve_mopp
name = "\improper M2 MOPP gloves"
desc = "M2 MOPP gloves to protect your insides from nerve gas and deadly chemicals. You'd probably feel safer if there was duct tape wrapped around these."
icon_state = "cbrn"
item_state = "cbrn"

/obj/item/clothing/gloves/marine/veteran
name = "armored gloves"
desc = "Non-standard kevlon fiber gloves. They're insulated and heavily armored."
Expand Down
12 changes: 11 additions & 1 deletion code/modules/clothing/masks/gasmask.dm
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,17 @@
icon_state = "kutjevo_respirator"
item_state = "kutjevo_respirator"

/obj/item/clothing/mask/gas/pve_mopp
name = "\improper M2 MOPP mask"
desc = "The M2 MOPP mask includes a full covering cowl that securely attaches to the MOPP suit. It is capable of protecting of a variety of radiological and biological threats."
icon = 'icons/obj/items/clothing/cm_hats.dmi'
icon_state = "cbrn_hood"
item_state = "cbrn_hood"
flags_inv_hide = HIDEEARS|HIDEFACE|HIDEALLHAIR
item_icons = list(
WEAR_FACE = 'icons/mob/humans/onmob/head_1.dmi'
)

/obj/item/clothing/mask/gas/pmc
name = "\improper M8 pattern armored balaclava"
desc = "An armored balaclava designed to conceal both the identity of the operator and act as an air-filter."
Expand Down Expand Up @@ -72,7 +83,6 @@




//Plague Dr suit can be found in clothing/suits/bio.dm
/obj/item/clothing/mask/gas/plaguedoctor
name = "plague doctor mask"
Expand Down
8 changes: 8 additions & 0 deletions code/modules/clothing/shoes/marine_shoes.dm
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,14 @@
armor_internaldamage = CLOTHING_ARMOR_MEDIUMLOW
knife_type = /obj/item/attachable/bayonet

/obj/item/clothing/shoes/marine/pve_mopp
name = "\improper M2 MOPP boots"
desc = "M2 MOPP boots excel at keeping viscera or other biological contaminants away from your feet."
icon_state = "cbrn"
item_state = "cbrn"
armor_rad = CLOTHING_ARMOR_GIGAHIGHPLUS
armor_bio = CLOTHING_ARMOR_GIGAHIGHPLUS

/obj/item/clothing/shoes/dress
name = "dress shoes"
desc = "Pre-polished fancy dress shoes. You can see your reflection in them."
Expand Down
14 changes: 14 additions & 0 deletions code/modules/clothing/under/marine_uniform.dm
Original file line number Diff line number Diff line change
Expand Up @@ -1042,6 +1042,20 @@
icon_state = "rmc_uniform_lt"
worn_state = "rmc_uniform_lt"

/obj/item/clothing/under/marine/pve_mopp
name = "\improper M2 MOPP suit"
desc = "M2 MOPP suits are purpose built to defend the wearer against biological and radioactive contaminants, from nerve gas to nuclear fallout."
desc_lore = "The several-paragraph long expository pamphlet that usually comes with these is missing."
AndroBetel marked this conversation as resolved.
Show resolved Hide resolved
flags_atom = NO_NAME_OVERRIDE|NO_SNOW_TYPE
flags_jumpsuit = NO_FLAGS
icon_state = "cbrn"
worn_state = "cbrn"

item_icons = list(
WEAR_BODY = 'icons/mob/humans/onmob/uniform_1.dmi',
)


/obj/item/clothing/under/marine/cbrn //CBRN MOPP suit
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."
Expand Down
Loading