diff --git a/code/game/objects/effects/temporary_visuals/miscellaneous.dm b/code/game/objects/effects/temporary_visuals/miscellaneous.dm index b95c884dc2..a103c0a54f 100644 --- a/code/game/objects/effects/temporary_visuals/miscellaneous.dm +++ b/code/game/objects/effects/temporary_visuals/miscellaneous.dm @@ -447,5 +447,5 @@ icon = 'icons/effects/96x96.dmi' icon_state = "slugboom" randomdir = FALSE - duration = 60 + duration = 30 pixel_x = -24 \ No newline at end of file diff --git a/code/game/objects/items/granters.dm b/code/game/objects/items/granters.dm index 6ea68bf548..41e2fa5146 100644 --- a/code/game/objects/items/granters.dm +++ b/code/game/objects/items/granters.dm @@ -183,6 +183,23 @@ explosion(user.loc, 1, 0, 2, 3, FALSE, FALSE, 2) qdel(src) +/obj/item/book/granter/spell/nuclearfist + spell = /obj/effect/proc_holder/spell/targeted/touch/nuclear_fist + spellname = "nuclear fist" + icon_state ="booknuclearfist" + desc = "This book radiates confidence." + remarks = list("Line them up....", ".. knock em' down...", "Dress in yellow for maximum effect... why?", "The energey comes from spinach... huh", "Work out for three years? No way!", "Oh I'll cast you a spell allright...", "What ho mighty wizard... ho ho ho...") + +/obj/item/book/granter/spell/nuclearfist/recoil(mob/living/carbon/user) + ..() + to_chat(user, "Your arm spontaneously detonates!") + explosion(user.loc, -1, 0, 2, -1, FALSE, FALSE, 2) + var/obj/item/bodypart/part = user.get_holding_bodypart_of_item(src) + if(part) + part.dismember() + qdel(part) + + /obj/item/book/granter/spell/sacredflame spell = /obj/effect/proc_holder/spell/targeted/sacred_flame spellname = "sacred flame" diff --git a/code/modules/antagonists/wizard/equipment/spellbook.dm b/code/modules/antagonists/wizard/equipment/spellbook.dm index 7f03a7e003..dfde04836d 100644 --- a/code/modules/antagonists/wizard/equipment/spellbook.dm +++ b/code/modules/antagonists/wizard/equipment/spellbook.dm @@ -144,7 +144,6 @@ /datum/spellbook_entry/nuclearfist name = "Nuclear Fist" spell_type = /obj/effect/proc_holder/spell/targeted/touch/nuclear_fist - cost = 3 /datum/spellbook_entry/disabletech name = "Disable Tech" diff --git a/code/modules/spells/spell_types/touch_attacks.dm b/code/modules/spells/spell_types/touch_attacks.dm index 0ca4982ea6..794ed797ad 100644 --- a/code/modules/spells/spell_types/touch_attacks.dm +++ b/code/modules/spells/spell_types/touch_attacks.dm @@ -74,13 +74,12 @@ /obj/effect/proc_holder/spell/targeted/touch/nuclear_fist name = "Nuclear Fist" - desc = "This spell channels raw manliness, allowing you punch your enemies across the galaxy, causing them to detonate violently if hitting any other living being midflight." + desc = "This spell channels raw manliness, allowing you punch your enemies across the galaxy, causing them to detonate violently if hitting any other living being midflight. Does not work while laying down." hand_path = /obj/item/melee/touch_attack/nuclearfist school = "evocation" - charge_max = 600 + charge_max = 200 clothes_req = 0 - cooldown_min = 200 //100 deciseconds reduction per rank - - action_icon = 'icons/obj/projectiles.dmi' - action_icon_state = "nuclear" \ No newline at end of file + cooldown_min = 40 + + action_icon_state = "nuclearfist" \ No newline at end of file diff --git a/icons/mob/actions/actions_spells.dmi b/icons/mob/actions/actions_spells.dmi index 30927d3608..072bfc8fe3 100644 Binary files a/icons/mob/actions/actions_spells.dmi and b/icons/mob/actions/actions_spells.dmi differ diff --git a/icons/obj/library.dmi b/icons/obj/library.dmi index 20e0f5f73c..45181b7c8d 100644 Binary files a/icons/obj/library.dmi and b/icons/obj/library.dmi differ