From 0189f62c2909d7d47d6626d9933b309b1b44ece7 Mon Sep 17 00:00:00 2001 From: ChesterTheCheesy <71487903+ChesterTheCheesy@users.noreply.github.com> Date: Tue, 1 Mar 2022 01:01:00 +0100 Subject: [PATCH 1/3] Update reactive_armour.dm --- code/modules/clothing/suits/reactive_armour.dm | 2 ++ 1 file changed, 2 insertions(+) diff --git a/code/modules/clothing/suits/reactive_armour.dm b/code/modules/clothing/suits/reactive_armour.dm index d1cba3cb7878..fa3d89bd8bd4 100644 --- a/code/modules/clothing/suits/reactive_armour.dm +++ b/code/modules/clothing/suits/reactive_armour.dm @@ -159,6 +159,7 @@ name = "reactive tesla armor" desc = "An experimental suit of armor with sensitive detectors hooked up to a huge capacitor grid, with emitters strutting out of it. Zap." siemens_coefficient = -1 + reactivearmor_cooldown_duration = 30 var/tesla_power = 25000 var/tesla_range = 20 var/tesla_flags = TESLA_MOB_DAMAGE | TESLA_OBJ_DAMAGE @@ -195,6 +196,7 @@ /obj/item/clothing/suit/armor/reactive/repulse name = "reactive repulse armor" desc = "An experimental suit of armor that violently throws back attackers." + reactivearmor_cooldown_duration = 50 var/repulse_force = MOVE_FORCE_EXTREMELY_STRONG /obj/item/clothing/suit/armor/reactive/repulse/hit_reaction(mob/living/carbon/human/owner, atom/movable/hitby, attack_text = "the attack", final_block_chance = 0, damage = 0, attack_type = MELEE_ATTACK) From 62d340d7406650eb19645a3b4a47162636864203 Mon Sep 17 00:00:00 2001 From: Jamie D <993128+JamieD1@users.noreply.github.com> Date: Mon, 7 Mar 2022 11:24:09 +0000 Subject: [PATCH 2/3] Update code/modules/clothing/suits/reactive_armour.dm Co-authored-by: TheGamerdk <5618080+TheGamerdk@users.noreply.github.com> --- code/modules/clothing/suits/reactive_armour.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/clothing/suits/reactive_armour.dm b/code/modules/clothing/suits/reactive_armour.dm index fa3d89bd8bd4..a4716f8fea27 100644 --- a/code/modules/clothing/suits/reactive_armour.dm +++ b/code/modules/clothing/suits/reactive_armour.dm @@ -159,7 +159,7 @@ name = "reactive tesla armor" desc = "An experimental suit of armor with sensitive detectors hooked up to a huge capacitor grid, with emitters strutting out of it. Zap." siemens_coefficient = -1 - reactivearmor_cooldown_duration = 30 + reactivearmor_cooldown_duration = 3 SECONDS var/tesla_power = 25000 var/tesla_range = 20 var/tesla_flags = TESLA_MOB_DAMAGE | TESLA_OBJ_DAMAGE From 6d69386de4a6a104e6ca308d364d93eb3a9d8f00 Mon Sep 17 00:00:00 2001 From: Jamie D <993128+JamieD1@users.noreply.github.com> Date: Mon, 7 Mar 2022 11:24:13 +0000 Subject: [PATCH 3/3] Update code/modules/clothing/suits/reactive_armour.dm Co-authored-by: TheGamerdk <5618080+TheGamerdk@users.noreply.github.com> --- code/modules/clothing/suits/reactive_armour.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/clothing/suits/reactive_armour.dm b/code/modules/clothing/suits/reactive_armour.dm index a4716f8fea27..8103092fa58f 100644 --- a/code/modules/clothing/suits/reactive_armour.dm +++ b/code/modules/clothing/suits/reactive_armour.dm @@ -196,7 +196,7 @@ /obj/item/clothing/suit/armor/reactive/repulse name = "reactive repulse armor" desc = "An experimental suit of armor that violently throws back attackers." - reactivearmor_cooldown_duration = 50 + reactivearmor_cooldown_duration = 5 SECONDS var/repulse_force = MOVE_FORCE_EXTREMELY_STRONG /obj/item/clothing/suit/armor/reactive/repulse/hit_reaction(mob/living/carbon/human/owner, atom/movable/hitby, attack_text = "the attack", final_block_chance = 0, damage = 0, attack_type = MELEE_ATTACK)