From 333cdc06d352c0d49a87d7271f56fdc5dbf14f57 Mon Sep 17 00:00:00 2001 From: Matt Atlas Date: Sun, 18 Sep 2022 15:04:20 +0200 Subject: [PATCH] Buffs combat hardsuits' armor values to match crimson hardsuit armor. (#14813) * Like it? Like it? Yeah I bet you want it / Then I'll keep it coming * LIKE IT LIKE IT YEAH I BET YOU WANT IT * AAAAAAAAA Co-authored-by: Matt Atlas --- code/__defines/armor.dm | 1 + .../clothing/spacesuits/rig/suits/combat.dm | 56 +++++++++---------- .../clothing/spacesuits/rig/suits/merc.dm | 16 +++--- .../clothing/spacesuits/rig/suits/station.dm | 6 +- html/changelogs/mattatlas-hardsuits.yml | 41 ++++++++++++++ 5 files changed, 81 insertions(+), 39 deletions(-) create mode 100644 html/changelogs/mattatlas-hardsuits.yml diff --git a/code/__defines/armor.dm b/code/__defines/armor.dm index 9dcac845932..2cfd59ce99a 100644 --- a/code/__defines/armor.dm +++ b/code/__defines/armor.dm @@ -8,6 +8,7 @@ #define ARMOR_BALLISTIC_SMALL 25 #define ARMOR_BALLISTIC_PISTOL 30 //Blocks holdout and normal pistol ammo #define ARMOR_BALLISTIC_MEDIUM 40 +#define ARMOR_BALLISTIC_CARBINE 45 #define ARMOR_BALLISTIC_REVOLVER 50 //Blocks antag revolver rounds. #define ARMOR_BALLISTIC_RIFLE 60 //Blocks rifle rounds. #define ARMOR_BALLISTIC_AP 75 //Blocks basically almost every caliber except superheavy ones. diff --git a/code/modules/clothing/spacesuits/rig/suits/combat.dm b/code/modules/clothing/spacesuits/rig/suits/combat.dm index 0d1090e4ec0..72459bfb9dd 100644 --- a/code/modules/clothing/spacesuits/rig/suits/combat.dm +++ b/code/modules/clothing/spacesuits/rig/suits/combat.dm @@ -7,12 +7,12 @@ suit_type = "combat hardsuit" armor = list( melee = ARMOR_MELEE_VERY_HIGH, - bullet = ARMOR_BALLISTIC_PISTOL, - laser = ARMOR_LASER_PISTOL, + bullet = ARMOR_BALLISTIC_RIFLE, + laser = ARMOR_LASER_MAJOR, energy = ARMOR_ENERGY_MINOR, - bomb = ARMOR_BOMB_PADDED, + bomb = ARMOR_BOMB_RESISTANT, bio = ARMOR_BIO_SHIELDED, - rad = ARMOR_RAD_RESISTANT + rad = ARMOR_RAD_SMALL ) siemens_coefficient = 0.1 offline_slowdown = 3 @@ -48,12 +48,12 @@ suit_type = "military hardsuit" armor = list( melee = ARMOR_MELEE_VERY_HIGH, - bullet = ARMOR_BALLISTIC_MEDIUM, + bullet = ARMOR_BALLISTIC_RIFLE, laser = ARMOR_LASER_MAJOR, energy = ARMOR_ENERGY_MINOR, - bomb = ARMOR_BOMB_SHIELDED, + bomb = ARMOR_BOMB_RESISTANT, bio = ARMOR_BIO_SHIELDED, - rad = ARMOR_RAD_RESISTANT + rad = ARMOR_RAD_SMALL ) siemens_coefficient = 0.1 offline_slowdown = 3 @@ -124,7 +124,7 @@ melee = ARMOR_MELEE_MAJOR, bullet = ARMOR_BALLISTIC_PISTOL, laser = ARMOR_LASER_PISTOL, - energy = ARMOR_ENERGY_MINOR, + energy = ARMOR_ENERGY_RESISTANT, bomb = ARMOR_BOMB_RESISTANT, bio = ARMOR_BIO_SHIELDED, rad = ARMOR_RAD_RESISTANT @@ -174,13 +174,13 @@ icon_state = "gunslinger" suit_type = "gunslinger hardsuit" armor = list( - melee = ARMOR_MELEE_MAJOR, - bullet = ARMOR_BALLISTIC_MEDIUM, - laser = ARMOR_LASER_PISTOL, - energy = ARMOR_ENERGY_SMALL, - bomb = ARMOR_BOMB_PADDED, + melee = ARMOR_MELEE_VERY_HIGH, + bullet = ARMOR_BALLISTIC_RIFLE, + laser = ARMOR_LASER_MAJOR, + energy = ARMOR_ENERGY_MINOR, + bomb = ARMOR_BOMB_RESISTANT, bio = ARMOR_BIO_SHIELDED, - rad = ARMOR_RAD_RESISTANT + rad = ARMOR_RAD_SMALL ) siemens_coefficient = 0.1 offline_slowdown = 2 @@ -224,12 +224,12 @@ suit_type = "strike hardsuit" armor = list( melee = ARMOR_MELEE_VERY_HIGH, - bullet = ARMOR_BALLISTIC_PISTOL, - laser = ARMOR_LASER_PISTOL, - energy = ARMOR_ENERGY_SMALL, - bomb = ARMOR_BOMB_PADDED, + bullet = ARMOR_BALLISTIC_RIFLE, + laser = ARMOR_LASER_MAJOR, + energy = ARMOR_ENERGY_MINOR, + bomb = ARMOR_BOMB_RESISTANT, bio = ARMOR_BIO_SHIELDED, - rad = ARMOR_RAD_SHIELDED + rad = ARMOR_RAD_SMALL ) siemens_coefficient = 0.1 offline_slowdown = 2 @@ -291,13 +291,13 @@ icon_state = "elyran_rig" suit_type = "elyran battlesuit" armor = list( - melee = ARMOR_MELEE_MAJOR, - bullet = ARMOR_BALLISTIC_PISTOL, + melee = ARMOR_MELEE_VERY_HIGH, + bullet = ARMOR_BALLISTIC_RIFLE, laser = ARMOR_LASER_MAJOR, - energy = ARMOR_ENERGY_SMALL, - bomb = ARMOR_BOMB_PADDED, + energy = ARMOR_ENERGY_MINOR, + bomb = ARMOR_BOMB_RESISTANT, bio = ARMOR_BIO_SHIELDED, - rad = ARMOR_RAD_SHIELDED + rad = ARMOR_RAD_SMALL ) siemens_coefficient = 0.1 offline_slowdown = 2 @@ -382,10 +382,10 @@ suit_type = "jinxiang combat suit" armor = list( melee = ARMOR_MELEE_VERY_HIGH, - bullet = ARMOR_BALLISTIC_PISTOL, - laser = ARMOR_LASER_PISTOL, - energy = ARMOR_ENERGY_SMALL, - bomb = ARMOR_BOMB_MINOR, + bullet = ARMOR_BALLISTIC_RIFLE, + laser = ARMOR_LASER_MAJOR, + energy = ARMOR_ENERGY_MINOR, + bomb = ARMOR_BOMB_RESISTANT, bio = ARMOR_BIO_SHIELDED, rad = ARMOR_RAD_SMALL ) diff --git a/code/modules/clothing/spacesuits/rig/suits/merc.dm b/code/modules/clothing/spacesuits/rig/suits/merc.dm index 448bfcb4cd3..28187c96a0a 100644 --- a/code/modules/clothing/spacesuits/rig/suits/merc.dm +++ b/code/modules/clothing/spacesuits/rig/suits/merc.dm @@ -12,7 +12,7 @@ suit_type = "crimson hardsuit" armor = list( melee = ARMOR_MELEE_VERY_HIGH, - bullet = ARMOR_BALLISTIC_RIFLE, + bullet = ARMOR_BALLISTIC_CARBINE, laser = ARMOR_LASER_MAJOR, energy = ARMOR_ENERGY_MINOR, bomb = ARMOR_BOMB_RESISTANT, @@ -76,14 +76,14 @@ icon_state = "rhino" suit_type = "rhino hardsuit" armor = list( - melee = ARMOR_MELEE_VERY_HIGH, - bullet = ARMOR_BALLISTIC_RIFLE, - laser = ARMOR_LASER_SMALL, - energy = ARMOR_ENERGY_MINOR, - bomb = ARMOR_BOMB_RESISTANT, + melee = ARMOR_MELEE_MAJOR, + bullet = ARMOR_BALLISTIC_REVOLVER, + laser = ARMOR_LASER_MEDIUM, + energy = ARMOR_ENERGY_RESISTANT, + bomb = ARMOR_BOMB_PADDED, bio = ARMOR_BIO_SHIELDED, - rad = ARMOR_RAD_SMALL - ) + rad = ARMOR_RAD_RESISTANT + ) siemens_coefficient = 0.1 offline_slowdown = 3 offline_vision_restriction = TINT_HEAVY diff --git a/code/modules/clothing/spacesuits/rig/suits/station.dm b/code/modules/clothing/spacesuits/rig/suits/station.dm index 3026b136dce..a03cb11042c 100644 --- a/code/modules/clothing/spacesuits/rig/suits/station.dm +++ b/code/modules/clothing/spacesuits/rig/suits/station.dm @@ -304,9 +304,9 @@ armor = list( melee = ARMOR_MELEE_MAJOR, bullet = ARMOR_BALLISTIC_PISTOL, - laser = ARMOR_LASER_SMALL, - energy = ARMOR_ENERGY_MINOR, - bomb = ARMOR_BOMB_RESISTANT, + laser = ARMOR_LASER_MEDIUM, + energy = ARMOR_ENERGY_RESISTANT, + bomb = ARMOR_BOMB_PADDED, bio = ARMOR_BIO_SHIELDED, rad = ARMOR_RAD_RESISTANT ) diff --git a/html/changelogs/mattatlas-hardsuits.yml b/html/changelogs/mattatlas-hardsuits.yml new file mode 100644 index 00000000000..683c08da2f6 --- /dev/null +++ b/html/changelogs/mattatlas-hardsuits.yml @@ -0,0 +1,41 @@ +################################ +# Example Changelog File +# +# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb. +# +# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.) +# When it is, any changes listed below will disappear. +# +# Valid Prefixes: +# bugfix +# wip (For works in progress) +# tweak +# soundadd +# sounddel +# rscadd (general adding of nice things) +# rscdel (general deleting of nice things) +# imageadd +# imagedel +# maptweak +# spellcheck (typo fixes) +# experiment +# balance +# admin +# backend +# security +# refactor +################################# + +# Your name. +author: MattAtlas + +# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again. +delete-after: True + +# Any changes you've made. See valid prefix list above. +# INDENT WITH TWO SPACES. NOT TABS. SPACES. +# SCREW THIS UP AND IT WON'T WORK. +# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries. +# Please surround your changes in double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog. +changes: + - balance: "Most combat hardsuits now have armor values equal to the crimson hardsuit, which means that they're really good at blocking damage now. The hazard hardsuit has been buffed to be comparable to heavy armour instead."