From a4fa24ac15dc55362f14bd20ce2ad56ade329149 Mon Sep 17 00:00:00 2001 From: kevinz000 <2003111+kevinz000@users.noreply.github.com> Date: Fri, 3 Jan 2020 23:33:39 -0800 Subject: [PATCH 1/3] Update touch_attacks.dm --- code/modules/spells/spell_types/touch_attacks.dm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/code/modules/spells/spell_types/touch_attacks.dm b/code/modules/spells/spell_types/touch_attacks.dm index 794ed797ad..5f984fa7e3 100644 --- a/code/modules/spells/spell_types/touch_attacks.dm +++ b/code/modules/spells/spell_types/touch_attacks.dm @@ -78,8 +78,8 @@ hand_path = /obj/item/melee/touch_attack/nuclearfist school = "evocation" - charge_max = 200 + charge_max = 100 clothes_req = 0 - cooldown_min = 40 + cooldown_min = 20 - action_icon_state = "nuclearfist" \ No newline at end of file + action_icon_state = "nuclearfist" From 0567dcd6dfcf156d77016ff6e08e0e2bce3c527c Mon Sep 17 00:00:00 2001 From: kevinz000 <2003111+kevinz000@users.noreply.github.com> Date: Fri, 3 Jan 2020 23:34:37 -0800 Subject: [PATCH 2/3] Update godhand.dm --- code/modules/spells/spell_types/godhand.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/modules/spells/spell_types/godhand.dm b/code/modules/spells/spell_types/godhand.dm index 8108b121ae..45c258cdf7 100644 --- a/code/modules/spells/spell_types/godhand.dm +++ b/code/modules/spells/spell_types/godhand.dm @@ -186,7 +186,7 @@ /obj/item/melee/touch_attack/nuclearfist name = "\improper PURE MANLINESS" desc = "SHOW THEM RAW POWER" - catchphrase = "I CAST FIST!" + catchphrase = "VIBE CHECK!!" on_use_sound = 'sound/weapons/nuclear_fist.ogg' icon_state = "disintegrate" item_state = "disintegrate" @@ -216,4 +216,4 @@ P.original = user P.firer = user P.fire() - return ..() \ No newline at end of file + return ..() From 8bf75be8ffe595d6eb3001f3159ab9ae5465834e Mon Sep 17 00:00:00 2001 From: Ghom <42542238+Ghommie@users.noreply.github.com> Date: Sun, 5 Jan 2020 15:38:23 +0100 Subject: [PATCH 3/3] Yea no, go away zoomer kevinz --- code/modules/spells/spell_types/godhand.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/spells/spell_types/godhand.dm b/code/modules/spells/spell_types/godhand.dm index 45c258cdf7..c4a2b4aa7e 100644 --- a/code/modules/spells/spell_types/godhand.dm +++ b/code/modules/spells/spell_types/godhand.dm @@ -186,7 +186,7 @@ /obj/item/melee/touch_attack/nuclearfist name = "\improper PURE MANLINESS" desc = "SHOW THEM RAW POWER" - catchphrase = "VIBE CHECK!!" + catchphrase = "I CAST FIST!" on_use_sound = 'sound/weapons/nuclear_fist.ogg' icon_state = "disintegrate" item_state = "disintegrate"