From c5dabb9cdac06a561b023b9374e12bcb78852b80 Mon Sep 17 00:00:00 2001 From: Fluffy <65877598+FluffyGhoster@users.noreply.github.com> Date: Sun, 9 Mar 2025 22:37:46 +0100 Subject: [PATCH] Armor defines (#20563) Added armor defines Converted raw strings use to defines Added UT test to ensure people set the armor var correctly (to a list) No player facing changes --- code/__DEFINES/combat.dm | 28 ++ code/__DEFINES/damage_organs.dm | 2 +- code/datums/components/armor/armor.dm | 18 +- .../changeling/implements/powers/resources.dm | 2 +- code/game/gamemodes/cult/items/armor.dm | 24 +- code/game/gamemodes/cult/items/clothes.dm | 30 +- code/game/gamemodes/technomancer/clothing.dm | 64 +-- .../technomancer/devices/shield_armor.dm | 10 +- .../technomancer/devices/tesla_armor.dm | 10 +- .../items/weapons/material/material_armor.dm | 4 +- .../objects/items/weapons/vaurca_items.dm | 54 +-- .../origins/origins/human/coalition.dm | 4 +- .../origins/origins/unathi/queendom.dm | 2 +- .../origins/origins/unathi/traditionalist.dm | 2 +- code/modules/clothing/factions/idris.dm | 10 +- code/modules/clothing/factions/scc.dm | 20 +- code/modules/clothing/factions/trinary.dm | 18 +- code/modules/clothing/gloves/miscellaneous.dm | 10 +- code/modules/clothing/gloves/xeno/tajara.dm | 10 +- code/modules/clothing/gloves/xeno/unathi.dm | 6 +- code/modules/clothing/head/hardhat.dm | 14 +- code/modules/clothing/head/hazmat.dm | 4 +- code/modules/clothing/head/helmet.dm | 142 +++--- code/modules/clothing/head/misc.dm | 22 +- code/modules/clothing/head/misc_special.dm | 2 +- code/modules/clothing/head/pilot_helmet.dm | 10 +- code/modules/clothing/head/xenos/tajara.dm | 20 +- code/modules/clothing/head/xenos/unathi.dm | 6 +- code/modules/clothing/masks/boxing.dm | 2 +- code/modules/clothing/masks/gasmask.dm | 10 +- code/modules/clothing/masks/miscellaneous.dm | 8 +- code/modules/clothing/sets/infiltrator.dm | 6 +- code/modules/clothing/sets/laser_tag.dm | 12 +- code/modules/clothing/shoes/boots.dm | 30 +- code/modules/clothing/shoes/miscellaneous.dm | 6 +- code/modules/clothing/shoes/sandals.dm | 2 +- code/modules/clothing/shoes/sneakers.dm | 2 +- code/modules/clothing/shoes/xeno/tajara.dm | 10 +- code/modules/clothing/shoes/xeno/vaurca.dm | 2 +- .../clothing/spacesuits/miscellaneous.dm | 48 +- code/modules/clothing/spacesuits/rig/rig.dm | 14 +- .../clothing/spacesuits/rig/suits/alien.dm | 70 +-- .../clothing/spacesuits/rig/suits/combat.dm | 154 +++---- .../clothing/spacesuits/rig/suits/ert.dm | 112 ++--- .../clothing/spacesuits/rig/suits/light.dm | 54 +-- .../clothing/spacesuits/rig/suits/merc.dm | 28 +- .../clothing/spacesuits/rig/suits/skrell.dm | 28 +- .../clothing/spacesuits/rig/suits/station.dm | 112 ++--- .../spacesuits/rig/suits/terminator.dm | 12 +- .../clothing/spacesuits/rig/suits/xanu.dm | 20 +- .../modules/clothing/spacesuits/spacesuits.dm | 8 +- code/modules/clothing/spacesuits/syndi.dm | 28 +- .../clothing/spacesuits/void/alien/skrell.dm | 84 ++-- .../clothing/spacesuits/void/alien/tajara.dm | 84 ++-- .../clothing/spacesuits/void/alien/unathi.dm | 124 +++--- .../clothing/spacesuits/void/captain.dm | 28 +- code/modules/clothing/spacesuits/void/merc.dm | 28 +- code/modules/clothing/spacesuits/void/misc.dm | 416 +++++++++--------- .../clothing/spacesuits/void/station.dm | 160 +++---- code/modules/clothing/spacesuits/void/void.dm | 28 +- code/modules/clothing/suits/armor.dm | 152 +++---- code/modules/clothing/suits/hazardvests.dm | 2 +- code/modules/clothing/suits/hazmat.dm | 4 +- code/modules/clothing/suits/hoodies.dm | 2 +- code/modules/clothing/suits/labcoat.dm | 6 +- code/modules/clothing/suits/miscellaneous.dm | 22 +- code/modules/clothing/suits/modular_armor.dm | 148 +++---- code/modules/clothing/suits/storage.dm | 2 +- code/modules/clothing/suits/utility.dm | 28 +- code/modules/clothing/suits/xeno/tajara.dm | 30 +- code/modules/clothing/suits/xeno/unathi.dm | 6 +- .../clothing/under/accessories/armor.dm | 196 ++++----- code/modules/clothing/under/jobs/civilian.dm | 2 +- .../clothing/under/jobs/engineering.dm | 4 +- code/modules/clothing/under/jobs/medsci.dm | 14 +- code/modules/clothing/under/jobs/security.dm | 10 +- code/modules/clothing/under/jobs/sol.dm | 6 +- code/modules/clothing/under/miscellaneous.dm | 38 +- code/modules/clothing/under/syndicate.dm | 2 +- code/modules/clothing/under/xenos/skrell.dm | 20 +- code/modules/clothing/under/xenos/tajara.dm | 18 +- code/modules/clothing/under/xenos/unathi.dm | 6 +- code/modules/custom_ka/projectiles.dm | 2 +- .../modules/heavy_vehicle/components/armor.dm | 54 +-- code/modules/heavy_vehicle/components/body.dm | 14 +- .../carbon/human/species/outsider/undead.dm | 12 +- .../station/vaurca/vaurca_subspecies.dm | 2 +- code/modules/mob/living/simple_animal/bees.dm | 4 +- .../living/simple_animal/friendly/adhomai.dm | 6 +- .../living/simple_animal/friendly/moghes.dm | 14 +- .../simple_animal/hostile/giant_spider.dm | 2 +- .../simple_animal/hostile/retaliate/cavern.dm | 2 +- .../hostile/retaliate/exoplanet.dm | 4 +- .../living/simple_animal/hostile/sarlacc.dm | 2 +- code/modules/projectiles/guns/alien.dm | 2 +- .../modules/projectiles/guns/energy/mining.dm | 2 +- code/modules/projectiles/projectile.dm | 2 +- .../modules/projectiles/projectile/animate.dm | 2 +- code/modules/projectiles/projectile/beams.dm | 6 +- .../modules/projectiles/projectile/bullets.dm | 10 +- code/modules/projectiles/projectile/change.dm | 2 +- code/modules/projectiles/projectile/energy.dm | 6 +- code/modules/projectiles/projectile/force.dm | 2 +- .../modules/projectiles/projectile/special.dm | 24 +- code/modules/psionics/abilities/barrier.dm | 2 +- .../xenoarchaeology/tools/anomaly_suit.dm | 40 +- .../artifacts/armor/bone_armor.dm | 4 +- code/modules/vehicles/animal.dm | 14 +- tools/ci/check_grep.sh | 12 + 109 files changed, 1666 insertions(+), 1578 deletions(-) diff --git a/code/__DEFINES/combat.dm b/code/__DEFINES/combat.dm index 0bbb7748e59..d8f8e0ac04d 100644 --- a/code/__DEFINES/combat.dm +++ b/code/__DEFINES/combat.dm @@ -1,3 +1,31 @@ +//Damage flag defines // + +/// Involves corrosive substances. +#define ACID "acid" +/// Involved in checking whether a disease can infect or spread. Also involved in xeno neurotoxin. +#define BIO "bio" +/// Involves a shockwave, usually from an explosion. +#define BOMB "bomb" +/// Involves a solid projectile. +#define BULLET "bullet" +/// Involves being eaten +#define CONSUME "consume" +/// Involves an EMP or energy-based projectile. +#define ENERGY "energy" +/// Involves fire or temperature extremes. +#define FIRE "fire" +/// Involves a laser. +#define LASER "laser" +/// Involves a melee attack or a thrown object. +#define MELEE "melee" +/// Involved in checking the likelihood of applying a wound to a mob. +#define WOUND "wound" +/// Aurora snowflake, radiations +#define RAD "rad" + +#define ARMOR_ALL "all_damage_types" + + //bullet_act() return values #define BULLET_ACT_HIT "HIT" //It's a successful hit, whatever that means in the context of the thing it's hitting. #define BULLET_ACT_BLOCK "BLOCK" //It's a blocked hit, whatever that means in the context of the thing it's hitting. diff --git a/code/__DEFINES/damage_organs.dm b/code/__DEFINES/damage_organs.dm index 8601d48053a..9c19fa904f9 100644 --- a/code/__DEFINES/damage_organs.dm +++ b/code/__DEFINES/damage_organs.dm @@ -11,7 +11,7 @@ #define CUT "cut" #define BRUISE "bruise" #define PIERCE "pierce" -#define LASER "laser" +//#define LASER "laser" #define DAMAGE_FLAG_EDGE 1 #define DAMAGE_FLAG_SHARP 2 diff --git a/code/datums/components/armor/armor.dm b/code/datums/components/armor/armor.dm index 4531b607cd9..a39e9aa09c1 100644 --- a/code/datums/components/armor/armor.dm +++ b/code/datums/components/armor/armor.dm @@ -77,7 +77,7 @@ if(isnull(armor_values[key])) return 0 if(armor_flags & ARMOR_TYPE_RIG) - if(key == "bio" && sealed) + if(key == BIO && sealed) return 100 return min(armor_values[key], 100) @@ -90,23 +90,23 @@ switch(damage_type) if(DAMAGE_BRUTE) if(damage_flags & DAMAGE_FLAG_BULLET) - key = "bullet" + key = BULLET else if(damage_flags & DAMAGE_FLAG_EXPLODE) - key = "bomb" + key = BOMB else - key = "melee" + key = MELEE if(DAMAGE_BURN) if(damage_flags & DAMAGE_FLAG_LASER) - key = "laser" + key = LASER else if(damage_flags & DAMAGE_FLAG_EXPLODE) - key = "bomb" + key = BOMB else - key = "energy" + key = ENERGY if (DAMAGE_TOXIN) if(damage_flags & DAMAGE_FLAG_BIO) - key = "bio" // Otherwise just not blocked by default. + key = BIO // Otherwise just not blocked by default. if (DAMAGE_RADIATION) - key = "rad" + key = RAD return key /datum/component/armor/toggle diff --git a/code/game/gamemodes/changeling/implements/powers/resources.dm b/code/game/gamemodes/changeling/implements/powers/resources.dm index 8c6c9e2ebe2..870142b50cd 100644 --- a/code/game/gamemodes/changeling/implements/powers/resources.dm +++ b/code/game/gamemodes/changeling/implements/powers/resources.dm @@ -16,7 +16,7 @@ return TRUE /mob/proc/changeling_armor() - AddComponent(/datum/component/armor, list(melee = ARMOR_MELEE_RESISTANT, bullet = ARMOR_BALLISTIC_CARBINE, laser = ARMOR_LASER_MEDIUM)) + AddComponent(/datum/component/armor, list(MELEE = ARMOR_MELEE_RESISTANT, BULLET = ARMOR_BALLISTIC_CARBINE, LASER = ARMOR_LASER_MEDIUM)) return TRUE //removes the need to breathe diff --git a/code/game/gamemodes/cult/items/armor.dm b/code/game/gamemodes/cult/items/armor.dm index 8f65266ef07..0fc1a950b27 100644 --- a/code/game/gamemodes/cult/items/armor.dm +++ b/code/game/gamemodes/cult/items/armor.dm @@ -18,12 +18,12 @@ desc = "A bulky armored voidsuit helmet, bristling with menacing spikes. It looks space proof." icon_state = "cult_helmet" armor = list( - melee = ARMOR_MELEE_VERY_HIGH, - bullet = ARMOR_BALLISTIC_CARBINE, - laser = ARMOR_LASER_RIFLE, - bomb = ARMOR_BOMB_PADDED, - bio = ARMOR_BIO_SHIELDED, - rad = ARMOR_RAD_RESISTANT + MELEE = ARMOR_MELEE_VERY_HIGH, + BULLET = ARMOR_BALLISTIC_CARBINE, + LASER = ARMOR_LASER_RIFLE, + BOMB = ARMOR_BOMB_PADDED, + BIO = ARMOR_BIO_SHIELDED, + RAD = ARMOR_RAD_RESISTANT ) siemens_coefficient = 0 light_overlay = "helmet_light_dual_red" @@ -43,12 +43,12 @@ allowed = list(/obj/item/book/tome, /obj/item/melee/cultblade, /obj/item/gun/energy/rifle/cult, /obj/item/tank, /obj/item/device/suit_cooling_unit) slowdown = 1 armor = list( - melee = ARMOR_MELEE_VERY_HIGH, - bullet = ARMOR_BALLISTIC_CARBINE, - laser = ARMOR_LASER_RIFLE, - bomb = ARMOR_BOMB_PADDED, - bio = ARMOR_BIO_SHIELDED, - rad = ARMOR_RAD_RESISTANT + MELEE = ARMOR_MELEE_VERY_HIGH, + BULLET = ARMOR_BALLISTIC_CARBINE, + LASER = ARMOR_LASER_RIFLE, + BOMB = ARMOR_BOMB_PADDED, + BIO = ARMOR_BIO_SHIELDED, + RAD = ARMOR_RAD_RESISTANT ) siemens_coefficient = 0 body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS|HANDS diff --git a/code/game/gamemodes/cult/items/clothes.dm b/code/game/gamemodes/cult/items/clothes.dm index 809f66c1e78..2ffd616b509 100644 --- a/code/game/gamemodes/cult/items/clothes.dm +++ b/code/game/gamemodes/cult/items/clothes.dm @@ -6,11 +6,11 @@ flags_inv = HIDEFACE|HIDEEARS|HIDEEYES body_parts_covered = HEAD|EYES armor = list( - melee = ARMOR_MELEE_RESISTANT, - bullet = ARMOR_BALLISTIC_CARBINE, - laser = ARMOR_LASER_RIFLE, - bomb = ARMOR_BOMB_PADDED, - bio = ARMOR_BIO_SMALL + MELEE = ARMOR_MELEE_RESISTANT, + BULLET = ARMOR_BALLISTIC_CARBINE, + LASER = ARMOR_LASER_RIFLE, + BOMB = ARMOR_BOMB_PADDED, + BIO = ARMOR_BIO_SMALL ) cold_protection = HEAD min_cold_protection_temperature = SPACE_HELMET_MIN_COLD_PROTECTION_TEMPERATURE @@ -33,11 +33,11 @@ body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS allowed = list(/obj/item/book/tome, /obj/item/melee/cultblade) armor = list( - melee = ARMOR_MELEE_RESISTANT, - bullet = ARMOR_BALLISTIC_CARBINE, - laser = ARMOR_LASER_RIFLE, - bomb = ARMOR_BOMB_PADDED, - bio = ARMOR_BIO_SMALL + MELEE = ARMOR_MELEE_RESISTANT, + BULLET = ARMOR_BALLISTIC_CARBINE, + LASER = ARMOR_LASER_RIFLE, + BOMB = ARMOR_BOMB_PADDED, + BIO = ARMOR_BIO_SMALL ) flags_inv = HIDEJUMPSUIT siemens_coefficient = 0 @@ -62,11 +62,11 @@ silent = 1 siemens_coefficient = 0.35 //antags don't get exceptions, it's just heavy armor by magical standards armor = list( - melee = ARMOR_MELEE_RESISTANT, - bullet = ARMOR_BALLISTIC_MEDIUM, - laser = ARMOR_LASER_MEDIUM, - bomb = ARMOR_BOMB_PADDED, - bio = ARMOR_BIO_SMALL + MELEE = ARMOR_MELEE_RESISTANT, + BULLET = ARMOR_BALLISTIC_MEDIUM, + LASER = ARMOR_LASER_MEDIUM, + BOMB = ARMOR_BOMB_PADDED, + BIO = ARMOR_BIO_SMALL ) cold_protection = FEET min_cold_protection_temperature = SHOE_MIN_COLD_PROTECTION_TEMPERATURE diff --git a/code/game/gamemodes/technomancer/clothing.dm b/code/game/gamemodes/technomancer/clothing.dm index ce32b279d6f..78c84c9cf8a 100644 --- a/code/game/gamemodes/technomancer/clothing.dm +++ b/code/game/gamemodes/technomancer/clothing.dm @@ -8,12 +8,12 @@ body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS|LEGS|FEET|HANDS allowed = list(/obj/item/tank) armor = list( - melee = ARMOR_MELEE_MAJOR, - bullet = ARMOR_BALLISTIC_SMALL, - laser = ARMOR_LASER_PISTOL, - energy = ARMOR_ENERGY_RESISTANT, - bomb = ARMOR_BOMB_MINOR, - rad = ARMOR_RAD_RESISTANT + MELEE = ARMOR_MELEE_MAJOR, + BULLET = ARMOR_BALLISTIC_SMALL, + LASER = ARMOR_LASER_PISTOL, + ENERGY = ARMOR_ENERGY_RESISTANT, + BOMB = ARMOR_BOMB_MINOR, + RAD = ARMOR_RAD_RESISTANT ) siemens_coefficient = 0.75 @@ -26,7 +26,7 @@ icon = 'icons/obj/clothing/technomancer.dmi' contained_sprite = TRUE armor = list( - melee = ARMOR_MELEE_MINOR, + MELEE = ARMOR_MELEE_MINOR, ) siemens_coefficient = 0.3 @@ -54,7 +54,7 @@ icon_state = "initiate_hat" item_state = "initiate_hat" armor = list( - melee = ARMOR_MELEE_MINOR, + MELEE = ARMOR_MELEE_MINOR, ) siemens_coefficient = 0.3 icon = 'icons/obj/clothing/technomancer.dmi' @@ -78,40 +78,40 @@ /obj/item/clothing/under/chameleon/technomancer armor = list( - melee = ARMOR_MELEE_MAJOR, - bullet = ARMOR_BALLISTIC_SMALL, - laser = ARMOR_LASER_PISTOL, - energy = ARMOR_ENERGY_RESISTANT, - bomb = ARMOR_BOMB_MINOR, - rad = ARMOR_RAD_RESISTANT + MELEE = ARMOR_MELEE_MAJOR, + BULLET = ARMOR_BALLISTIC_SMALL, + LASER = ARMOR_LASER_PISTOL, + ENERGY = ARMOR_ENERGY_RESISTANT, + BOMB = ARMOR_BOMB_MINOR, + RAD = ARMOR_RAD_RESISTANT ) /obj/item/clothing/head/chameleon/technomancer armor = list( - melee = ARMOR_MELEE_MAJOR, - bullet = ARMOR_BALLISTIC_SMALL, - laser = ARMOR_LASER_PISTOL, - energy = ARMOR_ENERGY_RESISTANT, - bomb = ARMOR_BOMB_MINOR, - rad = ARMOR_RAD_RESISTANT + MELEE = ARMOR_MELEE_MAJOR, + BULLET = ARMOR_BALLISTIC_SMALL, + LASER = ARMOR_LASER_PISTOL, + ENERGY = ARMOR_ENERGY_RESISTANT, + BOMB = ARMOR_BOMB_MINOR, + RAD = ARMOR_RAD_RESISTANT ) /obj/item/clothing/shoes/chameleon/technomancer armor = list( - melee = ARMOR_MELEE_MAJOR, - bullet = ARMOR_BALLISTIC_SMALL, - laser = ARMOR_LASER_PISTOL, - energy = ARMOR_ENERGY_RESISTANT, - bomb = ARMOR_BOMB_MINOR, - rad = ARMOR_RAD_RESISTANT + MELEE = ARMOR_MELEE_MAJOR, + BULLET = ARMOR_BALLISTIC_SMALL, + LASER = ARMOR_LASER_PISTOL, + ENERGY = ARMOR_ENERGY_RESISTANT, + BOMB = ARMOR_BOMB_MINOR, + RAD = ARMOR_RAD_RESISTANT ) /obj/item/clothing/suit/chameleon/technomancer armor = list( - melee = ARMOR_MELEE_MAJOR, - bullet = ARMOR_BALLISTIC_SMALL, - laser = ARMOR_LASER_PISTOL, - energy = ARMOR_ENERGY_RESISTANT, - bomb = ARMOR_BOMB_MINOR, - rad = ARMOR_RAD_RESISTANT + MELEE = ARMOR_MELEE_MAJOR, + BULLET = ARMOR_BALLISTIC_SMALL, + LASER = ARMOR_LASER_PISTOL, + ENERGY = ARMOR_ENERGY_RESISTANT, + BOMB = ARMOR_BOMB_MINOR, + RAD = ARMOR_RAD_RESISTANT ) diff --git a/code/game/gamemodes/technomancer/devices/shield_armor.dm b/code/game/gamemodes/technomancer/devices/shield_armor.dm index 03b66ac7149..e4991504f78 100644 --- a/code/game/gamemodes/technomancer/devices/shield_armor.dm +++ b/code/game/gamemodes/technomancer/devices/shield_armor.dm @@ -17,7 +17,15 @@ icon_state = "shield_armor_0" blood_overlay_type = "armor" slowdown = 0 - armor = list(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 0, rad = 0) + armor = list( + MELEE = 0, + BULLET = 0, + LASER = 0, + ENERGY = 0, + BOMB = 0, + BIO = 0, + RAD = 0 + ) action_button_name = "Toggle Shield Projector" var/active = 0 var/damage_to_energy_multiplier = 50.0 //Determines how much energy to charge for blocking, e.g. 20 damage attack = 750 energy cost diff --git a/code/game/gamemodes/technomancer/devices/tesla_armor.dm b/code/game/gamemodes/technomancer/devices/tesla_armor.dm index 5da0c3e29d5..a8af9c013d6 100644 --- a/code/game/gamemodes/technomancer/devices/tesla_armor.dm +++ b/code/game/gamemodes/technomancer/devices/tesla_armor.dm @@ -13,7 +13,15 @@ icon_state = "tesla_armor_1" blood_overlay_type = "armor" slowdown = 1 - armor = list(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 0, rad = 0) + armor = list( + MELEE = 0, + BULLET = 0, + LASER = 0, + ENERGY = 0, + BOMB = 0, + BIO = 0, + RAD = 0 + ) action_button_name = "Toggle Tesla Armor" var/active = 1 //Determines if the armor will zap or block var/ready = 1 //Determines if the next attack will be blocked, as well if a strong lightning bolt is sent out at the attacker. diff --git a/code/game/objects/items/weapons/material/material_armor.dm b/code/game/objects/items/weapons/material/material_armor.dm index 535545624e3..88234b5798f 100644 --- a/code/game/objects/items/weapons/material/material_armor.dm +++ b/code/game/objects/items/weapons/material/material_armor.dm @@ -32,7 +32,7 @@ Protectiveness | Armor % item_state = "material_armor" contained_sprite = 1 armor = list( - melee = ARMOR_MELEE_MINOR + MELEE = ARMOR_MELEE_MINOR ) pocket_slots = 1 @@ -98,7 +98,7 @@ Protectiveness | Armor % icon_state = "bucket" item_state = "bucket" armor = list( - melee = ARMOR_MELEE_MINOR + MELEE = ARMOR_MELEE_MINOR ) contained_sprite = 1 diff --git a/code/game/objects/items/weapons/vaurca_items.dm b/code/game/objects/items/weapons/vaurca_items.dm index b3d2e7c685d..8a42a32b589 100644 --- a/code/game/objects/items/weapons/vaurca_items.dm +++ b/code/game/objects/items/weapons/vaurca_items.dm @@ -303,11 +303,11 @@ species_restricted = list(BODYTYPE_VAURCA) armor = list( - melee = ARMOR_MELEE_RESISTANT, - bullet = ARMOR_BALLISTIC_SMALL, - laser = ARMOR_LASER_SMALL, - bomb = ARMOR_BOMB_PADDED, - bio = ARMOR_BIO_SHIELDED + MELEE = ARMOR_MELEE_RESISTANT, + BULLET = ARMOR_BALLISTIC_SMALL, + LASER = ARMOR_LASER_SMALL, + BOMB = ARMOR_BOMB_PADDED, + BIO = ARMOR_BIO_SHIELDED ) /obj/item/clothing/head/helmet/space/void/scout name = "scout helmet" @@ -319,11 +319,11 @@ species_restricted = list(BODYTYPE_VAURCA) armor = list( - melee = ARMOR_MELEE_RESISTANT, - bullet = ARMOR_BALLISTIC_SMALL, - laser = ARMOR_LASER_SMALL, - bomb = ARMOR_BOMB_PADDED, - bio = ARMOR_BIO_SHIELDED + MELEE = ARMOR_MELEE_RESISTANT, + BULLET = ARMOR_BALLISTIC_SMALL, + LASER = ARMOR_LASER_SMALL, + BOMB = ARMOR_BOMB_PADDED, + BIO = ARMOR_BIO_SHIELDED ) light_overlay = "helmet_light_dual_green" light_color = "#3e7c3e" @@ -338,12 +338,12 @@ species_restricted = list(BODYTYPE_VAURCA) armor = list( - melee = ARMOR_MELEE_RESISTANT, - bullet = ARMOR_BALLISTIC_MEDIUM, - laser = ARMOR_LASER_MAJOR, - bomb = ARMOR_BOMB_PADDED, - bio = ARMOR_BIO_SHIELDED, - rad = ARMOR_RAD_MINOR + MELEE = ARMOR_MELEE_RESISTANT, + BULLET = ARMOR_BALLISTIC_MEDIUM, + LASER = ARMOR_LASER_MAJOR, + BOMB = ARMOR_BOMB_PADDED, + BIO = ARMOR_BIO_SHIELDED, + RAD = ARMOR_RAD_MINOR ) /obj/item/clothing/head/helmet/space/void/commando name = "commando helmet" @@ -355,12 +355,12 @@ species_restricted = list(BODYTYPE_VAURCA) armor = list( - melee = ARMOR_MELEE_RESISTANT, - bullet = ARMOR_BALLISTIC_MEDIUM, - laser = ARMOR_LASER_MAJOR, - bomb = ARMOR_BOMB_PADDED, - bio = ARMOR_BIO_SHIELDED, - rad = ARMOR_RAD_MINOR + MELEE = ARMOR_MELEE_RESISTANT, + BULLET = ARMOR_BALLISTIC_MEDIUM, + LASER = ARMOR_LASER_MAJOR, + BOMB = ARMOR_BOMB_PADDED, + BIO = ARMOR_BIO_SHIELDED, + RAD = ARMOR_RAD_MINOR ) light_overlay = "helmet_light_dual_green" @@ -376,11 +376,11 @@ w_class = WEIGHT_CLASS_SMALL filtered_gases = list(GAS_NITROGEN, GAS_N2O) armor = list( - melee = ARMOR_MELEE_RESISTANT, - bullet = ARMOR_BALLISTIC_MINOR, - laser = ARMOR_LASER_SMALL, - bio = ARMOR_BIO_STRONG, - rad = ARMOR_RAD_MINOR + MELEE = ARMOR_MELEE_RESISTANT, + BULLET = ARMOR_BALLISTIC_MINOR, + LASER = ARMOR_LASER_SMALL, + BIO = ARMOR_BIO_STRONG, + RAD = ARMOR_RAD_MINOR ) icon = 'icons/obj/vaurca_items.dmi' icon_state = "m_metalg" diff --git a/code/modules/background/origins/origins/human/coalition.dm b/code/modules/background/origins/origins/human/coalition.dm index 0af19137f6d..336f741e71b 100644 --- a/code/modules/background/origins/origins/human/coalition.dm +++ b/code/modules/background/origins/origins/human/coalition.dm @@ -66,7 +66,7 @@ /singleton/origin_item/origin/gadpathur/on_apply(var/mob/living/carbon/human/H) . = ..() - H.AddComponent(/datum/component/armor, list(rad = ARMOR_RAD_MINOR)) + H.AddComponent(/datum/component/armor, list(RAD = ARMOR_RAD_MINOR)) /singleton/origin_item/origin/gadpathur/on_remove(mob/living/carbon/human/H) . = ..() @@ -84,7 +84,7 @@ /singleton/origin_item/origin/gadpathur_exile/on_apply(var/mob/living/carbon/human/H) . = ..() - H.AddComponent(/datum/component/armor, list(rad = ARMOR_RAD_MINOR)) + H.AddComponent(/datum/component/armor, list(RAD = ARMOR_RAD_MINOR)) /singleton/origin_item/origin/gadpathur_exile/on_remove(mob/living/carbon/human/H) . = ..() diff --git a/code/modules/background/origins/origins/unathi/queendom.dm b/code/modules/background/origins/origins/unathi/queendom.dm index 0bfcf50ef11..2a37f05b328 100644 --- a/code/modules/background/origins/origins/unathi/queendom.dm +++ b/code/modules/background/origins/origins/unathi/queendom.dm @@ -15,7 +15,7 @@ /singleton/origin_item/origin/queendom/on_apply(var/mob/living/carbon/human/H) . = ..() - H.AddComponent(/datum/component/armor, list(rad = ARMOR_RAD_MINOR)) + H.AddComponent(/datum/component/armor, list(RAD = ARMOR_RAD_MINOR)) /singleton/origin_item/origin/queendom/on_remove(mob/living/carbon/human/H) . = ..() diff --git a/code/modules/background/origins/origins/unathi/traditionalist.dm b/code/modules/background/origins/origins/unathi/traditionalist.dm index b9db3e5955e..78ae7e6bd2c 100644 --- a/code/modules/background/origins/origins/unathi/traditionalist.dm +++ b/code/modules/background/origins/origins/unathi/traditionalist.dm @@ -64,7 +64,7 @@ /singleton/origin_item/origin/wastelander/on_apply(var/mob/living/carbon/human/H) . = ..() - H.AddComponent(/datum/component/armor, list(rad = ARMOR_RAD_MINOR)) + H.AddComponent(/datum/component/armor, list(RAD = ARMOR_RAD_MINOR)) /singleton/origin_item/origin/wastelander/on_remove(mob/living/carbon/human/H) . = ..() diff --git a/code/modules/clothing/factions/idris.dm b/code/modules/clothing/factions/idris.dm index 44a47b8e085..4739d251754 100644 --- a/code/modules/clothing/factions/idris.dm +++ b/code/modules/clothing/factions/idris.dm @@ -13,11 +13,11 @@ max_heat_protection_temperature = 0 contained_sprite = TRUE armor = list( - melee = ARMOR_MELEE_KNIVES, - bullet = ARMOR_BALLISTIC_PISTOL, - laser = ARMOR_LASER_SMALL, - energy = ARMOR_ENERGY_MINOR, - bomb = ARMOR_BOMB_PADDED + MELEE = ARMOR_MELEE_KNIVES, + BULLET = ARMOR_BALLISTIC_PISTOL, + LASER = ARMOR_LASER_SMALL, + ENERGY = ARMOR_ENERGY_MINOR, + BOMB = ARMOR_BOMB_PADDED ) /obj/item/clothing/suit/storage/toggle/armor/vest/idris/white diff --git a/code/modules/clothing/factions/scc.dm b/code/modules/clothing/factions/scc.dm index 67cd42fe3c5..106af07e58b 100644 --- a/code/modules/clothing/factions/scc.dm +++ b/code/modules/clothing/factions/scc.dm @@ -31,11 +31,11 @@ ) body_parts_covered = UPPER_TORSO armor = list( - melee = ARMOR_MELEE_KNIVES, - bullet = ARMOR_BALLISTIC_PISTOL, - laser = ARMOR_LASER_SMALL, - energy = ARMOR_ENERGY_MINOR, - bomb = ARMOR_BOMB_PADDED + MELEE = ARMOR_MELEE_KNIVES, + BULLET = ARMOR_BALLISTIC_PISTOL, + LASER = ARMOR_LASER_SMALL, + ENERGY = ARMOR_ENERGY_MINOR, + BOMB = ARMOR_BOMB_PADDED ) /obj/item/clothing/suit/storage/toggle/armor/vest/scc/toggle_open() @@ -61,11 +61,11 @@ ) body_parts_covered = UPPER_TORSO|ARMS armor = list( - melee = ARMOR_MELEE_KNIVES, - bullet = ARMOR_BALLISTIC_PISTOL, - laser = ARMOR_LASER_SMALL, - energy = ARMOR_ENERGY_MINOR, - bomb = ARMOR_BOMB_PADDED + MELEE = ARMOR_MELEE_KNIVES, + BULLET = ARMOR_BALLISTIC_PISTOL, + LASER = ARMOR_LASER_SMALL, + ENERGY = ARMOR_ENERGY_MINOR, + BOMB = ARMOR_BOMB_PADDED ) /obj/item/clothing/accessory/tie/corporate/scc diff --git a/code/modules/clothing/factions/trinary.dm b/code/modules/clothing/factions/trinary.dm index 91599f5d44f..aafea4fc278 100644 --- a/code/modules/clothing/factions/trinary.dm +++ b/code/modules/clothing/factions/trinary.dm @@ -63,11 +63,11 @@ icon_state = "exclusionist_armored_robe" item_state = "exclusionist_armored_robe" armor = list( - melee = ARMOR_MELEE_MAJOR, - bullet = ARMOR_BALLISTIC_MAJOR, - laser = ARMOR_LASER_RIFLE, - energy = ARMOR_ENERGY_SMALL, - bomb = ARMOR_BOMB_PADDED, + MELEE = ARMOR_MELEE_MAJOR, + BULLET = ARMOR_BALLISTIC_MAJOR, + LASER = ARMOR_LASER_RIFLE, + ENERGY = ARMOR_ENERGY_SMALL, + BOMB = ARMOR_BOMB_PADDED, ) contained_sprite = TRUE slowdown = 1 @@ -81,9 +81,9 @@ item_state = "exclusionist_mask" contained_sprite = TRUE armor = list( - melee = ARMOR_MELEE_SMALL, - bullet = ARMOR_BALLISTIC_SMALL, - laser = ARMOR_LASER_MINOR, - bio = ARMOR_BIO_STRONG + MELEE = ARMOR_MELEE_SMALL, + BULLET = ARMOR_BALLISTIC_SMALL, + LASER = ARMOR_LASER_MINOR, + BIO = ARMOR_BIO_STRONG ) flash_protection = FLASH_PROTECTION_MODERATE diff --git a/code/modules/clothing/gloves/miscellaneous.dm b/code/modules/clothing/gloves/miscellaneous.dm index 26264737cc8..3956609d13b 100644 --- a/code/modules/clothing/gloves/miscellaneous.dm +++ b/code/modules/clothing/gloves/miscellaneous.dm @@ -260,11 +260,11 @@ item_state = "warping_claws" attack_verb = list("ripped", "torn", "cut") armor = list( - melee = ARMOR_MELEE_MAJOR, - bullet = ARMOR_BALLISTIC_MINOR, - laser = ARMOR_LASER_MINOR, - energy = ARMOR_ENERGY_MINOR, - bomb = ARMOR_BOMB_MINOR + MELEE = ARMOR_MELEE_MAJOR, + BULLET = ARMOR_BALLISTIC_MINOR, + LASER = ARMOR_LASER_MINOR, + ENERGY = ARMOR_ENERGY_MINOR, + BOMB = ARMOR_BOMB_MINOR ) siemens_coefficient = 1 force = 11 diff --git a/code/modules/clothing/gloves/xeno/tajara.dm b/code/modules/clothing/gloves/xeno/tajara.dm index fe40727d3f8..9568a84e8c3 100644 --- a/code/modules/clothing/gloves/xeno/tajara.dm +++ b/code/modules/clothing/gloves/xeno/tajara.dm @@ -73,11 +73,11 @@ body_parts_covered = ARMS|HANDS armor = list( - melee = ARMOR_MELEE_MAJOR, - bullet = ARMOR_BALLISTIC_PISTOL, - laser = ARMOR_LASER_SMALL, - energy = ARMOR_ENERGY_MINOR, - bomb = ARMOR_BOMB_MINOR + MELEE = ARMOR_MELEE_MAJOR, + BULLET = ARMOR_BALLISTIC_PISTOL, + LASER = ARMOR_LASER_SMALL, + ENERGY = ARMOR_ENERGY_MINOR, + BOMB = ARMOR_BOMB_MINOR ) punch_force = 5 diff --git a/code/modules/clothing/gloves/xeno/unathi.dm b/code/modules/clothing/gloves/xeno/unathi.dm index b129f5c7abb..c6b0f3c1023 100644 --- a/code/modules/clothing/gloves/xeno/unathi.dm +++ b/code/modules/clothing/gloves/xeno/unathi.dm @@ -19,9 +19,9 @@ species_restricted = list(BODYTYPE_UNATHI) contained_sprite = TRUE armor = list( //not designed to hold up to bullets or lasers, but still better than nothing. - melee = ARMOR_MELEE_MAJOR, - bullet = ARMOR_BALLISTIC_MINOR, - laser = ARMOR_LASER_SMALL + MELEE = ARMOR_MELEE_MAJOR, + BULLET = ARMOR_BALLISTIC_MINOR, + LASER = ARMOR_LASER_SMALL ) force = 5 punch_force = 5 diff --git a/code/modules/clothing/head/hardhat.dm b/code/modules/clothing/head/hardhat.dm index 67f9d3acf5f..f6c3619ce80 100644 --- a/code/modules/clothing/head/hardhat.dm +++ b/code/modules/clothing/head/hardhat.dm @@ -9,13 +9,13 @@ action_button_name = "Toggle Headlamp" brightness_on = 4 //luminosity when on armor = list( - melee = ARMOR_MELEE_RESISTANT, - bullet = ARMOR_BALLISTIC_MINOR, - laser = ARMOR_LASER_SMALL, - energy = ARMOR_ENERGY_MINOR, - bomb = ARMOR_BOMB_PADDED, - bio = ARMOR_BIO_MINOR, - rad = ARMOR_RAD_MINOR + MELEE = ARMOR_MELEE_RESISTANT, + BULLET = ARMOR_BALLISTIC_MINOR, + LASER = ARMOR_LASER_SMALL, + ENERGY = ARMOR_ENERGY_MINOR, + BOMB = ARMOR_BOMB_PADDED, + BIO = ARMOR_BIO_MINOR, + RAD = ARMOR_RAD_MINOR ) flags_inv = 0 w_class = WEIGHT_CLASS_NORMAL diff --git a/code/modules/clothing/head/hazmat.dm b/code/modules/clothing/head/hazmat.dm index 177d6113525..55248f627ff 100644 --- a/code/modules/clothing/head/hazmat.dm +++ b/code/modules/clothing/head/hazmat.dm @@ -14,8 +14,8 @@ gas_transfer_coefficient = 0 siemens_coefficient = 0.75 armor = list( - bio = ARMOR_BIO_SHIELDED, - rad = ARMOR_RAD_SMALL + BIO = ARMOR_BIO_SHIELDED, + RAD = ARMOR_RAD_SMALL ) body_parts_covered = HEAD | FACE | EYES flags_inv = HIDEMASK | HIDEEARS | HIDEEYES | BLOCKHAIR diff --git a/code/modules/clothing/head/helmet.dm b/code/modules/clothing/head/helmet.dm index a11142aebfd..8a35b74b709 100644 --- a/code/modules/clothing/head/helmet.dm +++ b/code/modules/clothing/head/helmet.dm @@ -5,11 +5,11 @@ item_state = "helmet" item_flags = ITEM_FLAG_THICK_MATERIAL armor = list( - melee = ARMOR_MELEE_KEVLAR, - bullet = ARMOR_BALLISTIC_MEDIUM, - laser = ARMOR_LASER_KEVLAR, - energy = ARMOR_ENERGY_SMALL, - bomb = ARMOR_BOMB_PADDED + MELEE = ARMOR_MELEE_KEVLAR, + BULLET = ARMOR_BALLISTIC_MEDIUM, + LASER = ARMOR_LASER_KEVLAR, + ENERGY = ARMOR_ENERGY_SMALL, + BOMB = ARMOR_BOMB_PADDED ) flags_inv = HIDEEARS|BLOCKHEADHAIR cold_protection = HEAD @@ -148,8 +148,8 @@ item_state = "helm_riot" body_parts_covered = HEAD|FACE|EYES //face shield armor = list( - melee = ARMOR_MELEE_VERY_HIGH, - bullet = ARMOR_BALLISTIC_MINOR + MELEE = ARMOR_MELEE_VERY_HIGH, + BULLET = ARMOR_BALLISTIC_MINOR ) siemens_coefficient = 0.35 flags_inv = HIDEEARS @@ -183,10 +183,10 @@ icon_state = "helm_ablative" item_state = "helm_ablative" armor = list( - melee = ARMOR_MELEE_SMALL, - bullet = ARMOR_BALLISTIC_MINOR, - laser = ARMOR_LASER_MAJOR, - energy = ARMOR_ENERGY_RESISTANT + MELEE = ARMOR_MELEE_SMALL, + BULLET = ARMOR_BALLISTIC_MINOR, + LASER = ARMOR_LASER_MAJOR, + ENERGY = ARMOR_ENERGY_RESISTANT ) siemens_coefficient = 0 @@ -198,10 +198,10 @@ icon_state = "helm_ballistic" item_state = "helm_ballistic" armor = list( - melee = ARMOR_MELEE_MINOR, - bullet = ARMOR_BALLISTIC_RIFLE, - laser = ARMOR_LASER_SMALL, - bomb = ARMOR_BOMB_PADDED + MELEE = ARMOR_MELEE_MINOR, + BULLET = ARMOR_BALLISTIC_RIFLE, + LASER = ARMOR_LASER_SMALL, + BOMB = ARMOR_BOMB_PADDED ) siemens_coefficient = 0.35 @@ -213,11 +213,11 @@ icon_state = "helm_heavy" item_state = "helm_heavy" armor = list( - melee = ARMOR_MELEE_MAJOR, - bullet = ARMOR_BALLISTIC_MAJOR, - laser = ARMOR_LASER_RIFLE, - energy = ARMOR_ENERGY_SMALL, - bomb = ARMOR_BOMB_PADDED, + MELEE = ARMOR_MELEE_MAJOR, + BULLET = ARMOR_BALLISTIC_MAJOR, + LASER = ARMOR_LASER_RIFLE, + ENERGY = ARMOR_ENERGY_SMALL, + BOMB = ARMOR_BOMB_PADDED, ) siemens_coefficient = 0.35 @@ -233,11 +233,11 @@ icon_state = "swat" item_state = "swat" armor = list( - melee = ARMOR_MELEE_VERY_HIGH, - bullet = ARMOR_BALLISTIC_MEDIUM, - laser = ARMOR_LASER_PISTOL, - energy = ARMOR_ENERGY_RESISTANT, - bomb = ARMOR_BOMB_PADDED + MELEE = ARMOR_MELEE_VERY_HIGH, + BULLET = ARMOR_BALLISTIC_MEDIUM, + LASER = ARMOR_LASER_PISTOL, + ENERGY = ARMOR_ENERGY_RESISTANT, + BOMB = ARMOR_BOMB_PADDED ) flags_inv = HIDEEARS|HIDEEYES|HIDEFACE cold_protection = HEAD @@ -272,11 +272,11 @@ desc = "'Let the battle commence!'" icon_state = "thunderdome" armor = list( - melee = ARMOR_MELEE_VERY_HIGH, - bullet = ARMOR_BALLISTIC_MEDIUM, - laser = ARMOR_LASER_PISTOL, - energy = ARMOR_ENERGY_RESISTANT, - bomb = ARMOR_BOMB_PADDED + MELEE = ARMOR_MELEE_VERY_HIGH, + BULLET = ARMOR_BALLISTIC_MEDIUM, + LASER = ARMOR_LASER_PISTOL, + ENERGY = ARMOR_ENERGY_RESISTANT, + BOMB = ARMOR_BOMB_PADDED ) cold_protection = HEAD min_cold_protection_temperature = SPACE_HELMET_MIN_COLD_PROTECTION_TEMPERATURE @@ -301,11 +301,11 @@ BODYTYPE_UNATHI = 'icons/mob/species/unathi/helmet.dmi' ) armor = list( - melee = ARMOR_MELEE_MAJOR, - bullet = ARMOR_BALLISTIC_RIFLE, - laser = ARMOR_LASER_PISTOL, - energy = ARMOR_ENERGY_RESISTANT, - bomb = ARMOR_BOMB_PADDED + MELEE = ARMOR_MELEE_MAJOR, + BULLET = ARMOR_BALLISTIC_RIFLE, + LASER = ARMOR_LASER_PISTOL, + ENERGY = ARMOR_ENERGY_RESISTANT, + BOMB = ARMOR_BOMB_PADDED ) siemens_coefficient = 0.35 @@ -315,11 +315,11 @@ desc = "A helmet with optical and cranial augments coupled to it." icon_state = "v62" armor = list( - melee = ARMOR_MELEE_VERY_HIGH, - bullet = ARMOR_BALLISTIC_MEDIUM, - laser = ARMOR_LASER_PISTOL, - energy = ARMOR_ENERGY_RESISTANT, - bomb = ARMOR_BOMB_PADDED + MELEE = ARMOR_MELEE_VERY_HIGH, + BULLET = ARMOR_BALLISTIC_MEDIUM, + LASER = ARMOR_LASER_PISTOL, + ENERGY = ARMOR_ENERGY_RESISTANT, + BOMB = ARMOR_BOMB_PADDED ) flags_inv = HIDEEARS|HIDEEYES body_parts_covered = HEAD|EYES @@ -332,10 +332,10 @@ desc = "This helmet is meant to protect the wearer from light debris, scrapes and bumps in a disaster situation, this lightweight helmet doesn't offer any significant protection from attacks or severe accidents. It's not recommended for use as armor and it's definitely not spaceworthy." icon_state = "iac_helmet" armor = list( - melee = ARMOR_MELEE_MINOR, - bullet = ARMOR_BALLISTIC_MINOR, - laser = ARMOR_LASER_MINOR, - bio = ARMOR_BIO_MINOR + MELEE = ARMOR_MELEE_MINOR, + BULLET = ARMOR_BALLISTIC_MINOR, + LASER = ARMOR_LASER_MINOR, + BIO = ARMOR_BIO_MINOR ) flags_inv = HIDEEARS @@ -348,11 +348,11 @@ contained_sprite = TRUE species_restricted = list(BODYTYPE_UNATHI) armor = list( - melee = ARMOR_MELEE_MAJOR, - bullet = ARMOR_BALLISTIC_PISTOL, - laser = ARMOR_LASER_KEVLAR, - energy = ARMOR_ENERGY_SMALL, - bomb = ARMOR_BOMB_PADDED + MELEE = ARMOR_MELEE_MAJOR, + BULLET = ARMOR_BALLISTIC_PISTOL, + LASER = ARMOR_LASER_KEVLAR, + ENERGY = ARMOR_ENERGY_SMALL, + BOMB = ARMOR_BOMB_PADDED ) siemens_coefficient = 0.35 @@ -362,12 +362,12 @@ icon_state = "hegemony_helmet" item_state = "hegemony_helmet" armor = list( - melee = ARMOR_MELEE_VERY_HIGH, - bullet = ARMOR_BALLISTIC_MEDIUM, - laser = ARMOR_LASER_RIFLE, - energy = ARMOR_ENERGY_MINOR, - bomb = ARMOR_BOMB_PADDED, - rad = ARMOR_RAD_MINOR + MELEE = ARMOR_MELEE_VERY_HIGH, + BULLET = ARMOR_BALLISTIC_MEDIUM, + LASER = ARMOR_LASER_RIFLE, + ENERGY = ARMOR_ENERGY_MINOR, + BOMB = ARMOR_BOMB_PADDED, + RAD = ARMOR_RAD_MINOR ) /obj/item/clothing/head/helmet/unathi/klax @@ -378,12 +378,12 @@ item_state = "klax_hopeful_helmet" species_restricted = list(BODYTYPE_VAURCA) armor = list( - melee = ARMOR_MELEE_RESISTANT, - bullet = ARMOR_BALLISTIC_PISTOL, - laser = ARMOR_LASER_PISTOL, - energy = ARMOR_ENERGY_RESISTANT, - bomb = ARMOR_BOMB_PADDED, - rad = ARMOR_RAD_RESISTANT + MELEE = ARMOR_MELEE_RESISTANT, + BULLET = ARMOR_BALLISTIC_PISTOL, + LASER = ARMOR_LASER_PISTOL, + ENERGY = ARMOR_ENERGY_RESISTANT, + BOMB = ARMOR_BOMB_PADDED, + RAD = ARMOR_RAD_RESISTANT ) siemens_coefficient = 0.35 flash_protection = FLASH_PROTECTION_MODERATE @@ -395,7 +395,7 @@ flags_inv = BLOCKHEADHAIR color = "#5f5f5f" armor = list( - melee = ARMOR_MELEE_KNIVES + MELEE = ARMOR_MELEE_KNIVES ) siemens_coefficient = 0.75 has_storage = FALSE @@ -416,10 +416,10 @@ icon_state = "erthelmet_cmd" item_state = "erthelmet_cmd" armor = list( - melee = ARMOR_MELEE_MAJOR, - bullet = ARMOR_BALLISTIC_RIFLE, - laser = ARMOR_LASER_PISTOL, - energy = ARMOR_ENERGY_RESISTANT, + MELEE = ARMOR_MELEE_MAJOR, + BULLET = ARMOR_BALLISTIC_RIFLE, + LASER = ARMOR_LASER_PISTOL, + ENERGY = ARMOR_ENERGY_RESISTANT, bomb = ARMOR_BIO_MINOR ) siemens_coefficient = 0.35 @@ -454,11 +454,11 @@ body_parts_covered = HEAD|FACE|EYES flags_inv = HIDEEARS|HIDEEYES|BLOCKHEADHAIR armor = list( - melee = ARMOR_MELEE_MAJOR, - bullet = ARMOR_BALLISTIC_SMALL, - laser = ARMOR_LASER_SMALL, - energy = ARMOR_ENERGY_MINOR, - bomb = ARMOR_BOMB_PADDED + MELEE = ARMOR_MELEE_MAJOR, + BULLET = ARMOR_BALLISTIC_SMALL, + LASER = ARMOR_LASER_SMALL, + ENERGY = ARMOR_ENERGY_MINOR, + BOMB = ARMOR_BOMB_PADDED ) siemens_coefficient = 0.35 sprite_sheets = list( diff --git a/code/modules/clothing/head/misc.dm b/code/modules/clothing/head/misc.dm index 9ea802f3444..ebc75494134 100644 --- a/code/modules/clothing/head/misc.dm +++ b/code/modules/clothing/head/misc.dm @@ -531,7 +531,7 @@ item_state = "navy_utility" contained_sprite = TRUE armor = list( - melee = ARMOR_MELEE_MINOR + MELEE = ARMOR_MELEE_MINOR ) /obj/item/clothing/head/sol/dress @@ -587,11 +587,11 @@ icon_state = "helmet_tac_sol" item_state = "helmet_tac_sol" armor = list( - melee = ARMOR_MELEE_MAJOR, - bullet = ARMOR_BALLISTIC_MEDIUM, - laser = ARMOR_LASER_RIFLE, - energy = ARMOR_ENERGY_SMALL, - bomb = ARMOR_BOMB_PADDED + MELEE = ARMOR_MELEE_MAJOR, + BULLET = ARMOR_BALLISTIC_MEDIUM, + LASER = ARMOR_LASER_RIFLE, + ENERGY = ARMOR_ENERGY_SMALL, + BOMB = ARMOR_BOMB_PADDED ) contained_sprite = TRUE @@ -710,11 +710,11 @@ icon_state = "helmet_konyang_army" item_state = "helmet_konyang_army" armor = list( - melee = ARMOR_MELEE_MAJOR, - bullet = ARMOR_BALLISTIC_MEDIUM, - laser = ARMOR_LASER_RIFLE, - energy = ARMOR_ENERGY_SMALL, - bomb = ARMOR_BOMB_PADDED + MELEE = ARMOR_MELEE_MAJOR, + BULLET = ARMOR_BALLISTIC_MEDIUM, + LASER = ARMOR_LASER_RIFLE, + ENERGY = ARMOR_ENERGY_SMALL, + BOMB = ARMOR_BOMB_PADDED ) contained_sprite = TRUE diff --git a/code/modules/clothing/head/misc_special.dm b/code/modules/clothing/head/misc_special.dm index 76a7232c71d..dce4dcc2b41 100644 --- a/code/modules/clothing/head/misc_special.dm +++ b/code/modules/clothing/head/misc_special.dm @@ -23,7 +23,7 @@ matter = list(DEFAULT_WALL_MATERIAL = 3000, MATERIAL_GLASS = 1000) var/up = 0 armor = list( - melee = ARMOR_MELEE_SMALL + MELEE = ARMOR_MELEE_SMALL ) flags_inv = (HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE) body_parts_covered = HEAD|FACE|EYES diff --git a/code/modules/clothing/head/pilot_helmet.dm b/code/modules/clothing/head/pilot_helmet.dm index c0bbd165593..48ef49ded91 100644 --- a/code/modules/clothing/head/pilot_helmet.dm +++ b/code/modules/clothing/head/pilot_helmet.dm @@ -8,11 +8,11 @@ flags_inv = BLOCKHEADHAIR body_parts_covered = HEAD|EYES armor = list( - melee = ARMOR_MELEE_KNIVES, - bullet = ARMOR_BALLISTIC_SMALL, - laser = ARMOR_LASER_SMALL, - energy = ARMOR_ENERGY_MINOR, - bomb = ARMOR_BOMB_PADDED + MELEE = ARMOR_MELEE_KNIVES, + BULLET = ARMOR_BALLISTIC_SMALL, + LASER = ARMOR_LASER_SMALL, + ENERGY = ARMOR_ENERGY_MINOR, + BOMB = ARMOR_BOMB_PADDED ) siemens_coefficient = 0.35 action_button_name = "Toggle Visor" diff --git a/code/modules/clothing/head/xenos/tajara.dm b/code/modules/clothing/head/xenos/tajara.dm index b7549d474c2..5855146ad30 100644 --- a/code/modules/clothing/head/xenos/tajara.dm +++ b/code/modules/clothing/head/xenos/tajara.dm @@ -172,11 +172,11 @@ flags_inv = HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE|BLOCKHAIR species_restricted = list(BODYTYPE_TAJARA) armor = list( - melee = ARMOR_MELEE_MAJOR, - bullet = ARMOR_BALLISTIC_PISTOL, - laser = ARMOR_LASER_SMALL, - energy = ARMOR_ENERGY_MINOR, - bomb = ARMOR_BOMB_MINOR + MELEE = ARMOR_MELEE_MAJOR, + BULLET = ARMOR_BALLISTIC_PISTOL, + LASER = ARMOR_LASER_SMALL, + ENERGY = ARMOR_ENERGY_MINOR, + BOMB = ARMOR_BOMB_MINOR ) allow_hair_covering = FALSE desc_extended = "The Feudal Era of Amohda is famous for the steel swords which became common. Many renowned swordsmen and famous warriors would travel the land fighting duels of \ @@ -195,11 +195,11 @@ item_state = "kettle" contained_sprite = TRUE armor = list( - melee = ARMOR_MELEE_MAJOR, - bullet = ARMOR_BALLISTIC_PISTOL, - laser = ARMOR_LASER_SMALL, - energy = ARMOR_ENERGY_MINOR, - bomb = ARMOR_BOMB_MINOR + MELEE = ARMOR_MELEE_MAJOR, + BULLET = ARMOR_BALLISTIC_PISTOL, + LASER = ARMOR_LASER_SMALL, + ENERGY = ARMOR_ENERGY_MINOR, + BOMB = ARMOR_BOMB_MINOR ) has_storage = FALSE diff --git a/code/modules/clothing/head/xenos/unathi.dm b/code/modules/clothing/head/xenos/unathi.dm index 084f2407ca3..790127c2e2c 100644 --- a/code/modules/clothing/head/xenos/unathi.dm +++ b/code/modules/clothing/head/xenos/unathi.dm @@ -72,9 +72,9 @@ icon_state = "ancient_helm" item_state = "ancient_helm" armor = list( //not designed to hold up to bullets or lasers, but still better than nothing. - melee = ARMOR_MELEE_MAJOR, - bullet = ARMOR_BALLISTIC_MINOR, - laser = ARMOR_LASER_SMALL + MELEE = ARMOR_MELEE_MAJOR, + BULLET = ARMOR_BALLISTIC_MINOR, + LASER = ARMOR_LASER_SMALL ) matter = list(MATERIAL_BRONZE = 1000) drop_sound = 'sound/items/drop/sword.ogg' diff --git a/code/modules/clothing/masks/boxing.dm b/code/modules/clothing/masks/boxing.dm index 3242248d6fd..b5500058e55 100644 --- a/code/modules/clothing/masks/boxing.dm +++ b/code/modules/clothing/masks/boxing.dm @@ -56,7 +56,7 @@ item_state = "balaclava_blue" germ_level = 0 armor = list( - bio = ARMOR_BIO_STRONG + BIO = ARMOR_BIO_STRONG ) /obj/item/clothing/mask/luchador diff --git a/code/modules/clothing/masks/gasmask.dm b/code/modules/clothing/masks/gasmask.dm index 43f7ed3187a..103d3bd9dfc 100644 --- a/code/modules/clothing/masks/gasmask.dm +++ b/code/modules/clothing/masks/gasmask.dm @@ -13,7 +13,7 @@ var/gas_filter_strength = 1 //For gas mask filters var/list/filtered_gases = list(GAS_PHORON, GAS_N2O, GAS_CHLORINE, GAS_ALIEN) armor = list( - bio = ARMOR_BIO_STRONG + BIO = ARMOR_BIO_STRONG ) /obj/item/clothing/mask/gas/filter_air(datum/gas_mixture/air) @@ -105,8 +105,8 @@ item_state = "fullgas" w_class = WEIGHT_CLASS_SMALL armor = list( - melee = ARMOR_MELEE_SMALL, - bullet = ARMOR_BALLISTIC_SMALL, - laser = ARMOR_LASER_MINOR, - bio = ARMOR_BIO_STRONG + MELEE = ARMOR_MELEE_SMALL, + BULLET = ARMOR_BALLISTIC_SMALL, + LASER = ARMOR_LASER_MINOR, + BIO = ARMOR_BIO_STRONG ) diff --git a/code/modules/clothing/masks/miscellaneous.dm b/code/modules/clothing/masks/miscellaneous.dm index 334a650cc4c..1957ac9194d 100644 --- a/code/modules/clothing/masks/miscellaneous.dm +++ b/code/modules/clothing/masks/miscellaneous.dm @@ -38,7 +38,7 @@ gas_transfer_coefficient = 0.90 permeability_coefficient = 0.01 armor = list( - bio = ARMOR_BIO_RESISTANT + BIO = ARMOR_BIO_RESISTANT ) down_gas_transfer_coefficient = 1 down_body_parts_covered = null @@ -60,7 +60,7 @@ gas_transfer_coefficient = 0.90 permeability_coefficient = 0.01 armor = list( - bio = ARMOR_BIO_MINOR + BIO = ARMOR_BIO_MINOR ) down_gas_transfer_coefficient = 1 down_body_parts_covered = null @@ -77,7 +77,7 @@ gas_transfer_coefficient = 0.90 permeability_coefficient = 0.01 armor = list( - bio = ARMOR_BIO_MINOR + BIO = ARMOR_BIO_MINOR ) down_gas_transfer_coefficient = 1 down_body_parts_covered = null @@ -199,7 +199,7 @@ gas_transfer_coefficient = 0.90 permeability_coefficient = 0.5 armor = list( - bio = ARMOR_BIO_MINOR + BIO = ARMOR_BIO_MINOR ) down_gas_transfer_coefficient = 1 down_body_parts_covered = null diff --git a/code/modules/clothing/sets/infiltrator.dm b/code/modules/clothing/sets/infiltrator.dm index 185e6a1008f..8f289daa491 100644 --- a/code/modules/clothing/sets/infiltrator.dm +++ b/code/modules/clothing/sets/infiltrator.dm @@ -23,9 +23,9 @@ contained_sprite = TRUE item_flags = ITEM_FLAG_THICK_MATERIAL | ITEM_FLAG_INJECTION_PORT | ITEM_FLAG_AIRTIGHT armor = list( - melee = ARMOR_MELEE_SMALL, - bullet = ARMOR_BALLISTIC_SMALL, - laser = ARMOR_LASER_SMALL + MELEE = ARMOR_MELEE_SMALL, + BULLET = ARMOR_BALLISTIC_SMALL, + LASER = ARMOR_LASER_SMALL ) max_pressure_protection = SPACE_SUIT_MAX_PRESSURE min_pressure_protection = 0 diff --git a/code/modules/clothing/sets/laser_tag.dm b/code/modules/clothing/sets/laser_tag.dm index c0a2f13baa5..1cf0ac2d2fc 100644 --- a/code/modules/clothing/sets/laser_tag.dm +++ b/code/modules/clothing/sets/laser_tag.dm @@ -13,9 +13,9 @@ body_parts_covered = UPPER_TORSO slowdown = 0 armor = list( // still somewhat sturdy, but ultimately not very - melee = ARMOR_MELEE_MINOR, - laser = ARMOR_LASER_MINOR, - energy = ARMOR_ENERGY_MINOR + MELEE = ARMOR_MELEE_MINOR, + LASER = ARMOR_LASER_MINOR, + ENERGY = ARMOR_ENERGY_MINOR ) siemens_coefficient = 1.0 var/laser_tag_color = "red" @@ -74,9 +74,9 @@ item_state = "helmet" contained_sprite = TRUE armor = list( // still somewhat sturdy, but ultimately not very - melee = ARMOR_MELEE_MINOR, - laser = ARMOR_LASER_MINOR, - energy = ARMOR_ENERGY_MINOR + MELEE = ARMOR_MELEE_MINOR, + LASER = ARMOR_LASER_MINOR, + ENERGY = ARMOR_ENERGY_MINOR ) siemens_coefficient = 1.0 var/laser_tag_color = "red" diff --git a/code/modules/clothing/shoes/boots.dm b/code/modules/clothing/shoes/boots.dm index 355bd4b1211..e84e9d367db 100644 --- a/code/modules/clothing/shoes/boots.dm +++ b/code/modules/clothing/shoes/boots.dm @@ -7,9 +7,9 @@ item_state = "jackboots" force = 3 armor = list( - melee = ARMOR_MELEE_KNIVES, - energy = ARMOR_ENERGY_MINOR, - bomb = ARMOR_BOMB_MINOR + MELEE = ARMOR_MELEE_KNIVES, + ENERGY = ARMOR_ENERGY_MINOR, + BOMB = ARMOR_BOMB_MINOR ) siemens_coefficient = 0.75 can_hold_knife = TRUE @@ -63,10 +63,10 @@ item_state = "workboots" force = 3 armor = list( - melee = ARMOR_MELEE_KNIVES, - energy = ARMOR_ENERGY_MINOR, - bomb = ARMOR_BOMB_MINOR, - rad = ARMOR_RAD_MINOR + MELEE = ARMOR_MELEE_KNIVES, + ENERGY = ARMOR_ENERGY_MINOR, + BOMB = ARMOR_BOMB_MINOR, + RAD = ARMOR_RAD_MINOR ) icon_auto_adapt = TRUE icon_supported_species_tags = list("taj") @@ -136,12 +136,12 @@ contained_sprite = TRUE force = 11 armor = list( - melee = ARMOR_MELEE_VERY_HIGH, - bullet = ARMOR_BALLISTIC_RIFLE, - laser = ARMOR_LASER_PISTOL, - energy = ARMOR_ENERGY_SMALL, - bomb = ARMOR_BOMB_RESISTANT, - bio = ARMOR_BIO_MINOR + MELEE = ARMOR_MELEE_VERY_HIGH, + BULLET = ARMOR_BALLISTIC_RIFLE, + LASER = ARMOR_LASER_PISTOL, + ENERGY = ARMOR_ENERGY_SMALL, + BOMB = ARMOR_BOMB_RESISTANT, + BIO = ARMOR_BIO_MINOR ) item_flags = ITEM_FLAG_NO_SLIP siemens_coefficient = 0.35 @@ -168,8 +168,8 @@ heat_protection = FEET|LEGS max_heat_protection_temperature = SHOE_MAX_HEAT_PROTECTION_TEMPERATURE armor = list( - melee = ARMOR_MELEE_MINOR, - bio = ARMOR_BIO_MINOR + MELEE = ARMOR_MELEE_MINOR, + BIO = ARMOR_BIO_MINOR ) icon_auto_adapt = TRUE icon_supported_species_tags = list("taj") diff --git a/code/modules/clothing/shoes/miscellaneous.dm b/code/modules/clothing/shoes/miscellaneous.dm index b30d568ee21..d8682c5d42a 100644 --- a/code/modules/clothing/shoes/miscellaneous.dm +++ b/code/modules/clothing/shoes/miscellaneous.dm @@ -99,9 +99,9 @@ species_restricted = list(BODYTYPE_UNATHI) contained_sprite = TRUE armor = list( //not designed to hold up to bullets or lasers, but still better than nothing. - melee = ARMOR_MELEE_MAJOR, - bullet = ARMOR_BALLISTIC_MINOR, - laser = ARMOR_LASER_SMALL + MELEE = ARMOR_MELEE_MAJOR, + BULLET = ARMOR_BALLISTIC_MINOR, + LASER = ARMOR_LASER_SMALL ) drop_sound = 'sound/items/drop/sword.ogg' pickup_sound = /singleton/sound_category/sword_pickup_sound diff --git a/code/modules/clothing/shoes/sandals.dm b/code/modules/clothing/shoes/sandals.dm index 6bed040390a..e2c0bb6762d 100644 --- a/code/modules/clothing/shoes/sandals.dm +++ b/code/modules/clothing/shoes/sandals.dm @@ -44,7 +44,7 @@ item_state = "caligae" force = 11 armor = list( - melee = ARMOR_MELEE_KNIVES + MELEE = ARMOR_MELEE_KNIVES ) siemens_coefficient = 0.75 body_parts_covered = FEET|LEGS diff --git a/code/modules/clothing/shoes/sneakers.dm b/code/modules/clothing/shoes/sneakers.dm index 4f6a14cf20e..f476e1c8406 100644 --- a/code/modules/clothing/shoes/sneakers.dm +++ b/code/modules/clothing/shoes/sneakers.dm @@ -114,7 +114,7 @@ gas_transfer_coefficient = 0.01 permeability_coefficient = 0.01 armor = list( - bio = ARMOR_BIO_RESISTANT + BIO = ARMOR_BIO_RESISTANT ) /obj/item/clothing/shoes/sneakers/medsci/zeng diff --git a/code/modules/clothing/shoes/xeno/tajara.dm b/code/modules/clothing/shoes/xeno/tajara.dm index 5ee13e823dd..4ebfaab8b02 100644 --- a/code/modules/clothing/shoes/xeno/tajara.dm +++ b/code/modules/clothing/shoes/xeno/tajara.dm @@ -157,11 +157,11 @@ body_parts_covered = FEET|LEGS species_restricted = list(BODYTYPE_TAJARA) armor = list( - melee = ARMOR_MELEE_MAJOR, - bullet = ARMOR_BALLISTIC_PISTOL, - laser = ARMOR_LASER_SMALL, - energy = ARMOR_ENERGY_MINOR, - bomb = ARMOR_BOMB_MINOR + MELEE = ARMOR_MELEE_MAJOR, + BULLET = ARMOR_BALLISTIC_PISTOL, + LASER = ARMOR_LASER_SMALL, + ENERGY = ARMOR_ENERGY_MINOR, + BOMB = ARMOR_BOMB_MINOR ) // High-heeled Adhomian Shoes diff --git a/code/modules/clothing/shoes/xeno/vaurca.dm b/code/modules/clothing/shoes/xeno/vaurca.dm index 393095e1786..5eb7d4ac2e7 100644 --- a/code/modules/clothing/shoes/xeno/vaurca.dm +++ b/code/modules/clothing/shoes/xeno/vaurca.dm @@ -8,7 +8,7 @@ build_from_parts = TRUE armor = list( - melee = ARMOR_MELEE_MINOR + MELEE = ARMOR_MELEE_MINOR ) sprite_sheets = list( diff --git a/code/modules/clothing/spacesuits/miscellaneous.dm b/code/modules/clothing/spacesuits/miscellaneous.dm index 3e2589aaa6c..2a2a3a0c020 100644 --- a/code/modules/clothing/spacesuits/miscellaneous.dm +++ b/code/modules/clothing/spacesuits/miscellaneous.dm @@ -10,13 +10,13 @@ slot_r_hand_str = "syndicate-helm-black-red" ) armor = list( - melee = ARMOR_MELEE_VERY_HIGH, - bullet = ARMOR_BALLISTIC_MEDIUM, - laser = ARMOR_LASER_PISTOL, - energy = ARMOR_ENERGY_SMALL, - bomb = ARMOR_BOMB_PADDED, - bio = ARMOR_BIO_SHIELDED, - rad = ARMOR_RAD_RESISTANT + MELEE = ARMOR_MELEE_VERY_HIGH, + BULLET = ARMOR_BALLISTIC_MEDIUM, + LASER = ARMOR_LASER_PISTOL, + ENERGY = ARMOR_ENERGY_SMALL, + BOMB = ARMOR_BOMB_PADDED, + BIO = ARMOR_BIO_SHIELDED, + RAD = ARMOR_RAD_RESISTANT ) max_pressure_protection = FIRESUIT_MAX_PRESSURE min_pressure_protection = 0 @@ -33,9 +33,9 @@ item_state = "beret_sec" contained_sprite = TRUE armor = list( - melee = ARMOR_MELEE_KNIVES, - bullet = ARMOR_BALLISTIC_MINOR, - laser = ARMOR_LASER_MINOR + MELEE = ARMOR_MELEE_KNIVES, + BULLET = ARMOR_BALLISTIC_MINOR, + LASER = ARMOR_LASER_MINOR ) flags_inv = BLOCKHAIR siemens_coefficient = 0.9 @@ -69,13 +69,13 @@ icon_state = "pirate" item_state = "pirate" armor = list( - melee = ARMOR_MELEE_MAJOR, - bullet = ARMOR_BALLISTIC_PISTOL, - laser = ARMOR_LASER_SMALL, - energy = ARMOR_ENERGY_MINOR, - bomb = ARMOR_BOMB_PADDED, - bio = ARMOR_BIO_SMALL, - rad = ARMOR_RAD_MINOR + MELEE = ARMOR_MELEE_MAJOR, + BULLET = ARMOR_BALLISTIC_PISTOL, + LASER = ARMOR_LASER_SMALL, + ENERGY = ARMOR_ENERGY_MINOR, + BOMB = ARMOR_BOMB_PADDED, + BIO = ARMOR_BIO_SMALL, + RAD = ARMOR_RAD_MINOR ) flags_inv = BLOCKHAIR body_parts_covered = 0 @@ -92,13 +92,13 @@ allowed = list(/obj/item/gun,/obj/item/ammo_magazine,/obj/item/ammo_casing,/obj/item/melee/baton,/obj/item/handcuffs,/obj/item/tank/emergency_oxygen) slowdown = 0 armor = list( - melee = ARMOR_MELEE_MAJOR, - bullet = ARMOR_BALLISTIC_PISTOL, - laser = ARMOR_LASER_SMALL, - energy = ARMOR_ENERGY_MINOR, - bomb = ARMOR_BOMB_PADDED, - bio = ARMOR_BIO_SMALL, - rad = ARMOR_RAD_MINOR + MELEE = ARMOR_MELEE_MAJOR, + BULLET = ARMOR_BALLISTIC_PISTOL, + LASER = ARMOR_LASER_SMALL, + ENERGY = ARMOR_ENERGY_MINOR, + BOMB = ARMOR_BOMB_PADDED, + BIO = ARMOR_BIO_SMALL, + RAD = ARMOR_RAD_MINOR ) siemens_coefficient = 0.4 body_parts_covered = UPPER_TORSO|ARMS diff --git a/code/modules/clothing/spacesuits/rig/rig.dm b/code/modules/clothing/spacesuits/rig/rig.dm index 8a238829753..d68822a8a3e 100644 --- a/code/modules/clothing/spacesuits/rig/rig.dm +++ b/code/modules/clothing/spacesuits/rig/rig.dm @@ -18,13 +18,13 @@ // These values are passed on to all component pieces. armor = list( - melee = ARMOR_MELEE_RESISTANT, - bullet = ARMOR_BALLISTIC_MINOR, - laser = ARMOR_LASER_SMALL, - energy = ARMOR_ENERGY_MINOR, - bomb = ARMOR_BOMB_PADDED, - bio = ARMOR_BIO_SHIELDED, - rad = ARMOR_RAD_MINOR + MELEE = ARMOR_MELEE_RESISTANT, + BULLET = ARMOR_BALLISTIC_MINOR, + LASER = ARMOR_LASER_SMALL, + ENERGY = ARMOR_ENERGY_MINOR, + BOMB = ARMOR_BOMB_PADDED, + BIO = ARMOR_BIO_SHIELDED, + RAD = ARMOR_RAD_MINOR ) min_cold_protection_temperature = SPACE_SUIT_MIN_COLD_PROTECTION_TEMPERATURE max_heat_protection_temperature = SPACE_SUIT_MAX_HEAT_PROTECTION_TEMPERATURE diff --git a/code/modules/clothing/spacesuits/rig/suits/alien.dm b/code/modules/clothing/spacesuits/rig/suits/alien.dm index e7f30639c5d..3f8731be04d 100644 --- a/code/modules/clothing/spacesuits/rig/suits/alien.dm +++ b/code/modules/clothing/spacesuits/rig/suits/alien.dm @@ -5,13 +5,13 @@ icon = 'icons/clothing/rig/unathi_breacher_cheap.dmi' icon_state = "breacher_rig_cheap" armor = list( - melee = ARMOR_MELEE_MAJOR, - bullet = ARMOR_BALLISTIC_RIFLE, - laser = ARMOR_LASER_PISTOL, - energy = ARMOR_ENERGY_RESISTANT, - bomb = ARMOR_BOMB_RESISTANT, - bio = ARMOR_BIO_SHIELDED, - rad = ARMOR_RAD_MINOR + MELEE = ARMOR_MELEE_MAJOR, + BULLET = ARMOR_BALLISTIC_RIFLE, + LASER = ARMOR_LASER_PISTOL, + ENERGY = ARMOR_ENERGY_RESISTANT, + BOMB = ARMOR_BOMB_RESISTANT, + BIO = ARMOR_BIO_SHIELDED, + RAD = ARMOR_RAD_MINOR ) siemens_coefficient = 0.1 emp_protection = -20 @@ -33,13 +33,13 @@ icon = 'icons/clothing/rig/unathi_breacher.dmi' icon_state = "breacher_rig" armor = list( - melee = ARMOR_MELEE_VERY_HIGH, - bullet = ARMOR_BALLISTIC_AP, - laser = ARMOR_LASER_RIFLE, - energy = ARMOR_ENERGY_STRONG, - bomb = ARMOR_BOMB_RESISTANT, - bio = ARMOR_BIO_SHIELDED, - rad = ARMOR_RAD_SMALL + MELEE = ARMOR_MELEE_VERY_HIGH, + BULLET = ARMOR_BALLISTIC_AP, + LASER = ARMOR_LASER_RIFLE, + ENERGY = ARMOR_ENERGY_STRONG, + BOMB = ARMOR_BOMB_RESISTANT, + BIO = ARMOR_BIO_SHIELDED, + RAD = ARMOR_RAD_SMALL ) siemens_coefficient = 0.1 vision_restriction = TINT_NONE @@ -80,13 +80,13 @@ icon = 'icons/clothing/rig/redsnout.dmi' icon_state = "redsnout_rig" armor = list( - melee = ARMOR_MELEE_VERY_HIGH, - bullet = ARMOR_BALLISTIC_AP, - laser = ARMOR_LASER_RIFLE, - energy = ARMOR_ENERGY_STRONG, - bomb = ARMOR_BOMB_RESISTANT, - bio = ARMOR_BIO_SHIELDED, - rad = ARMOR_RAD_SMALL + MELEE = ARMOR_MELEE_VERY_HIGH, + BULLET = ARMOR_BALLISTIC_AP, + LASER = ARMOR_LASER_RIFLE, + ENERGY = ARMOR_ENERGY_STRONG, + BOMB = ARMOR_BOMB_RESISTANT, + BIO = ARMOR_BIO_SHIELDED, + RAD = ARMOR_RAD_SMALL ) vision_restriction = TINT_NONE offline_vision_restriction = TINT_BLIND @@ -116,13 +116,13 @@ icon = 'icons/clothing/rig/vaurca.dmi' icon_state = "vaurca_rig" armor = list( - melee = ARMOR_MELEE_MAJOR, - bullet = ARMOR_BALLISTIC_MAJOR, - laser = ARMOR_LASER_RIFLE, - energy = ARMOR_ENERGY_SHIELDED, - bomb = ARMOR_BOMB_SHIELDED, - bio = ARMOR_BIO_SHIELDED, - rad = ARMOR_RAD_RESISTANT + MELEE = ARMOR_MELEE_MAJOR, + BULLET = ARMOR_BALLISTIC_MAJOR, + LASER = ARMOR_LASER_RIFLE, + ENERGY = ARMOR_ENERGY_SHIELDED, + BOMB = ARMOR_BOMB_SHIELDED, + BIO = ARMOR_BIO_SHIELDED, + RAD = ARMOR_RAD_RESISTANT ) siemens_coefficient = 0.1 vision_restriction = 0 @@ -179,13 +179,13 @@ icon = 'icons/clothing/rig/tesla.dmi' icon_state = "tesla_rig" armor = list( - melee = ARMOR_MELEE_VERY_HIGH, - bullet = ARMOR_BALLISTIC_PISTOL, - laser = ARMOR_LASER_SMALL, - energy = ARMOR_ENERGY_MINOR, - bomb = ARMOR_BOMB_RESISTANT, - bio = ARMOR_BIO_SHIELDED, - rad = ARMOR_RAD_RESISTANT + MELEE = ARMOR_MELEE_VERY_HIGH, + BULLET = ARMOR_BALLISTIC_PISTOL, + LASER = ARMOR_LASER_SMALL, + ENERGY = ARMOR_ENERGY_MINOR, + BOMB = ARMOR_BOMB_RESISTANT, + BIO = ARMOR_BIO_SHIELDED, + RAD = ARMOR_RAD_RESISTANT ) siemens_coefficient = 0 vision_restriction = 0 diff --git a/code/modules/clothing/spacesuits/rig/suits/combat.dm b/code/modules/clothing/spacesuits/rig/suits/combat.dm index 51fac08582b..afe303b202f 100644 --- a/code/modules/clothing/spacesuits/rig/suits/combat.dm +++ b/code/modules/clothing/spacesuits/rig/suits/combat.dm @@ -6,13 +6,13 @@ icon_supported_species_tags = list("skr") suit_type = "combat hardsuit" armor = list( - melee = ARMOR_MELEE_MAJOR, - bullet = ARMOR_BALLISTIC_MAJOR, - laser = ARMOR_LASER_MEDIUM, - energy = ARMOR_ENERGY_SMALL, - bomb = ARMOR_BOMB_PADDED, - bio = ARMOR_BIO_SHIELDED, - rad = ARMOR_RAD_SMALL + MELEE = ARMOR_MELEE_MAJOR, + BULLET = ARMOR_BALLISTIC_MAJOR, + LASER = ARMOR_LASER_MEDIUM, + ENERGY = ARMOR_ENERGY_SMALL, + BOMB = ARMOR_BOMB_PADDED, + BIO = ARMOR_BIO_SHIELDED, + RAD = ARMOR_RAD_SMALL ) siemens_coefficient = 0.1 offline_slowdown = 3 @@ -48,13 +48,13 @@ icon_state = "military_rig" suit_type = "military hardsuit" armor = list( - melee = ARMOR_MELEE_MAJOR, - bullet = ARMOR_BALLISTIC_MAJOR, - laser = ARMOR_LASER_MEDIUM, - energy = ARMOR_ENERGY_SMALL, - bomb = ARMOR_BOMB_PADDED, - bio = ARMOR_BIO_SHIELDED, - rad = ARMOR_RAD_SMALL + MELEE = ARMOR_MELEE_MAJOR, + BULLET = ARMOR_BALLISTIC_MAJOR, + LASER = ARMOR_LASER_MEDIUM, + ENERGY = ARMOR_ENERGY_SMALL, + BOMB = ARMOR_BOMB_PADDED, + BIO = ARMOR_BIO_SHIELDED, + RAD = ARMOR_RAD_SMALL ) siemens_coefficient = 0.1 offline_slowdown = 3 @@ -118,13 +118,13 @@ desc = "A Zavodskoi-manufactured hardsuit specially designed for the elite units of the Solarian SOCOM. A feared sight to behold, the most well-known usage of the Type-9A \"Nosferatu\" suits is by the forces of the Alliance's MARSOC operatives." icon = 'icons/clothing/rig/sol_marsoc.dmi' armor = list( - melee = ARMOR_MELEE_SHIELDED, - bullet = ARMOR_BALLISTIC_RIFLE, - laser = ARMOR_LASER_RIFLE, - energy = ARMOR_ENERGY_STRONG, - bomb = ARMOR_BOMB_PADDED, - bio = ARMOR_BIO_SHIELDED, - rad = ARMOR_RAD_SHIELDED + MELEE = ARMOR_MELEE_SHIELDED, + BULLET = ARMOR_BALLISTIC_RIFLE, + LASER = ARMOR_LASER_RIFLE, + ENERGY = ARMOR_ENERGY_STRONG, + BOMB = ARMOR_BOMB_PADDED, + BIO = ARMOR_BIO_SHIELDED, + RAD = ARMOR_RAD_SHIELDED ) emp_protection = 30 slowdown = 0 @@ -155,13 +155,13 @@ icon_supported_species_tags = list("ipc", "skr", "taj", "una", "vau", "vaw") suit_type = "retrofitted military hardsuit" armor = list( - melee = ARMOR_MELEE_MAJOR, - bullet = ARMOR_BALLISTIC_PISTOL, - laser = ARMOR_LASER_PISTOL, - energy = ARMOR_ENERGY_RESISTANT, - bomb = ARMOR_BOMB_RESISTANT, - bio = ARMOR_BIO_SHIELDED, - rad = ARMOR_RAD_RESISTANT + MELEE = ARMOR_MELEE_MAJOR, + BULLET = ARMOR_BALLISTIC_PISTOL, + LASER = ARMOR_LASER_PISTOL, + ENERGY = ARMOR_ENERGY_RESISTANT, + BOMB = ARMOR_BOMB_RESISTANT, + BIO = ARMOR_BIO_SHIELDED, + RAD = ARMOR_RAD_RESISTANT ) siemens_coefficient = 0.35 slowdown = 2 @@ -210,13 +210,13 @@ suit_type = "gunslinger hardsuit" icon_supported_species_tags = list("ipc", "skr", "taj") armor = list( - melee = ARMOR_MELEE_MAJOR, - bullet = ARMOR_BALLISTIC_MAJOR, - laser = ARMOR_LASER_MEDIUM, - energy = ARMOR_ENERGY_SMALL, - bomb = ARMOR_BOMB_PADDED, - bio = ARMOR_BIO_SHIELDED, - rad = ARMOR_RAD_SMALL + MELEE = ARMOR_MELEE_MAJOR, + BULLET = ARMOR_BALLISTIC_MAJOR, + LASER = ARMOR_LASER_MEDIUM, + ENERGY = ARMOR_ENERGY_SMALL, + BOMB = ARMOR_BOMB_PADDED, + BIO = ARMOR_BIO_SHIELDED, + RAD = ARMOR_RAD_SMALL ) siemens_coefficient = 0.1 offline_slowdown = 2 @@ -262,13 +262,13 @@ icon_state = "strikesuit" suit_type = "strike hardsuit" armor = list( - melee = ARMOR_MELEE_MAJOR, - bullet = ARMOR_BALLISTIC_MAJOR, - laser = ARMOR_LASER_MEDIUM, - energy = ARMOR_ENERGY_SMALL, - bomb = ARMOR_BOMB_PADDED, - bio = ARMOR_BIO_SHIELDED, - rad = ARMOR_RAD_SMALL + MELEE = ARMOR_MELEE_MAJOR, + BULLET = ARMOR_BALLISTIC_MAJOR, + LASER = ARMOR_LASER_MEDIUM, + ENERGY = ARMOR_ENERGY_SMALL, + BOMB = ARMOR_BOMB_PADDED, + BIO = ARMOR_BIO_SHIELDED, + RAD = ARMOR_RAD_SMALL ) siemens_coefficient = 0.1 offline_slowdown = 2 @@ -330,13 +330,13 @@ icon_state = "elyran_rig" suit_type = "elyran battlesuit" armor = list( - melee = ARMOR_MELEE_MAJOR, - bullet = ARMOR_BALLISTIC_MAJOR, - laser = ARMOR_LASER_MEDIUM, - energy = ARMOR_ENERGY_SMALL, - bomb = ARMOR_BOMB_PADDED, - bio = ARMOR_BIO_SHIELDED, - rad = ARMOR_RAD_SMALL + MELEE = ARMOR_MELEE_MAJOR, + BULLET = ARMOR_BALLISTIC_MAJOR, + LASER = ARMOR_LASER_MEDIUM, + ENERGY = ARMOR_ENERGY_SMALL, + BOMB = ARMOR_BOMB_PADDED, + BIO = ARMOR_BIO_SHIELDED, + RAD = ARMOR_RAD_SMALL ) siemens_coefficient = 0.1 offline_slowdown = 2 @@ -381,13 +381,13 @@ icon_state = "bunker" suit_type = "bunker suit" armor = list( - melee = ARMOR_MELEE_VERY_HIGH, - bullet = ARMOR_BALLISTIC_RIFLE, - laser = ARMOR_LASER_RIFLE, - energy = ARMOR_ENERGY_SHIELDED, - bomb = ARMOR_BOMB_PADDED, - bio = ARMOR_BIO_SHIELDED, - rad = ARMOR_RAD_SMALL + MELEE = ARMOR_MELEE_VERY_HIGH, + BULLET = ARMOR_BALLISTIC_RIFLE, + LASER = ARMOR_LASER_RIFLE, + ENERGY = ARMOR_ENERGY_SHIELDED, + BOMB = ARMOR_BOMB_PADDED, + BIO = ARMOR_BIO_SHIELDED, + RAD = ARMOR_RAD_SMALL ) offline_vision_restriction = TINT_HEAVY emp_protection = -30 @@ -420,13 +420,13 @@ icon_supported_species_tags = list("una") suit_type = "jinxiang combat suit" armor = list( - melee = ARMOR_MELEE_MAJOR, - bullet = ARMOR_BALLISTIC_MAJOR, - laser = ARMOR_LASER_MEDIUM, - energy = ARMOR_ENERGY_SMALL, - bomb = ARMOR_BOMB_PADDED, - bio = ARMOR_BIO_SHIELDED, - rad = ARMOR_RAD_SMALL + MELEE = ARMOR_MELEE_MAJOR, + BULLET = ARMOR_BALLISTIC_MAJOR, + LASER = ARMOR_LASER_MEDIUM, + ENERGY = ARMOR_ENERGY_SMALL, + BOMB = ARMOR_BOMB_PADDED, + BIO = ARMOR_BIO_SHIELDED, + RAD = ARMOR_RAD_SMALL ) offline_vision_restriction = TINT_HEAVY offline_slowdown = 10 @@ -468,13 +468,13 @@ icon_supported_species_tags = list("skr") species_restricted = list(BODYTYPE_SKRELL, BODYTYPE_HUMAN) armor = list( - melee = ARMOR_MELEE_MAJOR, - bullet = ARMOR_BALLISTIC_MAJOR, - laser = ARMOR_LASER_MEDIUM, - energy = ARMOR_ENERGY_MINOR, - bomb = ARMOR_BOMB_RESISTANT, - bio = ARMOR_BIO_SHIELDED, - rad = ARMOR_RAD_RESISTANT + MELEE = ARMOR_MELEE_MAJOR, + BULLET = ARMOR_BALLISTIC_MAJOR, + LASER = ARMOR_LASER_MEDIUM, + ENERGY = ARMOR_ENERGY_MINOR, + BOMB = ARMOR_BOMB_RESISTANT, + BIO = ARMOR_BIO_SHIELDED, + RAD = ARMOR_RAD_RESISTANT ) siemens_coefficient = 0.1 @@ -525,13 +525,13 @@ icon_supported_species_tags = null suit_type = "\improper Legionnaire Hardsuit" armor = list( - melee = ARMOR_MELEE_MAJOR, - bullet = ARMOR_BALLISTIC_MAJOR, - laser = ARMOR_LASER_MEDIUM, - energy = ARMOR_ENERGY_SMALL, - bomb = ARMOR_BOMB_PADDED, - bio = ARMOR_BIO_SHIELDED, - rad = ARMOR_RAD_SMALL + MELEE = ARMOR_MELEE_MAJOR, + BULLET = ARMOR_BALLISTIC_MAJOR, + LASER = ARMOR_LASER_MEDIUM, + ENERGY = ARMOR_ENERGY_SMALL, + BOMB = ARMOR_BOMB_PADDED, + BIO = ARMOR_BIO_SHIELDED, + RAD = ARMOR_RAD_SMALL ) siemens_coefficient = 0.1 offline_slowdown = 3 diff --git a/code/modules/clothing/spacesuits/rig/suits/ert.dm b/code/modules/clothing/spacesuits/rig/suits/ert.dm index b07570367f3..bee3b9f24bb 100644 --- a/code/modules/clothing/spacesuits/rig/suits/ert.dm +++ b/code/modules/clothing/spacesuits/rig/suits/ert.dm @@ -14,13 +14,13 @@ req_access = list(ACCESS_CENT_SPECOPS) species_restricted = list(BODYTYPE_SKRELL,BODYTYPE_HUMAN) armor = list( - melee = ARMOR_MELEE_MAJOR, - bullet = ARMOR_BALLISTIC_PISTOL, - laser = ARMOR_LASER_SMALL, - energy = ARMOR_ENERGY_SMALL, - bomb = ARMOR_BOMB_PADDED, - bio = ARMOR_BIO_SHIELDED, - rad = ARMOR_RAD_SHIELDED + MELEE = ARMOR_MELEE_MAJOR, + BULLET = ARMOR_BALLISTIC_PISTOL, + LASER = ARMOR_LASER_SMALL, + ENERGY = ARMOR_ENERGY_SMALL, + BOMB = ARMOR_BOMB_PADDED, + BIO = ARMOR_BIO_SHIELDED, + RAD = ARMOR_RAD_SHIELDED ) siemens_coefficient = 0.1 allowed = list( @@ -47,13 +47,13 @@ icon_state = "ert_engineer_rig" emp_protection = 30 armor = list( - melee = ARMOR_MELEE_MAJOR, - bullet = ARMOR_BALLISTIC_PISTOL, - laser = ARMOR_LASER_SMALL, - energy = ARMOR_ENERGY_SMALL, - bomb = ARMOR_BOMB_PADDED, - bio = ARMOR_BIO_SHIELDED, - rad = ARMOR_RAD_SHIELDED + MELEE = ARMOR_MELEE_MAJOR, + BULLET = ARMOR_BALLISTIC_PISTOL, + LASER = ARMOR_LASER_SMALL, + ENERGY = ARMOR_ENERGY_SMALL, + BOMB = ARMOR_BOMB_PADDED, + BIO = ARMOR_BIO_SHIELDED, + RAD = ARMOR_RAD_SHIELDED ) glove_type = /obj/item/clothing/gloves/rig/eva initial_modules = list( @@ -75,13 +75,13 @@ icon_state = "ert_medical_rig" emp_protection = 30 armor = list( - melee = ARMOR_MELEE_MAJOR, - bullet = ARMOR_BALLISTIC_PISTOL, - laser = ARMOR_LASER_SMALL, - energy = ARMOR_ENERGY_SMALL, - bomb = ARMOR_BOMB_PADDED, - bio = ARMOR_BIO_SHIELDED, - rad = ARMOR_RAD_SHIELDED + MELEE = ARMOR_MELEE_MAJOR, + BULLET = ARMOR_BALLISTIC_PISTOL, + LASER = ARMOR_LASER_SMALL, + ENERGY = ARMOR_ENERGY_SMALL, + BOMB = ARMOR_BOMB_PADDED, + BIO = ARMOR_BIO_SHIELDED, + RAD = ARMOR_RAD_SHIELDED ) initial_modules = list( /obj/item/rig_module/ai_container, @@ -103,13 +103,13 @@ icon_state = "ert_security_rig" emp_protection = 30 armor = list( - melee = ARMOR_MELEE_MAJOR, - bullet = ARMOR_BALLISTIC_PISTOL, - laser = ARMOR_LASER_PISTOL, - energy = ARMOR_ENERGY_SMALL, - bomb = ARMOR_BOMB_PADDED, - bio = ARMOR_BIO_SHIELDED, - rad = ARMOR_RAD_SHIELDED + MELEE = ARMOR_MELEE_MAJOR, + BULLET = ARMOR_BALLISTIC_PISTOL, + LASER = ARMOR_LASER_PISTOL, + ENERGY = ARMOR_ENERGY_SMALL, + BOMB = ARMOR_BOMB_PADDED, + BIO = ARMOR_BIO_SHIELDED, + RAD = ARMOR_RAD_SHIELDED ) initial_modules = list( /obj/item/rig_module/ai_container, @@ -132,13 +132,13 @@ species_restricted = list(BODYTYPE_HUMAN) armor = list( - melee = ARMOR_MELEE_MAJOR, - bullet = ARMOR_BALLISTIC_RIFLE, - laser = ARMOR_LASER_RIFLE, - energy = ARMOR_ENERGY_SMALL, - bomb = ARMOR_BOMB_RESISTANT, - bio = ARMOR_BIO_SHIELDED, - rad = ARMOR_RAD_SHIELDED + MELEE = ARMOR_MELEE_MAJOR, + BULLET = ARMOR_BALLISTIC_RIFLE, + LASER = ARMOR_LASER_RIFLE, + ENERGY = ARMOR_ENERGY_SMALL, + BOMB = ARMOR_BOMB_RESISTANT, + BIO = ARMOR_BIO_SHIELDED, + RAD = ARMOR_RAD_SHIELDED ) initial_modules = list( @@ -184,13 +184,13 @@ icon = 'icons/clothing/rig/apotheosis.dmi' icon_state = "apotheosis" armor = list( - melee = ARMOR_MELEE_MAJOR, - bullet = ARMOR_BALLISTIC_RIFLE, - laser = ARMOR_LASER_RIFLE, - energy = ARMOR_ENERGY_SMALL, - bomb = ARMOR_BOMB_RESISTANT, - bio = ARMOR_BIO_SHIELDED, - rad = ARMOR_RAD_SHIELDED + MELEE = ARMOR_MELEE_MAJOR, + BULLET = ARMOR_BALLISTIC_RIFLE, + LASER = ARMOR_LASER_RIFLE, + ENERGY = ARMOR_ENERGY_SMALL, + BOMB = ARMOR_BOMB_RESISTANT, + BIO = ARMOR_BIO_SHIELDED, + RAD = ARMOR_RAD_SHIELDED ) req_access = list() req_one_access = list() @@ -212,13 +212,13 @@ icon_state = "asset_protection_rig" icon_supported_species_tags = null armor = list( - melee = ARMOR_MELEE_SHIELDED, - bullet = ARMOR_BALLISTIC_RIFLE, - laser = ARMOR_LASER_RIFLE, - energy = ARMOR_ENERGY_STRONG, - bomb = ARMOR_BOMB_PADDED, - bio = ARMOR_BIO_SHIELDED, - rad = ARMOR_RAD_SHIELDED + MELEE = ARMOR_MELEE_SHIELDED, + BULLET = ARMOR_BALLISTIC_RIFLE, + LASER = ARMOR_LASER_RIFLE, + ENERGY = ARMOR_ENERGY_STRONG, + BOMB = ARMOR_BOMB_PADDED, + BIO = ARMOR_BIO_SHIELDED, + RAD = ARMOR_RAD_SHIELDED ) slowdown = 0 emp_protection = 50 @@ -253,13 +253,13 @@ icon_state = "asset_protection_rig" icon_supported_species_tags = null armor = list( - melee = ARMOR_MELEE_SHIELDED, - bullet = ARMOR_BALLISTIC_RIFLE, - laser = ARMOR_LASER_HEAVY, - energy = ARMOR_ENERGY_SHIELDED, - bomb = ARMOR_BOMB_RESISTANT, - bio = ARMOR_BIO_SHIELDED, - rad = ARMOR_RAD_SHIELDED + MELEE = ARMOR_MELEE_SHIELDED, + BULLET = ARMOR_BALLISTIC_RIFLE, + LASER = ARMOR_LASER_HEAVY, + ENERGY = ARMOR_ENERGY_SHIELDED, + BOMB = ARMOR_BOMB_RESISTANT, + BIO = ARMOR_BIO_SHIELDED, + RAD = ARMOR_RAD_SHIELDED ) slowdown = 0 emp_protection = 50 diff --git a/code/modules/clothing/spacesuits/rig/suits/light.dm b/code/modules/clothing/spacesuits/rig/suits/light.dm index f978cb3040e..e2dc266f8f8 100644 --- a/code/modules/clothing/spacesuits/rig/suits/light.dm +++ b/code/modules/clothing/spacesuits/rig/suits/light.dm @@ -8,11 +8,11 @@ suit_type = "light suit" allowed = list(/obj/item/gun,/obj/item/ammo_magazine,/obj/item/ammo_casing,/obj/item/melee/baton,/obj/item/handcuffs,/obj/item/tank,/obj/item/device/suit_cooling_unit,/obj/item/cell,/obj/item/material/twohanded/fireaxe) armor = list( - melee = ARMOR_MELEE_MAJOR, - bullet = ARMOR_BALLISTIC_SMALL, - laser = ARMOR_LASER_RIFLE, + MELEE = ARMOR_MELEE_MAJOR, + BULLET = ARMOR_BALLISTIC_SMALL, + LASER = ARMOR_LASER_RIFLE, energy = ARMOR_MELEE_MINOR, - bomb = ARMOR_BOMB_PADDED + BOMB = ARMOR_BOMB_PADDED ) emp_protection = 100 slowdown = -1 @@ -109,13 +109,13 @@ icon_state = "ninja_rig" icon_supported_species_tags = list("ipc", "skr", "taj", "una", "vau", "vaw") armor = list( - melee = ARMOR_MELEE_MAJOR, - bullet = ARMOR_BALLISTIC_PISTOL, - laser = ARMOR_LASER_PISTOL, - energy = ARMOR_ENERGY_SMALL, - bomb = ARMOR_BOMB_PADDED, - bio = ARMOR_BIO_SHIELDED, - rad = ARMOR_RAD_SHIELDED + MELEE = ARMOR_MELEE_MAJOR, + BULLET = ARMOR_BALLISTIC_PISTOL, + LASER = ARMOR_LASER_PISTOL, + ENERGY = ARMOR_ENERGY_SMALL, + BOMB = ARMOR_BOMB_PADDED, + BIO = ARMOR_BIO_SHIELDED, + RAD = ARMOR_RAD_SHIELDED ) emp_protection = 40 slowdown = 0 @@ -184,13 +184,13 @@ icon_state = "stealth_rig" icon_supported_species_tags = list("ipc", "skr", "taj", "una") armor = list( - melee = ARMOR_MELEE_MAJOR, - bullet = ARMOR_BALLISTIC_SMALL, - laser = ARMOR_LASER_RIFLE, - energy = ARMOR_ENERGY_SMALL, - bomb = ARMOR_BOMB_PADDED, - bio = ARMOR_BIO_SMALL, - rad = ARMOR_RAD_SMALL + MELEE = ARMOR_MELEE_MAJOR, + BULLET = ARMOR_BALLISTIC_SMALL, + LASER = ARMOR_LASER_RIFLE, + ENERGY = ARMOR_ENERGY_SMALL, + BOMB = ARMOR_BOMB_PADDED, + BIO = ARMOR_BIO_SMALL, + RAD = ARMOR_RAD_SMALL ) req_access = list(ACCESS_SYNDICATE) @@ -211,8 +211,8 @@ icon_supported_species_tags = null allowed = list(/obj/item/tank, /obj/item/device/flashlight) armor = list( - bio = ARMOR_BIO_MINOR, - rad = ARMOR_RAD_MINOR + BIO = ARMOR_BIO_MINOR, + RAD = ARMOR_RAD_MINOR ) slowdown = 0 airtight = 0 @@ -248,13 +248,13 @@ icon_state = "frontier_rig" suit_type = "advanced mobility hardsuit" armor = list( - melee = ARMOR_MELEE_MAJOR, - bullet = ARMOR_BALLISTIC_SMALL, - laser = ARMOR_LASER_SMALL, - energy = ARMOR_ENERGY_MINOR, - bomb = ARMOR_BOMB_PADDED, - bio = ARMOR_BIO_SHIELDED, - rad = ARMOR_RAD_SHIELDED + MELEE = ARMOR_MELEE_MAJOR, + BULLET = ARMOR_BALLISTIC_SMALL, + LASER = ARMOR_LASER_SMALL, + ENERGY = ARMOR_ENERGY_MINOR, + BOMB = ARMOR_BOMB_PADDED, + BIO = ARMOR_BIO_SHIELDED, + RAD = ARMOR_RAD_SHIELDED ) slowdown = -1 offline_slowdown = 0 diff --git a/code/modules/clothing/spacesuits/rig/suits/merc.dm b/code/modules/clothing/spacesuits/rig/suits/merc.dm index dd057b2e638..7b66cf82c90 100644 --- a/code/modules/clothing/spacesuits/rig/suits/merc.dm +++ b/code/modules/clothing/spacesuits/rig/suits/merc.dm @@ -11,13 +11,13 @@ icon_supported_species_tags = list("ipc", "skr", "taj", "una") suit_type = "crimson hardsuit" armor = list( - melee = ARMOR_MELEE_MAJOR, - bullet = ARMOR_BALLISTIC_MAJOR, - laser = ARMOR_LASER_MEDIUM, - energy = ARMOR_ENERGY_SMALL, - bomb = ARMOR_BOMB_PADDED, - bio = ARMOR_BIO_SHIELDED, - rad = ARMOR_RAD_SMALL + MELEE = ARMOR_MELEE_MAJOR, + BULLET = ARMOR_BALLISTIC_MAJOR, + LASER = ARMOR_LASER_MEDIUM, + ENERGY = ARMOR_ENERGY_SMALL, + BOMB = ARMOR_BOMB_PADDED, + BIO = ARMOR_BIO_SHIELDED, + RAD = ARMOR_RAD_SMALL ) siemens_coefficient = 0.1 offline_slowdown = 3 @@ -76,13 +76,13 @@ icon_state = "rhino" suit_type = "rhino hardsuit" armor = list( - melee = ARMOR_MELEE_MAJOR, - bullet = ARMOR_BALLISTIC_MAJOR, - laser = ARMOR_LASER_MEDIUM, - energy = ARMOR_ENERGY_SMALL, - bomb = ARMOR_BOMB_PADDED, - bio = ARMOR_BIO_SHIELDED, - rad = ARMOR_RAD_SMALL + MELEE = ARMOR_MELEE_MAJOR, + BULLET = ARMOR_BALLISTIC_MAJOR, + LASER = ARMOR_LASER_MEDIUM, + ENERGY = ARMOR_ENERGY_SMALL, + BOMB = ARMOR_BOMB_PADDED, + BIO = ARMOR_BIO_SHIELDED, + RAD = ARMOR_RAD_SMALL ) siemens_coefficient = 0.1 offline_slowdown = 3 diff --git a/code/modules/clothing/spacesuits/rig/suits/skrell.dm b/code/modules/clothing/spacesuits/rig/suits/skrell.dm index b9afd34d7fe..9374ed901f4 100644 --- a/code/modules/clothing/spacesuits/rig/suits/skrell.dm +++ b/code/modules/clothing/spacesuits/rig/suits/skrell.dm @@ -8,13 +8,13 @@ icon = 'icons/clothing/rig/nralakk.dmi' icon_state = "nralakk_rig" armor = list( - melee = ARMOR_MELEE_MAJOR, - bullet = ARMOR_BALLISTIC_MAJOR, - laser = ARMOR_LASER_MEDIUM, - energy = ARMOR_ENERGY_SMALL, - bomb = ARMOR_BOMB_PADDED, - bio = ARMOR_BIO_SHIELDED, - rad = ARMOR_RAD_SMALL + MELEE = ARMOR_MELEE_MAJOR, + BULLET = ARMOR_BALLISTIC_MAJOR, + LASER = ARMOR_LASER_MEDIUM, + ENERGY = ARMOR_ENERGY_SMALL, + BOMB = ARMOR_BOMB_PADDED, + BIO = ARMOR_BIO_SHIELDED, + RAD = ARMOR_RAD_SMALL ) siemens_coefficient = 0.1 emp_protection = 30 @@ -101,13 +101,13 @@ icon_state = "tup2_rig" helm_type = /obj/item/clothing/head/helmet/space/rig/skrell/tup/modern armor = list( - melee = ARMOR_MELEE_MAJOR, - bullet = ARMOR_BALLISTIC_RIFLE, - laser = ARMOR_LASER_RIFLE, - energy = ARMOR_ENERGY_STRONG, - bomb = ARMOR_BOMB_RESISTANT, - bio = ARMOR_BIO_SHIELDED, - rad = ARMOR_RAD_SHIELDED + MELEE = ARMOR_MELEE_MAJOR, + BULLET = ARMOR_BALLISTIC_RIFLE, + LASER = ARMOR_LASER_RIFLE, + ENERGY = ARMOR_ENERGY_STRONG, + BOMB = ARMOR_BOMB_RESISTANT, + BIO = ARMOR_BIO_SHIELDED, + RAD = ARMOR_RAD_SHIELDED ) /obj/item/rig/skrell/tup/modern/equipped diff --git a/code/modules/clothing/spacesuits/rig/suits/station.dm b/code/modules/clothing/spacesuits/rig/suits/station.dm index 235ff8e8a01..4ab5e0fb52e 100644 --- a/code/modules/clothing/spacesuits/rig/suits/station.dm +++ b/code/modules/clothing/spacesuits/rig/suits/station.dm @@ -76,13 +76,13 @@ icon_state = "industrial_rig" icon_supported_species_tags = list("ipc", "skr", "taj", "una") armor = list( - melee = ARMOR_MELEE_MAJOR, - bullet = ARMOR_BALLISTIC_PISTOL, - laser = ARMOR_LASER_SMALL, - energy = ARMOR_ENERGY_MINOR, - bomb = ARMOR_BOMB_RESISTANT, - bio = ARMOR_BIO_SHIELDED, - rad = ARMOR_RAD_RESISTANT + MELEE = ARMOR_MELEE_MAJOR, + BULLET = ARMOR_BALLISTIC_PISTOL, + LASER = ARMOR_LASER_SMALL, + ENERGY = ARMOR_ENERGY_MINOR, + BOMB = ARMOR_BOMB_RESISTANT, + BIO = ARMOR_BIO_SHIELDED, + RAD = ARMOR_RAD_RESISTANT ) siemens_coefficient = 0.35 slowdown = 2 @@ -141,13 +141,13 @@ icon_state = "eva_rig" icon_supported_species_tags = list("ipc", "skr", "taj", "una") armor = list( - melee = ARMOR_MELEE_RESISTANT, - bullet = ARMOR_BALLISTIC_MINOR, - laser = ARMOR_LASER_SMALL, - energy = ARMOR_ENERGY_SMALL, - bomb = ARMOR_BOMB_MINOR, - bio = ARMOR_BIO_SHIELDED, - rad = ARMOR_RAD_SHIELDED + MELEE = ARMOR_MELEE_RESISTANT, + BULLET = ARMOR_BALLISTIC_MINOR, + LASER = ARMOR_LASER_SMALL, + ENERGY = ARMOR_ENERGY_SMALL, + BOMB = ARMOR_BOMB_MINOR, + BIO = ARMOR_BIO_SHIELDED, + RAD = ARMOR_RAD_SHIELDED ) slowdown = 0 offline_slowdown = 3 @@ -191,13 +191,13 @@ icon_state = "pilot_rig" icon_supported_species_tags = list("ipc", "skr", "taj", "una") armor = list( - melee = ARMOR_MELEE_RESISTANT, - bullet = ARMOR_BALLISTIC_PISTOL, - laser = ARMOR_LASER_SMALL, - energy = ARMOR_ENERGY_SMALL, - bomb = ARMOR_BOMB_RESISTANT, - bio = ARMOR_BIO_SHIELDED, - rad = ARMOR_RAD_SHIELDED + MELEE = ARMOR_MELEE_RESISTANT, + BULLET = ARMOR_BALLISTIC_PISTOL, + LASER = ARMOR_LASER_SMALL, + ENERGY = ARMOR_ENERGY_SMALL, + BOMB = ARMOR_BOMB_RESISTANT, + BIO = ARMOR_BIO_SHIELDED, + RAD = ARMOR_RAD_SHIELDED ) /obj/item/rig/eva/pilot/equipped @@ -217,13 +217,13 @@ icon_state = "ce_rig" icon_supported_species_tags = list("ipc", "skr", "taj", "una") armor = list( - melee = ARMOR_MELEE_RESISTANT, - bullet = ARMOR_BALLISTIC_SMALL, - laser = ARMOR_LASER_SMALL, - energy = ARMOR_ENERGY_SMALL, - bomb = ARMOR_BOMB_PADDED, - bio = ARMOR_BIO_SHIELDED, - rad = ARMOR_RAD_SHIELDED + MELEE = ARMOR_MELEE_RESISTANT, + BULLET = ARMOR_BALLISTIC_SMALL, + LASER = ARMOR_LASER_SMALL, + ENERGY = ARMOR_ENERGY_SMALL, + BOMB = ARMOR_BOMB_PADDED, + BIO = ARMOR_BIO_SHIELDED, + RAD = ARMOR_RAD_SHIELDED ) slowdown = 0 offline_slowdown = 3 @@ -267,13 +267,13 @@ icon_state = "hazmat_rig" icon_supported_species_tags = list("ipc", "skr", "taj", "una") armor = list( - melee = ARMOR_MELEE_RESISTANT, - bullet = ARMOR_BALLISTIC_MINOR, - laser = ARMOR_LASER_PISTOL, - energy = ARMOR_ENERGY_STRONG, - bomb = ARMOR_BOMB_RESISTANT, - bio = ARMOR_BIO_SHIELDED, - rad = ARMOR_RAD_SHIELDED + MELEE = ARMOR_MELEE_RESISTANT, + BULLET = ARMOR_BALLISTIC_MINOR, + LASER = ARMOR_LASER_PISTOL, + ENERGY = ARMOR_ENERGY_STRONG, + BOMB = ARMOR_BOMB_RESISTANT, + BIO = ARMOR_BIO_SHIELDED, + RAD = ARMOR_RAD_SHIELDED ) siemens_coefficient = 0.50 offline_vision_restriction = TINT_HEAVY @@ -307,13 +307,13 @@ icon_state = "medical_rig" icon_supported_species_tags = list("ipc", "skr", "taj", "una") armor = list( - melee = ARMOR_MELEE_RESISTANT, - bullet = ARMOR_BALLISTIC_MINOR, - laser = ARMOR_LASER_SMALL, - energy = ARMOR_ENERGY_RESISTANT, - bomb = ARMOR_BOMB_PADDED, - bio = ARMOR_BIO_SHIELDED, - rad = ARMOR_RAD_SHIELDED + MELEE = ARMOR_MELEE_RESISTANT, + BULLET = ARMOR_BALLISTIC_MINOR, + LASER = ARMOR_LASER_SMALL, + ENERGY = ARMOR_ENERGY_RESISTANT, + BOMB = ARMOR_BOMB_PADDED, + BIO = ARMOR_BIO_SHIELDED, + RAD = ARMOR_RAD_SHIELDED ) siemens_coefficient = 0.50 slowdown = 1 @@ -350,13 +350,13 @@ icon_state = "hazard_rig" icon_supported_species_tags = list("ipc", "skr", "taj", "una") armor = list( - melee = ARMOR_MELEE_MAJOR, - bullet = ARMOR_BALLISTIC_PISTOL, - laser = ARMOR_LASER_MEDIUM, - energy = ARMOR_ENERGY_RESISTANT, - bomb = ARMOR_BOMB_PADDED, - bio = ARMOR_BIO_SHIELDED, - rad = ARMOR_RAD_RESISTANT + MELEE = ARMOR_MELEE_MAJOR, + BULLET = ARMOR_BALLISTIC_PISTOL, + LASER = ARMOR_LASER_MEDIUM, + ENERGY = ARMOR_ENERGY_RESISTANT, + BOMB = ARMOR_BOMB_PADDED, + BIO = ARMOR_BIO_SHIELDED, + RAD = ARMOR_RAD_RESISTANT ) offline_slowdown = 3 offline_vision_restriction = TINT_HEAVY @@ -395,13 +395,13 @@ icon = 'icons/clothing/rig/diving.dmi' icon_state = "diving_rig" armor = list( - melee = ARMOR_MELEE_RESISTANT, - bullet = ARMOR_BALLISTIC_MINOR, - laser = ARMOR_LASER_SMALL, - energy = ARMOR_ENERGY_RESISTANT, - bomb = ARMOR_BOMB_PADDED, - bio = ARMOR_BIO_SHIELDED, - rad = ARMOR_RAD_SHIELDED + MELEE = ARMOR_MELEE_RESISTANT, + BULLET = ARMOR_BALLISTIC_MINOR, + LASER = ARMOR_LASER_SMALL, + ENERGY = ARMOR_ENERGY_RESISTANT, + BOMB = ARMOR_BOMB_PADDED, + BIO = ARMOR_BIO_SHIELDED, + RAD = ARMOR_RAD_SHIELDED ) slowdown = 3 offline_slowdown = 4 diff --git a/code/modules/clothing/spacesuits/rig/suits/terminator.dm b/code/modules/clothing/spacesuits/rig/suits/terminator.dm index dda475694d6..f333759df8b 100644 --- a/code/modules/clothing/spacesuits/rig/suits/terminator.dm +++ b/code/modules/clothing/spacesuits/rig/suits/terminator.dm @@ -6,13 +6,13 @@ icon_state = "hunterkiller_rig" suit_type = "synthetic exoskeleton" armor = list( - melee = ARMOR_MELEE_VERY_HIGH, - bullet = ARMOR_BALLISTIC_RIFLE, - laser = ARMOR_LASER_RIFLE, + MELEE = ARMOR_MELEE_VERY_HIGH, + BULLET = ARMOR_BALLISTIC_RIFLE, + LASER = ARMOR_LASER_RIFLE, energy = ARMOR_MELEE_MINOR, - bomb = ARMOR_BOMB_SHIELDED, - bio = ARMOR_BIO_SHIELDED, - rad = ARMOR_RAD_RESISTANT + BOMB = ARMOR_BOMB_SHIELDED, + BIO = ARMOR_BIO_SHIELDED, + RAD = ARMOR_RAD_RESISTANT ) siemens_coefficient = 0 // Ok this is the only exception. Got it? Good. offline_slowdown = 3 diff --git a/code/modules/clothing/spacesuits/rig/suits/xanu.dm b/code/modules/clothing/spacesuits/rig/suits/xanu.dm index 28fcd8474bf..4ab1851a687 100644 --- a/code/modules/clothing/spacesuits/rig/suits/xanu.dm +++ b/code/modules/clothing/spacesuits/rig/suits/xanu.dm @@ -9,13 +9,13 @@ helm_type = /obj/item/clothing/head/helmet/space/rig/combat/xanu armor = list( - melee = ARMOR_MELEE_MAJOR, - bullet = ARMOR_BALLISTIC_MAJOR, - laser = ARMOR_LASER_MEDIUM, - energy = ARMOR_ENERGY_SMALL, - bomb = ARMOR_BOMB_PADDED, - bio = ARMOR_BIO_SHIELDED, - rad = ARMOR_RAD_SMALL, + MELEE = ARMOR_MELEE_MAJOR, + BULLET = ARMOR_BALLISTIC_MAJOR, + LASER = ARMOR_LASER_MEDIUM, + ENERGY = ARMOR_ENERGY_SMALL, + BOMB = ARMOR_BOMB_PADDED, + BIO = ARMOR_BIO_SHIELDED, + RAD = ARMOR_RAD_SMALL, ) allowed = list(/obj/item/device/flashlight,/obj/item/tank,/obj/item/device/suit_cooling_unit,/obj/item/gun,/obj/item/ammo_magazine,/obj/item/ammo_casing,/obj/item/melee/baton,/obj/item/melee/energy/sword,/obj/item/handcuffs) @@ -64,9 +64,9 @@ species_restricted = list(BODYTYPE_HUMAN, BODYTYPE_IPC, BODYTYPE_IPC_BISHOP, BODYTYPE_IPC_ZENGHU) //This suit has no slowdown. These armor values are intentionally terrible as a result. armor = list( - bomb = ARMOR_BOMB_MINOR, - bio = ARMOR_BIO_SHIELDED, - rad = ARMOR_RAD_MINOR + BOMB = ARMOR_BOMB_MINOR, + BIO = ARMOR_BIO_SHIELDED, + RAD = ARMOR_RAD_MINOR ) slowdown = 0 offline_slowdown = 1 diff --git a/code/modules/clothing/spacesuits/spacesuits.dm b/code/modules/clothing/spacesuits/spacesuits.dm index 779a3efbb77..b7f3e79a4ac 100644 --- a/code/modules/clothing/spacesuits/spacesuits.dm +++ b/code/modules/clothing/spacesuits/spacesuits.dm @@ -12,8 +12,8 @@ item_flags = ITEM_FLAG_THICK_MATERIAL | ITEM_FLAG_INJECTION_PORT | ITEM_FLAG_AIRTIGHT permeability_coefficient = 0.01 armor = list( - bio = ARMOR_BIO_SHIELDED, - rad = ARMOR_RAD_SMALL + BIO = ARMOR_BIO_SHIELDED, + RAD = ARMOR_RAD_SMALL ) flags_inv = HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE|BLOCKHAIR body_parts_covered = HEAD|FACE|EYES @@ -55,8 +55,8 @@ allowed = list(/obj/item/device/flashlight, /obj/item/tank/emergency_oxygen, /obj/item/device/suit_cooling_unit, /obj/item/tank) slowdown = 1 armor = list( - bio = ARMOR_BIO_SHIELDED, - rad = ARMOR_RAD_SMALL + BIO = ARMOR_BIO_SHIELDED, + RAD = ARMOR_RAD_SMALL ) flags_inv = HIDEWRISTS|HIDEGLOVES|HIDESHOES|HIDEJUMPSUIT|HIDETAIL cold_protection = UPPER_TORSO | LOWER_TORSO | LEGS | FEET | ARMS | HANDS diff --git a/code/modules/clothing/spacesuits/syndi.dm b/code/modules/clothing/spacesuits/syndi.dm index ac04520434c..5a80838b221 100644 --- a/code/modules/clothing/spacesuits/syndi.dm +++ b/code/modules/clothing/spacesuits/syndi.dm @@ -6,13 +6,13 @@ item_state = "syndicate" desc = "A crimson helmet sporting clean lines and durable plating. Engineered to look menacing." armor = list( - melee = ARMOR_MELEE_MAJOR, - bullet = ARMOR_BALLISTIC_MEDIUM, - laser = ARMOR_LASER_PISTOL, - energy = ARMOR_ENERGY_MINOR, - bomb = ARMOR_BOMB_PADDED, - bio = ARMOR_BIO_SMALL, - rad = ARMOR_RAD_MINOR + MELEE = ARMOR_MELEE_MAJOR, + BULLET = ARMOR_BALLISTIC_MEDIUM, + LASER = ARMOR_LASER_PISTOL, + ENERGY = ARMOR_ENERGY_MINOR, + BOMB = ARMOR_BOMB_PADDED, + BIO = ARMOR_BIO_SMALL, + RAD = ARMOR_RAD_MINOR ) siemens_coefficient = 0.5 brightness_on = 6 @@ -28,13 +28,13 @@ allowed = list(/obj/item/gun,/obj/item/ammo_magazine,/obj/item/ammo_casing,/obj/item/melee/baton,/obj/item/melee/energy/sword,/obj/item/handcuffs,/obj/item/tank/emergency_oxygen) slowdown = 1 armor = list( - melee = ARMOR_MELEE_MAJOR, - bullet = ARMOR_BALLISTIC_MEDIUM, - laser = ARMOR_LASER_PISTOL, - energy = ARMOR_ENERGY_MINOR, - bomb = ARMOR_BOMB_PADDED, - bio = ARMOR_BIO_SMALL, - rad = ARMOR_RAD_MINOR + MELEE = ARMOR_MELEE_MAJOR, + BULLET = ARMOR_BALLISTIC_MEDIUM, + LASER = ARMOR_LASER_PISTOL, + ENERGY = ARMOR_ENERGY_MINOR, + BOMB = ARMOR_BOMB_PADDED, + BIO = ARMOR_BIO_SMALL, + RAD = ARMOR_RAD_MINOR ) siemens_coefficient = 0.5 contained_sprite = FALSE diff --git a/code/modules/clothing/spacesuits/void/alien/skrell.dm b/code/modules/clothing/spacesuits/void/alien/skrell.dm index 8abde41daa9..3b238aa62c0 100644 --- a/code/modules/clothing/spacesuits/void/alien/skrell.dm +++ b/code/modules/clothing/spacesuits/void/alien/skrell.dm @@ -2,13 +2,13 @@ name = "skrellian helmet" desc = "Smoothly contoured and polished to a shine. Still looks like a fishbowl." armor = list( - melee = ARMOR_MELEE_KNIVES, - bullet = ARMOR_BALLISTIC_MINOR, - laser = ARMOR_LASER_MINOR, - energy = ARMOR_ENERGY_RESISTANT, - bomb = ARMOR_BOMB_PADDED, - bio = ARMOR_BIO_SHIELDED, - rad = ARMOR_RAD_SHIELDED + MELEE = ARMOR_MELEE_KNIVES, + BULLET = ARMOR_BALLISTIC_MINOR, + LASER = ARMOR_LASER_MINOR, + ENERGY = ARMOR_ENERGY_RESISTANT, + BOMB = ARMOR_BOMB_PADDED, + BIO = ARMOR_BIO_SHIELDED, + RAD = ARMOR_RAD_SHIELDED ) max_heat_protection_temperature = SPACE_SUIT_MAX_HEAT_PROTECTION_TEMPERATURE species_restricted = list(BODYTYPE_SKRELL,BODYTYPE_HUMAN) @@ -25,13 +25,13 @@ name = "skrellian voidsuit" desc = "Seems like a wetsuit with reinforced plating seamlessly attached to it. Very chic." armor = list( - melee = ARMOR_MELEE_KNIVES, - bullet = ARMOR_BALLISTIC_MINOR, - laser = ARMOR_LASER_MINOR, - energy = ARMOR_ENERGY_RESISTANT, - bomb = ARMOR_BOMB_PADDED, - bio = ARMOR_BIO_SHIELDED, - rad = ARMOR_RAD_SHIELDED + MELEE = ARMOR_MELEE_KNIVES, + BULLET = ARMOR_BALLISTIC_MINOR, + LASER = ARMOR_LASER_MINOR, + ENERGY = ARMOR_ENERGY_RESISTANT, + BOMB = ARMOR_BOMB_PADDED, + BIO = ARMOR_BIO_SHIELDED, + RAD = ARMOR_RAD_SHIELDED ) allowed = list(/obj/item/device/flashlight,/obj/item/tank,/obj/item/storage/bag/ore,/obj/item/device/t_scanner,/obj/item/pickaxe, /obj/item/rfd/construction) heat_protection = UPPER_TORSO|LOWER_TORSO|LEGS|FEET|ARMS|HANDS @@ -56,13 +56,13 @@ item_state = "kala_suit" contained_sprite = TRUE armor = list( - melee = ARMOR_MELEE_RESISTANT, - bullet = ARMOR_BALLISTIC_MEDIUM, - laser = ARMOR_LASER_PISTOL, - energy = ARMOR_ENERGY_MINOR, - bomb = ARMOR_BOMB_PADDED, - bio = ARMOR_BIO_SHIELDED, - rad = ARMOR_RAD_SMALL + MELEE = ARMOR_MELEE_RESISTANT, + BULLET = ARMOR_BALLISTIC_MEDIUM, + LASER = ARMOR_LASER_PISTOL, + ENERGY = ARMOR_ENERGY_MINOR, + BOMB = ARMOR_BOMB_PADDED, + BIO = ARMOR_BIO_SHIELDED, + RAD = ARMOR_RAD_SMALL ) species_restricted = list(BODYTYPE_SKRELL) refittable = FALSE @@ -75,13 +75,13 @@ item_state = "kala_helm" contained_sprite = TRUE armor = list( - melee = ARMOR_MELEE_RESISTANT, - bullet = ARMOR_BALLISTIC_MEDIUM, - laser = ARMOR_LASER_PISTOL, - energy = ARMOR_ENERGY_MINOR, - bomb = ARMOR_BOMB_PADDED, - bio = ARMOR_BIO_SHIELDED, - rad = ARMOR_RAD_SMALL + MELEE = ARMOR_MELEE_RESISTANT, + BULLET = ARMOR_BALLISTIC_MEDIUM, + LASER = ARMOR_LASER_PISTOL, + ENERGY = ARMOR_ENERGY_MINOR, + BOMB = ARMOR_BOMB_PADDED, + BIO = ARMOR_BIO_SHIELDED, + RAD = ARMOR_RAD_SMALL ) species_restricted = list(BODYTYPE_SKRELL) refittable = FALSE @@ -116,13 +116,13 @@ icon_state = "kala_eng" item_state = "kala_eng" armor = list( - melee = ARMOR_MELEE_RESISTANT, - bullet = ARMOR_BALLISTIC_MEDIUM, - laser = ARMOR_LASER_PISTOL, - energy = ARMOR_ENERGY_MINOR, - bomb = ARMOR_BOMB_PADDED, - bio = ARMOR_BIO_SHIELDED, - rad = ARMOR_RAD_SHIELDED + MELEE = ARMOR_MELEE_RESISTANT, + BULLET = ARMOR_BALLISTIC_MEDIUM, + LASER = ARMOR_LASER_PISTOL, + ENERGY = ARMOR_ENERGY_MINOR, + BOMB = ARMOR_BOMB_PADDED, + BIO = ARMOR_BIO_SHIELDED, + RAD = ARMOR_RAD_SHIELDED ) /obj/item/clothing/head/helmet/space/void/kala/engineering @@ -131,11 +131,11 @@ icon_state = "kala_helm_eng" item_state = "kala_helm_eng" armor = list( - melee = ARMOR_MELEE_RESISTANT, - bullet = ARMOR_BALLISTIC_MEDIUM, - laser = ARMOR_LASER_PISTOL, - energy = ARMOR_ENERGY_MINOR, - bomb = ARMOR_BOMB_PADDED, - bio = ARMOR_BIO_SHIELDED, - rad = ARMOR_RAD_SHIELDED + MELEE = ARMOR_MELEE_RESISTANT, + BULLET = ARMOR_BALLISTIC_MEDIUM, + LASER = ARMOR_LASER_PISTOL, + ENERGY = ARMOR_ENERGY_MINOR, + BOMB = ARMOR_BOMB_PADDED, + BIO = ARMOR_BIO_SHIELDED, + RAD = ARMOR_RAD_SHIELDED ) diff --git a/code/modules/clothing/spacesuits/void/alien/tajara.dm b/code/modules/clothing/spacesuits/void/alien/tajara.dm index 60c4c4b1bdb..d03cdc4a049 100644 --- a/code/modules/clothing/spacesuits/void/alien/tajara.dm +++ b/code/modules/clothing/spacesuits/void/alien/tajara.dm @@ -8,13 +8,13 @@ icon_state = "cosmo_suit" item_state = "cosmo_suit" armor = list( - melee = ARMOR_MELEE_RESISTANT, - bullet = ARMOR_BALLISTIC_MEDIUM, - laser = ARMOR_LASER_PISTOL, - energy = ARMOR_ENERGY_MINOR, - bomb = ARMOR_BOMB_PADDED, - bio = ARMOR_BIO_SHIELDED, - rad = ARMOR_RAD_SMALL + MELEE = ARMOR_MELEE_RESISTANT, + BULLET = ARMOR_BALLISTIC_MEDIUM, + LASER = ARMOR_LASER_PISTOL, + ENERGY = ARMOR_ENERGY_MINOR, + BOMB = ARMOR_BOMB_PADDED, + BIO = ARMOR_BIO_SHIELDED, + RAD = ARMOR_RAD_SMALL ) allowed = list( /obj/item/device/flashlight, @@ -40,13 +40,13 @@ icon_state = "cosmo_suit" item_state = "cosmo_suit" armor = list( - melee = ARMOR_MELEE_RESISTANT, - bullet = ARMOR_BALLISTIC_MEDIUM, - laser = ARMOR_LASER_PISTOL, - energy = ARMOR_ENERGY_MINOR, - bomb = ARMOR_BOMB_PADDED, - bio = ARMOR_BIO_SHIELDED, - rad = ARMOR_RAD_SMALL + MELEE = ARMOR_MELEE_RESISTANT, + BULLET = ARMOR_BALLISTIC_MEDIUM, + LASER = ARMOR_LASER_PISTOL, + ENERGY = ARMOR_ENERGY_MINOR, + BOMB = ARMOR_BOMB_PADDED, + BIO = ARMOR_BIO_SHIELDED, + RAD = ARMOR_RAD_SMALL ) species_restricted = list(BODYTYPE_TAJARA) refittable = FALSE @@ -130,13 +130,13 @@ item_state = "nkavoid" contained_sprite = TRUE armor = list( - melee = ARMOR_MELEE_RESISTANT, - bullet = ARMOR_BALLISTIC_MEDIUM, - laser = ARMOR_LASER_PISTOL, - energy = ARMOR_ENERGY_MINOR, - bomb = ARMOR_BOMB_PADDED, - bio = ARMOR_BIO_SHIELDED, - rad = ARMOR_RAD_SMALL + MELEE = ARMOR_MELEE_RESISTANT, + BULLET = ARMOR_BALLISTIC_MEDIUM, + LASER = ARMOR_LASER_PISTOL, + ENERGY = ARMOR_ENERGY_MINOR, + BOMB = ARMOR_BOMB_PADDED, + BIO = ARMOR_BIO_SHIELDED, + RAD = ARMOR_RAD_SMALL ) allowed = list( /obj/item/device/flashlight, @@ -160,13 +160,13 @@ item_state = "nkavoidhelm" contained_sprite = TRUE armor = list( - melee = ARMOR_MELEE_RESISTANT, - bullet = ARMOR_BALLISTIC_MEDIUM, - laser = ARMOR_LASER_PISTOL, - energy = ARMOR_ENERGY_MINOR, - bomb = ARMOR_BOMB_PADDED, - bio = ARMOR_BIO_SHIELDED, - rad = ARMOR_RAD_SMALL + MELEE = ARMOR_MELEE_RESISTANT, + BULLET = ARMOR_BALLISTIC_MEDIUM, + LASER = ARMOR_LASER_PISTOL, + ENERGY = ARMOR_ENERGY_MINOR, + BOMB = ARMOR_BOMB_PADDED, + BIO = ARMOR_BIO_SHIELDED, + RAD = ARMOR_RAD_SMALL ) species_restricted = list(BODYTYPE_TAJARA) refittable = FALSE @@ -179,13 +179,13 @@ item_state = "DPRA_voidsuit" contained_sprite = TRUE armor = list( - melee = ARMOR_MELEE_RESISTANT, - bullet = ARMOR_BALLISTIC_MEDIUM, - laser = ARMOR_LASER_PISTOL, - energy = ARMOR_ENERGY_MINOR, - bomb = ARMOR_BOMB_PADDED, - bio = ARMOR_BIO_SHIELDED, - rad = ARMOR_RAD_SMALL + MELEE = ARMOR_MELEE_RESISTANT, + BULLET = ARMOR_BALLISTIC_MEDIUM, + LASER = ARMOR_LASER_PISTOL, + ENERGY = ARMOR_ENERGY_MINOR, + BOMB = ARMOR_BOMB_PADDED, + BIO = ARMOR_BIO_SHIELDED, + RAD = ARMOR_RAD_SMALL ) allowed = list( /obj/item/device/flashlight, @@ -209,13 +209,13 @@ item_state = "DPRA_voidsuit_helmet" contained_sprite = TRUE armor = list( - melee = ARMOR_MELEE_RESISTANT, - bullet = ARMOR_BALLISTIC_MEDIUM, - laser = ARMOR_LASER_PISTOL, - energy = ARMOR_ENERGY_MINOR, - bomb = ARMOR_BOMB_PADDED, - bio = ARMOR_BIO_SHIELDED, - rad = ARMOR_RAD_SMALL + MELEE = ARMOR_MELEE_RESISTANT, + BULLET = ARMOR_BALLISTIC_MEDIUM, + LASER = ARMOR_LASER_PISTOL, + ENERGY = ARMOR_ENERGY_MINOR, + BOMB = ARMOR_BOMB_PADDED, + BIO = ARMOR_BIO_SHIELDED, + RAD = ARMOR_RAD_SMALL ) species_restricted = list(BODYTYPE_TAJARA) refittable = FALSE diff --git a/code/modules/clothing/spacesuits/void/alien/unathi.dm b/code/modules/clothing/spacesuits/void/alien/unathi.dm index dfc06c98c03..6371c0b83cf 100644 --- a/code/modules/clothing/spacesuits/void/alien/unathi.dm +++ b/code/modules/clothing/spacesuits/void/alien/unathi.dm @@ -6,13 +6,13 @@ item_state = "kataphract_helm" contained_sprite = TRUE armor = list( - melee = ARMOR_MELEE_RESISTANT, - bullet = ARMOR_BALLISTIC_MEDIUM, - laser = ARMOR_LASER_PISTOL, - energy = ARMOR_ENERGY_MINOR, - bomb = ARMOR_BOMB_PADDED, - bio = ARMOR_BIO_SHIELDED, - rad = ARMOR_RAD_SMALL + MELEE = ARMOR_MELEE_RESISTANT, + BULLET = ARMOR_BALLISTIC_MEDIUM, + LASER = ARMOR_LASER_PISTOL, + ENERGY = ARMOR_ENERGY_MINOR, + BOMB = ARMOR_BOMB_PADDED, + BIO = ARMOR_BIO_SHIELDED, + RAD = ARMOR_RAD_SMALL ) siemens_coefficient = 0.35 species_restricted = list(BODYTYPE_UNATHI) @@ -28,13 +28,13 @@ slowdown = 1 w_class = WEIGHT_CLASS_NORMAL armor = list( - melee = ARMOR_MELEE_RESISTANT, - bullet = ARMOR_BALLISTIC_MEDIUM, - laser = ARMOR_LASER_PISTOL, - energy = ARMOR_ENERGY_MINOR, - bomb = ARMOR_BOMB_PADDED, - bio = ARMOR_BIO_SHIELDED, - rad = ARMOR_RAD_SMALL + MELEE = ARMOR_MELEE_RESISTANT, + BULLET = ARMOR_BALLISTIC_MEDIUM, + LASER = ARMOR_LASER_PISTOL, + ENERGY = ARMOR_ENERGY_MINOR, + BOMB = ARMOR_BOMB_PADDED, + BIO = ARMOR_BIO_SHIELDED, + RAD = ARMOR_RAD_SMALL ) allowed = list(/obj/item/device/flashlight,/obj/item/tank,/obj/item/gun,/obj/item/ammo_magazine,/obj/item/ammo_casing,/obj/item/melee/baton,/obj/item/melee/energy/sword,/obj/item/handcuffs) siemens_coefficient = 0.35 @@ -73,13 +73,13 @@ item_state = "rig0-unathipirate" contained_sprite = TRUE armor = list( - melee = ARMOR_MELEE_RESISTANT, - bullet = ARMOR_BALLISTIC_MEDIUM, - laser = ARMOR_LASER_PISTOL, - energy = ARMOR_ENERGY_MINOR, - bomb = ARMOR_BOMB_PADDED, - bio = ARMOR_BIO_SHIELDED, - rad = ARMOR_RAD_SMALL + MELEE = ARMOR_MELEE_RESISTANT, + BULLET = ARMOR_BALLISTIC_MEDIUM, + LASER = ARMOR_LASER_PISTOL, + ENERGY = ARMOR_ENERGY_MINOR, + BOMB = ARMOR_BOMB_PADDED, + BIO = ARMOR_BIO_SHIELDED, + RAD = ARMOR_RAD_SMALL ) light_overlay = "helmet_light_dual_low" brightness_on = 6 @@ -94,13 +94,13 @@ item_state = "rig-unathipirate" contained_sprite = TRUE armor = list( - melee = ARMOR_MELEE_RESISTANT, - bullet = ARMOR_BALLISTIC_MEDIUM, - laser = ARMOR_LASER_PISTOL, - energy = ARMOR_ENERGY_MINOR, - bomb = ARMOR_BOMB_PADDED, - bio = ARMOR_BIO_SHIELDED, - rad = ARMOR_RAD_SMALL + MELEE = ARMOR_MELEE_RESISTANT, + BULLET = ARMOR_BALLISTIC_MEDIUM, + LASER = ARMOR_LASER_PISTOL, + ENERGY = ARMOR_ENERGY_MINOR, + BOMB = ARMOR_BOMB_PADDED, + BIO = ARMOR_BIO_SHIELDED, + RAD = ARMOR_RAD_SMALL ) allowed = list(/obj/item/gun,/obj/item/device/flashlight,/obj/item/tank,/obj/item/device/suit_cooling_unit,/obj/item/material/sword,/obj/item/melee/hammer,/obj/item/melee/energy) species_restricted = list(BODYTYPE_UNATHI) @@ -127,13 +127,13 @@ contained_sprite = TRUE w_class = WEIGHT_CLASS_NORMAL armor = list( - melee = ARMOR_MELEE_RESISTANT, - bullet = ARMOR_BALLISTIC_MEDIUM, - laser = ARMOR_LASER_PISTOL, - energy = ARMOR_ENERGY_MINOR, - bomb = ARMOR_BOMB_PADDED, - bio = ARMOR_BIO_SHIELDED, - rad = ARMOR_RAD_SMALL + MELEE = ARMOR_MELEE_RESISTANT, + BULLET = ARMOR_BALLISTIC_MEDIUM, + LASER = ARMOR_LASER_PISTOL, + ENERGY = ARMOR_ENERGY_MINOR, + BOMB = ARMOR_BOMB_PADDED, + BIO = ARMOR_BIO_SHIELDED, + RAD = ARMOR_RAD_SMALL ) allowed = list(/obj/item/gun,/obj/item/device/flashlight,/obj/item/tank,/obj/item/device/suit_cooling_unit,/obj/item/material/sword,/obj/item/melee/hammer,/obj/item/melee/energy) species_restricted = list(BODYTYPE_UNATHI) @@ -147,13 +147,13 @@ item_state = "hegemony-voidhelm" contained_sprite = TRUE armor = list( - melee = ARMOR_MELEE_RESISTANT, - bullet = ARMOR_BALLISTIC_MEDIUM, - laser = ARMOR_LASER_PISTOL, - energy = ARMOR_ENERGY_MINOR, - bomb = ARMOR_BOMB_PADDED, - bio = ARMOR_BIO_SHIELDED, - rad = ARMOR_RAD_SHIELDED + MELEE = ARMOR_MELEE_RESISTANT, + BULLET = ARMOR_BALLISTIC_MEDIUM, + LASER = ARMOR_LASER_PISTOL, + ENERGY = ARMOR_ENERGY_MINOR, + BOMB = ARMOR_BOMB_PADDED, + BIO = ARMOR_BIO_SHIELDED, + RAD = ARMOR_RAD_SHIELDED ) light_overlay = "helmet_light_dual_low" brightness_on = 6 @@ -204,13 +204,13 @@ icon_state = "rig-tarwapirate" item_state = "rig-tarwapirate" armor = list( - melee = ARMOR_MELEE_RESISTANT, - bullet = ARMOR_BALLISTIC_MEDIUM, - laser = ARMOR_LASER_PISTOL, - energy = ARMOR_ENERGY_MINOR, - bomb = ARMOR_BOMB_PADDED, - bio = ARMOR_BIO_SHIELDED, - rad = ARMOR_RAD_SHIELDED + MELEE = ARMOR_MELEE_RESISTANT, + BULLET = ARMOR_BALLISTIC_MEDIUM, + LASER = ARMOR_LASER_PISTOL, + ENERGY = ARMOR_ENERGY_MINOR, + BOMB = ARMOR_BOMB_PADDED, + BIO = ARMOR_BIO_SHIELDED, + RAD = ARMOR_RAD_SHIELDED ) /obj/item/clothing/suit/space/void/unathi_pirate/tarwa/captain @@ -227,13 +227,13 @@ icon_state = "rig-tarwapirate-helmet" item_state = "rig-tarwapirate-helmet" armor = list( - melee = ARMOR_MELEE_RESISTANT, - bullet = ARMOR_BALLISTIC_MEDIUM, - laser = ARMOR_LASER_PISTOL, - energy = ARMOR_ENERGY_MINOR, - bomb = ARMOR_BOMB_PADDED, - bio = ARMOR_BIO_SHIELDED, - rad = ARMOR_RAD_SHIELDED + MELEE = ARMOR_MELEE_RESISTANT, + BULLET = ARMOR_BALLISTIC_MEDIUM, + LASER = ARMOR_LASER_PISTOL, + ENERGY = ARMOR_ENERGY_MINOR, + BOMB = ARMOR_BOMB_PADDED, + BIO = ARMOR_BIO_SHIELDED, + RAD = ARMOR_RAD_SHIELDED ) light_overlay = "helmet_light_green" @@ -244,12 +244,12 @@ icon_state = "rig-tarwacaptain-helmet" item_state = "rig-tarwacaptain-helmet" armor = list( - melee = ARMOR_MELEE_MAJOR, - bullet = ARMOR_BALLISTIC_CARBINE, - laser = ARMOR_LASER_PISTOL, - bomb = ARMOR_BOMB_RESISTANT, - bio = ARMOR_BIO_SHIELDED, - rad = ARMOR_RAD_SHIELDED + MELEE = ARMOR_MELEE_MAJOR, + BULLET = ARMOR_BALLISTIC_CARBINE, + LASER = ARMOR_LASER_PISTOL, + BOMB = ARMOR_BOMB_RESISTANT, + BIO = ARMOR_BIO_SHIELDED, + RAD = ARMOR_RAD_SHIELDED ) /obj/item/clothing/suit/space/void/unathi_pirate/kazu diff --git a/code/modules/clothing/spacesuits/void/captain.dm b/code/modules/clothing/spacesuits/void/captain.dm index 511ec3aad40..0e0a6ad6a5a 100644 --- a/code/modules/clothing/spacesuits/void/captain.dm +++ b/code/modules/clothing/spacesuits/void/captain.dm @@ -8,13 +8,13 @@ contained_sprite = TRUE icon_supported_species_tags = list("skr", "taj", "una", "ipc") armor = list( - melee = ARMOR_MELEE_MAJOR, - bullet = ARMOR_BALLISTIC_PISTOL, - laser = ARMOR_LASER_PISTOL, - energy = ARMOR_ENERGY_SMALL, - bomb = ARMOR_BOMB_RESISTANT, - bio = ARMOR_BIO_SHIELDED, - rad = ARMOR_RAD_RESISTANT + MELEE = ARMOR_MELEE_MAJOR, + BULLET = ARMOR_BALLISTIC_PISTOL, + LASER = ARMOR_LASER_PISTOL, + ENERGY = ARMOR_ENERGY_SMALL, + BOMB = ARMOR_BOMB_RESISTANT, + BIO = ARMOR_BIO_SHIELDED, + RAD = ARMOR_RAD_RESISTANT ) siemens_coefficient = 0.35 refittable_species = list(BODYTYPE_HUMAN, BODYTYPE_TAJARA, BODYTYPE_IPC, BODYTYPE_UNATHI, BODYTYPE_SKRELL) @@ -30,13 +30,13 @@ w_class = WEIGHT_CLASS_BULKY allowed = list(/obj/item/tank, /obj/item/device/flashlight,/obj/item/gun/energy, /obj/item/gun/projectile, /obj/item/ammo_magazine, /obj/item/ammo_casing, /obj/item/melee/baton,/obj/item/handcuffs) armor = list( - melee = ARMOR_MELEE_MAJOR, - bullet = ARMOR_BALLISTIC_PISTOL, - laser = ARMOR_LASER_PISTOL, - energy = ARMOR_ENERGY_SMALL, - bomb = ARMOR_BOMB_RESISTANT, - bio = ARMOR_BIO_SHIELDED, - rad = ARMOR_RAD_RESISTANT + MELEE = ARMOR_MELEE_MAJOR, + BULLET = ARMOR_BALLISTIC_PISTOL, + LASER = ARMOR_LASER_PISTOL, + ENERGY = ARMOR_ENERGY_SMALL, + BOMB = ARMOR_BOMB_RESISTANT, + BIO = ARMOR_BIO_SHIELDED, + RAD = ARMOR_RAD_RESISTANT ) siemens_coefficient = 0.35 refittable_species = list(BODYTYPE_HUMAN, BODYTYPE_TAJARA, BODYTYPE_IPC, BODYTYPE_UNATHI, BODYTYPE_SKRELL) diff --git a/code/modules/clothing/spacesuits/void/merc.dm b/code/modules/clothing/spacesuits/void/merc.dm index db48790a8e4..b853a48e4a6 100644 --- a/code/modules/clothing/spacesuits/void/merc.dm +++ b/code/modules/clothing/spacesuits/void/merc.dm @@ -9,13 +9,13 @@ icon_supported_species_tags = list("skr", "taj", "una", "ipc") refittable_species = list(BODYTYPE_HUMAN, BODYTYPE_TAJARA, BODYTYPE_IPC, BODYTYPE_UNATHI, BODYTYPE_SKRELL) armor = list( - melee = ARMOR_MELEE_RESISTANT, - bullet = ARMOR_BALLISTIC_MEDIUM, - laser = ARMOR_LASER_PISTOL, - energy = ARMOR_ENERGY_MINOR, - bomb = ARMOR_BOMB_PADDED, - bio = ARMOR_BIO_SHIELDED, - rad = ARMOR_RAD_SMALL + MELEE = ARMOR_MELEE_RESISTANT, + BULLET = ARMOR_BALLISTIC_MEDIUM, + LASER = ARMOR_LASER_PISTOL, + ENERGY = ARMOR_ENERGY_MINOR, + BOMB = ARMOR_BOMB_PADDED, + BIO = ARMOR_BIO_SHIELDED, + RAD = ARMOR_RAD_SMALL ) siemens_coefficient = 0.35 species_restricted = list(BODYTYPE_HUMAN, BODYTYPE_IPC_INDUSTRIAL, BODYTYPE_IPC_ZENGHU, BODYTYPE_IPC_BISHOP) @@ -35,13 +35,13 @@ slowdown = 1 w_class = WEIGHT_CLASS_NORMAL armor = list( - melee = ARMOR_MELEE_RESISTANT, - bullet = ARMOR_BALLISTIC_MEDIUM, - laser = ARMOR_LASER_PISTOL, - energy = ARMOR_ENERGY_MINOR, - bomb = ARMOR_BOMB_PADDED, - bio = ARMOR_BIO_SHIELDED, - rad = ARMOR_RAD_SMALL + MELEE = ARMOR_MELEE_RESISTANT, + BULLET = ARMOR_BALLISTIC_MEDIUM, + LASER = ARMOR_LASER_PISTOL, + ENERGY = ARMOR_ENERGY_MINOR, + BOMB = ARMOR_BOMB_PADDED, + BIO = ARMOR_BIO_SHIELDED, + RAD = ARMOR_RAD_SMALL ) allowed = list(/obj/item/device/flashlight,/obj/item/tank,/obj/item/device/suit_cooling_unit,/obj/item/gun,/obj/item/ammo_magazine,/obj/item/ammo_casing,/obj/item/melee/baton,/obj/item/melee/energy/sword,/obj/item/handcuffs) siemens_coefficient = 0.35 diff --git a/code/modules/clothing/spacesuits/void/misc.dm b/code/modules/clothing/spacesuits/void/misc.dm index 240b5b914d2..33a4faa2533 100644 --- a/code/modules/clothing/spacesuits/void/misc.dm +++ b/code/modules/clothing/spacesuits/void/misc.dm @@ -6,13 +6,13 @@ item_state = "sol_helmet" contained_sprite = TRUE armor = list( - melee = ARMOR_MELEE_RESISTANT, - bullet = ARMOR_BALLISTIC_MEDIUM, - laser = ARMOR_LASER_PISTOL, - energy = ARMOR_ENERGY_MINOR, - bomb = ARMOR_BOMB_PADDED, - bio = ARMOR_BIO_SHIELDED, - rad = ARMOR_RAD_SMALL + MELEE = ARMOR_MELEE_RESISTANT, + BULLET = ARMOR_BALLISTIC_MEDIUM, + LASER = ARMOR_LASER_PISTOL, + ENERGY = ARMOR_ENERGY_MINOR, + BOMB = ARMOR_BOMB_PADDED, + BIO = ARMOR_BIO_SHIELDED, + RAD = ARMOR_RAD_SMALL ) siemens_coefficient = 0.35 species_restricted = list(BODYTYPE_HUMAN) @@ -28,13 +28,13 @@ item_state = "sol_suit" contained_sprite = TRUE armor = list( - melee = ARMOR_MELEE_RESISTANT, - bullet = ARMOR_BALLISTIC_MEDIUM, - laser = ARMOR_LASER_PISTOL, - energy = ARMOR_ENERGY_MINOR, - bomb = ARMOR_BOMB_PADDED, - bio = ARMOR_BIO_SHIELDED, - rad = ARMOR_RAD_SMALL + MELEE = ARMOR_MELEE_RESISTANT, + BULLET = ARMOR_BALLISTIC_MEDIUM, + LASER = ARMOR_LASER_PISTOL, + ENERGY = ARMOR_ENERGY_MINOR, + BOMB = ARMOR_BOMB_PADDED, + BIO = ARMOR_BIO_SHIELDED, + RAD = ARMOR_RAD_SMALL ) slowdown = 1 allowed = list(/obj/item/device/flashlight,/obj/item/tank,/obj/item/device/suit_cooling_unit,/obj/item/gun,/obj/item/ammo_magazine,/obj/item/ammo_casing,/obj/item/melee/baton,/obj/item/melee/energy/sword,/obj/item/handcuffs) @@ -51,13 +51,13 @@ item_state = "vulture_helmet" contained_sprite = TRUE armor = list( - melee = ARMOR_MELEE_RESISTANT, - bullet = ARMOR_BALLISTIC_MEDIUM, - laser = ARMOR_LASER_PISTOL, - energy = ARMOR_ENERGY_MINOR, - bomb = ARMOR_BOMB_PADDED, - bio = ARMOR_BIO_SHIELDED, - rad = ARMOR_RAD_SMALL + MELEE = ARMOR_MELEE_RESISTANT, + BULLET = ARMOR_BALLISTIC_MEDIUM, + LASER = ARMOR_LASER_PISTOL, + ENERGY = ARMOR_ENERGY_MINOR, + BOMB = ARMOR_BOMB_PADDED, + BIO = ARMOR_BIO_SHIELDED, + RAD = ARMOR_RAD_SMALL ) siemens_coefficient = 0.35 species_restricted = list(BODYTYPE_HUMAN, BODYTYPE_IPC_INDUSTRIAL, BODYTYPE_IPC_ZENGHU, BODYTYPE_IPC_BISHOP) @@ -77,13 +77,13 @@ contained_sprite = TRUE slowdown = 1 armor = list( - melee = ARMOR_MELEE_RESISTANT, - bullet = ARMOR_BALLISTIC_MEDIUM, - laser = ARMOR_LASER_PISTOL, - energy = ARMOR_ENERGY_MINOR, - bomb = ARMOR_BOMB_PADDED, - bio = ARMOR_BIO_SHIELDED, - rad = ARMOR_RAD_SMALL + MELEE = ARMOR_MELEE_RESISTANT, + BULLET = ARMOR_BALLISTIC_MEDIUM, + LASER = ARMOR_LASER_PISTOL, + ENERGY = ARMOR_ENERGY_MINOR, + BOMB = ARMOR_BOMB_PADDED, + BIO = ARMOR_BIO_SHIELDED, + RAD = ARMOR_RAD_SMALL ) allowed = list(/obj/item/device/flashlight,/obj/item/tank,/obj/item/device/suit_cooling_unit,/obj/item/gun,/obj/item/ammo_magazine,/obj/item/ammo_casing,/obj/item/melee/baton,/obj/item/melee/energy/sword,/obj/item/handcuffs) siemens_coefficient = 0.35 @@ -173,13 +173,13 @@ item_state = "cruiser_helm" contained_sprite = TRUE armor = list( - melee = ARMOR_MELEE_RESISTANT, - bullet = ARMOR_BALLISTIC_MEDIUM, - laser = ARMOR_LASER_PISTOL, - energy = ARMOR_ENERGY_MINOR, - bomb = ARMOR_BOMB_PADDED, - bio = ARMOR_BIO_SHIELDED, - rad = ARMOR_RAD_SMALL + MELEE = ARMOR_MELEE_RESISTANT, + BULLET = ARMOR_BALLISTIC_MEDIUM, + LASER = ARMOR_LASER_PISTOL, + ENERGY = ARMOR_ENERGY_MINOR, + BOMB = ARMOR_BOMB_PADDED, + BIO = ARMOR_BIO_SHIELDED, + RAD = ARMOR_RAD_SMALL ) siemens_coefficient = 0.35 species_restricted = list(BODYTYPE_HUMAN) @@ -195,13 +195,13 @@ item_state = "cruiser" contained_sprite = TRUE armor = list( - melee = ARMOR_MELEE_RESISTANT, - bullet = ARMOR_BALLISTIC_MEDIUM, - laser = ARMOR_LASER_PISTOL, - energy = ARMOR_ENERGY_MINOR, - bomb = ARMOR_BOMB_PADDED, - bio = ARMOR_BIO_SHIELDED, - rad = ARMOR_RAD_SMALL + MELEE = ARMOR_MELEE_RESISTANT, + BULLET = ARMOR_BALLISTIC_MEDIUM, + LASER = ARMOR_LASER_PISTOL, + ENERGY = ARMOR_ENERGY_MINOR, + BOMB = ARMOR_BOMB_PADDED, + BIO = ARMOR_BIO_SHIELDED, + RAD = ARMOR_RAD_SMALL ) slowdown = 1 allowed = list(/obj/item/tank,/obj/item/device/flashlight,/obj/item/device/suit_cooling_unit,/obj/item/gun,/obj/item/ammo_magazine,/obj/item/ammo_casing,/obj/item/melee/baton,/obj/item/melee/energy/sword,/obj/item/handcuffs) @@ -217,13 +217,13 @@ icon = 'icons/obj/clothing/voidsuit/elyra.dmi' contained_sprite = TRUE armor = list( - melee = ARMOR_MELEE_RESISTANT, - bullet = ARMOR_BALLISTIC_MEDIUM, - laser = ARMOR_LASER_PISTOL, - energy = ARMOR_ENERGY_MINOR, - bomb = ARMOR_BOMB_PADDED, - bio = ARMOR_BIO_SHIELDED, - rad = ARMOR_RAD_SMALL + MELEE = ARMOR_MELEE_RESISTANT, + BULLET = ARMOR_BALLISTIC_MEDIUM, + LASER = ARMOR_LASER_PISTOL, + ENERGY = ARMOR_ENERGY_MINOR, + BOMB = ARMOR_BOMB_PADDED, + BIO = ARMOR_BIO_SHIELDED, + RAD = ARMOR_RAD_SMALL ) siemens_coefficient = 0.35 species_restricted = list(BODYTYPE_HUMAN) @@ -241,13 +241,13 @@ contained_sprite = TRUE slowdown = 1 armor = list( - melee = ARMOR_MELEE_RESISTANT, - bullet = ARMOR_BALLISTIC_MEDIUM, - laser = ARMOR_LASER_PISTOL, - energy = ARMOR_ENERGY_MINOR, - bomb = ARMOR_BOMB_PADDED, - bio = ARMOR_BIO_SHIELDED, - rad = ARMOR_RAD_SMALL + MELEE = ARMOR_MELEE_RESISTANT, + BULLET = ARMOR_BALLISTIC_MEDIUM, + LASER = ARMOR_LASER_PISTOL, + ENERGY = ARMOR_ENERGY_MINOR, + BOMB = ARMOR_BOMB_PADDED, + BIO = ARMOR_BIO_SHIELDED, + RAD = ARMOR_RAD_SMALL ) allowed = list(/obj/item/tank,/obj/item/device/flashlight,/obj/item/device/suit_cooling_unit,/obj/item/gun,/obj/item/ammo_magazine,/obj/item/ammo_casing,/obj/item/melee/baton,/obj/item/melee/energy/sword,/obj/item/handcuffs) siemens_coefficient = 0.35 @@ -265,13 +265,13 @@ icon_supported_species_tags = list("una") contained_sprite = TRUE armor = list( - melee = ARMOR_MELEE_RESISTANT, - bullet = ARMOR_BALLISTIC_MEDIUM, - laser = ARMOR_LASER_PISTOL, - energy = ARMOR_ENERGY_MINOR, - bomb = ARMOR_BOMB_PADDED, - bio = ARMOR_BIO_SHIELDED, - rad = ARMOR_RAD_SMALL + MELEE = ARMOR_MELEE_RESISTANT, + BULLET = ARMOR_BALLISTIC_MEDIUM, + LASER = ARMOR_LASER_PISTOL, + ENERGY = ARMOR_ENERGY_MINOR, + BOMB = ARMOR_BOMB_PADDED, + BIO = ARMOR_BIO_SHIELDED, + RAD = ARMOR_RAD_SMALL ) siemens_coefficient = 0.35 species_restricted = list(BODYTYPE_HUMAN) @@ -292,13 +292,13 @@ slowdown = 1 w_class = WEIGHT_CLASS_NORMAL armor = list( - melee = ARMOR_MELEE_RESISTANT, - bullet = ARMOR_BALLISTIC_MEDIUM, - laser = ARMOR_LASER_PISTOL, - energy = ARMOR_ENERGY_MINOR, - bomb = ARMOR_BOMB_PADDED, - bio = ARMOR_BIO_SHIELDED, - rad = ARMOR_RAD_SMALL + MELEE = ARMOR_MELEE_RESISTANT, + BULLET = ARMOR_BALLISTIC_MEDIUM, + LASER = ARMOR_LASER_PISTOL, + ENERGY = ARMOR_ENERGY_MINOR, + BOMB = ARMOR_BOMB_PADDED, + BIO = ARMOR_BIO_SHIELDED, + RAD = ARMOR_RAD_SMALL ) allowed = list(/obj/item/device/flashlight,/obj/item/tank,/obj/item/device/suit_cooling_unit,/obj/item/gun,/obj/item/ammo_magazine,/obj/item/ammo_casing,/obj/item/melee/baton,/obj/item/melee/energy/sword,/obj/item/handcuffs) siemens_coefficient = 0.35 @@ -319,13 +319,13 @@ contained_sprite = 1 armor = list( - melee = ARMOR_MELEE_RESISTANT, - bullet = ARMOR_BALLISTIC_MEDIUM, - laser = ARMOR_LASER_PISTOL, - energy = ARMOR_ENERGY_MINOR, - bomb = ARMOR_BOMB_PADDED, - bio = ARMOR_BIO_SHIELDED, - rad = ARMOR_RAD_SMALL + MELEE = ARMOR_MELEE_RESISTANT, + BULLET = ARMOR_BALLISTIC_MEDIUM, + LASER = ARMOR_LASER_PISTOL, + ENERGY = ARMOR_ENERGY_MINOR, + BOMB = ARMOR_BOMB_PADDED, + BIO = ARMOR_BIO_SHIELDED, + RAD = ARMOR_RAD_SMALL ) siemens_coefficient = 0.35 species_restricted = list(BODYTYPE_HUMAN, BODYTYPE_IPC_INDUSTRIAL, BODYTYPE_IPC_ZENGHU, BODYTYPE_IPC_BISHOP) @@ -346,13 +346,13 @@ slowdown = 1 armor = list( - melee = ARMOR_MELEE_RESISTANT, - bullet = ARMOR_BALLISTIC_MEDIUM, - laser = ARMOR_LASER_PISTOL, - energy = ARMOR_ENERGY_MINOR, - bomb = ARMOR_BOMB_PADDED, - bio = ARMOR_BIO_SHIELDED, - rad = ARMOR_RAD_SMALL + MELEE = ARMOR_MELEE_RESISTANT, + BULLET = ARMOR_BALLISTIC_MEDIUM, + LASER = ARMOR_LASER_PISTOL, + ENERGY = ARMOR_ENERGY_MINOR, + BOMB = ARMOR_BOMB_PADDED, + BIO = ARMOR_BIO_SHIELDED, + RAD = ARMOR_RAD_SMALL ) allowed = list(/obj/item/device/flashlight,/obj/item/tank,/obj/item/device/suit_cooling_unit,/obj/item/gun,/obj/item/ammo_magazine,/obj/item/ammo_casing,/obj/item/melee/baton,/obj/item/melee/energy/sword,/obj/item/handcuffs) siemens_coefficient = 0.35 @@ -371,13 +371,13 @@ contained_sprite = 1 armor = list( - melee = ARMOR_MELEE_RESISTANT, - bullet = ARMOR_BALLISTIC_MEDIUM, - laser = ARMOR_LASER_PISTOL, - energy = ARMOR_ENERGY_MINOR, - bomb = ARMOR_BOMB_PADDED, - bio = ARMOR_BIO_SHIELDED, - rad = ARMOR_RAD_SMALL + MELEE = ARMOR_MELEE_RESISTANT, + BULLET = ARMOR_BALLISTIC_MEDIUM, + LASER = ARMOR_LASER_PISTOL, + ENERGY = ARMOR_ENERGY_MINOR, + BOMB = ARMOR_BOMB_PADDED, + BIO = ARMOR_BIO_SHIELDED, + RAD = ARMOR_RAD_SMALL ) siemens_coefficient = 0.35 species_restricted = list(BODYTYPE_HUMAN, BODYTYPE_IPC_INDUSTRIAL, BODYTYPE_IPC_ZENGHU, BODYTYPE_IPC_BISHOP) @@ -398,13 +398,13 @@ slowdown = 1 armor = list( - melee = ARMOR_MELEE_RESISTANT, - bullet = ARMOR_BALLISTIC_MEDIUM, - laser = ARMOR_LASER_PISTOL, - energy = ARMOR_ENERGY_MINOR, - bomb = ARMOR_BOMB_PADDED, - bio = ARMOR_BIO_SHIELDED, - rad = ARMOR_RAD_SMALL + MELEE = ARMOR_MELEE_RESISTANT, + BULLET = ARMOR_BALLISTIC_MEDIUM, + LASER = ARMOR_LASER_PISTOL, + ENERGY = ARMOR_ENERGY_MINOR, + BOMB = ARMOR_BOMB_PADDED, + BIO = ARMOR_BIO_SHIELDED, + RAD = ARMOR_RAD_SMALL ) allowed = list(/obj/item/device/flashlight,/obj/item/tank,/obj/item/device/suit_cooling_unit,/obj/item/gun,/obj/item/ammo_magazine,/obj/item/ammo_casing,/obj/item/melee/baton,/obj/item/melee/energy/sword,/obj/item/handcuffs) siemens_coefficient = 0.35 @@ -423,13 +423,13 @@ contained_sprite = 1 armor = list( - melee = ARMOR_MELEE_RESISTANT, - bullet = ARMOR_BALLISTIC_MEDIUM, - laser = ARMOR_LASER_PISTOL, - energy = ARMOR_ENERGY_MINOR, - bomb = ARMOR_BOMB_PADDED, - bio = ARMOR_BIO_SHIELDED, - rad = ARMOR_RAD_SMALL + MELEE = ARMOR_MELEE_RESISTANT, + BULLET = ARMOR_BALLISTIC_MEDIUM, + LASER = ARMOR_LASER_PISTOL, + ENERGY = ARMOR_ENERGY_MINOR, + BOMB = ARMOR_BOMB_PADDED, + BIO = ARMOR_BIO_SHIELDED, + RAD = ARMOR_RAD_SMALL ) siemens_coefficient = 0.35 species_restricted = list(BODYTYPE_HUMAN, BODYTYPE_IPC_INDUSTRIAL, BODYTYPE_IPC_BISHOP, BODYTYPE_IPC_ZENGHU) @@ -450,13 +450,13 @@ slowdown = 1 armor = list( - melee = ARMOR_MELEE_RESISTANT, - bullet = ARMOR_BALLISTIC_MEDIUM, - laser = ARMOR_LASER_PISTOL, - energy = ARMOR_ENERGY_MINOR, - bomb = ARMOR_BOMB_PADDED, - bio = ARMOR_BIO_SHIELDED, - rad = ARMOR_RAD_SMALL + MELEE = ARMOR_MELEE_RESISTANT, + BULLET = ARMOR_BALLISTIC_MEDIUM, + LASER = ARMOR_LASER_PISTOL, + ENERGY = ARMOR_ENERGY_MINOR, + BOMB = ARMOR_BOMB_PADDED, + BIO = ARMOR_BIO_SHIELDED, + RAD = ARMOR_RAD_SMALL ) allowed = list(/obj/item/device/flashlight,/obj/item/tank,/obj/item/device/suit_cooling_unit,/obj/item/gun,/obj/item/ammo_magazine,/obj/item/ammo_casing,/obj/item/melee/baton,/obj/item/melee/energy/sword,/obj/item/handcuffs) siemens_coefficient = 0.35 @@ -475,13 +475,13 @@ contained_sprite = 1 armor = list( - melee = ARMOR_MELEE_RESISTANT, - bullet = ARMOR_BALLISTIC_MEDIUM, - laser = ARMOR_LASER_PISTOL, - energy = ARMOR_ENERGY_MINOR, - bomb = ARMOR_BOMB_PADDED, - bio = ARMOR_BIO_SHIELDED, - rad = ARMOR_RAD_SMALL + MELEE = ARMOR_MELEE_RESISTANT, + BULLET = ARMOR_BALLISTIC_MEDIUM, + LASER = ARMOR_LASER_PISTOL, + ENERGY = ARMOR_ENERGY_MINOR, + BOMB = ARMOR_BOMB_PADDED, + BIO = ARMOR_BIO_SHIELDED, + RAD = ARMOR_RAD_SMALL ) siemens_coefficient = 0.35 species_restricted = list(BODYTYPE_HUMAN) @@ -500,13 +500,13 @@ w_class = WEIGHT_CLASS_NORMAL armor = list( - melee = ARMOR_MELEE_RESISTANT, - bullet = ARMOR_BALLISTIC_MEDIUM, - laser = ARMOR_LASER_PISTOL, - energy = ARMOR_ENERGY_MINOR, - bomb = ARMOR_BOMB_PADDED, - bio = ARMOR_BIO_SHIELDED, - rad = ARMOR_RAD_SMALL + MELEE = ARMOR_MELEE_RESISTANT, + BULLET = ARMOR_BALLISTIC_MEDIUM, + LASER = ARMOR_LASER_PISTOL, + ENERGY = ARMOR_ENERGY_MINOR, + BOMB = ARMOR_BOMB_PADDED, + BIO = ARMOR_BIO_SHIELDED, + RAD = ARMOR_RAD_SMALL ) slowdown = 1 allowed = list(/obj/item/device/flashlight,/obj/item/tank,/obj/item/device/suit_cooling_unit,/obj/item/gun,/obj/item/ammo_magazine,/obj/item/ammo_casing,/obj/item/melee/baton,/obj/item/melee/energy/sword,/obj/item/handcuffs) @@ -524,13 +524,13 @@ contained_sprite = TRUE icon_supported_species_tags = list("skr", "taj", "una", "ipc") armor = list( - melee = ARMOR_MELEE_RESISTANT, - bullet = ARMOR_BALLISTIC_MEDIUM, - laser = ARMOR_LASER_PISTOL, - energy = ARMOR_ENERGY_MINOR, - bomb = ARMOR_BOMB_PADDED, - bio = ARMOR_BIO_SHIELDED, - rad = ARMOR_RAD_SMALL + MELEE = ARMOR_MELEE_RESISTANT, + BULLET = ARMOR_BALLISTIC_MEDIUM, + LASER = ARMOR_LASER_PISTOL, + ENERGY = ARMOR_ENERGY_MINOR, + BOMB = ARMOR_BOMB_PADDED, + BIO = ARMOR_BIO_SHIELDED, + RAD = ARMOR_RAD_SMALL ) siemens_coefficient = 0.35 species_restricted = list(BODYTYPE_HUMAN, BODYTYPE_IPC_INDUSTRIAL, BODYTYPE_IPC_ZENGHU, BODYTYPE_IPC_BISHOP) @@ -550,13 +550,13 @@ slowdown = 1 w_class = WEIGHT_CLASS_NORMAL armor = list( - melee = ARMOR_MELEE_RESISTANT, - bullet = ARMOR_BALLISTIC_MEDIUM, - laser = ARMOR_LASER_PISTOL, - energy = ARMOR_ENERGY_MINOR, - bomb = ARMOR_BOMB_PADDED, - bio = ARMOR_BIO_SHIELDED, - rad = ARMOR_RAD_SMALL + MELEE = ARMOR_MELEE_RESISTANT, + BULLET = ARMOR_BALLISTIC_MEDIUM, + LASER = ARMOR_LASER_PISTOL, + ENERGY = ARMOR_ENERGY_MINOR, + BOMB = ARMOR_BOMB_PADDED, + BIO = ARMOR_BIO_SHIELDED, + RAD = ARMOR_RAD_SMALL ) allowed = list(/obj/item/device/flashlight,/obj/item/tank,/obj/item/device/suit_cooling_unit,/obj/item/gun,/obj/item/ammo_magazine,/obj/item/ammo_casing,/obj/item/melee/baton,/obj/item/melee/energy/sword,/obj/item/handcuffs) siemens_coefficient = 0.35 @@ -572,13 +572,13 @@ contained_sprite = 1 armor = list( - melee = ARMOR_MELEE_RESISTANT, - bullet = ARMOR_BALLISTIC_MEDIUM, - laser = ARMOR_LASER_PISTOL, - energy = ARMOR_ENERGY_MINOR, - bomb = ARMOR_BOMB_PADDED, - bio = ARMOR_BIO_SHIELDED, - rad = ARMOR_RAD_SMALL + MELEE = ARMOR_MELEE_RESISTANT, + BULLET = ARMOR_BALLISTIC_MEDIUM, + LASER = ARMOR_LASER_PISTOL, + ENERGY = ARMOR_ENERGY_MINOR, + BOMB = ARMOR_BOMB_PADDED, + BIO = ARMOR_BIO_SHIELDED, + RAD = ARMOR_RAD_SMALL ) siemens_coefficient = 0.35 species_restricted = list(BODYTYPE_HUMAN, BODYTYPE_UNATHI) @@ -605,13 +605,13 @@ w_class = WEIGHT_CLASS_NORMAL armor = list( - melee = ARMOR_MELEE_RESISTANT, - bullet = ARMOR_BALLISTIC_MEDIUM, - laser = ARMOR_LASER_PISTOL, - energy = ARMOR_ENERGY_MINOR, - bomb = ARMOR_BOMB_PADDED, - bio = ARMOR_BIO_SHIELDED, - rad = ARMOR_RAD_SMALL + MELEE = ARMOR_MELEE_RESISTANT, + BULLET = ARMOR_BALLISTIC_MEDIUM, + LASER = ARMOR_LASER_PISTOL, + ENERGY = ARMOR_ENERGY_MINOR, + BOMB = ARMOR_BOMB_PADDED, + BIO = ARMOR_BIO_SHIELDED, + RAD = ARMOR_RAD_SMALL ) allowed = list(/obj/item/device/flashlight,/obj/item/tank,/obj/item/device/suit_cooling_unit,/obj/item/gun,/obj/item/ammo_magazine,/obj/item/ammo_casing,/obj/item/melee/baton,/obj/item/melee/energy/sword,/obj/item/handcuffs) siemens_coefficient = 0.35 @@ -638,13 +638,13 @@ contained_sprite = 1 armor = list( - melee = ARMOR_MELEE_RESISTANT, - bullet = ARMOR_BALLISTIC_MEDIUM, - laser = ARMOR_LASER_PISTOL, - energy = ARMOR_ENERGY_MINOR, - bomb = ARMOR_BOMB_PADDED, - bio = ARMOR_BIO_SHIELDED, - rad = ARMOR_RAD_SMALL + MELEE = ARMOR_MELEE_RESISTANT, + BULLET = ARMOR_BALLISTIC_MEDIUM, + LASER = ARMOR_LASER_PISTOL, + ENERGY = ARMOR_ENERGY_MINOR, + BOMB = ARMOR_BOMB_PADDED, + BIO = ARMOR_BIO_SHIELDED, + RAD = ARMOR_RAD_SMALL ) siemens_coefficient = 0.35 species_restricted = list(BODYTYPE_HUMAN, BODYTYPE_IPC, BODYTYPE_IPC_INDUSTRIAL, BODYTYPE_IPC_ZENGHU, BODYTYPE_IPC_BISHOP) @@ -660,13 +660,13 @@ slowdown = 1 armor = list( - melee = ARMOR_MELEE_RESISTANT, - bullet = ARMOR_BALLISTIC_MEDIUM, - laser = ARMOR_LASER_PISTOL, - energy = ARMOR_ENERGY_MINOR, - bomb = ARMOR_BOMB_PADDED, - bio = ARMOR_BIO_SHIELDED, - rad = ARMOR_RAD_SMALL + MELEE = ARMOR_MELEE_RESISTANT, + BULLET = ARMOR_BALLISTIC_MEDIUM, + LASER = ARMOR_LASER_PISTOL, + ENERGY = ARMOR_ENERGY_MINOR, + BOMB = ARMOR_BOMB_PADDED, + BIO = ARMOR_BIO_SHIELDED, + RAD = ARMOR_RAD_SMALL ) allowed = list(/obj/item/device/flashlight,/obj/item/tank,/obj/item/device/suit_cooling_unit,/obj/item/gun,/obj/item/ammo_magazine,/obj/item/ammo_casing,/obj/item/melee/baton,/obj/item/melee/energy/sword,/obj/item/handcuffs) siemens_coefficient = 0.35 @@ -679,12 +679,12 @@ icon_state = "golden_deep" item_state = "golden_deep" armor = list( - melee = ARMOR_MELEE_RESISTANT, - bullet = ARMOR_BALLISTIC_MINOR, - laser = ARMOR_LASER_MINOR, - bomb = ARMOR_BOMB_PADDED, - bio = ARMOR_BIO_SHIELDED, - rad = ARMOR_RAD_RESISTANT + MELEE = ARMOR_MELEE_RESISTANT, + BULLET = ARMOR_BALLISTIC_MINOR, + LASER = ARMOR_LASER_MINOR, + BOMB = ARMOR_BOMB_PADDED, + BIO = ARMOR_BIO_SHIELDED, + RAD = ARMOR_RAD_RESISTANT ) /obj/item/clothing/head/helmet/space/void/golden_deep/menial @@ -693,12 +693,12 @@ icon_state = "golden_deep_helm" item_state = "golden_deep_helm" armor = list( - melee = ARMOR_MELEE_RESISTANT, - bullet = ARMOR_BALLISTIC_MINOR, - laser = ARMOR_LASER_MINOR, - bomb = ARMOR_BOMB_PADDED, - bio = ARMOR_BIO_SHIELDED, - rad = ARMOR_RAD_RESISTANT + MELEE = ARMOR_MELEE_RESISTANT, + BULLET = ARMOR_BALLISTIC_MINOR, + LASER = ARMOR_LASER_MINOR, + BOMB = ARMOR_BOMB_PADDED, + BIO = ARMOR_BIO_SHIELDED, + RAD = ARMOR_RAD_RESISTANT ) // For use by the Hoplan, the Golden Deep's military. @@ -708,13 +708,13 @@ icon_state = "hoplan" item_state = "hoplan" armor = list( - melee = ARMOR_MELEE_RESISTANT, - bullet = ARMOR_BALLISTIC_MEDIUM, - laser = ARMOR_LASER_MEDIUM, - energy = ARMOR_ENERGY_SMALL, - bomb = ARMOR_BOMB_PADDED, - bio = ARMOR_BIO_SHIELDED, - rad = ARMOR_RAD_SMALL + MELEE = ARMOR_MELEE_RESISTANT, + BULLET = ARMOR_BALLISTIC_MEDIUM, + LASER = ARMOR_LASER_MEDIUM, + ENERGY = ARMOR_ENERGY_SMALL, + BOMB = ARMOR_BOMB_PADDED, + BIO = ARMOR_BIO_SHIELDED, + RAD = ARMOR_RAD_SMALL ) /obj/item/clothing/head/helmet/space/void/golden_deep/hoplan @@ -723,13 +723,13 @@ icon_state = "hoplan_helm" item_state = "hoplan_helm" armor = list( - melee = ARMOR_MELEE_RESISTANT, - bullet = ARMOR_BALLISTIC_MEDIUM, - laser = ARMOR_LASER_MEDIUM, - energy = ARMOR_ENERGY_SMALL, - bomb = ARMOR_BOMB_PADDED, - bio = ARMOR_BIO_SHIELDED, - rad = ARMOR_RAD_SMALL + MELEE = ARMOR_MELEE_RESISTANT, + BULLET = ARMOR_BALLISTIC_MEDIUM, + LASER = ARMOR_LASER_MEDIUM, + ENERGY = ARMOR_ENERGY_SMALL, + BOMB = ARMOR_BOMB_PADDED, + BIO = ARMOR_BIO_SHIELDED, + RAD = ARMOR_RAD_SMALL ) /obj/item/clothing/head/helmet/space/void/mining/himeo @@ -1060,13 +1060,13 @@ icon_state = "tcaf_suit" item_state = "tcaf_suit" armor = list( - melee = ARMOR_MELEE_RESISTANT, - bullet = ARMOR_BALLISTIC_MEDIUM, - laser = ARMOR_LASER_PISTOL, - energy = ARMOR_ENERGY_MINOR, - bomb = ARMOR_BOMB_PADDED, - bio = ARMOR_BIO_SHIELDED, - rad = ARMOR_RAD_SMALL + MELEE = ARMOR_MELEE_RESISTANT, + BULLET = ARMOR_BALLISTIC_MEDIUM, + LASER = ARMOR_LASER_PISTOL, + ENERGY = ARMOR_ENERGY_MINOR, + BOMB = ARMOR_BOMB_PADDED, + BIO = ARMOR_BIO_SHIELDED, + RAD = ARMOR_RAD_SMALL ) slowdown = 1 allowed = list(/obj/item/device/flashlight,/obj/item/tank,/obj/item/device/suit_cooling_unit,/obj/item/gun,/obj/item/ammo_magazine,/obj/item/ammo_casing,/obj/item/melee/baton,/obj/item/melee/energy/sword,/obj/item/handcuffs) @@ -1083,13 +1083,13 @@ icon_state = "tcaf_helmet" item_state = "tcaf_helmet" armor = list( - melee = ARMOR_MELEE_RESISTANT, - bullet = ARMOR_BALLISTIC_MEDIUM, - laser = ARMOR_LASER_PISTOL, - energy = ARMOR_ENERGY_MINOR, - bomb = ARMOR_BOMB_PADDED, - bio = ARMOR_BIO_SHIELDED, - rad = ARMOR_RAD_SMALL + MELEE = ARMOR_MELEE_RESISTANT, + BULLET = ARMOR_BALLISTIC_MEDIUM, + LASER = ARMOR_LASER_PISTOL, + ENERGY = ARMOR_ENERGY_MINOR, + BOMB = ARMOR_BOMB_PADDED, + BIO = ARMOR_BIO_SHIELDED, + RAD = ARMOR_RAD_SMALL ) species_restricted = list(BODYTYPE_HUMAN, BODYTYPE_IPC_BISHOP, BODYTYPE_IPC_INDUSTRIAL, BODYTYPE_IPC_ZENGHU) contained_sprite = TRUE diff --git a/code/modules/clothing/spacesuits/void/station.dm b/code/modules/clothing/spacesuits/void/station.dm index 6025168f579..29014cb2133 100644 --- a/code/modules/clothing/spacesuits/void/station.dm +++ b/code/modules/clothing/spacesuits/void/station.dm @@ -13,12 +13,12 @@ contained_sprite = TRUE icon_supported_species_tags = list("skr", "taj", "una", "ipc", "vau") armor = list( - melee = ARMOR_MELEE_RESISTANT, - bullet = ARMOR_BALLISTIC_MINOR, - laser = ARMOR_LASER_MINOR, - bomb = ARMOR_BOMB_PADDED, - bio = ARMOR_BIO_SHIELDED, - rad = ARMOR_RAD_RESISTANT + MELEE = ARMOR_MELEE_RESISTANT, + BULLET = ARMOR_BALLISTIC_MINOR, + LASER = ARMOR_LASER_MINOR, + BOMB = ARMOR_BOMB_PADDED, + BIO = ARMOR_BIO_SHIELDED, + RAD = ARMOR_RAD_RESISTANT ) max_pressure_protection = ENG_VOIDSUIT_MAX_PRESSURE light_overlay = "helmet_light_dual_low" @@ -38,12 +38,12 @@ icon_supported_species_tags = list("skr", "taj", "una", "ipc", "vau") slowdown = 1 armor = list( - melee = ARMOR_MELEE_RESISTANT, - bullet = ARMOR_BALLISTIC_MINOR, - laser = ARMOR_LASER_MINOR, - bomb = ARMOR_BOMB_PADDED, - bio = ARMOR_BIO_SHIELDED, - rad = ARMOR_RAD_RESISTANT + MELEE = ARMOR_MELEE_RESISTANT, + BULLET = ARMOR_BALLISTIC_MINOR, + LASER = ARMOR_LASER_MINOR, + BOMB = ARMOR_BOMB_PADDED, + BIO = ARMOR_BIO_SHIELDED, + RAD = ARMOR_RAD_RESISTANT ) max_pressure_protection = ENG_VOIDSUIT_MAX_PRESSURE allowed = list(/obj/item/device/flashlight,/obj/item/tank,/obj/item/device/suit_cooling_unit,/obj/item/storage/bag/ore,/obj/item/device/t_scanner,/obj/item/pickaxe,/obj/item/material/twohanded/fireaxe,/obj/item/rfd/construction,/obj/item/storage/bag/inflatable) @@ -62,12 +62,12 @@ contained_sprite = TRUE icon_supported_species_tags = list("skr", "taj", "una", "ipc", "vau") armor = list( - melee = ARMOR_MELEE_RESISTANT, - bullet = ARMOR_BALLISTIC_MINOR, - laser = ARMOR_LASER_MINOR, - bomb = ARMOR_BOMB_RESISTANT, - bio = ARMOR_BIO_SHIELDED, - rad = ARMOR_RAD_MINOR + MELEE = ARMOR_MELEE_RESISTANT, + BULLET = ARMOR_BALLISTIC_MINOR, + LASER = ARMOR_LASER_MINOR, + BOMB = ARMOR_BOMB_RESISTANT, + BIO = ARMOR_BIO_SHIELDED, + RAD = ARMOR_RAD_MINOR ) light_overlay = "merc_voidsuit_lights" brightness_on = 6 @@ -85,12 +85,12 @@ contained_sprite = TRUE icon_supported_species_tags = list("skr", "taj", "una", "ipc", "vau") armor = list( - melee = ARMOR_MELEE_RESISTANT, - bullet = ARMOR_BALLISTIC_MINOR, - laser = ARMOR_LASER_MINOR, - bomb = ARMOR_BOMB_RESISTANT, - bio = ARMOR_BIO_SHIELDED, - rad = ARMOR_RAD_MINOR + MELEE = ARMOR_MELEE_RESISTANT, + BULLET = ARMOR_BALLISTIC_MINOR, + LASER = ARMOR_LASER_MINOR, + BOMB = ARMOR_BOMB_RESISTANT, + BIO = ARMOR_BIO_SHIELDED, + RAD = ARMOR_RAD_MINOR ) allowed = list(/obj/item/device/flashlight,/obj/item/tank,/obj/item/device/suit_cooling_unit,/obj/item/storage/bag/ore,/obj/item/pickaxe, /obj/item/gun/custom_ka, /obj/item/gun/energy/vaurca/thermaldrill,/obj/item/rfd/mining) refittable_species = list(BODYTYPE_HUMAN, BODYTYPE_TAJARA, BODYTYPE_IPC, BODYTYPE_UNATHI, BODYTYPE_SKRELL, BODYTYPE_VAURCA) @@ -109,11 +109,11 @@ contained_sprite = TRUE icon_supported_species_tags = list("skr", "taj", "una", "ipc") armor = list( - melee = ARMOR_MELEE_KNIVES, - laser = ARMOR_LASER_MINOR, - bomb = ARMOR_BOMB_PADDED, - bio = ARMOR_BIO_SHIELDED, - rad = ARMOR_RAD_SMALL + MELEE = ARMOR_MELEE_KNIVES, + LASER = ARMOR_LASER_MINOR, + BOMB = ARMOR_BOMB_PADDED, + BIO = ARMOR_BIO_SHIELDED, + RAD = ARMOR_RAD_SMALL ) light_overlay = "helmet_light_dual_low" brightness_on = 6 @@ -132,11 +132,11 @@ contained_sprite = TRUE icon_supported_species_tags = list("skr", "taj", "una", "ipc") armor = list( - melee = ARMOR_MELEE_KNIVES, - laser = ARMOR_LASER_MINOR, - bomb = ARMOR_BOMB_PADDED, - bio = ARMOR_BIO_SHIELDED, - rad = ARMOR_RAD_SMALL + MELEE = ARMOR_MELEE_KNIVES, + LASER = ARMOR_LASER_MINOR, + BOMB = ARMOR_BOMB_PADDED, + BIO = ARMOR_BIO_SHIELDED, + RAD = ARMOR_RAD_SMALL ) allowed = list(/obj/item/device/flashlight,/obj/item/tank,/obj/item/device/suit_cooling_unit,/obj/item/storage/firstaid,/obj/item/device/healthanalyzer,/obj/item/stack/medical,/obj/item/device/breath_analyzer,/obj/item/material/twohanded/fireaxe) refittable_species = list(BODYTYPE_HUMAN, BODYTYPE_TAJARA, BODYTYPE_IPC, BODYTYPE_UNATHI, BODYTYPE_SKRELL) @@ -155,12 +155,12 @@ contained_sprite = TRUE icon_supported_species_tags = list("skr", "taj", "una", "ipc") armor = list( - melee = ARMOR_MELEE_RESISTANT, - bullet = ARMOR_BALLISTIC_MEDIUM, - laser = ARMOR_LASER_PISTOL, - bomb = ARMOR_BOMB_PADDED, - bio = ARMOR_BIO_SHIELDED, - rad = ARMOR_RAD_MINOR + MELEE = ARMOR_MELEE_RESISTANT, + BULLET = ARMOR_BALLISTIC_MEDIUM, + LASER = ARMOR_LASER_PISTOL, + BOMB = ARMOR_BOMB_PADDED, + BIO = ARMOR_BIO_SHIELDED, + RAD = ARMOR_RAD_MINOR ) light_overlay = "helmet_light_dual_low" brightness_on = 6 @@ -179,12 +179,12 @@ contained_sprite = TRUE icon_supported_species_tags = list("skr", "taj", "una", "ipc") armor = list( - melee = ARMOR_MELEE_RESISTANT, - bullet = ARMOR_BALLISTIC_MEDIUM, - laser = ARMOR_LASER_PISTOL, - bomb = ARMOR_BOMB_PADDED, - bio = ARMOR_BIO_SHIELDED, - rad = ARMOR_RAD_MINOR + MELEE = ARMOR_MELEE_RESISTANT, + BULLET = ARMOR_BALLISTIC_MEDIUM, + LASER = ARMOR_LASER_PISTOL, + BOMB = ARMOR_BOMB_PADDED, + BIO = ARMOR_BIO_SHIELDED, + RAD = ARMOR_RAD_MINOR ) allowed = list(/obj/item/gun,/obj/item/device/flashlight,/obj/item/tank,/obj/item/device/suit_cooling_unit,/obj/item/melee/baton) refittable_species = list(BODYTYPE_HUMAN, BODYTYPE_TAJARA, BODYTYPE_IPC, BODYTYPE_UNATHI, BODYTYPE_SKRELL) @@ -203,12 +203,12 @@ contained_sprite = TRUE icon_supported_species_tags = list("skr", "taj", "una", "ipc", "vau") armor = list( - melee = ARMOR_MELEE_RESISTANT, - bullet = ARMOR_BALLISTIC_MINOR, - laser = ARMOR_LASER_MINOR, - bomb = ARMOR_BOMB_PADDED, - bio = ARMOR_BIO_SHIELDED, - rad = ARMOR_RAD_SMALL + MELEE = ARMOR_MELEE_RESISTANT, + BULLET = ARMOR_BALLISTIC_MINOR, + LASER = ARMOR_LASER_MINOR, + BOMB = ARMOR_BOMB_PADDED, + BIO = ARMOR_BIO_SHIELDED, + RAD = ARMOR_RAD_SMALL ) max_heat_protection_temperature = FIRE_HELMET_MAX_HEAT_PROTECTION_TEMPERATURE + 10000 // It is a suit designed for fire, enclosed max_pressure_protection = FIRESUIT_MAX_PRESSURE @@ -229,12 +229,12 @@ contained_sprite = TRUE icon_supported_species_tags = list("skr", "taj", "una", "ipc", "vau") armor = list( - melee = ARMOR_MELEE_RESISTANT, - bullet = ARMOR_BALLISTIC_MINOR, - laser = ARMOR_LASER_MINOR, - bomb = ARMOR_BOMB_PADDED, - bio = ARMOR_BIO_SHIELDED, - rad = ARMOR_RAD_SMALL + MELEE = ARMOR_MELEE_RESISTANT, + BULLET = ARMOR_BALLISTIC_MINOR, + LASER = ARMOR_LASER_MINOR, + BOMB = ARMOR_BOMB_PADDED, + BIO = ARMOR_BIO_SHIELDED, + RAD = ARMOR_RAD_SMALL ) max_pressure_protection = FIRESUIT_MAX_PRESSURE allowed = list(/obj/item/device/flashlight,/obj/item/tank,/obj/item/device/suit_cooling_unit,/obj/item/storage/bag/ore,/obj/item/device/t_scanner,/obj/item/pickaxe,/obj/item/material/twohanded/fireaxe,/obj/item/rfd/construction,/obj/item/storage/bag/inflatable) @@ -255,12 +255,12 @@ contained_sprite = TRUE icon_supported_species_tags = list("skr", "taj", "una", "ipc") armor = list( - melee = ARMOR_MELEE_RESISTANT, - bullet = ARMOR_BALLISTIC_MEDIUM, - laser = ARMOR_LASER_PISTOL, - bomb = ARMOR_BOMB_RESISTANT, - bio = ARMOR_BIO_SHIELDED, - rad = ARMOR_RAD_RESISTANT + MELEE = ARMOR_MELEE_RESISTANT, + BULLET = ARMOR_BALLISTIC_MEDIUM, + LASER = ARMOR_LASER_PISTOL, + BOMB = ARMOR_BOMB_RESISTANT, + BIO = ARMOR_BIO_SHIELDED, + RAD = ARMOR_RAD_RESISTANT ) light_overlay = "helmet_light_dual" refittable_species = list(BODYTYPE_HUMAN, BODYTYPE_TAJARA, BODYTYPE_IPC, BODYTYPE_UNATHI, BODYTYPE_SKRELL) @@ -278,12 +278,12 @@ contained_sprite = TRUE icon_supported_species_tags = list("skr", "taj", "una", "ipc") armor = list( - melee = ARMOR_MELEE_RESISTANT, - bullet = ARMOR_BALLISTIC_MEDIUM, - laser = ARMOR_LASER_PISTOL, - bomb = ARMOR_BOMB_RESISTANT, - bio = ARMOR_BIO_SHIELDED, - rad = ARMOR_RAD_RESISTANT + MELEE = ARMOR_MELEE_RESISTANT, + BULLET = ARMOR_BALLISTIC_MEDIUM, + LASER = ARMOR_LASER_PISTOL, + BOMB = ARMOR_BOMB_RESISTANT, + BIO = ARMOR_BIO_SHIELDED, + RAD = ARMOR_RAD_RESISTANT ) allowed = list(/obj/item/gun,/obj/item/device/flashlight,/obj/item/tank,/obj/item/device/suit_cooling_unit,/obj/item/melee/baton) refittable_species = list(BODYTYPE_HUMAN, BODYTYPE_TAJARA, BODYTYPE_IPC, BODYTYPE_UNATHI, BODYTYPE_SKRELL) @@ -302,11 +302,11 @@ contained_sprite = TRUE icon_supported_species_tags = list("skr", "taj", "una", "ipc", "vau") armor = list( - melee = ARMOR_MELEE_KNIVES, - laser = ARMOR_LASER_MINOR, - bomb = ARMOR_BOMB_PADDED, - bio = ARMOR_BIO_SHIELDED, - rad = ARMOR_RAD_RESISTANT + MELEE = ARMOR_MELEE_KNIVES, + LASER = ARMOR_LASER_MINOR, + BOMB = ARMOR_BOMB_PADDED, + BIO = ARMOR_BIO_SHIELDED, + RAD = ARMOR_RAD_RESISTANT ) refittable_species = list(BODYTYPE_HUMAN, BODYTYPE_TAJARA, BODYTYPE_IPC, BODYTYPE_UNATHI, BODYTYPE_SKRELL, BODYTYPE_VAURCA) @@ -324,10 +324,10 @@ icon_supported_species_tags = list("skr", "taj", "una", "ipc", "vau") allowed = list(/obj/item/device/flashlight,/obj/item/tank,/obj/item/device/suit_cooling_unit) armor = list( - melee = ARMOR_MELEE_KNIVES, - laser = ARMOR_LASER_MINOR, - bomb = ARMOR_BOMB_PADDED, - bio = ARMOR_BIO_SHIELDED, - rad = ARMOR_RAD_RESISTANT + MELEE = ARMOR_MELEE_KNIVES, + LASER = ARMOR_LASER_MINOR, + BOMB = ARMOR_BOMB_PADDED, + BIO = ARMOR_BIO_SHIELDED, + RAD = ARMOR_RAD_RESISTANT ) refittable_species = list(BODYTYPE_HUMAN, BODYTYPE_TAJARA, BODYTYPE_IPC, BODYTYPE_UNATHI, BODYTYPE_SKRELL, BODYTYPE_VAURCA) diff --git a/code/modules/clothing/spacesuits/void/void.dm b/code/modules/clothing/spacesuits/void/void.dm index 52a16fa7dc9..4e1b47aee11 100644 --- a/code/modules/clothing/spacesuits/void/void.dm +++ b/code/modules/clothing/spacesuits/void/void.dm @@ -6,13 +6,13 @@ heat_protection = HEAD armor = list( - melee = ARMOR_MELEE_RESISTANT, - bullet = ARMOR_BALLISTIC_MINOR, - laser = ARMOR_LASER_SMALL, - energy = ARMOR_ENERGY_MINOR, - bomb = ARMOR_BOMB_PADDED, - bio = ARMOR_BIO_SHIELDED, - rad = ARMOR_RAD_MINOR + MELEE = ARMOR_MELEE_RESISTANT, + BULLET = ARMOR_BALLISTIC_MINOR, + LASER = ARMOR_LASER_SMALL, + ENERGY = ARMOR_ENERGY_MINOR, + BOMB = ARMOR_BOMB_PADDED, + BIO = ARMOR_BIO_SHIELDED, + RAD = ARMOR_RAD_MINOR ) max_heat_protection_temperature = SPACE_SUIT_MAX_HEAT_PROTECTION_TEMPERATURE max_pressure_protection = VOIDSUIT_MAX_PRESSURE @@ -45,13 +45,13 @@ desc = "A high-tech dark red space suit. Used for AI satellite maintenance." slowdown = 1 armor = list( - melee = ARMOR_MELEE_RESISTANT, - bullet = ARMOR_BALLISTIC_MINOR, - laser = ARMOR_LASER_SMALL, - energy = ARMOR_ENERGY_MINOR, - bomb = ARMOR_BOMB_PADDED, - bio = ARMOR_BIO_SHIELDED, - rad = ARMOR_RAD_MINOR + MELEE = ARMOR_MELEE_RESISTANT, + BULLET = ARMOR_BALLISTIC_MINOR, + LASER = ARMOR_LASER_SMALL, + ENERGY = ARMOR_ENERGY_MINOR, + BOMB = ARMOR_BOMB_PADDED, + BIO = ARMOR_BIO_SHIELDED, + RAD = ARMOR_RAD_MINOR ) allowed = list(/obj/item/device/flashlight,/obj/item/tank,/obj/item/device/suit_cooling_unit) heat_protection = UPPER_TORSO|LOWER_TORSO|LEGS|FEET|ARMS|HANDS diff --git a/code/modules/clothing/suits/armor.dm b/code/modules/clothing/suits/armor.dm index 646acf1b186..94b802db23e 100644 --- a/code/modules/clothing/suits/armor.dm +++ b/code/modules/clothing/suits/armor.dm @@ -71,11 +71,11 @@ item_state = "armor" blood_overlay_type = "armor" armor = list( - melee = ARMOR_MELEE_KNIVES, - bullet = ARMOR_BALLISTIC_PISTOL, - laser = ARMOR_LASER_SMALL, - energy = ARMOR_ENERGY_MINOR, - bomb = ARMOR_BOMB_PADDED + MELEE = ARMOR_MELEE_KNIVES, + BULLET = ARMOR_BALLISTIC_PISTOL, + LASER = ARMOR_LASER_SMALL, + ENERGY = ARMOR_ENERGY_MINOR, + BOMB = ARMOR_BOMB_PADDED ) /obj/item/clothing/suit/storage/toggle/armor/hos @@ -85,11 +85,11 @@ item_state = "jensencoat" body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS|LEGS armor = list( - melee = ARMOR_MELEE_KNIVES, - bullet = ARMOR_BALLISTIC_SMALL, - laser = ARMOR_LASER_SMALL, - energy = ARMOR_ENERGY_MINOR, - bomb = ARMOR_BOMB_PADDED + MELEE = ARMOR_MELEE_KNIVES, + BULLET = ARMOR_BALLISTIC_SMALL, + LASER = ARMOR_LASER_SMALL, + ENERGY = ARMOR_ENERGY_MINOR, + BOMB = ARMOR_BOMB_PADDED ) allowed = list(/obj/item/gun/energy, /obj/item/reagent_containers/spray/pepper, /obj/item/gun/projectile, /obj/item/ammo_magazine, /obj/item/ammo_casing, /obj/item/melee/baton, /obj/item/handcuffs, /obj/item/device/flashlight) @@ -112,13 +112,13 @@ allowed = list(/obj/item/gun,/obj/item/ammo_magazine,/obj/item/ammo_casing,/obj/item/melee/baton,/obj/item/handcuffs,/obj/item/tank/emergency_oxygen) slowdown = 1 armor = list( - melee = ARMOR_MELEE_RESISTANT, - bullet = ARMOR_BALLISTIC_MEDIUM, - laser = ARMOR_LASER_RIFLE, - energy = ARMOR_ENERGY_MINOR, - bomb = ARMOR_BOMB_PADDED, - bio = ARMOR_BIO_SHIELDED, - rad = ARMOR_RAD_SMALL + MELEE = ARMOR_MELEE_RESISTANT, + BULLET = ARMOR_BALLISTIC_MEDIUM, + LASER = ARMOR_LASER_RIFLE, + ENERGY = ARMOR_ENERGY_MINOR, + BOMB = ARMOR_BOMB_PADDED, + BIO = ARMOR_BIO_SHIELDED, + RAD = ARMOR_RAD_SMALL ) max_pressure_protection = FIRESUIT_MAX_PRESSURE min_pressure_protection = 0 @@ -200,11 +200,11 @@ body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS slowdown = 1 armor = list( - melee = ARMOR_MELEE_KNIVES, - bullet = ARMOR_BALLISTIC_MEDIUM, - laser = ARMOR_LASER_RIFLE, - energy = ARMOR_ENERGY_SMALL, - bomb = ARMOR_BOMB_PADDED + MELEE = ARMOR_MELEE_KNIVES, + BULLET = ARMOR_BALLISTIC_MEDIUM, + LASER = ARMOR_LASER_RIFLE, + ENERGY = ARMOR_ENERGY_SMALL, + BOMB = ARMOR_BOMB_PADDED ) siemens_coefficient = 0.35 var/obj/item/clothing/accessory/holster/holster @@ -259,11 +259,11 @@ item_state = "armor" body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS armor = list( - melee = ARMOR_MELEE_KNIVES, - bullet = ARMOR_BALLISTIC_PISTOL, - laser = ARMOR_LASER_RIFLE, - energy = ARMOR_ENERGY_SMALL, - bomb = ARMOR_BOMB_PADDED + MELEE = ARMOR_MELEE_KNIVES, + BULLET = ARMOR_BALLISTIC_PISTOL, + LASER = ARMOR_LASER_RIFLE, + ENERGY = ARMOR_ENERGY_SMALL, + BOMB = ARMOR_BOMB_PADDED ) siemens_coefficient = 0.35 @@ -298,11 +298,11 @@ allowed = list(/obj/item/gun,/obj/item/reagent_containers/spray/pepper,/obj/item/ammo_magazine,/obj/item/ammo_casing,/obj/item/melee/baton,/obj/item/handcuffs,/obj/item/device/flashlight) siemens_coefficient = 0.5 armor = list( - melee = ARMOR_MELEE_KNIVES, - bullet = ARMOR_BALLISTIC_PISTOL, - laser = ARMOR_LASER_SMALL, - energy = ARMOR_ENERGY_SMALL, - bomb = ARMOR_BOMB_PADDED + MELEE = ARMOR_MELEE_KNIVES, + BULLET = ARMOR_BALLISTIC_PISTOL, + LASER = ARMOR_LASER_SMALL, + ENERGY = ARMOR_ENERGY_SMALL, + BOMB = ARMOR_BOMB_PADDED ) /obj/item/clothing/suit/storage/vest/Initialize() @@ -358,9 +358,9 @@ allowed = list(/obj/item/gun,/obj/item/reagent_containers/spray/pepper,/obj/item/ammo_magazine,/obj/item/ammo_casing,/obj/item/melee/baton,/obj/item/handcuffs,/obj/item/device/flashlight) siemens_coefficient = 0.5 armor = list( - melee = ARMOR_MELEE_SMALL, - energy = ARMOR_ENERGY_MINOR, - bomb = ARMOR_BOMB_MINOR + MELEE = ARMOR_MELEE_SMALL, + ENERGY = ARMOR_ENERGY_MINOR, + BOMB = ARMOR_BOMB_MINOR ) contained_sprite = TRUE @@ -395,11 +395,11 @@ icon_badge = "hoswebvest_badge" icon_nobadge = "hoswebvest_nobadge" armor = list( - melee = ARMOR_MELEE_RESISTANT, - bullet = ARMOR_BALLISTIC_SMALL, + MELEE = ARMOR_MELEE_RESISTANT, + BULLET = ARMOR_BALLISTIC_SMALL, laser = ARMOR_BALLISTIC_PISTOL, - energy = ARMOR_ENERGY_MINOR, - bomb = ARMOR_BOMB_PADDED + ENERGY = ARMOR_ENERGY_MINOR, + BOMB = ARMOR_BOMB_PADDED ) //ert related armor @@ -411,11 +411,11 @@ item_state = "ert_soldier" body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS armor = list( - melee = ARMOR_MELEE_RESISTANT, - bullet = ARMOR_BALLISTIC_RIFLE, - laser = ARMOR_LASER_RIFLE, - energy = ARMOR_ENERGY_RESISTANT, - bomb = ARMOR_BOMB_PADDED + MELEE = ARMOR_MELEE_RESISTANT, + BULLET = ARMOR_BALLISTIC_RIFLE, + LASER = ARMOR_LASER_RIFLE, + ENERGY = ARMOR_ENERGY_RESISTANT, + BOMB = ARMOR_BOMB_PADDED ) siemens_coefficient = 0.35 slowdown = 0 @@ -463,11 +463,11 @@ contained_sprite = TRUE species_restricted = list(BODYTYPE_UNATHI) armor = list( - melee = ARMOR_MELEE_MAJOR, - bullet = ARMOR_BALLISTIC_PISTOL, - laser = ARMOR_LASER_KEVLAR, - energy = ARMOR_ENERGY_SMALL, - bomb = ARMOR_BOMB_PADDED + MELEE = ARMOR_MELEE_MAJOR, + BULLET = ARMOR_BALLISTIC_PISTOL, + LASER = ARMOR_LASER_KEVLAR, + ENERGY = ARMOR_ENERGY_SMALL, + BOMB = ARMOR_BOMB_PADDED ) siemens_coefficient = 0.35 @@ -477,12 +477,12 @@ icon_state = "hegemony_armor" item_state = "hegemony_armor" armor = list( - melee = ARMOR_MELEE_VERY_HIGH, - bullet = ARMOR_BALLISTIC_MEDIUM, - laser = ARMOR_LASER_RIFLE, - energy = ARMOR_ENERGY_MINOR, - bomb = ARMOR_BOMB_PADDED, - rad = ARMOR_RAD_MINOR + MELEE = ARMOR_MELEE_VERY_HIGH, + BULLET = ARMOR_BALLISTIC_MEDIUM, + LASER = ARMOR_LASER_RIFLE, + ENERGY = ARMOR_ENERGY_MINOR, + BOMB = ARMOR_BOMB_PADDED, + RAD = ARMOR_RAD_MINOR ) // Vaurca version of Unathi armor @@ -495,12 +495,12 @@ contained_sprite = TRUE species_restricted = list(BODYTYPE_VAURCA) armor = list( - melee = ARMOR_MELEE_VERY_HIGH, - bullet = ARMOR_BALLISTIC_MEDIUM, - laser = ARMOR_LASER_RIFLE, - energy = ARMOR_ENERGY_MINOR, - bomb = ARMOR_BOMB_PADDED, - rad = ARMOR_RAD_MINOR + MELEE = ARMOR_MELEE_VERY_HIGH, + BULLET = ARMOR_BALLISTIC_MEDIUM, + LASER = ARMOR_LASER_RIFLE, + ENERGY = ARMOR_ENERGY_MINOR, + BOMB = ARMOR_BOMB_PADDED, + RAD = ARMOR_RAD_MINOR ) allowed = list(/obj/item/gun/projectile, /obj/item/gun/energy, /obj/item/gun/launcher, /obj/item/melee, /obj/item/reagent_containers/spray/pepper, /obj/item/ammo_magazine, /obj/item/ammo_casing, /obj/item/melee/baton, /obj/item/handcuffs, /obj/item/device/flashlight) siemens_coefficient = 0.35 @@ -523,11 +523,11 @@ /obj/item/material/twohanded/pike/flag ) armor = list( - melee = ARMOR_MELEE_MAJOR, - bullet = ARMOR_BALLISTIC_SMALL, - laser = ARMOR_LASER_SMALL, - energy = ARMOR_ENERGY_MINOR, - bomb = ARMOR_BOMB_RESISTANT + MELEE = ARMOR_MELEE_MAJOR, + BULLET = ARMOR_BALLISTIC_SMALL, + LASER = ARMOR_LASER_SMALL, + ENERGY = ARMOR_ENERGY_MINOR, + BOMB = ARMOR_BOMB_RESISTANT ) /obj/item/clothing/suit/storage/vest/legion/legate @@ -550,11 +550,11 @@ icon_state = "solwebvest" item_state = "solwebvest" armor = list( - melee = ARMOR_MELEE_VERY_HIGH, - bullet = ARMOR_BALLISTIC_MEDIUM, - laser = ARMOR_LASER_RIFLE, - energy = ARMOR_ENERGY_RESISTANT, - bomb = ARMOR_BOMB_PADDED + MELEE = ARMOR_MELEE_VERY_HIGH, + BULLET = ARMOR_BALLISTIC_MEDIUM, + LASER = ARMOR_LASER_RIFLE, + ENERGY = ARMOR_ENERGY_RESISTANT, + BOMB = ARMOR_BOMB_PADDED ) contained_sprite = TRUE @@ -573,11 +573,11 @@ icon_state = "kala_armor" item_state = "kala_armor" armor = list( - melee = ARMOR_MELEE_KNIVES, - bullet = ARMOR_BALLISTIC_PISTOL, - laser = ARMOR_LASER_RIFLE, - energy = ARMOR_ENERGY_SMALL, - bomb = ARMOR_BOMB_PADDED + MELEE = ARMOR_MELEE_KNIVES, + BULLET = ARMOR_BALLISTIC_PISTOL, + LASER = ARMOR_LASER_RIFLE, + ENERGY = ARMOR_ENERGY_SMALL, + BOMB = ARMOR_BOMB_PADDED ) contained_sprite = TRUE diff --git a/code/modules/clothing/suits/hazardvests.dm b/code/modules/clothing/suits/hazardvests.dm index 5945c22106d..9c52f3dd920 100644 --- a/code/modules/clothing/suits/hazardvests.dm +++ b/code/modules/clothing/suits/hazardvests.dm @@ -102,7 +102,7 @@ item_state = "hazard_iac" permeability_coefficient = 0.50 armor = list( - bio = ARMOR_BIO_MINOR + BIO = ARMOR_BIO_MINOR ) /obj/item/clothing/suit/storage/hazardvest/colorable diff --git a/code/modules/clothing/suits/hazmat.dm b/code/modules/clothing/suits/hazmat.dm index 2cbb13cc5c8..9d4d9bceff4 100644 --- a/code/modules/clothing/suits/hazmat.dm +++ b/code/modules/clothing/suits/hazmat.dm @@ -14,8 +14,8 @@ gas_transfer_coefficient = 0 siemens_coefficient = 0.75 armor = list( - bio = ARMOR_BIO_SHIELDED, - rad = ARMOR_RAD_SMALL + BIO = ARMOR_BIO_SHIELDED, + RAD = ARMOR_RAD_SMALL ) body_parts_covered = UPPER_TORSO | LOWER_TORSO | LEGS | FEET | ARMS | HANDS flags_inv = HIDEWRISTS | HIDEGLOVES | HIDESHOES | HIDEJUMPSUIT | HIDETAIL diff --git a/code/modules/clothing/suits/hoodies.dm b/code/modules/clothing/suits/hoodies.dm index 70b04357d0f..e41eb690c7b 100644 --- a/code/modules/clothing/suits/hoodies.dm +++ b/code/modules/clothing/suits/hoodies.dm @@ -43,7 +43,7 @@ cold_protection = UPPER_TORSO|LOWER_TORSO|ARMS min_cold_protection_temperature = SPACE_SUIT_MIN_COLD_PROTECTION_TEMPERATURE armor = list( - bio = ARMOR_BIO_MINOR + BIO = ARMOR_BIO_MINOR ) siemens_coefficient = 0.75 protects_against_weather = TRUE diff --git a/code/modules/clothing/suits/labcoat.dm b/code/modules/clothing/suits/labcoat.dm index cd3d23e7f38..da9433288e7 100644 --- a/code/modules/clothing/suits/labcoat.dm +++ b/code/modules/clothing/suits/labcoat.dm @@ -9,7 +9,7 @@ body_parts_covered = UPPER_TORSO|ARMS allowed = list(/obj/item/device/analyzer,/obj/item/stack/medical,/obj/item/dnainjector,/obj/item/reagent_containers/dropper,/obj/item/reagent_containers/syringe,/obj/item/reagent_containers/hypospray,/obj/item/device/healthanalyzer,/obj/item/device/flashlight/pen,/obj/item/reagent_containers/glass/bottle,/obj/item/reagent_containers/glass/beaker,/obj/item/reagent_containers/pill,/obj/item/storage/pill_bottle,/obj/item/paper, /obj/item/device/breath_analyzer) armor = list( - bio = ARMOR_BIO_RESISTANT + BIO = ARMOR_BIO_RESISTANT ) opened = TRUE // spawns opened @@ -24,7 +24,7 @@ body_parts_covered = UPPER_TORSO|ARMS|LOWER_TORSO|LEGS allowed = list(/obj/item/device/analyzer,/obj/item/stack/medical,/obj/item/dnainjector,/obj/item/reagent_containers/dropper,/obj/item/reagent_containers/syringe,/obj/item/reagent_containers/hypospray,/obj/item/device/healthanalyzer,/obj/item/device/flashlight/pen,/obj/item/reagent_containers/glass/bottle,/obj/item/reagent_containers/glass/beaker,/obj/item/reagent_containers/pill,/obj/item/storage/pill_bottle,/obj/item/paper, /obj/item/device/breath_analyzer) armor = list( - bio = ARMOR_BIO_RESISTANT + BIO = ARMOR_BIO_RESISTANT ) /obj/item/clothing/suit/storage/toggle/labcoat/cmo @@ -197,7 +197,7 @@ body_parts_covered = UPPER_TORSO|ARMS allowed = list(/obj/item/device/analyzer,/obj/item/stack/medical,/obj/item/dnainjector,/obj/item/reagent_containers/dropper,/obj/item/reagent_containers/syringe,/obj/item/reagent_containers/hypospray,/obj/item/device/healthanalyzer,/obj/item/device/flashlight/pen,/obj/item/reagent_containers/glass/bottle,/obj/item/reagent_containers/glass/beaker,/obj/item/reagent_containers/pill,/obj/item/storage/pill_bottle,/obj/item/paper, /obj/item/device/breath_analyzer) armor = list( - bio = ARMOR_BIO_RESISTANT + BIO = ARMOR_BIO_RESISTANT ) /obj/item/clothing/suit/storage/galatea_labcoat/alt diff --git a/code/modules/clothing/suits/miscellaneous.dm b/code/modules/clothing/suits/miscellaneous.dm index 2025f5e0061..b6790493c6b 100644 --- a/code/modules/clothing/suits/miscellaneous.dm +++ b/code/modules/clothing/suits/miscellaneous.dm @@ -234,7 +234,7 @@ icon_state = "lflight" item_state = "lflight" armor = list( - bio = ARMOR_BIO_MINOR + BIO = ARMOR_BIO_MINOR ) siemens_coefficient = 0.75 @@ -245,11 +245,11 @@ /obj/item/clothing/suit/storage/toggle/leather_jacket/flight/legion/alt desc = "A Tau Ceti Foreign Legion pilot's jacket made from a silky, shiny nanonylon material and lined with tough, protective synthfabrics." armor = list( - melee = ARMOR_MELEE_RESISTANT, - bullet = ARMOR_BALLISTIC_MINOR, - laser = ARMOR_LASER_SMALL, - energy = ARMOR_ENERGY_MINOR, - bomb = ARMOR_BOMB_PADDED + MELEE = ARMOR_MELEE_RESISTANT, + BULLET = ARMOR_BALLISTIC_MINOR, + LASER = ARMOR_LASER_SMALL, + ENERGY = ARMOR_ENERGY_MINOR, + BOMB = ARMOR_BOMB_PADDED ) siemens_coefficient = 0.35 @@ -628,11 +628,11 @@ icon_state = "bssb_jacket_armored" item_state = "bssb_jacket_armored" armor = list( - melee = ARMOR_MELEE_KNIVES, - bullet = ARMOR_BALLISTIC_SMALL, - laser = ARMOR_LASER_SMALL, - energy = ARMOR_ENERGY_MINOR, - bomb = ARMOR_BOMB_PADDED + MELEE = ARMOR_MELEE_KNIVES, + BULLET = ARMOR_BALLISTIC_SMALL, + LASER = ARMOR_LASER_SMALL, + ENERGY = ARMOR_ENERGY_MINOR, + BOMB = ARMOR_BOMB_PADDED ) // Cardigans. diff --git a/code/modules/clothing/suits/modular_armor.dm b/code/modules/clothing/suits/modular_armor.dm index 745b2759dcf..35027fb04b8 100644 --- a/code/modules/clothing/suits/modular_armor.dm +++ b/code/modules/clothing/suits/modular_armor.dm @@ -19,11 +19,11 @@ much to the dismay of officers." icon_state = "dom_carrier" armor = list( - melee = ARMOR_MELEE_KEVLAR, - bullet = ARMOR_BALLISTIC_MEDIUM, - laser = ARMOR_LASER_KEVLAR, - energy = ARMOR_ENERGY_SMALL, - bomb = ARMOR_BOMB_PADDED + MELEE = ARMOR_MELEE_KEVLAR, + BULLET = ARMOR_BALLISTIC_MEDIUM, + LASER = ARMOR_LASER_KEVLAR, + ENERGY = ARMOR_ENERGY_SMALL, + BOMB = ARMOR_BOMB_PADDED ) /obj/item/clothing/suit/armor/carrier/officer @@ -144,11 +144,11 @@ body_parts_covered = UPPER_TORSO|LOWER_TORSO w_class = WEIGHT_CLASS_NORMAL armor = list( - melee = ARMOR_MELEE_KEVLAR, - bullet = ARMOR_BALLISTIC_MEDIUM, - laser = ARMOR_LASER_KEVLAR, - energy = ARMOR_ENERGY_SMALL, - bomb = ARMOR_BOMB_PADDED + MELEE = ARMOR_MELEE_KEVLAR, + BULLET = ARMOR_BALLISTIC_MEDIUM, + LASER = ARMOR_LASER_KEVLAR, + ENERGY = ARMOR_ENERGY_SMALL, + BOMB = ARMOR_BOMB_PADDED ) /obj/item/clothing/accessory/armor_plate/before_attached(var/obj/item/clothing/clothing, var/mob/user) @@ -183,11 +183,11 @@ icon_state = "plate_ballistic" item_state = "plate_ballistic" armor = list( - melee = ARMOR_MELEE_RESISTANT, - bullet = ARMOR_BALLISTIC_RIFLE, - laser = ARMOR_LASER_MINOR, - energy = ARMOR_ENERGY_MINOR, - bomb = ARMOR_BOMB_PADDED + MELEE = ARMOR_MELEE_RESISTANT, + BULLET = ARMOR_BALLISTIC_RIFLE, + LASER = ARMOR_LASER_MINOR, + ENERGY = ARMOR_ENERGY_MINOR, + BOMB = ARMOR_BOMB_PADDED ) slowdown = 0.4 @@ -197,11 +197,11 @@ icon_state = "plate_riot" item_state = "plate_riot" armor = list( - melee = ARMOR_MELEE_VERY_HIGH, - bullet = ARMOR_BALLISTIC_MINOR, - laser = ARMOR_LASER_MINOR, - energy = ARMOR_ENERGY_MINOR, - bomb = ARMOR_BOMB_PADDED + MELEE = ARMOR_MELEE_VERY_HIGH, + BULLET = ARMOR_BALLISTIC_MINOR, + LASER = ARMOR_LASER_MINOR, + ENERGY = ARMOR_ENERGY_MINOR, + BOMB = ARMOR_BOMB_PADDED ) slowdown = 0.4 @@ -211,10 +211,10 @@ icon_state = "plate_ablative" item_state = "plate_ablative" armor = list( - melee = ARMOR_MELEE_MINOR, - bullet = ARMOR_BALLISTIC_MINOR, - laser = ARMOR_LASER_MAJOR, - energy = ARMOR_ENERGY_RESISTANT + MELEE = ARMOR_MELEE_MINOR, + BULLET = ARMOR_BALLISTIC_MINOR, + LASER = ARMOR_LASER_MAJOR, + ENERGY = ARMOR_ENERGY_RESISTANT ) slowdown = 0.4 siemens_coefficient = 0 @@ -225,11 +225,11 @@ icon_state = "plate_military" item_state = "plate_military" armor = list( - melee = ARMOR_MELEE_MAJOR, - bullet = ARMOR_BALLISTIC_MAJOR, - laser = ARMOR_LASER_RIFLE, - energy = ARMOR_ENERGY_SMALL, - bomb = ARMOR_BOMB_PADDED, + MELEE = ARMOR_MELEE_MAJOR, + BULLET = ARMOR_BALLISTIC_MAJOR, + LASER = ARMOR_LASER_RIFLE, + ENERGY = ARMOR_ENERGY_SMALL, + BOMB = ARMOR_BOMB_PADDED, ) slowdown = 0.4 @@ -239,11 +239,11 @@ icon_state = "plate_heavy" item_state = "plate_heavy" armor = list( - melee = ARMOR_MELEE_MAJOR, - bullet = ARMOR_BALLISTIC_MAJOR, - laser = ARMOR_LASER_RIFLE, - energy = ARMOR_ENERGY_SMALL, - bomb = ARMOR_BOMB_PADDED, + MELEE = ARMOR_MELEE_MAJOR, + BULLET = ARMOR_BALLISTIC_MAJOR, + LASER = ARMOR_LASER_RIFLE, + ENERGY = ARMOR_ENERGY_SMALL, + BOMB = ARMOR_BOMB_PADDED, ) slowdown = 0.4 @@ -278,11 +278,11 @@ item_state = "tcaf_plate" contained_sprite = TRUE armor = list( - melee = ARMOR_MELEE_MAJOR, - bullet = ARMOR_BALLISTIC_MAJOR, - laser = ARMOR_LASER_RIFLE, - energy = ARMOR_ENERGY_SMALL, - bomb = ARMOR_BOMB_PADDED, + MELEE = ARMOR_MELEE_MAJOR, + BULLET = ARMOR_BALLISTIC_MAJOR, + LASER = ARMOR_LASER_RIFLE, + ENERGY = ARMOR_ENERGY_SMALL, + BOMB = ARMOR_BOMB_PADDED, ) slowdown = 0.4 @@ -292,11 +292,11 @@ icon_state = "tcaf_plate_light" item_state = "tcaf_plate_light" armor = list( - melee = ARMOR_MELEE_KEVLAR, - bullet = ARMOR_BALLISTIC_MEDIUM, - laser = ARMOR_LASER_KEVLAR, - energy = ARMOR_ENERGY_SMALL, - bomb = ARMOR_BOMB_PADDED + MELEE = ARMOR_MELEE_KEVLAR, + BULLET = ARMOR_BALLISTIC_MEDIUM, + LASER = ARMOR_LASER_KEVLAR, + ENERGY = ARMOR_ENERGY_SMALL, + BOMB = ARMOR_BOMB_PADDED ) slowdown = 0 @@ -361,11 +361,11 @@ icon_state = "plate_sec_heavy" item_state = "plate_sec_heavy" armor = list( - melee = ARMOR_MELEE_MAJOR, - bullet = ARMOR_BALLISTIC_MAJOR, - laser = ARMOR_LASER_MEDIUM, - energy = ARMOR_ENERGY_SMALL, - bomb = ARMOR_BOMB_PADDED + MELEE = ARMOR_MELEE_MAJOR, + BULLET = ARMOR_BALLISTIC_MAJOR, + LASER = ARMOR_LASER_MEDIUM, + ENERGY = ARMOR_ENERGY_SMALL, + BOMB = ARMOR_BOMB_PADDED ) slowdown = 0.4 @@ -408,11 +408,11 @@ icon_state = "helm_sec_heavy" item_state = "helm_sec_heavy" armor = list( - melee = ARMOR_MELEE_MAJOR, - bullet = ARMOR_BALLISTIC_MAJOR, - laser = ARMOR_LASER_MEDIUM, - energy = ARMOR_ENERGY_SMALL, - bomb = ARMOR_BOMB_PADDED, + MELEE = ARMOR_MELEE_MAJOR, + BULLET = ARMOR_BALLISTIC_MAJOR, + LASER = ARMOR_LASER_MEDIUM, + ENERGY = ARMOR_ENERGY_SMALL, + BOMB = ARMOR_BOMB_PADDED, ) /obj/item/clothing/head/helmet/military @@ -423,11 +423,11 @@ icon_state = "helm_military" item_state = "helm_military" armor = list( - melee = ARMOR_MELEE_MAJOR, - bullet = ARMOR_BALLISTIC_MAJOR, - laser = ARMOR_LASER_MEDIUM, - energy = ARMOR_ENERGY_SMALL, - bomb = ARMOR_BOMB_PADDED, + MELEE = ARMOR_MELEE_MAJOR, + BULLET = ARMOR_BALLISTIC_MAJOR, + LASER = ARMOR_LASER_MEDIUM, + ENERGY = ARMOR_ENERGY_SMALL, + BOMB = ARMOR_BOMB_PADDED, ) /obj/item/clothing/head/helmet/dominia @@ -440,11 +440,11 @@ icon_state = "dom_helmet" item_state = "dom_helmet" armor = list( - melee = ARMOR_MELEE_MAJOR, - bullet = ARMOR_BALLISTIC_MAJOR, - laser = ARMOR_LASER_MEDIUM, - energy = ARMOR_ENERGY_SMALL, - bomb = ARMOR_BOMB_PADDED, + MELEE = ARMOR_MELEE_MAJOR, + BULLET = ARMOR_BALLISTIC_MAJOR, + LASER = ARMOR_LASER_MEDIUM, + ENERGY = ARMOR_ENERGY_SMALL, + BOMB = ARMOR_BOMB_PADDED, ) /obj/item/clothing/head/helmet/dominia/nco @@ -461,11 +461,11 @@ icon_state = "tcaf_helm_face" item_state = "tcaf_helm_face" armor = list( - melee = ARMOR_MELEE_MAJOR, - bullet = ARMOR_BALLISTIC_MAJOR, - laser = ARMOR_LASER_MEDIUM, - energy = ARMOR_ENERGY_SMALL, - bomb = ARMOR_BOMB_PADDED, + MELEE = ARMOR_MELEE_MAJOR, + BULLET = ARMOR_BALLISTIC_MAJOR, + LASER = ARMOR_LASER_MEDIUM, + ENERGY = ARMOR_ENERGY_SMALL, + BOMB = ARMOR_BOMB_PADDED, ) /obj/item/clothing/head/helmet/tcaf/tcaf_novisor @@ -488,11 +488,11 @@ icon_state = "hoplan_helm" item_state = "hoplan_helm" armor = list( - melee = ARMOR_MELEE_MAJOR, - bullet = ARMOR_BALLISTIC_MAJOR, - laser = ARMOR_LASER_MEDIUM, - energy = ARMOR_ENERGY_SMALL, - bomb = ARMOR_BOMB_PADDED, + MELEE = ARMOR_MELEE_MAJOR, + BULLET = ARMOR_BALLISTIC_MAJOR, + LASER = ARMOR_LASER_MEDIUM, + ENERGY = ARMOR_ENERGY_SMALL, + BOMB = ARMOR_BOMB_PADDED, ) //Cosmetic Accessories diff --git a/code/modules/clothing/suits/storage.dm b/code/modules/clothing/suits/storage.dm index 3256ed7cdb4..a35e8f90131 100644 --- a/code/modules/clothing/suits/storage.dm +++ b/code/modules/clothing/suits/storage.dm @@ -112,7 +112,7 @@ cold_protection = UPPER_TORSO|LOWER_TORSO|ARMS min_cold_protection_temperature = SPACE_SUIT_MIN_COLD_PROTECTION_TEMPERATURE armor = list( - bio = ARMOR_BIO_MINOR + BIO = ARMOR_BIO_MINOR ) siemens_coefficient = 0.8 protects_against_weather = TRUE diff --git a/code/modules/clothing/suits/utility.dm b/code/modules/clothing/suits/utility.dm index 6fd0974cf62..c1fd6b32674 100644 --- a/code/modules/clothing/suits/utility.dm +++ b/code/modules/clothing/suits/utility.dm @@ -70,11 +70,11 @@ w_class = WEIGHT_CLASS_HUGE//Too large to fit in a backpack item_flags = ITEM_FLAG_THICK_MATERIAL|ITEM_FLAG_BLOCK_GAS_SMOKE_EFFECT armor = list( - melee = ARMOR_MELEE_VERY_HIGH, - bullet = ARMOR_BALLISTIC_MINOR, - laser = ARMOR_LASER_SMALL, - energy = ARMOR_ENERGY_RESISTANT, - bomb = ARMOR_BOMB_SHIELDED + MELEE = ARMOR_MELEE_VERY_HIGH, + BULLET = ARMOR_BALLISTIC_MINOR, + LASER = ARMOR_LASER_SMALL, + ENERGY = ARMOR_ENERGY_RESISTANT, + BOMB = ARMOR_BOMB_SHIELDED ) max_pressure_protection = FIRESUIT_MAX_PRESSURE siemens_coefficient = 0 @@ -98,11 +98,11 @@ permeability_coefficient = 0.01 slowdown = 8 armor = list( - melee = ARMOR_MELEE_VERY_HIGH, - bullet = ARMOR_BALLISTIC_MINOR, - laser = ARMOR_LASER_SMALL, - energy = ARMOR_ENERGY_RESISTANT, - bomb = ARMOR_BOMB_SHIELDED + MELEE = ARMOR_MELEE_VERY_HIGH, + BULLET = ARMOR_BALLISTIC_MINOR, + LASER = ARMOR_LASER_SMALL, + ENERGY = ARMOR_ENERGY_RESISTANT, + BOMB = ARMOR_BOMB_SHIELDED ) siemens_coefficient = 0 item_flags = ITEM_FLAG_THICK_MATERIAL @@ -208,8 +208,8 @@ flags_inv = BLOCKHAIR body_parts_covered = HEAD|FACE|EYES armor = list( - bio = ARMOR_BIO_RESISTANT, - rad = ARMOR_RAD_SHIELDED + BIO = ARMOR_BIO_RESISTANT, + RAD = ARMOR_RAD_SHIELDED ) siemens_coefficient = 0.35 @@ -231,8 +231,8 @@ allowed = list(/obj/item/device/flashlight,/obj/item/tank,/obj/item/device/suit_cooling_unit,/obj/item/storage/bag/inflatable,/obj/item/device/t_scanner,/obj/item/rfd/construction,/obj/item/material/twohanded/fireaxe,/obj/item/storage/backpack/cell,/obj/item/clothing/head/radiation,/obj/item/clothing/mask/gas,/obj/item/reagent_containers/hypospray/autoinjector) slowdown = 1.5 armor = list( - bio = ARMOR_BIO_RESISTANT, - rad = ARMOR_RAD_SHIELDED + BIO = ARMOR_BIO_RESISTANT, + RAD = ARMOR_RAD_SHIELDED ) siemens_coefficient = 0.35 flags_inv = HIDEJUMPSUIT|HIDETAIL diff --git a/code/modules/clothing/suits/xeno/tajara.dm b/code/modules/clothing/suits/xeno/tajara.dm index 6dab220e409..fb0a8c1e5d3 100644 --- a/code/modules/clothing/suits/xeno/tajara.dm +++ b/code/modules/clothing/suits/xeno/tajara.dm @@ -210,11 +210,11 @@ flags_inv = HIDEJUMPSUIT|HIDETAIL species_restricted = list(BODYTYPE_TAJARA) armor = list( - melee = ARMOR_MELEE_MAJOR, - bullet = ARMOR_BALLISTIC_PISTOL, - laser = ARMOR_LASER_SMALL, - energy = ARMOR_ENERGY_MINOR, - bomb = ARMOR_BOMB_MINOR + MELEE = ARMOR_MELEE_MAJOR, + BULLET = ARMOR_BALLISTIC_PISTOL, + LASER = ARMOR_LASER_SMALL, + ENERGY = ARMOR_ENERGY_MINOR, + BOMB = ARMOR_BOMB_MINOR ) siemens_coefficient = 0.35 desc_extended = "The Feudal Era of Amohda is famous for the steel swords which became common. Many renowned swordsmen and famous warriors would travel the land fighting duels of \ @@ -231,11 +231,11 @@ item_state = "cuirass" contained_sprite = TRUE armor = list( - melee = ARMOR_MELEE_MAJOR, - bullet = ARMOR_BALLISTIC_PISTOL, - laser = ARMOR_LASER_SMALL, - energy = ARMOR_ENERGY_MINOR, - bomb = ARMOR_BOMB_MINOR + MELEE = ARMOR_MELEE_MAJOR, + BULLET = ARMOR_BALLISTIC_PISTOL, + LASER = ARMOR_LASER_SMALL, + ENERGY = ARMOR_ENERGY_MINOR, + BOMB = ARMOR_BOMB_MINOR ) /obj/item/clothing/suit/storage/tajaran/pra_jacket @@ -251,11 +251,11 @@ name = "hadiist service jacket" desc = "An olive military jacket worn by the forces of the Grand People's Army." armor = list( - melee = ARMOR_MELEE_KNIVES, - bullet = ARMOR_BALLISTIC_MINOR, - laser = ARMOR_LASER_MINOR, - energy = ARMOR_ENERGY_MINOR, - bomb = ARMOR_BOMB_MINOR + MELEE = ARMOR_MELEE_KNIVES, + BULLET = ARMOR_BALLISTIC_MINOR, + LASER = ARMOR_LASER_MINOR, + ENERGY = ARMOR_ENERGY_MINOR, + BOMB = ARMOR_BOMB_MINOR ) siemens_coefficient = 0.50 allowed = list(/obj/item/gun/projectile/shotgun/pump/rifle, /obj/item/ammo_magazine/boltaction, /obj/item/gun/projectile/automatic/rifle/adhomian, /obj/item/device/flashlight) diff --git a/code/modules/clothing/suits/xeno/unathi.dm b/code/modules/clothing/suits/xeno/unathi.dm index efa3f6b1744..a4cb80d7df0 100644 --- a/code/modules/clothing/suits/xeno/unathi.dm +++ b/code/modules/clothing/suits/xeno/unathi.dm @@ -67,9 +67,9 @@ icon_state = "ancient_armor" item_state = "ancient_armor" armor = list( //not designed to hold up to bullets or lasers, but still better than nothing. - melee = ARMOR_MELEE_MAJOR, - bullet = ARMOR_BALLISTIC_MINOR, - laser = ARMOR_LASER_SMALL + MELEE = ARMOR_MELEE_MAJOR, + BULLET = ARMOR_BALLISTIC_MINOR, + LASER = ARMOR_LASER_SMALL ) matter = list(MATERIAL_BRONZE = 1000) drop_sound = 'sound/items/drop/sword.ogg' diff --git a/code/modules/clothing/under/accessories/armor.dm b/code/modules/clothing/under/accessories/armor.dm index 7c88cc73687..068fb8e16c9 100644 --- a/code/modules/clothing/under/accessories/armor.dm +++ b/code/modules/clothing/under/accessories/armor.dm @@ -11,11 +11,11 @@ accessory_layer = ACCESSORY_LAYER_LOWER w_class = WEIGHT_CLASS_NORMAL armor = list( - melee = ARMOR_MELEE_KEVLAR, - bullet = ARMOR_BALLISTIC_MEDIUM, - laser = ARMOR_LASER_KEVLAR, - energy = ARMOR_ENERGY_SMALL, - bomb = ARMOR_BOMB_PADDED + MELEE = ARMOR_MELEE_KEVLAR, + BULLET = ARMOR_BALLISTIC_MEDIUM, + LASER = ARMOR_LASER_KEVLAR, + ENERGY = ARMOR_ENERGY_SMALL, + BOMB = ARMOR_BOMB_PADDED ) body_parts_covered = LEGS|FEET drop_sound = 'sound/items/drop/boots.ogg' @@ -45,10 +45,10 @@ icon_state = "legguards_ablative" item_state = "legguards_ablative" armor = list( - melee = ARMOR_MELEE_MINOR, - bullet = ARMOR_BALLISTIC_MINOR, - laser = ARMOR_LASER_MAJOR, - energy = ARMOR_ENERGY_RESISTANT + MELEE = ARMOR_MELEE_MINOR, + BULLET = ARMOR_BALLISTIC_MINOR, + LASER = ARMOR_LASER_MAJOR, + ENERGY = ARMOR_ENERGY_RESISTANT ) slowdown = 0.3 siemens_coefficient = 0 @@ -59,11 +59,11 @@ icon_state = "legguards_ballistic" item_state = "legguards_ballistic" armor = list( - melee = ARMOR_MELEE_RESISTANT, - bullet = ARMOR_BALLISTIC_RIFLE, - laser = ARMOR_LASER_MINOR, - energy = ARMOR_ENERGY_MINOR, - bomb = ARMOR_BOMB_PADDED + MELEE = ARMOR_MELEE_RESISTANT, + BULLET = ARMOR_BALLISTIC_RIFLE, + LASER = ARMOR_LASER_MINOR, + ENERGY = ARMOR_ENERGY_MINOR, + BOMB = ARMOR_BOMB_PADDED ) slowdown = 0.3 @@ -73,11 +73,11 @@ icon_state = "legguards_riot" item_state = "legguards_riot" armor = list( - melee = ARMOR_MELEE_VERY_HIGH, - bullet = ARMOR_BALLISTIC_MINOR, - laser = ARMOR_LASER_MINOR, - energy = ARMOR_ENERGY_MINOR, - bomb = ARMOR_BOMB_PADDED + MELEE = ARMOR_MELEE_VERY_HIGH, + BULLET = ARMOR_BALLISTIC_MINOR, + LASER = ARMOR_LASER_MINOR, + ENERGY = ARMOR_ENERGY_MINOR, + BOMB = ARMOR_BOMB_PADDED ) slowdown = 0.3 @@ -87,11 +87,11 @@ icon_state = "legguards_military" item_state = "legguards_military" armor = list( - melee = ARMOR_MELEE_MAJOR, - bullet = ARMOR_BALLISTIC_MAJOR, - laser = ARMOR_LASER_MEDIUM, - energy = ARMOR_ENERGY_SMALL, - bomb = ARMOR_BOMB_PADDED, + MELEE = ARMOR_MELEE_MAJOR, + BULLET = ARMOR_BALLISTIC_MAJOR, + LASER = ARMOR_LASER_MEDIUM, + ENERGY = ARMOR_ENERGY_SMALL, + BOMB = ARMOR_BOMB_PADDED, ) slowdown = 0.3 @@ -101,11 +101,11 @@ icon_state = "legguards_heavy" item_state = "legguards_heavy" armor = list( - melee = ARMOR_MELEE_MAJOR, - bullet = ARMOR_BALLISTIC_MAJOR, - laser = ARMOR_LASER_MEDIUM, - energy = ARMOR_ENERGY_SMALL, - bomb = ARMOR_BOMB_PADDED, + MELEE = ARMOR_MELEE_MAJOR, + BULLET = ARMOR_BALLISTIC_MAJOR, + LASER = ARMOR_LASER_MEDIUM, + ENERGY = ARMOR_ENERGY_SMALL, + BOMB = ARMOR_BOMB_PADDED, ) slowdown = 0.3 @@ -120,11 +120,11 @@ icon_state = "legguards_sec_heavy" item_state = "legguards_sec_heavy" armor = list( - melee = ARMOR_MELEE_MAJOR, - bullet = ARMOR_BALLISTIC_MAJOR, - laser = ARMOR_LASER_MEDIUM, - energy = ARMOR_ENERGY_SMALL, - bomb = ARMOR_BOMB_PADDED, + MELEE = ARMOR_MELEE_MAJOR, + BULLET = ARMOR_BALLISTIC_MAJOR, + LASER = ARMOR_LASER_MEDIUM, + ENERGY = ARMOR_ENERGY_SMALL, + BOMB = ARMOR_BOMB_PADDED, ) slowdown = 0.3 @@ -136,11 +136,11 @@ item_state = "tcaf_boot_armor" contained_sprite = TRUE armor = list( - melee = ARMOR_MELEE_MAJOR, - bullet = ARMOR_BALLISTIC_MAJOR, - laser = ARMOR_LASER_MEDIUM, - energy = ARMOR_ENERGY_SMALL, - bomb = ARMOR_BOMB_PADDED, + MELEE = ARMOR_MELEE_MAJOR, + BULLET = ARMOR_BALLISTIC_MAJOR, + LASER = ARMOR_LASER_MEDIUM, + ENERGY = ARMOR_ENERGY_SMALL, + BOMB = ARMOR_BOMB_PADDED, ) slowdown = 0.3 @@ -149,11 +149,11 @@ icon_state = "legguards_navy" item_state = "legguards_navy" armor = list( - melee = ARMOR_MELEE_MAJOR, - bullet = ARMOR_BALLISTIC_MAJOR, - laser = ARMOR_LASER_MEDIUM, - energy = ARMOR_ENERGY_SMALL, - bomb = ARMOR_BOMB_PADDED, + MELEE = ARMOR_MELEE_MAJOR, + BULLET = ARMOR_BALLISTIC_MAJOR, + LASER = ARMOR_LASER_MEDIUM, + ENERGY = ARMOR_ENERGY_SMALL, + BOMB = ARMOR_BOMB_PADDED, ) slowdown = 0.3 @@ -166,11 +166,11 @@ item_state = "hoplan_thigh_protector" contained_sprite = TRUE armor = list( - melee = ARMOR_MELEE_MAJOR, - bullet = ARMOR_BALLISTIC_MAJOR, - laser = ARMOR_LASER_MEDIUM, - energy = ARMOR_ENERGY_SMALL, - bomb = ARMOR_BOMB_PADDED, + MELEE = ARMOR_MELEE_MAJOR, + BULLET = ARMOR_BALLISTIC_MAJOR, + LASER = ARMOR_LASER_MEDIUM, + ENERGY = ARMOR_ENERGY_SMALL, + BOMB = ARMOR_BOMB_PADDED, ) slowdown = 0.3 @@ -195,11 +195,11 @@ accessory_layer = ACCESSORY_LAYER_LOWER body_parts_covered = HANDS|ARMS armor = list( - melee = ARMOR_MELEE_KEVLAR, - bullet = ARMOR_BALLISTIC_MEDIUM, - laser = ARMOR_LASER_KEVLAR, - energy = ARMOR_ENERGY_SMALL, - bomb = ARMOR_BOMB_PADDED + MELEE = ARMOR_MELEE_KEVLAR, + BULLET = ARMOR_BALLISTIC_MEDIUM, + LASER = ARMOR_LASER_KEVLAR, + ENERGY = ARMOR_ENERGY_SMALL, + BOMB = ARMOR_BOMB_PADDED ) w_class = WEIGHT_CLASS_NORMAL drop_sound = 'sound/items/drop/axe.ogg' @@ -229,10 +229,10 @@ icon_state = "armguards_ablative" item_state = "armguards_ablative" armor = list( - melee = ARMOR_MELEE_MINOR, - bullet = ARMOR_BALLISTIC_MINOR, - laser = ARMOR_LASER_MAJOR, - energy = ARMOR_ENERGY_RESISTANT + MELEE = ARMOR_MELEE_MINOR, + BULLET = ARMOR_BALLISTIC_MINOR, + LASER = ARMOR_LASER_MAJOR, + ENERGY = ARMOR_ENERGY_RESISTANT ) slowdown = 0.3 siemens_coefficient = 0 @@ -243,11 +243,11 @@ icon_state = "armguards_ballistic" item_state = "armguards_ballistic" armor = list( - melee = ARMOR_MELEE_RESISTANT, - bullet = ARMOR_BALLISTIC_RIFLE, - laser = ARMOR_LASER_MINOR, - energy = ARMOR_ENERGY_MINOR, - bomb = ARMOR_BOMB_PADDED + MELEE = ARMOR_MELEE_RESISTANT, + BULLET = ARMOR_BALLISTIC_RIFLE, + LASER = ARMOR_LASER_MINOR, + ENERGY = ARMOR_ENERGY_MINOR, + BOMB = ARMOR_BOMB_PADDED ) slowdown = 0.3 @@ -257,11 +257,11 @@ icon_state = "armguards_riot" item_state = "armguards_riot" armor = list( - melee = ARMOR_MELEE_VERY_HIGH, - bullet = ARMOR_BALLISTIC_MINOR, - laser = ARMOR_LASER_MINOR, - energy = ARMOR_ENERGY_MINOR, - bomb = ARMOR_BOMB_PADDED + MELEE = ARMOR_MELEE_VERY_HIGH, + BULLET = ARMOR_BALLISTIC_MINOR, + LASER = ARMOR_LASER_MINOR, + ENERGY = ARMOR_ENERGY_MINOR, + BOMB = ARMOR_BOMB_PADDED ) slowdown = 0.3 @@ -271,11 +271,11 @@ icon_state = "armguards_military" item_state = "armguards_military" armor = list( - melee = ARMOR_MELEE_MAJOR, - bullet = ARMOR_BALLISTIC_MAJOR, - laser = ARMOR_LASER_MEDIUM, - energy = ARMOR_ENERGY_SMALL, - bomb = ARMOR_BOMB_PADDED, + MELEE = ARMOR_MELEE_MAJOR, + BULLET = ARMOR_BALLISTIC_MAJOR, + LASER = ARMOR_LASER_MEDIUM, + ENERGY = ARMOR_ENERGY_SMALL, + BOMB = ARMOR_BOMB_PADDED, ) slowdown = 0.3 @@ -285,11 +285,11 @@ icon_state = "armguards_heavy" item_state = "armguards_heavy" armor = list( - melee = ARMOR_MELEE_MAJOR, - bullet = ARMOR_BALLISTIC_MAJOR, - laser = ARMOR_LASER_MEDIUM, - energy = ARMOR_ENERGY_SMALL, - bomb = ARMOR_BOMB_PADDED, + MELEE = ARMOR_MELEE_MAJOR, + BULLET = ARMOR_BALLISTIC_MAJOR, + LASER = ARMOR_LASER_MEDIUM, + ENERGY = ARMOR_ENERGY_SMALL, + BOMB = ARMOR_BOMB_PADDED, ) slowdown = 0.3 @@ -304,11 +304,11 @@ icon_state = "armguards_sec_heavy" item_state = "armguards_sec_heavy" armor = list( - melee = ARMOR_MELEE_MAJOR, - bullet = ARMOR_BALLISTIC_MAJOR, - laser = ARMOR_LASER_MEDIUM, - energy = ARMOR_ENERGY_SMALL, - bomb = ARMOR_BOMB_PADDED, + MELEE = ARMOR_MELEE_MAJOR, + BULLET = ARMOR_BALLISTIC_MAJOR, + LASER = ARMOR_LASER_MEDIUM, + ENERGY = ARMOR_ENERGY_SMALL, + BOMB = ARMOR_BOMB_PADDED, ) slowdown = 0.3 @@ -318,11 +318,11 @@ icon_state = "armguards_sec_heavy" item_state = "armguards_sec_heavy" armor = list( - melee = ARMOR_MELEE_MAJOR, - bullet = ARMOR_BALLISTIC_MAJOR, - laser = ARMOR_LASER_MEDIUM, - energy = ARMOR_ENERGY_SMALL, - bomb = ARMOR_BOMB_PADDED, + MELEE = ARMOR_MELEE_MAJOR, + BULLET = ARMOR_BALLISTIC_MAJOR, + LASER = ARMOR_LASER_MEDIUM, + ENERGY = ARMOR_ENERGY_SMALL, + BOMB = ARMOR_BOMB_PADDED, ) /obj/item/clothing/accessory/arm_guard/tcaf @@ -333,11 +333,11 @@ item_state = "tcaf_armguards" contained_sprite = TRUE armor = list( - melee = ARMOR_MELEE_MAJOR, - bullet = ARMOR_BALLISTIC_MAJOR, - laser = ARMOR_LASER_MEDIUM, - energy = ARMOR_ENERGY_SMALL, - bomb = ARMOR_BOMB_PADDED, + MELEE = ARMOR_MELEE_MAJOR, + BULLET = ARMOR_BALLISTIC_MAJOR, + LASER = ARMOR_LASER_MEDIUM, + ENERGY = ARMOR_ENERGY_SMALL, + BOMB = ARMOR_BOMB_PADDED, ) slowdown = 0.3 @@ -355,10 +355,10 @@ item_state = "hoplan_sleeves" contained_sprite = TRUE armor = list( - melee = ARMOR_MELEE_MAJOR, - bullet = ARMOR_BALLISTIC_MAJOR, - laser = ARMOR_LASER_MEDIUM, - energy = ARMOR_ENERGY_SMALL, - bomb = ARMOR_BOMB_PADDED, + MELEE = ARMOR_MELEE_MAJOR, + BULLET = ARMOR_BALLISTIC_MAJOR, + LASER = ARMOR_LASER_MEDIUM, + ENERGY = ARMOR_ENERGY_SMALL, + BOMB = ARMOR_BOMB_PADDED, ) slowdown = 0.3 diff --git a/code/modules/clothing/under/jobs/civilian.dm b/code/modules/clothing/under/jobs/civilian.dm index 136eaae0ffb..4a8342538d3 100644 --- a/code/modules/clothing/under/jobs/civilian.dm +++ b/code/modules/clothing/under/jobs/civilian.dm @@ -109,7 +109,7 @@ icon_state = "nt_janitor" item_state = "nt_janitor" armor = list( - bio = ARMOR_BIO_MINOR + BIO = ARMOR_BIO_MINOR ) /obj/item/clothing/under/rank/janitor/alt diff --git a/code/modules/clothing/under/jobs/engineering.dm b/code/modules/clothing/under/jobs/engineering.dm index 21143cfdf76..3de441aa7cf 100644 --- a/code/modules/clothing/under/jobs/engineering.dm +++ b/code/modules/clothing/under/jobs/engineering.dm @@ -7,7 +7,7 @@ item_state = "chief_engineer" contained_sprite = TRUE armor = list( - rad = ARMOR_RAD_MINOR + RAD = ARMOR_RAD_MINOR ) siemens_coefficient = 0.75 @@ -36,7 +36,7 @@ item_state = "nt_engineer" contained_sprite = TRUE armor = list( - rad = ARMOR_RAD_MINOR + RAD = ARMOR_RAD_MINOR ) siemens_coefficient = 0.75 diff --git a/code/modules/clothing/under/jobs/medsci.dm b/code/modules/clothing/under/jobs/medsci.dm index e92ee229e8b..ff3ee4880eb 100644 --- a/code/modules/clothing/under/jobs/medsci.dm +++ b/code/modules/clothing/under/jobs/medsci.dm @@ -9,7 +9,7 @@ item_state = "research_director" contained_sprite = TRUE armor = list( - bio = ARMOR_BIO_MINOR + BIO = ARMOR_BIO_MINOR ) // Scientist @@ -21,7 +21,7 @@ item_state = "nt_scientist" permeability_coefficient = 0.50 armor = list( - bio = ARMOR_BIO_MINOR + BIO = ARMOR_BIO_MINOR ) contained_sprite = TRUE @@ -94,7 +94,7 @@ item_state = "nt_xenoarch" permeability_coefficient = 0.50 armor = list( - bomb = ARMOR_BOMB_MINOR + BOMB = ARMOR_BOMB_MINOR ) /obj/item/clothing/under/rank/scientist/xenoarchaeologist/zeng @@ -112,7 +112,7 @@ item_state = "nt_xenoarch" permeability_coefficient = 0.50 armor = list( - bomb = ARMOR_BOMB_MINOR + BOMB = ARMOR_BOMB_MINOR ) /obj/item/clothing/under/rank/scientist/anomalist/zeng @@ -137,7 +137,7 @@ contained_sprite = TRUE permeability_coefficient = 0.50 armor = list( - bio = ARMOR_BIO_MINOR + BIO = ARMOR_BIO_MINOR ) /obj/item/clothing/under/rank/iacjumpsuit @@ -149,7 +149,7 @@ contained_sprite = TRUE permeability_coefficient = 0.50 armor = list( - bio = ARMOR_BIO_MINOR + BIO = ARMOR_BIO_MINOR ) // Physician @@ -163,7 +163,7 @@ contained_sprite = TRUE permeability_coefficient = 0.50 armor = list( - bio = ARMOR_BIO_MINOR + BIO = ARMOR_BIO_MINOR ) /obj/item/clothing/under/rank/medical/generic diff --git a/code/modules/clothing/under/jobs/security.dm b/code/modules/clothing/under/jobs/security.dm index 8aa007a4307..0b5c998998e 100644 --- a/code/modules/clothing/under/jobs/security.dm +++ b/code/modules/clothing/under/jobs/security.dm @@ -16,7 +16,7 @@ icon_state = "nt_officer" item_state = "nt_officer" armor = list( - melee = ARMOR_MELEE_SMALL + MELEE = ARMOR_MELEE_SMALL ) siemens_coefficient = 0.75 contained_sprite = TRUE @@ -80,7 +80,7 @@ icon_state = "nt_cadet" item_state = "nt_cadet" armor = list( - melee = ARMOR_MELEE_SMALL + MELEE = ARMOR_MELEE_SMALL ) siemens_coefficient = 0.75 contained_sprite = TRUE @@ -128,7 +128,7 @@ icon_state = "nt_warden" item_state = "nt_warden" armor = list( - melee = ARMOR_MELEE_SMALL + MELEE = ARMOR_MELEE_SMALL ) siemens_coefficient = 0.75 contained_sprite = TRUE @@ -168,7 +168,7 @@ icon_state = "nt_invest" item_state = "nt_invest" armor = list( - melee = ARMOR_MELEE_SMALL + MELEE = ARMOR_MELEE_SMALL ) siemens_coefficient = 0.75 contained_sprite = TRUE @@ -215,6 +215,6 @@ item_state = "head_of_security" contained_sprite = TRUE armor = list( - melee = ARMOR_MELEE_SMALL + MELEE = ARMOR_MELEE_SMALL ) siemens_coefficient = 0.75 diff --git a/code/modules/clothing/under/jobs/sol.dm b/code/modules/clothing/under/jobs/sol.dm index fdea9f43a15..22cce52efee 100644 --- a/code/modules/clothing/under/jobs/sol.dm +++ b/code/modules/clothing/under/jobs/sol.dm @@ -7,9 +7,9 @@ item_state = "navy_coveralls" contained_sprite = TRUE armor = list( - melee = ARMOR_MELEE_SMALL, - bullet = ARMOR_BALLISTIC_MINOR, - laser = ARMOR_LASER_MINOR + MELEE = ARMOR_MELEE_SMALL, + BULLET = ARMOR_BALLISTIC_MINOR, + LASER = ARMOR_LASER_MINOR ) /obj/item/clothing/under/rank/sol/marine //green sol marine fatigues diff --git a/code/modules/clothing/under/miscellaneous.dm b/code/modules/clothing/under/miscellaneous.dm index 6a21bb49a2c..5ac1adc4be0 100644 --- a/code/modules/clothing/under/miscellaneous.dm +++ b/code/modules/clothing/under/miscellaneous.dm @@ -138,13 +138,13 @@ permeability_coefficient = 0.01 body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|FEET|ARMS|HANDS armor = list( - melee = ARMOR_MELEE_VERY_HIGH, - bullet = ARMOR_BALLISTIC_AP, - laser = ARMOR_LASER_HEAVY, - energy = ARMOR_ENERGY_SHIELDED, - bomb = ARMOR_BOMB_SHIELDED, - bio = ARMOR_BIO_SHIELDED, - rad = ARMOR_RAD_SHIELDED + MELEE = ARMOR_MELEE_VERY_HIGH, + BULLET = ARMOR_BALLISTIC_AP, + LASER = ARMOR_LASER_HEAVY, + ENERGY = ARMOR_ENERGY_SHIELDED, + BOMB = ARMOR_BOMB_SHIELDED, + BIO = ARMOR_BIO_SHIELDED, + RAD = ARMOR_RAD_SHIELDED ) cold_protection = UPPER_TORSO | LOWER_TORSO | LEGS | FEET | ARMS | HANDS min_cold_protection_temperature = SPACE_SUIT_MIN_COLD_PROTECTION_TEMPERATURE @@ -525,7 +525,7 @@ contained_sprite = TRUE siemens_coefficient = 0.7 armor = list( - melee = ARMOR_MELEE_MINOR) + MELEE = ARMOR_MELEE_MINOR) /obj/item/clothing/under/legion/sentinel name = "Tau Ceti Foreign Legion sentinel uniform" @@ -564,7 +564,7 @@ //item_state = "swatunder" worn_state = "swatunder" armor = list( - melee = ARMOR_MELEE_MINOR + MELEE = ARMOR_MELEE_MINOR ) siemens_coefficient = 0.7 @@ -576,7 +576,7 @@ worn_state = "lance_fatigues" body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS armor = list( - melee = ARMOR_MELEE_MINOR + MELEE = ARMOR_MELEE_MINOR ) siemens_coefficient = 0.7 @@ -615,9 +615,9 @@ icon_state = "elyran_fatigues" item_state = "elyran_fatigues" armor = list( - melee = ARMOR_MELEE_SMALL, - bullet = ARMOR_BALLISTIC_MINOR, - laser = ARMOR_LASER_MINOR + MELEE = ARMOR_MELEE_SMALL, + BULLET = ARMOR_BALLISTIC_MINOR, + LASER = ARMOR_LASER_MINOR ) /obj/item/clothing/under/rank/elyran_fatigues/commander @@ -634,9 +634,9 @@ item_state = "konyang_army" contained_sprite = TRUE armor = list( - melee = ARMOR_MELEE_SMALL, - bullet = ARMOR_BALLISTIC_MINOR, - laser = ARMOR_LASER_MINOR + MELEE = ARMOR_MELEE_SMALL, + BULLET = ARMOR_BALLISTIC_MINOR, + LASER = ARMOR_LASER_MINOR ) /obj/item/clothing/under/rank/konyang/officer @@ -744,9 +744,9 @@ contained_sprite = TRUE siemens_coefficient = 0.5 armor = list( - melee = ARMOR_MELEE_KNIVES, - bullet = ARMOR_BALLISTIC_MINOR, - laser = ARMOR_LASER_MINOR + MELEE = ARMOR_MELEE_KNIVES, + BULLET = ARMOR_BALLISTIC_MINOR, + LASER = ARMOR_LASER_MINOR ) /obj/item/clothing/under/xanu/med diff --git a/code/modules/clothing/under/syndicate.dm b/code/modules/clothing/under/syndicate.dm index 117fd6be663..706073e6da9 100644 --- a/code/modules/clothing/under/syndicate.dm +++ b/code/modules/clothing/under/syndicate.dm @@ -6,7 +6,7 @@ worn_state = "syndicate" has_sensor = SUIT_NO_SENSORS armor = list( - melee = ARMOR_MELEE_MINOR + MELEE = ARMOR_MELEE_MINOR ) siemens_coefficient = 0.75 diff --git a/code/modules/clothing/under/xenos/skrell.dm b/code/modules/clothing/under/xenos/skrell.dm index 6ec5d422847..b196b070f81 100644 --- a/code/modules/clothing/under/xenos/skrell.dm +++ b/code/modules/clothing/under/xenos/skrell.dm @@ -336,7 +336,7 @@ item_state = "cthur_uniform" contained_sprite = TRUE armor = list( - laser = ARMOR_LASER_SMALL + LASER = ARMOR_LASER_SMALL ) species_restricted = list(BODYTYPE_VAURCA) @@ -348,8 +348,8 @@ item_state = "qukala_uniform" contained_sprite = TRUE armor = list( - melee = ARMOR_MELEE_SMALL, - bullet = ARMOR_BALLISTIC_MINOR + MELEE = ARMOR_MELEE_SMALL, + BULLET = ARMOR_BALLISTIC_MINOR ) /obj/item/clothing/under/skrell/nlomkala @@ -360,8 +360,8 @@ item_state = "nlom_uniform" contained_sprite = TRUE armor = list( - melee = ARMOR_MELEE_SMALL, - bullet = ARMOR_BALLISTIC_MINOR + MELEE = ARMOR_MELEE_SMALL, + BULLET = ARMOR_BALLISTIC_MINOR ) /obj/item/clothing/under/skrell/ruupkala @@ -372,8 +372,8 @@ item_state = "ruup_uniform" contained_sprite = TRUE armor = list( - melee = ARMOR_MELEE_SMALL, - bullet = ARMOR_BALLISTIC_MINOR + MELEE = ARMOR_MELEE_SMALL, + BULLET = ARMOR_BALLISTIC_MINOR ) /obj/item/clothing/under/skrell/sromkala @@ -391,8 +391,8 @@ icon_state = "tup_uniform" item_state = "tup_uniform" armor = list( - melee = ARMOR_MELEE_SMALL, - bullet = ARMOR_BALLISTIC_MINOR, - laser = ARMOR_LASER_MINOR + MELEE = ARMOR_MELEE_SMALL, + BULLET = ARMOR_BALLISTIC_MINOR, + LASER = ARMOR_LASER_MINOR ) contained_sprite = TRUE diff --git a/code/modules/clothing/under/xenos/tajara.dm b/code/modules/clothing/under/xenos/tajara.dm index a83bd66903c..1b683f0878d 100644 --- a/code/modules/clothing/under/xenos/tajara.dm +++ b/code/modules/clothing/under/xenos/tajara.dm @@ -57,8 +57,8 @@ starting_accessories = (/obj/item/clothing/accessory/storage/bayonet) siemens_coefficient = 0.5 // Every Kosmostrelki is expected to assist in repairs when push comes to shove, so their uniform is slightly better at absorbing shocks compared to other combat uniforms armor = list( - melee = ARMOR_MELEE_SMALL, - bullet = ARMOR_BALLISTIC_MINOR) + MELEE = ARMOR_MELEE_SMALL, + BULLET = ARMOR_BALLISTIC_MINOR) /obj/item/clothing/under/tajaran/cosmonaut/commissar name = "kosmostrelki commissar uniform" @@ -221,8 +221,8 @@ starting_accessories = list(/obj/item/clothing/accessory/storage/bayonet) siemens_coefficient = 0.7 armor = list( - melee = ARMOR_MELEE_SMALL, - bullet = ARMOR_BALLISTIC_MINOR) + MELEE = ARMOR_MELEE_SMALL, + BULLET = ARMOR_BALLISTIC_MINOR) /obj/item/clothing/under/tajaran/nka_uniform name = "imperial adhomian army uniform" @@ -230,7 +230,7 @@ icon_state = "nka_uniform" item_state = "nka_uniform" starting_accessories = list(/obj/item/clothing/accessory/storage/bayonet) - armor = list(melee = ARMOR_MELEE_SMALL) + armor = list(MELEE = ARMOR_MELEE_SMALL) /obj/item/clothing/under/tajaran/nka_uniform/commander name = "imperial adhomian army officer uniform" @@ -328,8 +328,8 @@ starting_accessories = (/obj/item/clothing/accessory/storage/bayonet) siemens_coefficient = 0.5 armor = list( - melee = ARMOR_MELEE_SMALL, - bullet = ARMOR_BALLISTIC_MINOR) + MELEE = ARMOR_MELEE_SMALL, + BULLET = ARMOR_BALLISTIC_MINOR) /obj/item/clothing/under/tajaran/pvsm/captain name = "people's volunteer spacer militia captain uniform" @@ -345,8 +345,8 @@ starting_accessories = list(/obj/item/clothing/accessory/storage/bayonet) siemens_coefficient = 0.7 armor = list( - melee = ARMOR_MELEE_SMALL, - bullet = ARMOR_BALLISTIC_MINOR) + MELEE = ARMOR_MELEE_SMALL, + BULLET = ARMOR_BALLISTIC_MINOR) /obj/item/clothing/under/tajaran/ala/wraps icon_state = "ala-grunt-wraps" diff --git a/code/modules/clothing/under/xenos/unathi.dm b/code/modules/clothing/under/xenos/unathi.dm index c18291159a6..f413b3fcc41 100644 --- a/code/modules/clothing/under/xenos/unathi.dm +++ b/code/modules/clothing/under/xenos/unathi.dm @@ -103,9 +103,9 @@ icon_state = "izweski" item_state = "izweski" armor = list( - melee = ARMOR_MELEE_SMALL, - bullet = ARMOR_BALLISTIC_MINOR, - laser = ARMOR_LASER_MINOR + MELEE = ARMOR_MELEE_SMALL, + BULLET = ARMOR_BALLISTIC_MINOR, + LASER = ARMOR_LASER_MINOR ) /obj/item/clothing/under/unathi/izweski/officer diff --git a/code/modules/custom_ka/projectiles.dm b/code/modules/custom_ka/projectiles.dm index cd1e3bb7786..58cd35294dd 100644 --- a/code/modules/custom_ka/projectiles.dm +++ b/code/modules/custom_ka/projectiles.dm @@ -4,7 +4,7 @@ icon_state = null damage = 0 //Base damage handled elsewhere. damage_type = DAMAGE_BRUTE - check_armor = "bomb" + check_armor = BOMB range = 5 var/pressure_decrease = 0.25 var/base_damage = 0 diff --git a/code/modules/heavy_vehicle/components/armor.dm b/code/modules/heavy_vehicle/components/armor.dm index be5855ca886..8f1a64c3256 100644 --- a/code/modules/heavy_vehicle/components/armor.dm +++ b/code/modules/heavy_vehicle/components/armor.dm @@ -2,13 +2,13 @@ name = "exosuit armor plating" desc = "A pair of flexible armor plates, used to protect the internals of exosuits and its pilot." armor = list( - melee = ARMOR_MELEE_MAJOR, - bullet = ARMOR_BALLISTIC_MEDIUM, - laser = ARMOR_LASER_MEDIUM, - energy = ARMOR_ENERGY_MINOR, - bomb = ARMOR_BOMB_PADDED, - bio = ARMOR_BIO_SHIELDED, - rad = ARMOR_RAD_MINOR + MELEE = ARMOR_MELEE_MAJOR, + BULLET = ARMOR_BALLISTIC_MEDIUM, + LASER = ARMOR_LASER_MEDIUM, + ENERGY = ARMOR_ENERGY_MINOR, + BOMB = ARMOR_BOMB_PADDED, + BIO = ARMOR_BIO_SHIELDED, + RAD = ARMOR_RAD_MINOR ) origin_tech = list(TECH_MATERIAL = 1) @@ -22,13 +22,13 @@ icon_state = "armor_r" icon_state_broken = "armor_r_broken" armor = list( - melee = ARMOR_MELEE_RESISTANT, - bullet = ARMOR_BALLISTIC_MEDIUM, - laser = ARMOR_LASER_MEDIUM, - energy = ARMOR_ENERGY_MINOR, - bomb = ARMOR_BOMB_PADDED, - bio = ARMOR_BIO_SHIELDED, - rad = ARMOR_RAD_SHIELDED + MELEE = ARMOR_MELEE_RESISTANT, + BULLET = ARMOR_BALLISTIC_MEDIUM, + LASER = ARMOR_LASER_MEDIUM, + ENERGY = ARMOR_ENERGY_MINOR, + BOMB = ARMOR_BOMB_PADDED, + BIO = ARMOR_BIO_SHIELDED, + RAD = ARMOR_RAD_SHIELDED ) origin_tech = list(TECH_MATERIAL = 3) @@ -38,13 +38,13 @@ icon_state = "armor_e" icon_state_broken = "armor_e_broken" armor = list( - melee = ARMOR_MELEE_RESISTANT , - bullet = ARMOR_BALLISTIC_PISTOL, - laser = ARMOR_LASER_PISTOL, - energy = ARMOR_ENERGY_SHIELDED, - bomb = ARMOR_BOMB_MINOR, - bio = ARMOR_BIO_SHIELDED, - rad = ARMOR_RAD_SMALL + MELEE = ARMOR_MELEE_RESISTANT , + BULLET = ARMOR_BALLISTIC_PISTOL, + LASER = ARMOR_LASER_PISTOL, + ENERGY = ARMOR_ENERGY_SHIELDED, + BOMB = ARMOR_BOMB_MINOR, + BIO = ARMOR_BIO_SHIELDED, + RAD = ARMOR_RAD_SMALL ) origin_tech = list(TECH_MATERIAL = 3) @@ -54,11 +54,11 @@ icon_state = "armor_c" icon_state_broken = "armor_c_broken" armor = list( - melee = ARMOR_MELEE_VERY_HIGH, - bullet = ARMOR_BALLISTIC_MAJOR, - laser = ARMOR_LASER_RIFLE, - energy = ARMOR_ENERGY_MINOR, - bomb = ARMOR_BOMB_RESISTANT, - bio = ARMOR_BIO_SHIELDED + MELEE = ARMOR_MELEE_VERY_HIGH, + BULLET = ARMOR_BALLISTIC_MAJOR, + LASER = ARMOR_LASER_RIFLE, + ENERGY = ARMOR_ENERGY_MINOR, + BOMB = ARMOR_BOMB_RESISTANT, + BIO = ARMOR_BIO_SHIELDED ) origin_tech = list(TECH_MATERIAL = 5) diff --git a/code/modules/heavy_vehicle/components/body.dm b/code/modules/heavy_vehicle/components/body.dm index eb8e4692de8..92516fe4d12 100644 --- a/code/modules/heavy_vehicle/components/body.dm +++ b/code/modules/heavy_vehicle/components/body.dm @@ -6,13 +6,13 @@ center_of_mass = list("x"=24, "y"=20) armor = list( - melee = ARMOR_MELEE_RESISTANT, - bullet = ARMOR_BALLISTIC_PISTOL, - laser = ARMOR_LASER_PISTOL, - energy = ARMOR_ENERGY_MINOR, - bomb = ARMOR_BOMB_PADDED, - bio = ARMOR_BIO_RESISTANT, - rad = ARMOR_RAD_MINOR + MELEE = ARMOR_MELEE_RESISTANT, + BULLET = ARMOR_BALLISTIC_PISTOL, + LASER = ARMOR_LASER_PISTOL, + ENERGY = ARMOR_ENERGY_MINOR, + BOMB = ARMOR_BOMB_PADDED, + BIO = ARMOR_BIO_RESISTANT, + RAD = ARMOR_RAD_MINOR ) var/mech_health = 600 diff --git a/code/modules/mob/living/carbon/human/species/outsider/undead.dm b/code/modules/mob/living/carbon/human/species/outsider/undead.dm index 07a24adf804..b6e583af2f0 100644 --- a/code/modules/mob/living/carbon/human/species/outsider/undead.dm +++ b/code/modules/mob/living/carbon/human/species/outsider/undead.dm @@ -348,9 +348,9 @@ natural_armor = list( ballistic = ARMOR_BALLISTIC_MEDIUM, - melee = ARMOR_MELEE_MAJOR, + MELEE = ARMOR_MELEE_MAJOR, bomb = null, - energy = ARMOR_ENERGY_RESISTANT + ENERGY = ARMOR_ENERGY_RESISTANT ) mob_size = 20 @@ -428,10 +428,10 @@ natural_armor = list( ballistic = ARMOR_BALLISTIC_MINOR, - laser = ARMOR_LASER_MINOR, - melee = ARMOR_MELEE_SMALL, - bomb = ARMOR_BOMB_PADDED, - energy = ARMOR_ENERGY_SMALL + LASER = ARMOR_LASER_MINOR, + MELEE = ARMOR_MELEE_SMALL, + BOMB = ARMOR_BOMB_PADDED, + ENERGY = ARMOR_ENERGY_SMALL ) inherent_verbs = list( diff --git a/code/modules/mob/living/carbon/human/species/station/vaurca/vaurca_subspecies.dm b/code/modules/mob/living/carbon/human/species/station/vaurca/vaurca_subspecies.dm index c73734242ce..57edab5013e 100644 --- a/code/modules/mob/living/carbon/human/species/station/vaurca/vaurca_subspecies.dm +++ b/code/modules/mob/living/carbon/human/species/station/vaurca/vaurca_subspecies.dm @@ -356,7 +356,7 @@ ) natural_armor = list( - melee = ARMOR_MELEE_MEDIUM + MELEE = ARMOR_MELEE_MEDIUM ) brute_mod = 0.4 diff --git a/code/modules/mob/living/simple_animal/bees.dm b/code/modules/mob/living/simple_animal/bees.dm index d2f4a245158..9bc62c7a37e 100644 --- a/code/modules/mob/living/simple_animal/bees.dm +++ b/code/modules/mob/living/simple_animal/bees.dm @@ -90,12 +90,12 @@ if ((worn_suit.item_flags & ITEM_FLAG_THICK_MATERIAL)) prob_mult -= 0.7 else - prob_mult -= 0.01 * (min(LAZYACCESS(worn_suit.armor, "bio"), 70)) // Is it sealed? I can't get to 70% of your body. + prob_mult -= 0.01 * (min(LAZYACCESS(worn_suit.armor, BIO), 70)) // Is it sealed? I can't get to 70% of your body. if(worn_helmet) if ((worn_helmet.item_flags & ITEM_FLAG_THICK_MATERIAL)) prob_mult -= 0.3 else - prob_mult -= 0.01 *(min(LAZYACCESS(worn_helmet.armor, "bio"), 30))// Is your helmet sealed? I can't get to 30% of your body. + prob_mult -= 0.01 *(min(LAZYACCESS(worn_helmet.armor, BIO), 30))// Is your helmet sealed? I can't get to 30% of your body. if( prob(sting_prob*prob_mult) && (M.stat == CONSCIOUS || (M.stat == UNCONSCIOUS && prob(25*prob_mult))) ) // Try to sting! If you're not moving, think about stinging. M.apply_damage(min(strength*0.85,2)+mut, DAMAGE_BURN, damage_flags = DAMAGE_FLAG_SHARP) // Stinging. The more mutated I am, the harder I sting. var/venom_strength = max(strength*0.2, (round(feral/10,1) * (max(round(strength/20,1), 1)))) + toxic // Bee venom based on how angry I am and how many there are of me! diff --git a/code/modules/mob/living/simple_animal/friendly/adhomai.dm b/code/modules/mob/living/simple_animal/friendly/adhomai.dm index 254da7f49d3..b888ea3b06a 100644 --- a/code/modules/mob/living/simple_animal/friendly/adhomai.dm +++ b/code/modules/mob/living/simple_animal/friendly/adhomai.dm @@ -288,9 +288,9 @@ meat_amount = 4 vehicle_version = /obj/vehicle/animal/climber natural_armor = list( - melee = ARMOR_MELEE_MEDIUM, - bullet = ARMOR_BALLISTIC_MINOR, - bomb = ARMOR_BOMB_MINOR + MELEE = ARMOR_MELEE_MEDIUM, + BULLET = ARMOR_BALLISTIC_MINOR, + BOMB = ARMOR_BOMB_MINOR ) /mob/living/simple_animal/climber/saddle diff --git a/code/modules/mob/living/simple_animal/friendly/moghes.dm b/code/modules/mob/living/simple_animal/friendly/moghes.dm index 57b99535e98..6c3d222ea30 100644 --- a/code/modules/mob/living/simple_animal/friendly/moghes.dm +++ b/code/modules/mob/living/simple_animal/friendly/moghes.dm @@ -31,9 +31,9 @@ meat_amount = 20 vehicle_version = /obj/vehicle/animal/threshbeast natural_armor = list( - melee = ARMOR_MELEE_MEDIUM, - bullet = ARMOR_BALLISTIC_MINOR, - bomb = ARMOR_BOMB_MINOR + MELEE = ARMOR_MELEE_MEDIUM, + BULLET = ARMOR_BALLISTIC_MINOR, + BOMB = ARMOR_BOMB_MINOR ) resists_weather = TRUE sample_data = list("Cellular biochemistry shows high metabolic capacity", "Tissue sample contains high muscle content", "Genetic biomarkers identified linked with passiveness and domestication") @@ -81,10 +81,10 @@ meat_amount = 30 vehicle_version = /obj/vehicle/animal/hegeranzi natural_armor = list( //big tough war beast, has some more armor particularly against bullets and melee - melee = ARMOR_MELEE_MAJOR, - bullet = ARMOR_BALLISTIC_MEDIUM, - laser = ARMOR_LASER_MINOR, - bomb = ARMOR_BOMB_MINOR + MELEE = ARMOR_MELEE_MAJOR, + BULLET = ARMOR_BALLISTIC_MEDIUM, + LASER = ARMOR_LASER_MINOR, + BOMB = ARMOR_BOMB_MINOR ) resists_weather = TRUE sample_data = list("Cellular biochemistry shows high metabolic capacity", "Tissue sample contains high muscle content", "Genetic biomarkers identified linked with domestication", "Intracellular keratin synthesis present") diff --git a/code/modules/mob/living/simple_animal/hostile/giant_spider.dm b/code/modules/mob/living/simple_animal/hostile/giant_spider.dm index 2d78b3cac2a..d50bfb6435c 100644 --- a/code/modules/mob/living/simple_animal/hostile/giant_spider.dm +++ b/code/modules/mob/living/simple_animal/hostile/giant_spider.dm @@ -189,7 +189,7 @@ var/list/armors = target.get_armors_by_zone(limb.limb_name, DAMAGE_BRUTE, DAMAGE_FLAG_SHARP) for(var/armor in armors) var/datum/component/armor/armor_datum = armor - inject_probability -= armor_datum.armor_values["melee"] * 1.8 + inject_probability -= armor_datum.armor_values[MELEE] * 1.8 if(prob(inject_probability)) to_chat(target, SPAN_WARNING("You feel a tiny prick.")) target.reagents.add_reagent(poison_type, poison_per_bite) diff --git a/code/modules/mob/living/simple_animal/hostile/retaliate/cavern.dm b/code/modules/mob/living/simple_animal/hostile/retaliate/cavern.dm index 4e727f9e1be..ad99e686a85 100644 --- a/code/modules/mob/living/simple_animal/hostile/retaliate/cavern.dm +++ b/code/modules/mob/living/simple_animal/hostile/retaliate/cavern.dm @@ -54,7 +54,7 @@ name = "electrical discharge" icon_state = "stun" damage_type = DAMAGE_BURN - check_armor = "energy" + check_armor = ENERGY damage = 5 muzzle_type = /obj/effect/projectile/muzzle/stun diff --git a/code/modules/mob/living/simple_animal/hostile/retaliate/exoplanet.dm b/code/modules/mob/living/simple_animal/hostile/retaliate/exoplanet.dm index 230c08b5143..57fd0fb4b5e 100644 --- a/code/modules/mob/living/simple_animal/hostile/retaliate/exoplanet.dm +++ b/code/modules/mob/living/simple_animal/hostile/retaliate/exoplanet.dm @@ -23,7 +23,7 @@ melee_damage_lower = 10 melee_damage_upper = 15 natural_armor = list( - melee = ARMOR_MELEE_RESISTANT + MELEE = ARMOR_MELEE_RESISTANT ) emote_see = list("skitters","oozes liquid from its mouth", "scratches at the ground", "clicks its claws") @@ -46,7 +46,7 @@ melee_damage_upper = 10 blood_color = COLOR_RED natural_armor = list( - laser = ARMOR_LASER_PISTOL + LASER = ARMOR_LASER_PISTOL ) /mob/living/simple_animal/hostile/retaliate/beast/charbaby/on_attack_mob(var/mob/hit_mob) diff --git a/code/modules/mob/living/simple_animal/hostile/sarlacc.dm b/code/modules/mob/living/simple_animal/hostile/sarlacc.dm index 83302b98956..ae27fcef94c 100644 --- a/code/modules/mob/living/simple_animal/hostile/sarlacc.dm +++ b/code/modules/mob/living/simple_animal/hostile/sarlacc.dm @@ -365,7 +365,7 @@ icon_state = "ion" damage = 0 agony = 20 - check_armor = "energy" + check_armor = ENERGY pass_flags = PASSTABLE | PASSGLASS | PASSGRILLE var/list/thoughts = list( "You hear a cacophany of alien sounds.", diff --git a/code/modules/projectiles/guns/alien.dm b/code/modules/projectiles/guns/alien.dm index c62271c0d14..b2b1394ed44 100644 --- a/code/modules/projectiles/guns/alien.dm +++ b/code/modules/projectiles/guns/alien.dm @@ -99,7 +99,7 @@ icon_state = "particle" damage = 60 damage_type = DAMAGE_BRUTE - check_armor = "bullet" + check_armor = BULLET pass_flags = PASSTABLE | PASSGLASS | PASSGRILLE embed = 0 diff --git a/code/modules/projectiles/guns/energy/mining.dm b/code/modules/projectiles/guns/energy/mining.dm index ecbaf932f7e..c1831ca2e9f 100644 --- a/code/modules/projectiles/guns/energy/mining.dm +++ b/code/modules/projectiles/guns/energy/mining.dm @@ -71,7 +71,7 @@ icon_state = "omnilaser" damage = 20 damage_type = DAMAGE_BURN - check_armor = "laser" + check_armor = LASER range = 5 pass_flags = PASSTABLE|PASSRAILING diff --git a/code/modules/projectiles/projectile.dm b/code/modules/projectiles/projectile.dm index e5b52d082bc..8599fee3eec 100644 --- a/code/modules/projectiles/projectile.dm +++ b/code/modules/projectiles/projectile.dm @@ -181,7 +181,7 @@ //Effects var/damage_flags = DAMAGE_FLAG_BULLET - var/check_armor = "bullet" //Defines what armor to use when it hits things. Must be set to bullet, laser, energy,or bomb //Cael - bio and rad are also valid + var/check_armor = BULLET //Defines what armor to use when it hits things. Must be set to bullet, laser, energy,or bomb //Cael - bio and rad are also valid var/list/impact_sounds //for different categories, IMPACT_MEAT etc var/stun = 0 diff --git a/code/modules/projectiles/projectile/animate.dm b/code/modules/projectiles/projectile/animate.dm index d116e34816e..177282a3d1c 100644 --- a/code/modules/projectiles/projectile/animate.dm +++ b/code/modules/projectiles/projectile/animate.dm @@ -3,7 +3,7 @@ icon_state = "ice_1" damage = 0 damage_type = DAMAGE_BURN - check_armor = "energy" + check_armor = ENERGY /obj/projectile/animate/Collide(atom/change) if((istype(change, /obj/item) || istype(change, /obj/structure)) && !is_type_in_list(change, GLOB.protected_objects)) diff --git a/code/modules/projectiles/projectile/beams.dm b/code/modules/projectiles/projectile/beams.dm index d460636946c..7d24a6e149c 100644 --- a/code/modules/projectiles/projectile/beams.dm +++ b/code/modules/projectiles/projectile/beams.dm @@ -7,7 +7,7 @@ armor_penetration = 10 damage_type = DAMAGE_BURN impact_sounds = list(BULLET_IMPACT_MEAT = SOUNDS_LASER_MEAT, BULLET_IMPACT_METAL = SOUNDS_LASER_METAL) - check_armor = "laser" + check_armor = LASER eyeblur = 4 damage_flags = DAMAGE_FLAG_LASER var/frequency = 1 @@ -161,7 +161,7 @@ pass_flags = PASSTABLE | PASSGLASS | PASSGRILLE | PASSRAILING damage = 0 damage_type = DAMAGE_BURN - check_armor = "laser" + check_armor = LASER var/laser_tag_color = "red" muzzle_type = /obj/effect/projectile/muzzle/laser @@ -496,7 +496,7 @@ pass_flags = PASSTABLE | PASSRAILING damage = 15 damage_type = DAMAGE_BURN - check_armor = "energy" + check_armor = ENERGY muzzle_type = /obj/effect/projectile/muzzle/laser/blue tracer_type = /obj/effect/projectile/tracer/laser/blue diff --git a/code/modules/projectiles/projectile/bullets.dm b/code/modules/projectiles/projectile/bullets.dm index 20f7d6dd68e..dd00bde090a 100644 --- a/code/modules/projectiles/projectile/bullets.dm +++ b/code/modules/projectiles/projectile/bullets.dm @@ -4,7 +4,7 @@ damage = 60 damage_type = DAMAGE_BRUTE impact_sounds = list(BULLET_IMPACT_MEAT = SOUNDS_BULLET_MEAT, BULLET_IMPACT_METAL = SOUNDS_BULLET_METAL) - check_armor = "bullet" + check_armor = BULLET embed = TRUE sharp = TRUE shrapnel_type = /obj/item/material/shard/shrapnel @@ -199,7 +199,7 @@ /obj/projectile/bullet/pistol/rubber //"rubber" bullets name = "rubber bullet" - check_armor = "melee" + check_armor = MELEE damage = 5 agony = 40 embed = 0 @@ -217,7 +217,7 @@ /obj/projectile/bullet/shotgun/beanbag //because beanbags are not bullets name = "beanbag" - check_armor = "melee" + check_armor = MELEE damage = 10 agony = 60 embed = 0 @@ -225,7 +225,7 @@ /obj/projectile/bullet/shotgun/incendiary name = "incendiary" - check_armor = "melee" + check_armor = MELEE damage = 5 agony = 0 embed = 0 @@ -438,7 +438,7 @@ damage = 40 armor_penetration = 15 damage_type = DAMAGE_BRUTE - check_armor = "bullet" + check_armor = BULLET embed = 1 sharp = 1 penetrating = 1 diff --git a/code/modules/projectiles/projectile/change.dm b/code/modules/projectiles/projectile/change.dm index 59ceaea5ab1..0f8085f4b64 100644 --- a/code/modules/projectiles/projectile/change.dm +++ b/code/modules/projectiles/projectile/change.dm @@ -3,7 +3,7 @@ icon_state = "ice_1" damage = 0 damage_type = DAMAGE_BURN - check_armor = "energy" + check_armor = ENERGY /obj/projectile/change/on_hit(atom/target, blocked, def_zone) . = ..() diff --git a/code/modules/projectiles/projectile/energy.dm b/code/modules/projectiles/projectile/energy.dm index 3286868eea9..d364e17e018 100644 --- a/code/modules/projectiles/projectile/energy.dm +++ b/code/modules/projectiles/projectile/energy.dm @@ -3,7 +3,7 @@ icon_state = "spark" damage = 0 damage_type = DAMAGE_BURN - check_armor = "energy" + check_armor = ENERGY //releases a burst of light on impact or after travelling a distance /obj/projectile/energy/flash @@ -101,7 +101,7 @@ name = "distortion" icon = 'icons/obj/projectiles.dmi' icon_state = "bfg" - check_armor = "bomb" + check_armor = BOMB damage = 60 damage_type = DAMAGE_BRUTE pass_flags = PASSTABLE | PASSGLASS | PASSGRILLE | PASSRAILING @@ -171,7 +171,7 @@ name = "blaster bolt" icon_state = "laser" damage = 30 - check_armor = "laser" + check_armor = LASER damage_type = DAMAGE_BURN damage_flags = DAMAGE_FLAG_LASER pass_flags = PASSTABLE | PASSGLASS | PASSGRILLE | PASSRAILING diff --git a/code/modules/projectiles/projectile/force.dm b/code/modules/projectiles/projectile/force.dm index 529890e506a..b55573ac16a 100644 --- a/code/modules/projectiles/projectile/force.dm +++ b/code/modules/projectiles/projectile/force.dm @@ -3,7 +3,7 @@ icon = 'icons/obj/projectiles.dmi' icon_state = "bluespace" damage = 40 - check_armor = "energy" + check_armor = ENERGY embed = 1 /obj/projectile/forcebolt/strong diff --git a/code/modules/projectiles/projectile/special.dm b/code/modules/projectiles/projectile/special.dm index 65efd76f823..8ef146db5b6 100644 --- a/code/modules/projectiles/projectile/special.dm +++ b/code/modules/projectiles/projectile/special.dm @@ -4,7 +4,7 @@ damage = 0 damage_type = DAMAGE_BURN impact_sounds = list(BULLET_IMPACT_MEAT = SOUNDS_ION_ANY, BULLET_IMPACT_METAL = SOUNDS_ION_ANY) - check_armor = "energy" + check_armor = ENERGY var/pulse_range = 1 /obj/projectile/ion/on_hit(atom/target, blocked, def_zone) @@ -71,7 +71,7 @@ name ="explosive bolt" icon_state= "bolter" damage = 50 - check_armor = "bullet" + check_armor = BULLET sharp = 1 edge = TRUE @@ -98,7 +98,7 @@ icon_state = "ice_2" damage = 0 damage_type = DAMAGE_BURN - check_armor = "energy" + check_armor = ENERGY //var/temperature = 300 @@ -115,7 +115,7 @@ icon_state = "small1" damage = 0 damage_type = DAMAGE_BRUTE - check_armor = "bullet" + check_armor = BULLET /obj/projectile/meteor/Collide(atom/A) if(A == firer) @@ -141,7 +141,7 @@ icon_state = "energy" damage = 0 damage_type = DAMAGE_TOXIN - check_armor = "energy" + check_armor = ENERGY /obj/projectile/energy/floramut/gene name = "gamma somatoray" @@ -181,7 +181,7 @@ icon_state = "energy2" damage = 0 damage_type = DAMAGE_TOXIN - check_armor = "energy" + check_armor = ENERGY /obj/projectile/energy/florayield/on_hit(atom/target, blocked, def_zone) . = ..() @@ -210,7 +210,7 @@ name ="tungsten rod" icon_state= "gauss" damage = 75 - check_armor = "bomb" + check_armor = BOMB sharp = 1 edge = TRUE @@ -245,7 +245,7 @@ icon = 'icons/obj/projectiles.dmi' icon_state = "spell" damage = 0 - check_armor = "energy" + check_armor = ENERGY embed = 0 damage_type = DAMAGE_PAIN @@ -282,7 +282,7 @@ damage = 20 damage_type = DAMAGE_BRUTE damage_flags = DAMAGE_FLAG_LASER - check_armor = "energy" + check_armor = ENERGY incinerate = 10 armor_penetration = 60 penetrating = 1 @@ -312,7 +312,7 @@ icon_state= "icer_bolt" damage = 15 damage_type = DAMAGE_BRUTE - check_armor = "energy" + check_armor = ENERGY /obj/projectile/bonedart name = "bone dart" @@ -320,7 +320,7 @@ damage = 35 damage_type = DAMAGE_BRUTE impact_sounds = list(BULLET_IMPACT_MEAT = SOUNDS_BULLET_MEAT, BULLET_IMPACT_METAL = SOUNDS_BULLET_METAL) - check_armor = "melee" + check_armor = MELEE embed = TRUE sharp = TRUE shrapnel_type = /obj/item/bone_dart/vannatusk @@ -329,4 +329,4 @@ name = "bone dart" damage = 10 armor_penetration = 10 - check_armor = "bullet" + check_armor = BULLET diff --git a/code/modules/psionics/abilities/barrier.dm b/code/modules/psionics/abilities/barrier.dm index 72f39057b1b..6ef854302da 100644 --- a/code/modules/psionics/abilities/barrier.dm +++ b/code/modules/psionics/abilities/barrier.dm @@ -27,4 +27,4 @@ to_chat(H, SPAN_WARNING("You are already enveloped by psionic armour!")) return to_chat(H, SPAN_NOTICE("You are enveloped by a protective warmth.")) - H.psi.AddComponent(/datum/component/armor/psionic, list(laser = ARMOR_LASER_MEDIUM, bullet = ARMOR_BALLISTIC_CARBINE, energy = ARMOR_ENERGY_RESISTANT, melee = ARMOR_MELEE_RESISTANT)) + H.psi.AddComponent(/datum/component/armor/psionic, list(LASER = ARMOR_LASER_MEDIUM, BULLET = ARMOR_BALLISTIC_CARBINE, ENERGY = ARMOR_ENERGY_RESISTANT, MELEE = ARMOR_MELEE_RESISTANT)) diff --git a/code/modules/research/xenoarchaeology/tools/anomaly_suit.dm b/code/modules/research/xenoarchaeology/tools/anomaly_suit.dm index 407b9181c3e..6d08c9ee643 100644 --- a/code/modules/research/xenoarchaeology/tools/anomaly_suit.dm +++ b/code/modules/research/xenoarchaeology/tools/anomaly_suit.dm @@ -7,7 +7,15 @@ item_state = "engspace_suit" icon_auto_adapt = TRUE icon_supported_species_tags = list("skr", "taj", "una") - armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 100, rad = 100) + armor = list( + MELEE = 0, + BULLET = 0, + LASER = 0, + ENERGY = 0, + BOMB = 0, + BIO = 100, + RAD = 100, + ) anomaly_protection = 0.6 /obj/item/clothing/head/hazmat/anomaly @@ -17,7 +25,15 @@ item_state = "engspace_helmet" icon_auto_adapt = TRUE icon_supported_species_tags = list("skr", "taj", "una") - armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 100, rad = 100) + armor = list( + MELEE = 0, + BULLET = 0, + LASER = 0, + ENERGY = 0, + BOMB = 0, + BIO = 100, + RAD = 100, + ) anomaly_protection = 0.3 /obj/item/clothing/suit/space/anomaly @@ -25,7 +41,15 @@ desc = "A pressure resistant excavation suit partially capable of insulating against exotic alien energies." icon_state = "cespace_suit" item_state = "cespace_suit" - armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 100, rad = 100) + armor = list( + MELEE = 0, + BULLET = 0, + LASER = 0, + ENERGY = 0, + BOMB = 0, + BIO = 100, + RAD = 100, + ) allowed = list(/obj/item/device/flashlight,/obj/item/tank,/obj/item/device/suit_cooling_unit) contained_sprite = FALSE icon = 'icons/obj/clothing/suits.dmi' @@ -36,7 +60,15 @@ desc = "A pressure resistant excavation hood partially capable of insulating against exotic alien energies." icon_state = "cespace_helmet" item_state = "cespace_helmet" - armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 100, rad = 100) + armor = list( + MELEE = 0, + BULLET = 0, + LASER = 0, + ENERGY = 0, + BOMB = 0, + BIO = 100, + RAD = 100, + ) icon = 'icons/obj/clothing/hats.dmi' contained_sprite = FALSE anomaly_protection = 0.2 diff --git a/code/modules/spell_system/artifacts/armor/bone_armor.dm b/code/modules/spell_system/artifacts/armor/bone_armor.dm index f4243dd1a11..1b9d7033e7c 100644 --- a/code/modules/spell_system/artifacts/armor/bone_armor.dm +++ b/code/modules/spell_system/artifacts/armor/bone_armor.dm @@ -7,7 +7,7 @@ contained_sprite = TRUE species_restricted = list(BODYTYPE_SKELETON) body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS - armor = list(melee = ARMOR_MELEE_MAJOR, bullet = 40, laser = 50, energy = 25, bomb = 30, bio = 0, rad = 0) + armor = list(MELEE = ARMOR_MELEE_MAJOR, bullet = 40, laser = 50, energy = 25, bomb = 30, bio = 0, rad = 0) /obj/item/clothing/head/helmet/bone name = "bone helmet" @@ -17,4 +17,4 @@ item_state = "skull" contained_sprite = TRUE species_restricted = list(BODYTYPE_SKELETON) - armor = list(melee = ARMOR_MELEE_MAJOR, bullet = 40, laser = 50, energy = 25, bomb = 30, bio = 0, rad = 0) + armor = list(MELEE = ARMOR_MELEE_MAJOR, bullet = 40, laser = 50, energy = 25, bomb = 30, bio = 0, rad = 0) diff --git a/code/modules/vehicles/animal.dm b/code/modules/vehicles/animal.dm index 9a05df93530..6145f0c84a0 100644 --- a/code/modules/vehicles/animal.dm +++ b/code/modules/vehicles/animal.dm @@ -32,9 +32,9 @@ organic = TRUE on = TRUE var/list/armor_values = list( //some default values that seem about right for an average animal - melee = ARMOR_MELEE_MEDIUM, - bullet = ARMOR_BALLISTIC_MINOR, - bomb = ARMOR_BOMB_MINOR + MELEE = ARMOR_MELEE_MEDIUM, + BULLET = ARMOR_BALLISTIC_MINOR, + BOMB = ARMOR_BOMB_MINOR ) /obj/vehicle/animal/setup_vehicle() @@ -243,10 +243,10 @@ storage_type = /obj/item/storage/toolbox/bike_storage/saddle corpse = /mob/living/simple_animal/hostile/retaliate/hegeranzi/saddle armor_values = list( //big tough war beast, has some more armor particularly against bullets and melee - melee = ARMOR_MELEE_MAJOR, - bullet = ARMOR_BALLISTIC_MEDIUM, - laser = ARMOR_LASER_MINOR, - bomb = ARMOR_BOMB_MINOR + MELEE = ARMOR_MELEE_MAJOR, + BULLET = ARMOR_BALLISTIC_MEDIUM, + LASER = ARMOR_LASER_MINOR, + BOMB = ARMOR_BOMB_MINOR ) /obj/vehicle/animal/warmount/RunOver(mob/living/carbon/human/H) diff --git a/tools/ci/check_grep.sh b/tools/ci/check_grep.sh index f92b1dcc0ca..93dda77e233 100755 --- a/tools/ci/check_grep.sh +++ b/tools/ci/check_grep.sh @@ -208,6 +208,18 @@ else echo "PASS: No new unmanaged globals are being added" >> code_error.log fi +############################################################## +# Armor is a list, make sure to use it that way +############################################################## +WRONG_ARMOR_REGEXP='\s+armor\s*=[\s*](?!(list\()|(null))' +WRONG_ARMORS=`grep -r -o --include \*.dm -P --regexp=$WRONG_ARMOR_REGEXP` +if [[ $WRONG_ARMORS != '' ]]; then + ERROR_COUNT=$(($ERROR_COUNT+1)) + echo "FAIL: Armor was set incorrectly! It's a list!" >> code_error.log + echo $WRONG_ARMORS >> code_error.log +else + echo "PASS: All armors are correctly set" >> code_error.log +fi ####################################### # Output the result of the checks