From 4ef9c419673fa2e8eedf8217becc3abb1c557b1c Mon Sep 17 00:00:00 2001 From: SuperSlayer <91609255+TymurShatillo@users.noreply.github.com> Date: Tue, 14 Jun 2022 11:59:48 +0300 Subject: [PATCH 1/3] Update touch_attacks.dm --- code/modules/spells/spell_types/touch_attacks.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/modules/spells/spell_types/touch_attacks.dm b/code/modules/spells/spell_types/touch_attacks.dm index a4fb116a2b7f..73daf0f4381e 100644 --- a/code/modules/spells/spell_types/touch_attacks.dm +++ b/code/modules/spells/spell_types/touch_attacks.dm @@ -104,9 +104,9 @@ hand_path = /obj/item/melee/touch_attack/pacifism school = "evocation" - charge_max = 600 + charge_max = 2 MINUTES clothes_req = FALSE - cooldown_min = 2 MINUTES + cooldown_min = 1 MINUTES action_icon ='icons/mob/gondolas.dmi' action_icon_state = "gondola" From bd971f79c1b4f2f165b5bcb55786cc9d9fd2f057 Mon Sep 17 00:00:00 2001 From: SuperSlayer <91609255+TymurShatillo@users.noreply.github.com> Date: Tue, 14 Jun 2022 12:44:57 +0300 Subject: [PATCH 2/3] Update touch_attacks.dm --- code/modules/spells/spell_types/touch_attacks.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/modules/spells/spell_types/touch_attacks.dm b/code/modules/spells/spell_types/touch_attacks.dm index 73daf0f4381e..ecd57ffa5a99 100644 --- a/code/modules/spells/spell_types/touch_attacks.dm +++ b/code/modules/spells/spell_types/touch_attacks.dm @@ -104,9 +104,9 @@ hand_path = /obj/item/melee/touch_attack/pacifism school = "evocation" - charge_max = 2 MINUTES + charge_max = 1 MINUTES clothes_req = FALSE - cooldown_min = 1 MINUTES + cooldown_min = 0.5 MINUTES action_icon ='icons/mob/gondolas.dmi' action_icon_state = "gondola" From 55ff56eb9c57d017a46796d19c01d0ad31d3102d Mon Sep 17 00:00:00 2001 From: SuperSlayer <91609255+TymurShatillo@users.noreply.github.com> Date: Tue, 14 Jun 2022 12:45:35 +0300 Subject: [PATCH 3/3] Update touch_attacks.dm --- code/modules/spells/spell_types/touch_attacks.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/spells/spell_types/touch_attacks.dm b/code/modules/spells/spell_types/touch_attacks.dm index ecd57ffa5a99..3b06f41a4882 100644 --- a/code/modules/spells/spell_types/touch_attacks.dm +++ b/code/modules/spells/spell_types/touch_attacks.dm @@ -106,7 +106,7 @@ school = "evocation" charge_max = 1 MINUTES clothes_req = FALSE - cooldown_min = 0.5 MINUTES + cooldown_min = 20 SECONDS action_icon ='icons/mob/gondolas.dmi' action_icon_state = "gondola"