Merge pull request #14032 from kappa-sama/kaiowhat
two toggled self-buffing spells that have no relation to any anime or video game in particular
This commit is contained in:
@@ -38,7 +38,7 @@
|
||||
dat += "<A href='byond://?src=[REF(src)];school=[APPRENTICE_ROBELESS]'>Robeless</A><BR>"
|
||||
dat += "<I>Your apprentice is training to cast spells without their robes. They know Knock and Mindswap.</I><BR>"
|
||||
dat += "<A href='byond://?src=[REF(src)];school=[APPRENTICE_MARTIAL]'>Martial Artist</a><BR>"
|
||||
dat += "<I>Your apprentice is training in ancient martial arts. They know the Plasmafist and Nuclear Fist.</I><BR>"
|
||||
dat += "<I>Your apprentice is training in ancient martial arts. They know an Inner Mantra and the Nuclear Fist technique.</I><BR>"
|
||||
user << browse(dat, "window=radio")
|
||||
onclose(user, "radio")
|
||||
return
|
||||
|
||||
@@ -189,6 +189,10 @@
|
||||
name = "Mutate"
|
||||
spell_type = /obj/effect/proc_holder/spell/targeted/genetic/mutate
|
||||
|
||||
/datum/spellbook_entry/mantra
|
||||
name = "Inner Mantra"
|
||||
spell_type = /obj/effect/proc_holder/spell/self/mantra
|
||||
|
||||
/datum/spellbook_entry/jaunt
|
||||
name = "Ethereal Jaunt"
|
||||
spell_type = /obj/effect/proc_holder/spell/targeted/ethereal_jaunt
|
||||
|
||||
@@ -181,8 +181,8 @@
|
||||
to_chat(owner, "<B>Your service has not gone unrewarded, however. Studying under [master.current.real_name], you have learned stealthy, robeless spells. You are able to cast knock and mindswap.")
|
||||
if(APPRENTICE_MARTIAL)
|
||||
owner.AddSpell(new /obj/effect/proc_holder/spell/targeted/touch/nuclear_fist(null))
|
||||
H.put_in_hands(new /obj/item/book/granter/martial/plasma_fist(H))
|
||||
to_chat(owner, "<B>Your service has not gone unrewarded, however. Studying under [master.current.real_name], you have learned mystical martial abilities. You are also able to use the Nuclear Fist at will.")
|
||||
owner.AddSpell(new /obj/effect/proc_holder/spell/self/mantra(null))
|
||||
to_chat(owner, "<B>Your service has not gone unrewarded, however. Studying under [master.current.real_name], you have learned to control your Inner Mantra. You are also able to use the Nuclear Fist at will.")
|
||||
|
||||
/datum/antagonist/wizard/apprentice/create_objectives()
|
||||
var/datum/objective/protect/new_objective = new /datum/objective/protect
|
||||
|
||||
@@ -1104,7 +1104,7 @@
|
||||
if(1)
|
||||
new /obj/item/mayhem(src)
|
||||
if(2)
|
||||
new /obj/item/gun/ballistic/revolver/doublebarrel/super(src)
|
||||
new /obj/item/book/granter/spell/asura(src)
|
||||
if(3)
|
||||
new /obj/item/guardiancreator(src)
|
||||
|
||||
@@ -1187,6 +1187,13 @@
|
||||
unique_reskin = null
|
||||
sawn_off = TRUE
|
||||
|
||||
/obj/item/book/granter/spell/asura
|
||||
spell = /obj/effect/proc_holder/spell/self/asura
|
||||
spellname = "asuras wrath"
|
||||
icon_state = "bookasura"
|
||||
desc = "This crimson novel emanates rage incarnate."
|
||||
remarks = list("Kaio-What?", "It can only be sustained for a short time...", "It's like a massive upsurge of energy...", "Takes a heavy toll on the user's body...?", "Extra arms not included...", "There's stronger levels? Why aren't they in the book...")
|
||||
|
||||
//Colossus
|
||||
/obj/structure/closet/crate/necropolis/colossus
|
||||
name = "colossus chest"
|
||||
|
||||
@@ -0,0 +1,35 @@
|
||||
/obj/effect/proc_holder/spell/self/mantra
|
||||
name = "Inner Mantra"
|
||||
desc = "Control your Inner Mantra, gaining strength and durability for a cost."
|
||||
clothes_req = NONE
|
||||
mobs_whitelist = list(/mob/living/carbon/human)
|
||||
charge_max = 100
|
||||
antimagic_allowed = TRUE
|
||||
invocation = "SU'UP'AH S'EI YEN"
|
||||
invocation_type = "shout"
|
||||
level_max = 0
|
||||
cooldown_min = 100
|
||||
|
||||
/obj/effect/proc_holder/spell/self/mantra/cast(mob/living/carbon/human/user)
|
||||
if(user.has_status_effect(STATUS_EFFECT_MANTRA))
|
||||
user.remove_status_effect(STATUS_EFFECT_MANTRA)
|
||||
else
|
||||
user.apply_status_effect(STATUS_EFFECT_MANTRA)
|
||||
|
||||
/obj/effect/proc_holder/spell/self/asura
|
||||
name = "Asura's Wrath"
|
||||
desc = "Unleash your rage as corrosive power fills your muscles."
|
||||
clothes_req = NONE
|
||||
mobs_whitelist = list(/mob/living/carbon/human)
|
||||
charge_max = 100
|
||||
antimagic_allowed = TRUE
|
||||
invocation = "KYE Y'O'KEN"
|
||||
invocation_type = "shout"
|
||||
level_max = 0
|
||||
cooldown_min = 100
|
||||
|
||||
/obj/effect/proc_holder/spell/self/asura/cast(mob/living/carbon/human/user)
|
||||
if(user.has_status_effect(STATUS_EFFECT_ASURA))
|
||||
user.remove_status_effect(STATUS_EFFECT_ASURA)
|
||||
else
|
||||
user.apply_status_effect(STATUS_EFFECT_ASURA)
|
||||
Reference in New Issue
Block a user