diff --git a/code/__DEFINES/armor.dm b/code/__DEFINES/armor.dm index 0b60775edc..3d66fcb1b9 100644 --- a/code/__DEFINES/armor.dm +++ b/code/__DEFINES/armor.dm @@ -70,7 +70,7 @@ "fire" = 10, \ "acid" = 10, \ "wound" = 10, \ - "damage_threshold" = 1) + "damage_threshold" = 0) /* Medium armor values * Decent mobility @@ -91,7 +91,7 @@ "fire" = 25, \ "acid" = 25, \ "wound" = 20, \ - "damage_threshold" = 3) + "damage_threshold" = 2) /* Heavy armor values * Low mobility @@ -134,7 +134,7 @@ "fire" = 80, \ "acid" = 80, \ "wound" = 40, \ - "damage_threshold" = 8) + "damage_threshold" = 6) /* Power armor values * High mobility diff --git a/code/modules/clothing/head/f13factionhead.dm b/code/modules/clothing/head/f13factionhead.dm index 8fe031b5a7..6f5ae6a274 100644 --- a/code/modules/clothing/head/f13factionhead.dm +++ b/code/modules/clothing/head/f13factionhead.dm @@ -54,7 +54,7 @@ icon_state = "supafly" item_state = "supafly" flags_cover = HEADCOVERSEYES | HEADCOVERSMOUTH - armor_tokens = list(ARMOR_MODIFIER_UP_DT_T1) + armor_tokens = list(ARMOR_MODIFIER_UP_MELEE_T1, ARMOR_MODIFIER_DOWN_BULLET_T3, ARMOR_MODIFIER_DOWN_LASER_T3, ARMOR_MODIFIER_UP_DT_T1) flags_inv = HIDEEARS|HIDEEYES|HIDEFACE|HIDEHAIR|HIDEFACIALHAIR slowdown = 0 @@ -178,7 +178,7 @@ desc = "A combat helmet modified with metal plating" icon_state = "raider_combat_helmet" item_state = "raider_combat_helmet" - armor_tokens = list(ARMOR_MODIFIER_UP_DT_T2) + armor_tokens = list(ARMOR_MODIFIER_DOWN_BULLET_T1, ARMOR_MODIFIER_UP_LASER_T1, ARMOR_MODIFIER_UP_ENV_T1, ARMOR_MODIFIER_UP_DT_T1) flags_inv = HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE|HIDEHAIR|HIDEFACIALHAIR slowdown = 0.025 @@ -507,7 +507,7 @@ obj/item/clothing/head/helmet/f13/enclave/usmcriot unique_reskin = list("M1" = "ncr_old") salvage_loot = list(/obj/item/stack/crafting/armor_plate = 1) armor = ARMOR_VALUE_LIGHT - armor_tokens = list(ARMOR_MODIFIER_UP_DT_T1, ARMOR_MODIFIER_UP_BULLET_T1) // The NCR is more tanky, but slower + armor_tokens = list(ARMOR_MODIFIER_DOWN_MELEE_T2, ARMOR_MODIFIER_DOWN_LASER_T3, ARMOR_MODIFIER_DOWN_BULLET_T1) // The NCR is more tanky, but slower /obj/item/clothing/head/f13/ncr/Initialize() . = ..() @@ -551,6 +551,8 @@ obj/item/clothing/head/helmet/f13/enclave/usmcriot /obj/item/clothing/head/f13/ncr/steelpot_goggles/trenchraider name = "NCR trench storm helmet" desc = "A standard issue NCR steel helmet, issued with extra steel for close quarters fighting." + armor_tokens = list(ARMOR_MODIFIER_UP_MELEE_T2, ARMOR_MODIFIER_DOWN_BULLET_T2, ARMOR_MODIFIER_DOWN_LASER_T3, ARMOR_MODIFIER_UP_DT_T1) // The NCR is more tanky, but slower + /obj/item/clothing/head/f13/ncr/steelpot_med name = "NCR medic helmet" @@ -594,7 +596,7 @@ obj/item/clothing/head/helmet/f13/enclave/usmcriot flags_inv = HIDEEARS dog_fashion = null armor = ARMOR_VALUE_MEDIUM - armor_tokens = list(ARMOR_MODIFIER_UP_DT_T1) + armor_tokens = list(ARMOR_MODIFIER_UP_DT_T1, ARMOR_MODIFIER_UP_BOMB_T2) /obj/item/clothing/head/helmet/f13/ncr/heavygunner name = "NCR Trench Raider Helmet" @@ -604,7 +606,7 @@ obj/item/clothing/head/helmet/f13/enclave/usmcriot icon_state = "ncrarmyhelmetheavy" item_state = "ncrarmyhelmetheavy" flags_cover = HEADCOVERSEYES|HEADCOVERSMOUTH - armor_tokens = list(ARMOR_MODIFIER_DOWN_BULLET_T1, ARMOR_MODIFIER_UP_MELEE_T3) + armor_tokens = list(ARMOR_MODIFIER_DOWN_BULLET_T1, ARMOR_MODIFIER_UP_MELEE_T3, ARMOR_MODIFIER_DOWN_LASER_T2, ARMOR_MODIFIER_UP_DT_T3) salvage_loot = list(/obj/item/stack/crafting/armor_plate = 8) /obj/item/clothing/head/f13/ncr/standard/conscript @@ -617,7 +619,7 @@ obj/item/clothing/head/helmet/f13/enclave/usmcriot visor_flags_cover = HEADCOVERSEYES dog_fashion = null unique_reskin = list("M1" = "ncr_old") - armor_tokens = list() + armor_tokens = list(ARMOR_MODIFIER_DOWN_MELEE_T3, ARMOR_MODIFIER_DOWN_LASER_T2, ARMOR_MODIFIER_DOWN_BULLET_T1) /obj/item/clothing/head/f13/ncr/ncr_flapcap name = "NCR field cap" @@ -701,7 +703,7 @@ obj/item/clothing/head/helmet/f13/enclave/usmcriot item_state = "scoutberet" salvage_loot = list(/obj/item/stack/crafting/armor_plate = 2) armor = ARMOR_VALUE_LIGHT - armor_tokens = list(ARMOR_MODIFIER_UP_DT_T2, ARMOR_MODIFIER_UP_BULLET_T1) + armor_tokens = list(ARMOR_MODIFIER_DOWN_MELEE_T2, ARMOR_MODIFIER_DOWN_LASER_T3, ARMOR_MODIFIER_DOWN_BULLET_T1) /obj/item/clothing/head/f13/trailranger name = "NCR trail ranger hat" @@ -710,7 +712,7 @@ obj/item/clothing/head/helmet/f13/enclave/usmcriot item_state = "cowboyrang" salvage_loot = list(/obj/item/stack/crafting/armor_plate = 2) armor = ARMOR_VALUE_LIGHT - armor_tokens = list(ARMOR_MODIFIER_UP_DT_T2, ARMOR_MODIFIER_UP_BULLET_T1) + armor_tokens = list(ARMOR_MODIFIER_DOWN_MELEE_T2, ARMOR_MODIFIER_DOWN_LASER_T3, ARMOR_MODIFIER_DOWN_BULLET_T1) /obj/item/clothing/head/f13/ranger name = "NCR ranger campaign hat" @@ -728,7 +730,7 @@ obj/item/clothing/head/helmet/f13/enclave/usmcriot flags_inv = HIDEMASK|HIDEEARS|HIDEEYES|HIDEHAIR|HIDEFACIALHAIR|HIDEFACE flags_cover = HEADCOVERSEYES | HEADCOVERSMOUTH salvage_loot = list(/obj/item/stack/crafting/armor_plate = 2) - armor_tokens = list(ARMOR_MODIFIER_UP_DT_T1, ARMOR_MODIFIER_UP_BULLET_T1) + armor_tokens = list(ARMOR_MODIFIER_UP_DT_T2, ARMOR_MODIFIER_UP_BULLET_T1, ARMOR_MODIFIER_DOWN_MELEE_T2) /obj/item/clothing/head/helmet/f13/ncr/rangercombat name = "ranger combat helmet" @@ -746,7 +748,7 @@ obj/item/clothing/head/helmet/f13/enclave/usmcriot darkness_view = 24 salvage_loot = list(/obj/item/stack/crafting/armor_plate = 3, /obj/item/clothing/glasses/night/polarizing = 1) armor = ARMOR_VALUE_HEAVY - armor_tokens = list(ARMOR_MODIFIER_UP_DT_T2) + armor_tokens = list(ARMOR_MODIFIER_UP_DT_T2, ARMOR_MODIFIER_UP_BULLET_T1, ARMOR_MODIFIER_DOWN_MELEE_T2, ARMOR_MODIFIER_DOWN_LASER_T2) /* /obj/item/clothing/head/helmet/f13/ncr/rangercombat/Initialize() . = ..() @@ -795,7 +797,7 @@ obj/item/clothing/head/helmet/f13/enclave/usmcriot desc = "An improved combat helmet, bearing the symbol of the Knights." icon_state = "brotherhood_helmet_knight" item_state = "brotherhood_helmet_knight" - + armor_tokens = list(ARMOR_MODIFIER_DOWN_MELEE_T3, ARMOR_MODIFIER_DOWN_LASER_T2, ARMOR_MODIFIER_DOWN_BULLET_T1) /obj/item/clothing/head/helmet/f13/combat/brotherhood/senior name = "brotherhood senior knight helmet" @@ -808,12 +810,14 @@ obj/item/clothing/head/helmet/f13/enclave/usmcriot desc = "An improved combat helmet, bearing the symbol of a Sargeant." icon_state = "brotherhood_helmet_senior" item_state = "brotherhood_helmet_senior" + armor_tokens = list(ARMOR_MODIFIER_DOWN_MELEE_T3, ARMOR_MODIFIER_DOWN_LASER_T2, ARMOR_MODIFIER_DOWN_BULLET_T1, ARMOR_MODIFIER_UP_DT_T1) /obj/item/clothing/head/helmet/f13/combat/brotherhood/captain name = "brotherhood head knight helmet" desc = "An improved combat helmet, bearing the symbol of the Head Knight." icon_state = "brotherhood_helmet_captain" item_state = "brotherhood_helmet_captain" + armor_tokens = list(ARMOR_MODIFIER_DOWN_MELEE_T3, ARMOR_MODIFIER_DOWN_LASER_T2, ARMOR_MODIFIER_DOWN_BULLET_T1, ARMOR_MODIFIER_UP_DT_T2) /obj/item/clothing/head/helmet/f13/combat/brotherhood/initiate name = "initiate helmet" @@ -826,6 +830,7 @@ obj/item/clothing/head/helmet/f13/enclave/usmcriot desc = "An advanced pre-war titanium plated, ceramic coated, kevlar, padded helmet designed to withstand extreme punishment of all forms, repainted to the colour scheme of the Brotherhood of Steel." icon_state = "brotherhood_helmet" item_state = "brotherhood_helmet" + armor_tokens = list(ARMOR_MODIFIER_DOWN_MELEE_T3, ARMOR_MODIFIER_DOWN_LASER_T2, ARMOR_MODIFIER_DOWN_BULLET_T1, ARMOR_MODIFIER_UP_DT_T1) /obj/item/clothing/head/helmet/f13/combat/brotherhood/outcast name = "brotherhood helmet" @@ -1303,12 +1308,14 @@ obj/item/clothing/head/f13/army/beret desc = "A standard issue NCR helmet, with the letters \"MP\" scrawled on the front." icon_state = "ncr_MP" item_state = "ncr_MP" + armor_tokens = list(ARMOR_MODIFIER_DOWN_MELEE_T1, ARMOR_MODIFIER_UP_BULLET_T1, ARMOR_MODIFIER_DOWN_LASER_T3, ARMOR_MODIFIER_UP_DT_T1) /obj/item/clothing/head/f13/ncr/goggles name = "NCR storm helmet" desc = "A standard issue NCR Infantry helmet, with a pair of goggles attached to it." icon_state = "ncr_goggles_helmet" item_state = "ncr_goggles_helmet" + armor_tokens = list(ARMOR_MODIFIER_DOWN_MELEE_T1, ARMOR_MODIFIER_UP_BULLET_T1, ARMOR_MODIFIER_DOWN_LASER_T3, ARMOR_MODIFIER_UP_DT_T1) toggle_message = "You pull the goggles down under " alt_toggle_message = "You push the goggles up onto the " can_toggle = 1 diff --git a/code/modules/clothing/head/f13head.dm b/code/modules/clothing/head/f13head.dm index 60bcff33a7..d9a2e20827 100644 --- a/code/modules/clothing/head/f13head.dm +++ b/code/modules/clothing/head/f13head.dm @@ -80,7 +80,7 @@ desc = "An advanced pre-war titanium plated, ceramic coated, kevlar, padded helmet designed to withstand extreme punishment of all forms." icon_state = "combat_helmet_mk2" item_state = "combat_helmet_mk2" - armor_tokens = list(ARMOR_MODIFIER_UP_BULLET_T2, ARMOR_MODIFIER_UP_MELEE_T2) + armor_tokens = list(ARMOR_MODIFIER_UP_BULLET_T2, ARMOR_MODIFIER_UP_MELEE_T2, ARMOR_MODIFIER_UP_LASER_T2, ARMOR_MODIFIER_DOWN_ENV_T1, ARMOR_MODIFIER_UP_DT_T3) flags_inv = HIDEEARS|HIDEEYES|HIDEHAIR flags_cover = HEADCOVERSEYES salvage_loot = list(/obj/item/stack/crafting/armor_plate = 5) @@ -170,7 +170,7 @@ desc = "A sulphite raider helmet, affixed with thick anti-ballistic glass over the eyes." icon_state = "sulphite_helm" item_state = "sulphite_helm" - armor_tokens = list(ARMOR_MODIFIER_UP_BULLET_T2, ARMOR_MODIFIER_UP_MELEE_T2, ARMOR_MODIFIER_UP_FIRE_T3) + armor_tokens = list(ARMOR_MODIFIER_UP_MELEE_T3, ARMOR_MODIFIER_DOWN_BULLET_T2, ARMOR_MODIFIER_UP_BOMB_T3, ARMOR_MODIFIER_UP_ENV_T2, ARMOR_MODIFIER_UP_FIRE_T3) flags_inv = HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE|HIDEHAIR|HIDEFACIALHAIR flags_cover = HEADCOVERSEYES | HEADCOVERSMOUTH @@ -211,7 +211,7 @@ toggle_message = "You lower" alt_toggle_message = "You raise" can_toggle = 1 - armor_tokens = list(ARMOR_MODIFIER_UP_LASER_T2, ARMOR_MODIFIER_UP_MELEE_T2) + armor_tokens = list(ARMOR_MODIFIER_DOWN_BULLET_T3, ARMOR_MODIFIER_UP_MELEE_T1, ARMOR_MODIFIER_UP_LASER_T1, ARMOR_MODIFIER_UP_ENV_T2, ARMOR_MODIFIER_UP_DT_T1) flags_inv = HIDEMASK|HIDEEYES|HIDEFACE strip_delay = 80 actions_types = list(/datum/action/item_action/toggle) @@ -234,7 +234,7 @@ desc = "A reinforced metal hockey mask." icon_state = "metal_mask2" item_state = "metal_mask2" - armor_tokens = list(ARMOR_MODIFIER_UP_LASER_T3, ARMOR_MODIFIER_UP_MELEE_T3) + armor_tokens = list(ARMOR_MODIFIER_UP_MELEE_T2, ARMOR_MODIFIER_DOWN_BULLET_T2, ARMOR_MODIFIER_UP_LASER_T1, ARMOR_MODIFIER_UP_ENV_T2, ARMOR_MODIFIER_UP_DT_T1) /obj/item/clothing/head/helmet/f13/tesla name = "tesla helmet" diff --git a/code/modules/clothing/head/helmet.dm b/code/modules/clothing/head/helmet.dm index a101ae197f..66fe388846 100644 --- a/code/modules/clothing/head/helmet.dm +++ b/code/modules/clothing/head/helmet.dm @@ -100,7 +100,7 @@ desc = "A bulletproof combat helmet that excels in protecting the wearer against traditional projectile weaponry and explosives to a minor extent." icon_state = "helmetalt" item_state = "helmetalt" - armor_tokens = list(ARMOR_MODIFIER_UP_BULLET_T2) + armor_tokens = list(ARMOR_MODIFIER_UP_BULLET_T3, ARMOR_MODIFIER_DOWN_MELEE_T2, ARMOR_MODIFIER_UP_BOMB_T2, ARMOR_MODIFIER_DOWN_ENV_T2, ARMOR_MODIFIER_UP_DT_T2) can_flashlight = 1 dog_fashion = null @@ -127,7 +127,7 @@ toggle_message = "You pull the visor down on" alt_toggle_message = "You push the visor up on" can_toggle = 1 - armor_tokens = list(ARMOR_MODIFIER_UP_MELEE_T2) + armor_tokens = list(ARMOR_MODIFIER_UP_MELEE_T3, ARMOR_MODIFIER_DOWN_BULLET_T2, ARMOR_MODIFIER_DOWN_LASER_T3, ARMOR_MODIFIER_DOWN_FIRE_T3, ARMOR_MODIFIER_UP_DT_T2) flags_inv = HIDEEARS|HIDEFACE strip_delay = 80 actions_types = list(/datum/action/item_action/toggle) @@ -182,6 +182,7 @@ desc = "An extremely robust, space-worthy helmet in a nefarious red and black stripe pattern." icon_state = "swatsyndie" item_state = "swatsyndie" + armor_tokens = list(ARMOR_MODIFIER_UP_BULLET_T2, ARMOR_MODIFIER_UP_MELEE_T2, ARMOR_MODIFIER_UP_LASER_T2, ARMOR_MODIFIER_DOWN_ENV_T1, ARMOR_MODIFIER_UP_DT_T3) cold_protection = HEAD min_cold_protection_temperature = SPACE_HELM_MIN_TEMP_PROTECT heat_protection = HEAD diff --git a/code/modules/clothing/suits/bigiron_suits.dm b/code/modules/clothing/suits/bigiron_suits.dm index e60f092bf8..affc453459 100644 --- a/code/modules/clothing/suits/bigiron_suits.dm +++ b/code/modules/clothing/suits/bigiron_suits.dm @@ -574,7 +574,7 @@ heat_protection = CHEST|GROIN|ARMS|LEGS // chyll min_cold_protection_temperature = ARMOR_MIN_TEMP_PROTECT max_heat_protection_temperature = ARMOR_MAX_TEMP_PROTECT - armor_tokens = list(ARMOR_MODIFIER_UP_ENV_T1) + armor_tokens = list(ARMOR_MODIFIER_UP_MELEE_T1, ARMOR_MODIFIER_DOWN_LASER_T1, ARMOR_MODIFIER_DOWN_ENV_T1) /obj/item/clothing/suit/armor/light/tribal/wastetribe name = "wasteland tribe armor" @@ -584,6 +584,7 @@ icon_state = "tribal" item_state = "tribal" body_parts_hidden = GROIN|ARMS|LEGS + armor_tokens = list(ARMOR_MODIFIER_UP_BULLET_T1) /obj/item/clothing/suit/armor/light/tribal/cloak name = "light tribal cloak" @@ -591,6 +592,7 @@ icon_state = "lightcloak" item_state = "lightcloak" body_parts_hidden = CHEST|ARMS|LEGS + armor_tokens = list(ARMOR_MODIFIER_UP_MELEE_T2) /obj/item/clothing/suit/armor/light/tribal/simple @@ -605,6 +607,7 @@ desc = "A worn ballistic vest from Salt Lake, adorned with feathers and turqoise beads, with an ornamental pattern painted over the sides. Commonly worn by the members of the peaceful Sorrows tribe." icon_state = "sorrows_armour" item_state = "sorrows_armour" + armor_tokens = list(ARMOR_MODIFIER_UP_BULLET_T1) /obj/item/clothing/suit/armor/light/tribal/westernwayfarer name = "Western Wayfarer salvaged armor" @@ -613,6 +616,7 @@ mob_overlay_icon = 'icons/fallout/onmob/clothes/armor_light.dmi' icon_state = "western_wayfarer_armor" item_state = "western_wayfarer_armor" + armor_tokens = list(ARMOR_MODIFIER_UP_MELEE_T1) /obj/item/clothing/suit/armor/light/tribal/bone name = "Bone armor" @@ -620,6 +624,7 @@ icon_state = "bone_dancer_armor_light" item_state = "bone_dancer_armor_light" blood_overlay_type = "armor" + armor_tokens = list(ARMOR_MODIFIER_UP_MELEE_T2, ARMOR_MODIFIER_DOWN_BULLET_T1) /obj/item/clothing/suit/armor/light/tribal/bone/cool name = "bone armor suit" @@ -641,6 +646,7 @@ icon_state = "white_legs_armour_light" item_state = "white_legs_armour_light" body_parts_hidden = ARMS + armor_tokens = list(ARMOR_MODIFIER_UP_BULLET_T1, ARMOR_MODIFIER_UP_MELEE_T1) /obj/item/clothing/suit/armor/light/tribal/eighties name = "80s light armour" @@ -948,6 +954,7 @@ icon_state = "badlands" item_state = "badlands" body_parts_hidden = ARMS + armor_tokens = list(ARMOR_MODIFIER_UP_LASER_T1) /obj/item/clothing/suit/armor/light/raider/tribalraider name = "tribal raider wear" @@ -957,18 +964,23 @@ icon_state = "tribal_outcast" item_state = "tribal_outcast" body_parts_hidden = ARMS | GROIN + armor_tokens = list(ARMOR_MODIFIER_UP_ENV_T1) /obj/item/clothing/suit/armor/light/raider/supafly name = "supa-fly raider armor" desc = "Fabulous mutant powers were revealed to me the day I held aloft my bumper sword and said...
BY THE POWER OF NUKA-COLA, I AM RAIDER MAN!" icon_state = "supafly" item_state = "supafly" + armor_tokens = list(ARMOR_MODIFIER_UP_MELEE_T1) + /obj/item/clothing/suit/armor/light/raider/sadist name = "sadist raider armor" desc = "A bunch of metal chaps adorned with severed hands at the waist with a leather plate worn on the left shoulder. Very intimidating." icon_state = "sadist" item_state = "sadist" + armor_tokens = list(ARMOR_MODIFIER_UP_BULLET_T1, ARMOR_MODIFIER_DOWN_LASER_T1) + /obj/item/clothing/suit/armor/light/raider/painspike name = "painspike raider armor" desc = "A particularly unhuggable armor, even by raider standards. Extremely spiky." @@ -1311,7 +1323,7 @@ equip_delay_other = 20 max_integrity = 150 pocket_storage_component_path = /datum/component/storage/concrete/pockets/armor - armor_tokens = list(ARMOR_MODIFIER_UP_MELEE_T1, ARMOR_MODIFIER_UP_BULLET_T1, ARMOR_MODIFIER_UP_DT_T2) + armor_tokens = list(ARMOR_MODIFIER_UP_MELEE_T1, ARMOR_MODIFIER_UP_LASER_T1, ARMOR_MODIFIER_DOWN_BULLET_T1, ARMOR_MODIFIER_UP_DT_T2) body_parts_hidden = ARMS | CHEST // Recipe the above + 2 gecko hides @@ -1320,7 +1332,7 @@ desc = "Armor in the motorcycle-football style, either with intact original polymer plating, or reinforced with gecko hide." icon_state = "leather_armor_mk2" item_state = "leather_armor_mk2" - armor_tokens = list(ARMOR_MODIFIER_UP_MELEE_T2, ARMOR_MODIFIER_UP_BULLET_T1, ARMOR_MODIFIER_DOWN_FIRE_T2, ARMOR_MODIFIER_UP_DT_T3) + armor_tokens = list(ARMOR_MODIFIER_UP_MELEE_T2, ARMOR_MODIFIER_UP_LASER_T2, ARMOR_MODIFIER_UP_BULLET_T1, ARMOR_MODIFIER_DOWN_FIRE_T2, ARMOR_MODIFIER_UP_DT_T3) /obj/item/clothing/suit/armor/light/leather/leathersuit name = "leather suit" @@ -1729,6 +1741,7 @@ max_integrity = 200 pocket_storage_component_path = /datum/component/storage/concrete/pockets/duster slowdown = ARMOR_SLOWDOWN_MEDIUM * ARMOR_SLOWDOWN_LESS_T2 * ARMOR_SLOWDOWN_GLOBAL_MULT // lighter, cus melee focus + armor_tokens = list(ARMOR_MODIFIER_UP_MELEE_T1, ARMOR_MODIFIER_DOWN_BULLET_T2, ARMOR_MODIFIER_DOWN_LASER_T2, ARMOR_MODIFIER_DOWN_ENV_T1) /obj/item/clothing/suit/armor/medium/tribal/chitinarmor name = "insect chitin armor" @@ -1742,7 +1755,7 @@ resistance_flags = FIRE_PROOF | ACID_PROOF siemens_coefficient = 0.5 permeability_coefficient = 0.5 - armor_tokens = list(ARMOR_MODIFIER_UP_ENV_T2, ARMOR_MODIFIER_UP_BULLET_T1, ARMOR_MODIFIER_DOWN_LASER_T1, ARMOR_MODIFIER_UP_DT_T2) // tribal enviro armor + armor_tokens = list(ARMOR_MODIFIER_UP_ENV_T2, ARMOR_MODIFIER_DOWN_BULLET_T1, ARMOR_MODIFIER_DOWN_LASER_T1, ARMOR_MODIFIER_UP_DT_T2) // tribal enviro armor /obj/item/clothing/suit/armor/medium/tribal/rustwalkers name = "Rustwalkers armor" @@ -1750,6 +1763,7 @@ icon_state = "rustwalkers_armour" item_state = "rustwalkers_armour" body_parts_hidden = CHEST + armor_tokens = list(ARMOR_MODIFIER_DOWN_BULLET_T1, ARMOR_MODIFIER_UP_LASER_T1, ARMOR_MODIFIER_UP_DT_T1) /obj/item/clothing/suit/armor/medium/tribal/whitelegs name = "White Legs armour" @@ -1757,6 +1771,7 @@ icon_state = "white_legs_armour" item_state = "white_legs_armour" body_parts_hidden = ARMS | LEGS + armor_tokens = list(ARMOR_MODIFIER_UP_BULLET_T2, ARMOR_MODIFIER_UP_MELEE_T1, ARMOR_MODIFIER_DOWN_LASER_T1, ARMOR_MODIFIER_UP_DT_T1) /obj/item/clothing/suit/armor/medium/tribal/eighties name = "80s armour" @@ -1778,7 +1793,7 @@ icon_state = "bone_dancer_armor" item_state = "bone_dancer_armor" blood_overlay_type = "armor" - armor_tokens = list(ARMOR_MODIFIER_UP_MELEE_T1, ARMOR_MODIFIER_UP_DT_T2) + armor_tokens = list(ARMOR_MODIFIER_UP_MELEE_T2, ARMOR_MODIFIER_UP_DT_T2) /*/obj/item/clothing/suit/armor/medium/tribal/westernwayfarer name = "Western Wayfarer armor" @@ -1823,6 +1838,7 @@ mob_overlay_icon = 'icons/fallout/onmob/clothes/armor_light.dmi' icon_state = "vest_flak" item_state = "vest_flak" + armor_tokens = list(ARMOR_MODIFIER_UP_BULLET_T1) /obj/item/clothing/suit/armor/medium/vest/kevlar name = "kevlar vest" @@ -1849,6 +1865,8 @@ mob_overlay_icon = 'icons/fallout/onmob/clothes/armor_medium.dmi' icon_state = "vest_armor" item_state = "vest_armor" + slowdown = ARMOR_SLOWDOWN_MEDIUM * ARMOR_SLOWDOWN_MORE_T2 * ARMOR_SLOWDOWN_GLOBAL_MULT + armor_tokens = list(ARMOR_MODIFIER_UP_BULLET_T3, ARMOR_MODIFIER_DOWN_MELEE_T1, ARMOR_MODIFIER_DOWN_LASER_T1, ARMOR_MODIFIER_DOWN_ENV_T2, ARMOR_MODIFIER_UP_DT_T3) /obj/item/clothing/suit/armor/medium/vest/bulletproof/big name = "security vest" @@ -1857,6 +1875,8 @@ mob_overlay_icon = 'icons/fallout/onmob/clothes/armor_medium.dmi' icon_state = "vest_armor" item_state = "vest_armor" + slowdown = ARMOR_SLOWDOWN_MEDIUM * ARMOR_SLOWDOWN_MORE_T2 * ARMOR_SLOWDOWN_GLOBAL_MULT + armor_tokens = list(ARMOR_MODIFIER_UP_BULLET_T3, ARMOR_MODIFIER_DOWN_MELEE_T1, ARMOR_MODIFIER_DOWN_LASER_T1, ARMOR_MODIFIER_UP_DT_T3) /obj/item/clothing/suit/armor/medium/vest/followers name = "followers armor vest" @@ -1897,6 +1917,7 @@ item_state = "mm_coat" mutantrace_variation = NONE body_parts_covered = CHEST|ARMS|LEGS + armor_tokens = list(ARMOR_MODIFIER_UP_LASER_T2) /obj/item/clothing/suit/armor/light/vest/russian name = "russian vest" @@ -2021,8 +2042,8 @@ mob_overlay_icon = 'icons/fallout/onmob/clothes/armor_medium.dmi' icon_state = "steel_bib" item_state = "steel_bib" - slowdown = ARMOR_SLOWDOWN_MEDIUM * ARMOR_SLOWDOWN_MORE_T1 * ARMOR_SLOWDOWN_GLOBAL_MULT - armor_tokens = list(ARMOR_MODIFIER_DOWN_BULLET_T1, ARMOR_MODIFIER_UP_MELEE_T2, ARMOR_MODIFIER_UP_LASER_T2, ARMOR_MODIFIER_DOWN_ENV_T1, ARMOR_MODIFIER_UP_DT_T2) + slowdown = ARMOR_SLOWDOWN_LIGHT * ARMOR_SLOWDOWN_MORE_T1 * ARMOR_SLOWDOWN_GLOBAL_MULT + armor_tokens = list(ARMOR_MODIFIER_DOWN_BULLET_T1, ARMOR_MODIFIER_UP_MELEE_T2, ARMOR_MODIFIER_UP_LASER_T2, ARMOR_MODIFIER_DOWN_ENV_T1) /obj/item/clothing/suit/armor/medium/vest/breastplate/light name = "light armor plates" @@ -2057,7 +2078,8 @@ mob_overlay_icon = 'icons/fallout/onmob/clothes/armor_medium.dmi' icon_state = "steel_bib_rein" item_state = "steel_bib_rein" - armor_tokens = list(ARMOR_MODIFIER_DOWN_BULLET_T1, ARMOR_MODIFIER_UP_MELEE_T3, ARMOR_MODIFIER_UP_LASER_T2, ARMOR_MODIFIER_DOWN_ENV_T1, ARMOR_MODIFIER_UP_DT_T3) + slowdown = ARMOR_SLOWDOWN_MEDIUM * ARMOR_SLOWDOWN_MORE_T1 * ARMOR_SLOWDOWN_GLOBAL_MULT + armor_tokens = list(ARMOR_MODIFIER_UP_BULLET_T1, ARMOR_MODIFIER_UP_MELEE_T3, ARMOR_MODIFIER_UP_LASER_T2, ARMOR_MODIFIER_DOWN_ENV_T1, ARMOR_MODIFIER_UP_DT_T3) /obj/item/clothing/suit/armor/medium/vest/breastplate/scrap name = "scrap metal chestplate" @@ -2067,6 +2089,7 @@ icon_state = "metal_chestplate" item_state = "metal_chestplate" siemens_coefficient = 1.3 + armor_tokens = list(ARMOR_MODIFIER_DOWN_BULLET_T1, ARMOR_MODIFIER_UP_MELEE_T2, ARMOR_MODIFIER_UP_LASER_T1, ARMOR_MODIFIER_UP_DT_T1) /obj/item/clothing/suit/armor/medium/vest/breastplate/scrap/reinforced name = "reinforced metal chestplate" @@ -2113,7 +2136,7 @@ max_integrity = 200 pocket_storage_component_path = /datum/component/storage/concrete/pockets/duster/armored slowdown = ARMOR_SLOWDOWN_MEDIUM * ARMOR_SLOWDOWN_LESS_T3 * ARMOR_SLOWDOWN_GLOBAL_MULT - armor_tokens = list(ARMOR_MODIFIER_UP_BULLET_T1, ARMOR_MODIFIER_UP_LASER_T1, ARMOR_MODIFIER_UP_ENV_T1) + armor_tokens = list(ARMOR_MODIFIER_DOWN_MELEE_T2, ARMOR_MODIFIER_UP_BULLET_T1, ARMOR_MODIFIER_UP_LASER_T1, ARMOR_MODIFIER_UP_ENV_T1) /obj/item/clothing/suit/armor/medium/duster/navyblue name = "head of security's jacket" @@ -2268,7 +2291,7 @@ item_state = "combat_armor_mk2" salvage_loot = list(/obj/item/stack/crafting/armor_plate = 8) slowdown = ARMOR_SLOWDOWN_MEDIUM * ARMOR_SLOWDOWN_MORE_T2 * ARMOR_SLOWDOWN_GLOBAL_MULT - armor_tokens = list(ARMOR_MODIFIER_UP_BULLET_T2, ARMOR_MODIFIER_UP_MELEE_T1, ARMOR_MODIFIER_UP_LASER_T2, ARMOR_MODIFIER_DOWN_ENV_T1, ARMOR_MODIFIER_UP_DT_T3) + armor_tokens = list(ARMOR_MODIFIER_UP_BULLET_T2, ARMOR_MODIFIER_UP_MELEE_T2, ARMOR_MODIFIER_UP_LASER_T2, ARMOR_MODIFIER_DOWN_ENV_T1, ARMOR_MODIFIER_UP_DT_T3) /obj/item/clothing/suit/armor/medium/combat/mk2/dark name = "reinforced combat armor" @@ -2297,7 +2320,7 @@ name = "raider combat armor" desc = "An old set of reinforced combat armor with some parts supplanted with painspike armor. It seems less protective than a mint-condition set of combat armor. Can probably be used to make a better set, though..." item_state = "combat_armor_raider" - armor_tokens = list(ARMOR_MODIFIER_DOWN_BULLET_T1, ARMOR_MODIFIER_UP_MELEE_T1, ARMOR_MODIFIER_DOWN_LASER_T1, ARMOR_MODIFIER_DOWN_ENV_T1) + armor_tokens = list(ARMOR_MODIFIER_DOWN_BULLET_T2, ARMOR_MODIFIER_DOWN_MELEE_T1, ARMOR_MODIFIER_DOWN_LASER_T1, ARMOR_MODIFIER_DOWN_ENV_T1) /obj/item/clothing/suit/armor/medium/combat/mk2/tribal name = "tribal reinforced combat armor" @@ -2313,6 +2336,7 @@ icon_state = "armoralt" item_state = "armoralt" clothing_flags = CUSHIONED_ARMOR + slowdown = ARMOR_SLOWDOWN_MEDIUM * ARMOR_SLOWDOWN_LESS_T2 * ARMOR_SLOWDOWN_GLOBAL_MULT /obj/item/clothing/suit/armor/medium/combat/chinese name = "chinese combat armor" @@ -2425,7 +2449,7 @@ icon_state = "brotherhood_armor_knight" item_state = "brotherhood_armor_knight" slowdown = ARMOR_SLOWDOWN_MEDIUM * ARMOR_SLOWDOWN_GLOBAL_MULT - armor_tokens = list(ARMOR_MODIFIER_UP_LASER_T2, ARMOR_MODIFIER_DOWN_ENV_T1, ARMOR_MODIFIER_UP_DT_T1) + armor_tokens = list(ARMOR_MODIFIER_DOWN_MELEE_T3, ARMOR_MODIFIER_DOWN_BULLET_T2, ARMOR_MODIFIER_DOWN_LASER_T1, ARMOR_MODIFIER_UP_DT_T1) /obj/item/clothing/suit/armor/medium/combat/brotherhood/senior name = "brotherhood senior knight armor" @@ -2438,25 +2462,28 @@ desc = "A renforced combat armor set made by the Brotherhood of Steel, standard issue for all Knight Sarge. It bears a silver stripe." icon_state = "brotherhood_armor_senior" item_state = "brotherhood_armor_senior" - armor_tokens = list(ARMOR_MODIFIER_UP_LASER_T2, ARMOR_MODIFIER_DOWN_ENV_T2, ARMOR_MODIFIER_UP_DT_T1, ARMOR_MODIFIER_UP_MELEE_T1) + armor_tokens = list(ARMOR_MODIFIER_DOWN_MELEE_T3, ARMOR_MODIFIER_DOWN_BULLET_T2, ARMOR_MODIFIER_UP_DT_T1) /obj/item/clothing/suit/armor/medium/combat/brotherhood/captain name = "brotherhood head knight armor" desc = "A renforced combat armor set made by the Brotherhood of Steel, standard issue for all Head Knights. It bears golden embroidery." icon_state = "brotherhood_armor_captain" item_state = "brotherhood_armor_captain" + armor_tokens = list(ARMOR_MODIFIER_DOWN_MELEE_T3, ARMOR_MODIFIER_DOWN_BULLET_T1, ARMOR_MODIFIER_UP_DT_T1) /obj/item/clothing/suit/armor/medium/combat/brotherhood/initiate name = "initiate armor" desc = "An old degraded pre war combat armor, repainted to the colour scheme of the Brotherhood of Steel." icon_state = "brotherhood_armor" item_state = "brotherhood_armor" + armor_tokens = list(ARMOR_MODIFIER_DOWN_MELEE_T3, ARMOR_MODIFIER_DOWN_BULLET_T3, ARMOR_MODIFIER_DOWN_LASER_T2) /obj/item/clothing/suit/armor/medium/combat/brotherhood/initiate/mk2 name = "reinforced knight armor" desc = "A reinforced set of bracers, greaves, and torso plating of prewar design This one is kitted with additional plates and, repainted to the colour scheme of the Brotherhood of Steel." icon_state = "brotherhood_armor_mk2" item_state = "brotherhood_armor_mk2" + armor_tokens = list(ARMOR_MODIFIER_DOWN_MELEE_T3, ARMOR_MODIFIER_UP_DT_T1) /obj/item/clothing/suit/armor/medium/combat/brotherhood/outcast name = "brotherhood armor" //unused? @@ -2505,7 +2532,7 @@ desc = "for testing" pocket_storage_component_path = /datum/component/storage/concrete/pockets/jacket slowdown = ARMOR_SLOWDOWN_MEDIUM * ARMOR_SLOWDOWN_LESS_T1 * ARMOR_SLOWDOWN_GLOBAL_MULT - armor_tokens = list(ARMOR_MODIFIER_UP_MELEE_T1, ARMOR_MODIFIER_DOWN_LASER_T1, ARMOR_MODIFIER_DOWN_ENV_T1) + armor_tokens = list(ARMOR_MODIFIER_DOWN_MELEE_T2, ARMOR_MODIFIER_DOWN_BULLET_T2, ARMOR_MODIFIER_DOWN_LASER_T2, ARMOR_MODIFIER_DOWN_ENV_T1) /obj/item/clothing/suit/armor/medium/raider/slam name = "slammer raider armor" @@ -2517,6 +2544,7 @@ icon = 'icons/fallout/clothing/armored_medium.dmi' mob_overlay_icon = 'icons/fallout/onmob/clothes/armor_medium.dmi' body_parts_hidden = ARMS | LEGS | GROIN + armor_tokens = list(ARMOR_MODIFIER_UP_MELEE_T1, ARMOR_MODIFIER_DOWN_BULLET_T2, ARMOR_MODIFIER_DOWN_LASER_T1, ARMOR_MODIFIER_DOWN_ENV_T1) /obj/item/clothing/suit/armor/medium/raider/rebel name = "rebel raider armor" @@ -2531,6 +2559,7 @@ desc = "Scavenged military combat armor, repaired by unskilled hands many times, most of the original plating having cracked or crumbled to dust." icon_state = "raider_combat" item_state = "raider_combat" + armor_tokens = list(ARMOR_MODIFIER_DOWN_MELEE_T3, ARMOR_MODIFIER_DOWN_BULLET_T2, ARMOR_MODIFIER_DOWN_LASER_T1, ARMOR_MODIFIER_DOWN_ENV_T1) /obj/item/clothing/suit/armor/medium/raider/badlands name = "badlands raider armor" @@ -2547,7 +2576,7 @@ item_state = "combatduster" pocket_storage_component_path = /datum/component/storage/concrete/pockets/duster/armored slowdown = ARMOR_SLOWDOWN_MEDIUM * ARMOR_SLOWDOWN_LESS_T1 * ARMOR_SLOWDOWN_GLOBAL_MULT - armor_tokens = list(ARMOR_MODIFIER_UP_MELEE_T1, ARMOR_MODIFIER_UP_ENV_T2, ARMOR_MODIFIER_UP_DT_T1) + armor_tokens = list(ARMOR_MODIFIER_DOWN_MELEE_T2, ARMOR_MODIFIER_UP_ENV_T2, ARMOR_MODIFIER_UP_DT_T1) /obj/item/clothing/suit/armor/medium/raider/combatduster/patrolduster name = "Patrol Duster" @@ -2561,7 +2590,7 @@ icon_state = "raider_combat" item_state = "raider_combat" slowdown = ARMOR_SLOWDOWN_MEDIUM * ARMOR_SLOWDOWN_GLOBAL_MULT - armor_tokens = list(ARMOR_MODIFIER_UP_BULLET_T1, ARMOR_MODIFIER_UP_LASER_T1, ARMOR_MODIFIER_UP_ENV_T1, ARMOR_MODIFIER_UP_DT_T1) + armor_tokens = list(ARMOR_MODIFIER_DOWN_BULLET_T1, ARMOR_MODIFIER_UP_LASER_T1, ARMOR_MODIFIER_UP_ENV_T1, ARMOR_MODIFIER_UP_DT_T1) /obj/item/clothing/suit/armor/medium/raider/raidermetal name = "metal raider armor" @@ -2570,7 +2599,7 @@ item_state = "raider_metal" resistance_flags = FIRE_PROOF slowdown = ARMOR_SLOWDOWN_MEDIUM * ARMOR_SLOWDOWN_MORE_T1 * ARMOR_SLOWDOWN_GLOBAL_MULT - armor_tokens = list(ARMOR_MODIFIER_UP_BULLET_T1, ARMOR_MODIFIER_UP_LASER_T2, ARMOR_MODIFIER_UP_DT_T2) + armor_tokens = list(ARMOR_MODIFIER_DOWN_BULLET_T2, ARMOR_MODIFIER_DOWN_MELEE_T1, ARMOR_MODIFIER_UP_LASER_T1, ARMOR_MODIFIER_DOWN_ENV_T1) /obj/item/clothing/suit/armor/medium/raider/wastewar name = "wasteland warrior armor" @@ -2580,6 +2609,7 @@ resistance_flags = FLAMMABLE pocket_storage_component_path = /datum/component/storage/concrete/pockets/massive/swords body_parts_hidden = CHEST | GROIN + armor_tokens = list(ARMOR_MODIFIER_DOWN_MELEE_T1, ARMOR_MODIFIER_DOWN_BULLET_T2, ARMOR_MODIFIER_DOWN_LASER_T2, ARMOR_MODIFIER_DOWN_ENV_T1) /obj/item/clothing/suit/armor/medium/raider/blastmaster name = "blastmaster raider armor" @@ -2587,7 +2617,7 @@ icon_state = "blastmaster" item_state = "blastmaster" flash_protect = 2 - armor_tokens = list(ARMOR_MODIFIER_UP_BULLET_T1, ARMOR_MODIFIER_UP_LASER_T2, ARMOR_MODIFIER_UP_BOMB_T2) + armor_tokens = list(ARMOR_MODIFIER_DOWN_BULLET_T3, ARMOR_MODIFIER_UP_LASER_T2, ARMOR_MODIFIER_UP_BOMB_T2) /obj/item/clothing/suit/armor/medium/raider/yankee name = "yankee raider armor" @@ -2603,7 +2633,7 @@ icon_state = "iconoclast" item_state = "iconoclast" slowdown = ARMOR_SLOWDOWN_MEDIUM * ARMOR_SLOWDOWN_MORE_T1 * ARMOR_SLOWDOWN_GLOBAL_MULT - armor_tokens = list(, ARMOR_MODIFIER_UP_LASER_T1, ARMOR_MODIFIER_UP_ENV_T2) + armor_tokens = list(ARMOR_MODIFIER_DOWN_LASER_T1, ARMOR_MODIFIER_UP_ENV_T2) /////////// @@ -2653,7 +2683,7 @@ mutantrace_variation = STYLE_DIGITIGRADE pocket_storage_component_path = /datum/component/storage/concrete/pockets/magpouch // 4 slots for ammo! slowdown = ARMOR_SLOWDOWN_HEAVY * ARMOR_SLOWDOWN_LESS_T2 * ARMOR_SLOWDOWN_GLOBAL_MULT - armor_tokens = list(ARMOR_MODIFIER_UP_BULLET_T3, ARMOR_MODIFIER_DOWN_LASER_T1, ARMOR_MODIFIER_DOWN_ENV_T2, ARMOR_MODIFIER_UP_DT_T3) + armor_tokens = list(ARMOR_MODIFIER_DOWN_MELEE_T3, ARMOR_MODIFIER_UP_BULLET_T3, ARMOR_MODIFIER_DOWN_LASER_T3, ARMOR_MODIFIER_DOWN_ENV_T2, ARMOR_MODIFIER_UP_DT_T3) ////////////////////// //// TRIBAL ARMOR //// @@ -2668,7 +2698,7 @@ item_state = "tribal_heavy" pocket_storage_component_path = /datum/component/storage/concrete/pockets/jacket slowdown = ARMOR_SLOWDOWN_HEAVY * ARMOR_SLOWDOWN_LESS_T1 * ARMOR_SLOWDOWN_GLOBAL_MULT - armor_tokens = list(ARMOR_MODIFIER_UP_MELEE_T1, ARMOR_MODIFIER_DOWN_LASER_T1) + armor_tokens = list(ARMOR_MODIFIER_DOWN_MELEE_T1, ARMOR_MODIFIER_DOWN_LASER_T4, ARMOR_MODIFIER_DOWN_BULLET_T2) /obj/item/clothing/suit/armor/heavy/tribal/bone @@ -2679,7 +2709,7 @@ icon_state = "bone_dancer_armor_heavy" item_state = "bone_dancer_armor_heavy" blood_overlay_type = "armor" - armor_tokens = list(ARMOR_MODIFIER_UP_MELEE_T2, ARMOR_MODIFIER_DOWN_LASER_T1) + armor_tokens = list(ARMOR_MODIFIER_UP_MELEE_T3, ARMOR_MODIFIER_DOWN_LASER_T3, ARMOR_MODIFIER_DOWN_BULLET_T2) /obj/item/clothing/suit/armor/heavy/tribal/metal @@ -2689,7 +2719,7 @@ mob_overlay_icon = null icon_state = "raider_metal" item_state = "raider_metal" - armor_tokens = list(ARMOR_MODIFIER_UP_MELEE_T1, ARMOR_MODIFIER_UP_LASER_T1) + armor_tokens = list(ARMOR_MODIFIER_DOWN_MELEE_T1, ARMOR_MODIFIER_UP_LASER_T2, ARMOR_MODIFIER_DOWN_BULLET_T2) /obj/item/clothing/suit/armor/heavy/tribal/rustwalkers name = "Rustwalkers heavy armor" @@ -2702,6 +2732,8 @@ desc = "A series of tan and khaki armour plates, held in place with a considerable amount of strapping and possibly duct tape. Commonly worn by members of the White Legs tribe." icon_state = "white_legs_armour_heavy" item_state = "white_legs_armour_heavy" + armor_tokens = list(ARMOR_MODIFIER_DOWN_MELEE_T2, ARMOR_MODIFIER_DOWN_LASER_T3, ARMOR_MODIFIER_UP_BULLET_T3) + /obj/item/clothing/suit/armor/heavy/tribal/eighties name = "80s heavy armour" @@ -2729,6 +2761,7 @@ item_state = "bone_dancer_armor_heavy" blood_overlay_type = "armor" body_parts_covered = CHEST|GROIN|LEGS|FEET|ARMS + armor_tokens = list(ARMOR_MODIFIER_UP_MELEE_T3, ARMOR_MODIFIER_DOWN_LASER_T3, ARMOR_MODIFIER_DOWN_BULLET_T2) ///////////////////// //// METAL ARMOR //// @@ -2742,7 +2775,7 @@ icon_state = "metal_chestplate" item_state = "metal_chestplate" slowdown = ARMOR_SLOWDOWN_HEAVY * ARMOR_SLOWDOWN_MORE_T1 * ARMOR_SLOWDOWN_GLOBAL_MULT - armor_tokens = list(ARMOR_MODIFIER_UP_MELEE_T1, ARMOR_MODIFIER_UP_LASER_T1, ARMOR_MODIFIER_UP_ENV_T2, ARMOR_MODIFIER_UP_DT_T1) + armor_tokens = list(ARMOR_MODIFIER_DOWN_BULLET_T3, ARMOR_MODIFIER_DOWN_MELEE_T1, ARMOR_MODIFIER_DOWN_LASER_T1, ARMOR_MODIFIER_UP_ENV_T2, ARMOR_MODIFIER_UP_DT_T1) /obj/item/clothing/suit/armor/heavy/metal/polished name = "polished metal armor" @@ -2751,7 +2784,7 @@ mob_overlay_icon = 'icons/fallout/onmob/clothes/armor_medium.dmi' icon_state = "armor_enclave_peacekeeper" item_state = "armor_enclave_peacekeeper" - armor_tokens = list(ARMOR_MODIFIER_UP_MELEE_T1, ARMOR_MODIFIER_UP_LASER_T3, ARMOR_MODIFIER_UP_ENV_T1) + armor_tokens = list(ARMOR_MODIFIER_DOWN_MELEE_T1, ARMOR_MODIFIER_UP_LASER_T3, ARMOR_MODIFIER_UP_ENV_T1) mutantrace_variation = NONE /obj/item/clothing/suit/armor/heavy/metal/polished/actually_laserproof // also actually_unobtainable @@ -2820,7 +2853,7 @@ icon_state = "metal_chestplate2" item_state = "metal_chestplate2" slowdown = ARMOR_SLOWDOWN_HEAVY * ARMOR_SLOWDOWN_MORE_T1 * ARMOR_SLOWDOWN_GLOBAL_MULT - armor_tokens = list(ARMOR_MODIFIER_UP_MELEE_T2, ARMOR_MODIFIER_UP_BULLET_T1, ARMOR_MODIFIER_UP_LASER_T1, ARMOR_MODIFIER_UP_ENV_T2, ARMOR_MODIFIER_UP_DT_T1) + armor_tokens = list(ARMOR_MODIFIER_UP_MELEE_T2, ARMOR_MODIFIER_DOWN_BULLET_T2, ARMOR_MODIFIER_UP_LASER_T1, ARMOR_MODIFIER_UP_ENV_T2, ARMOR_MODIFIER_UP_DT_T1) /obj/item/clothing/suit/armor/heavy/metal/mutant name = "mutant armour" @@ -2848,7 +2881,7 @@ icon_state = "sulphite" item_state = "sulphite" slowdown = ARMOR_SLOWDOWN_HEAVY * ARMOR_SLOWDOWN_MORE_T1 * ARMOR_SLOWDOWN_GLOBAL_MULT - armor_tokens = list(ARMOR_MODIFIER_UP_MELEE_T3, ARMOR_MODIFIER_UP_BULLET_T1, ARMOR_MODIFIER_UP_LASER_T2, ARMOR_MODIFIER_UP_ENV_T2, ARMOR_MODIFIER_UP_FIRE_T3) + armor_tokens = list(ARMOR_MODIFIER_UP_MELEE_T3, ARMOR_MODIFIER_DOWN_BULLET_T2, ARMOR_MODIFIER_UP_BOMB_T3, ARMOR_MODIFIER_UP_ENV_T2, ARMOR_MODIFIER_UP_FIRE_T3) mutantrace_variation = NONE //////////////////// @@ -2863,7 +2896,7 @@ pocket_storage_component_path = /datum/component/storage/concrete/pockets/magpouch // 4 slots for ammo! blocks_shove_knockdown = TRUE slowdown = ARMOR_SLOWDOWN_HEAVY * ARMOR_SLOWDOWN_GLOBAL_MULT - armor_tokens = list(ARMOR_MODIFIER_UP_MELEE_T3, ARMOR_MODIFIER_UP_BULLET_T1, ARMOR_MODIFIER_DOWN_LASER_T2, ARMOR_MODIFIER_DOWN_FIRE_T3, ARMOR_MODIFIER_UP_DT_T2) + armor_tokens = list(ARMOR_MODIFIER_UP_MELEE_T3, ARMOR_MODIFIER_DOWN_BULLET_T2, ARMOR_MODIFIER_DOWN_LASER_T3, ARMOR_MODIFIER_DOWN_FIRE_T3, ARMOR_MODIFIER_UP_DT_T2) /obj/item/clothing/suit/armor/heavy/riot/combat name = "combat riot armor" @@ -3076,11 +3109,11 @@ /// Cell that is currently installed in the suit var/obj/item/stock_parts/cell/cell = /obj/item/stock_parts/cell/high /// How much power the cell consumes each process tick - var/usage_cost = 5 // With high-capacity cell it'd run out of charge in ~33 minutes + var/usage_cost = 15 // With high-capacity cell it'd run out of charge in ~33 minutes /// If TRUE - suit has ran out of charge and is currently affected by slowdown from it var/no_power = FALSE /// How much slowdown is added when suit is unpowered - var/unpowered_slowdown = 3 + var/unpowered_slowdown = 5 /// Projectiles below this damage will get deflected var/deflect_damage = 18 /// If TRUE - it requires PA training trait to be worn diff --git a/code/modules/clothing/suits/bigiron_suits_factions.dm b/code/modules/clothing/suits/bigiron_suits_factions.dm index 943b175896..19c785379e 100644 --- a/code/modules/clothing/suits/bigiron_suits_factions.dm +++ b/code/modules/clothing/suits/bigiron_suits_factions.dm @@ -295,7 +295,7 @@ Suits. 0-10 in its primary value, slowdown 0, various utility armor = ARMOR_VALUE_MEDIUM armor_tier_desc = ARMOR_CLOTHING_MEDIUM slowdown = ARMOR_SLOWDOWN_MEDIUM * ARMOR_SLOWDOWN_GLOBAL_MULT - armor_tokens = list(ARMOR_MODIFIER_UP_DT_T1) // The NCR is more tanky, but slower + armor_tokens = list(ARMOR_MODIFIER_DOWN_MELEE_T3, ARMOR_MODIFIER_DOWN_BULLET_T2, ARMOR_MODIFIER_DOWN_LASER_T2, ARMOR_MODIFIER_UP_DT_T1) // The NCR is more tanky, but slower /datum/component/storage/concrete/pockets/bulletbelt/ncr max_items = 2 @@ -305,13 +305,16 @@ Suits. 0-10 in its primary value, slowdown 0, various utility desc = "A standard issue NCR Infantry vest with a mantle on the shoulder." icon_state = "ncr_standard_mantle" item_state = "ncr_standard_mantle" + armor_tokens = list(ARMOR_MODIFIER_DOWN_MELEE_T3, ARMOR_MODIFIER_DOWN_BULLET_T1, ARMOR_MODIFIER_DOWN_LASER_T2, ARMOR_MODIFIER_UP_DT_T1) + /obj/item/clothing/suit/armor/ncrarmor/reserve name = "reserve NCR patrol vest" desc = "A standard issue NCR Infantry vest." icon_state = "ncr_infantry_vest" item_state = "ncr_infantry_vest" - armor_tokens = list() + armor_tokens = list(ARMOR_MODIFIER_DOWN_MELEE_T3, ARMOR_MODIFIER_DOWN_BULLET_T3, ARMOR_MODIFIER_DOWN_LASER_T3) + /obj/item/clothing/suit/armor/ncrarmor/conscript name = "NCR flak vest" @@ -333,23 +336,24 @@ Suits. 0-10 in its primary value, slowdown 0, various utility armor = ARMOR_VALUE_MEDIUM armor_tier_desc = ARMOR_CLOTHING_MEDIUM slowdown = ARMOR_SLOWDOWN_MEDIUM * ARMOR_SLOWDOWN_GLOBAL_MULT - armor_tokens = list(ARMOR_MODIFIER_UP_DT_T1, ARMOR_MODIFIER_UP_BULLET_T1) + armor_tokens = list(ARMOR_MODIFIER_DOWN_MELEE_T3, ARMOR_MODIFIER_DOWN_LASER_T2, ARMOR_MODIFIER_UP_DT_T1) salvage_loot = list(/obj/item/stack/crafting/armor_plate = 3) /obj/item/clothing/suit/armor/ncrarmor/reinforced/engineer name = "NCR blast-padded reinforced patrol vest" desc = "A standard issue NCR Engineer vest reinforced with a groinpad." - armor_tokens = list(ARMOR_MODIFIER_UP_DT_T1, ARMOR_MODIFIER_UP_BOMB_T2, ARMOR_MODIFIER_UP_FIRE_T2) + armor_tokens = list(ARMOR_MODIFIER_DOWN_MELEE_T2, ARMOR_MODIFIER_DOWN_LASER_T3, ARMOR_MODIFIER_UP_DT_T1, ARMOR_MODIFIER_UP_BOMB_T3, ARMOR_MODIFIER_UP_FIRE_T2) /obj/item/clothing/suit/armor/ncrarmor/reinforced/mantle name = "NCR reinforced mantle vest" desc = "A standard issue NCR Infantry vest reinforced with a groinpad and a mantle." icon_state = "ncr_reinforced_mantle" + armor_tokens = list(ARMOR_MODIFIER_DOWN_MELEE_T1, ARMOR_MODIFIER_UP_BULLET_T1, ARMOR_MODIFIER_DOWN_LASER_T2, ARMOR_MODIFIER_UP_DT_T1) /obj/item/clothing/suit/armor/ncrarmor/reinforced/mantle/trenchraider name = "NCR reinforced trench mantle vest" desc = "A standard issue NCR Infantry vest with a really long name and extra melee plating." - armor_tokens = list(ARMOR_MODIFIER_UP_DT_T1, ARMOR_MODIFIER_UP_MELEE_T2) + armor_tokens = list(ARMOR_MODIFIER_UP_MELEE_T1, ARMOR_MODIFIER_DOWN_BULLET_T1, ARMOR_MODIFIER_DOWN_LASER_T2, ARMOR_MODIFIER_UP_DT_T1) /obj/item/clothing/suit/armor/ncrarmor/heavygunner //NCR Trench Raider Armor name = "NCR Trench Raider Chestplate" @@ -358,7 +362,7 @@ Suits. 0-10 in its primary value, slowdown 0, various utility mob_overlay_icon = 'icons/fallout/onmob/clothes/armor_medium.dmi' icon_state = "steel_bib_ncra" item_state = "steel_bib_ncra" - armor_tokens = list(ARMOR_MODIFIER_DOWN_BULLET_T1, ARMOR_MODIFIER_UP_MELEE_T3) + armor_tokens = list(ARMOR_MODIFIER_DOWN_BULLET_T1, ARMOR_MODIFIER_UP_MELEE_T3, ARMOR_MODIFIER_DOWN_LASER_T2, ARMOR_MODIFIER_UP_DT_T3) salvage_loot = list(/obj/item/stack/crafting/armor_plate = 8) /obj/item/clothing/suit/armor/ncrarmor/labcoat @@ -377,8 +381,7 @@ Suits. 0-10 in its primary value, slowdown 0, various utility armor = ARMOR_VALUE_MEDIUM armor_tier_desc = ARMOR_CLOTHING_MEDIUM slowdown = ARMOR_SLOWDOWN_MEDIUM * ARMOR_SLOWDOWN_LESS_T1 * ARMOR_SLOWDOWN_GLOBAL_MULT - armor_tokens = list(ARMOR_MODIFIER_UP_DT_T1, ARMOR_MODIFIER_UP_BULLET_T1) - + armor_tokens = list(ARMOR_MODIFIER_DOWN_MELEE_T3, ARMOR_MODIFIER_DOWN_LASER_T2, ARMOR_MODIFIER_UP_DT_T1) /obj/item/clothing/suit/armor/ncrarmor/captain/ncr_officer_coat name = "NCR officer vest" desc = "A special issue NCR officer's armour with an added thick overcoat for protection from the elements." @@ -408,12 +411,14 @@ Suits. 0-10 in its primary value, slowdown 0, various utility desc = "A brown dress uniform jacket intended for enlisted NCRA personnel." icon_state = "ncr_dressjack" item_state = "ncr_dressjack" + armor_tokens = list(ARMOR_MODIFIER_DOWN_MELEE_T3, ARMOR_MODIFIER_DOWN_BULLET_T4, ARMOR_MODIFIER_DOWN_LASER_T4) /obj/item/clothing/suit/armor/ncrarmor/ncr_codressjack name = "NCR dress jacket" desc = "A brown dress uniform jacket for commissioned NCRA personnel." icon_state = "ncr_codressjack" item_state = "ncr_codressjack" + armor_tokens = list(ARMOR_MODIFIER_DOWN_MELEE_T3, ARMOR_MODIFIER_DOWN_BULLET_T4, ARMOR_MODIFIER_DOWN_LASER_T4) //NCR Ranger @@ -427,7 +432,7 @@ Suits. 0-10 in its primary value, slowdown 0, various utility stiffness = LIGHT_STIFFNESS armor_tier_desc = ARMOR_CLOTHING_LIGHT slowdown = ARMOR_SLOWDOWN_LIGHT * ARMOR_SLOWDOWN_LESS_T1 * ARMOR_SLOWDOWN_GLOBAL_MULT - armor_tokens = list(ARMOR_MODIFIER_UP_DT_T2, ARMOR_MODIFIER_UP_BULLET_T1) + armor_tokens = list(ARMOR_MODIFIER_UP_DT_T2, ARMOR_MODIFIER_UP_BULLET_T2, ARMOR_MODIFIER_DOWN_MELEE_T2) /obj/item/clothing/suit/armor/trailranger name = "ranger vest" @@ -458,7 +463,7 @@ Suits. 0-10 in its primary value, slowdown 0, various utility clothing_flags = CUSHIONED_ARMOR stiffness = LIGHT_STIFFNESS slowdown = ARMOR_SLOWDOWN_MEDIUM * ARMOR_SLOWDOWN_LESS_T2 * ARMOR_SLOWDOWN_GLOBAL_MULT - armor_tokens = list(ARMOR_MODIFIER_UP_DT_T1, ARMOR_MODIFIER_UP_BULLET_T1) + armor_tokens = list(ARMOR_MODIFIER_UP_DT_T2, ARMOR_MODIFIER_UP_BULLET_T1, ARMOR_MODIFIER_DOWN_MELEE_T2) /obj/item/clothing/suit/armor/rangercombat name = "veteran ranger combat armor" @@ -470,7 +475,7 @@ Suits. 0-10 in its primary value, slowdown 0, various utility armor_tier_desc = ARMOR_CLOTHING_HEAVY stiffness = LIGHT_STIFFNESS slowdown = ARMOR_SLOWDOWN_MEDIUM * ARMOR_SLOWDOWN_LESS_T3 * ARMOR_SLOWDOWN_GLOBAL_MULT - armor_tokens = list(ARMOR_MODIFIER_UP_DT_T2) + armor_tokens = list(ARMOR_MODIFIER_UP_DT_T2, ARMOR_MODIFIER_UP_BULLET_T1, ARMOR_MODIFIER_DOWN_MELEE_T2, ARMOR_MODIFIER_DOWN_LASER_T2) salvage_loot = list(/obj/item/stack/crafting/armor_plate = 8)