From a6d9a4f721e13d607d42d687c5e00ab1ac5073fa Mon Sep 17 00:00:00 2001 From: kevinz000 <2003111+kevinz000@users.noreply.github.com> Date: Wed, 28 Nov 2018 21:14:30 -0800 Subject: [PATCH 1/3] Update reactive_armour.dm --- code/modules/clothing/suits/reactive_armour.dm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/code/modules/clothing/suits/reactive_armour.dm b/code/modules/clothing/suits/reactive_armour.dm index 7c79aff143..7a1950d57c 100644 --- a/code/modules/clothing/suits/reactive_armour.dm +++ b/code/modules/clothing/suits/reactive_armour.dm @@ -126,7 +126,7 @@ /obj/item/clothing/suit/armor/reactive/stealth name = "reactive stealth armor" - reactivearmor_cooldown_duration = 300 + reactivearmor_cooldown_duration = 75 desc = "An experimental suit of armor that renders the wearer invisible on detection of imminent harm, and creates a decoy that runs away from the owner. You can't fight what you can't see." /obj/item/clothing/suit/armor/reactive/stealth/hit_reaction(mob/living/carbon/human/owner, atom/movable/hitby, attack_text = "the attack", final_block_chance = 0, damage = 0, attack_type = MELEE_ATTACK) @@ -153,7 +153,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 = 150 + reactivearmor_cooldown_duration = 25 var/tesla_power = 25000 var/tesla_range = 20 var/tesla_flags = TESLA_MOB_DAMAGE | TESLA_OBJ_DAMAGE @@ -187,7 +187,7 @@ /obj/item/clothing/suit/armor/reactive/repulse name = "reactive repulse armor" - reactivearmor_cooldown_duration = 200 + reactivearmor_cooldown_duration = 50 desc = "An experimental suit of armor that violently throws back attackers." /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) @@ -213,7 +213,7 @@ /obj/item/clothing/suit/armor/reactive/table name = "reactive table armor" - reactivearmor_cooldown_duration = 500 + reactivearmor_cooldown_duration = 0 desc = "If you can't beat the memes, embrace them." var/tele_range = 10 From 02ec7a38ce05de3c0a4e580278a829e23bb41107 Mon Sep 17 00:00:00 2001 From: kevinz000 <2003111+kevinz000@users.noreply.github.com> Date: Wed, 28 Nov 2018 21:16:30 -0800 Subject: [PATCH 2/3] Update reactive_armour.dm --- code/modules/clothing/suits/reactive_armour.dm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/code/modules/clothing/suits/reactive_armour.dm b/code/modules/clothing/suits/reactive_armour.dm index 7a1950d57c..fe38d050cf 100644 --- a/code/modules/clothing/suits/reactive_armour.dm +++ b/code/modules/clothing/suits/reactive_armour.dm @@ -126,7 +126,7 @@ /obj/item/clothing/suit/armor/reactive/stealth name = "reactive stealth armor" - reactivearmor_cooldown_duration = 75 + reactivearmor_cooldown_duration = 65 desc = "An experimental suit of armor that renders the wearer invisible on detection of imminent harm, and creates a decoy that runs away from the owner. You can't fight what you can't see." /obj/item/clothing/suit/armor/reactive/stealth/hit_reaction(mob/living/carbon/human/owner, atom/movable/hitby, attack_text = "the attack", final_block_chance = 0, damage = 0, attack_type = MELEE_ATTACK) @@ -153,7 +153,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 = 25 + reactivearmor_cooldown_duration = 20 var/tesla_power = 25000 var/tesla_range = 20 var/tesla_flags = TESLA_MOB_DAMAGE | TESLA_OBJ_DAMAGE @@ -187,7 +187,7 @@ /obj/item/clothing/suit/armor/reactive/repulse name = "reactive repulse armor" - reactivearmor_cooldown_duration = 50 + reactivearmor_cooldown_duration = 35 desc = "An experimental suit of armor that violently throws back attackers." /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 63bf5c54e1ad142599678920de093adcf508f9ee Mon Sep 17 00:00:00 2001 From: kevinz000 <2003111+kevinz000@users.noreply.github.com> Date: Wed, 28 Nov 2018 21:21:48 -0800 Subject: [PATCH 3/3] Update reactive_armour.dm --- 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 fe38d050cf..2516d446d6 100644 --- a/code/modules/clothing/suits/reactive_armour.dm +++ b/code/modules/clothing/suits/reactive_armour.dm @@ -187,7 +187,7 @@ /obj/item/clothing/suit/armor/reactive/repulse name = "reactive repulse armor" - reactivearmor_cooldown_duration = 35 + reactivearmor_cooldown_duration = 20 desc = "An experimental suit of armor that violently throws back attackers." /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)