From 800d5b4b0b5860d2d5dc708cd59c88d65e56b47a Mon Sep 17 00:00:00 2001 From: ZomgPonies Date: Wed, 23 Jul 2014 10:58:20 -0400 Subject: [PATCH] Revert "Made wizard spells into various subtypes" This reverts commit 8b703f55af66f697e9b0a4cea17e16e7434f5c81. --- code/datums/spell.dm | 2 +- code/datums/spells/charge.dm | 2 +- code/datums/spells/construct_spells.dm | 2 +- code/datums/spells/ethereal_jaunt.dm | 4 +- code/datums/spells/horsemask.dm | 2 +- code/datums/spells/knock.dm | 2 +- code/datums/spells/mind_transfer.dm | 6 +-- code/datums/spells/wizard.dm | 30 +++++------ code/game/gamemodes/wizard/artefact.dm | 16 +++--- code/game/gamemodes/wizard/spellbook.dm | 50 +++++++++---------- code/modules/admin/admin_verbs.dm | 3 +- .../mob/living/simple_animal/constructs.dm | 2 +- 12 files changed, 60 insertions(+), 61 deletions(-) diff --git a/code/datums/spell.dm b/code/datums/spell.dm index 56a6a5a5fee..82d29382b85 100644 --- a/code/datums/spell.dm +++ b/code/datums/spell.dm @@ -77,7 +77,7 @@ var/list/spells = typesof(/obj/effect/proc_holder/spell) //needed for the badmin if(istype(usr.wear_mask, /obj/item/clothing/mask/muzzle)) usr << "Mmmf mrrfff!" return 0 - var/obj/effect/proc_holder/spell/wizard/noclothes/spell = locate() in user.spell_list + var/obj/effect/proc_holder/spell/noclothes/spell = locate() in user.spell_list if(clothes_req && !(spell && istype(spell)))//clothes check if(!istype(usr, /mob/living/carbon/human)) usr << "You aren't a human, Why are you trying to cast a human spell, silly non-human? Casting human spells is for humans." diff --git a/code/datums/spells/charge.dm b/code/datums/spells/charge.dm index f8109d906bd..c1fa2866b67 100644 --- a/code/datums/spells/charge.dm +++ b/code/datums/spells/charge.dm @@ -1,4 +1,4 @@ -/obj/effect/proc_holder/spell/targeted/wizard/charge +/obj/effect/proc_holder/spell/targeted/charge name = "Charge" desc = "This spell can be used to charge up spent magical artifacts, among other things." diff --git a/code/datums/spells/construct_spells.dm b/code/datums/spells/construct_spells.dm index 4a26fb1cbcd..5d94f28cdb7 100644 --- a/code/datums/spells/construct_spells.dm +++ b/code/datums/spells/construct_spells.dm @@ -72,7 +72,7 @@ summon_lifespan = 200 -/obj/effect/proc_holder/spell/targeted/wizard/ethereal_jaunt/shift +/obj/effect/proc_holder/spell/targeted/ethereal_jaunt/shift name = "Phase Shift" desc = "This spell allows you to pass through walls" diff --git a/code/datums/spells/ethereal_jaunt.dm b/code/datums/spells/ethereal_jaunt.dm index 4ccdebcac91..111d26ced73 100644 --- a/code/datums/spells/ethereal_jaunt.dm +++ b/code/datums/spells/ethereal_jaunt.dm @@ -1,4 +1,4 @@ -/obj/effect/proc_holder/spell/targeted/wizard/ethereal_jaunt +/obj/effect/proc_holder/spell/targeted/ethereal_jaunt name = "Ethereal Jaunt" desc = "This spell creates your ethereal form, temporarily making you invisible and able to pass through walls." @@ -17,7 +17,7 @@ icon_power_button = "spell_jaunt" -/obj/effect/proc_holder/spell/targeted/wizard/ethereal_jaunt/cast(list/targets) //magnets, so mostly hardcoded +/obj/effect/proc_holder/spell/targeted/ethereal_jaunt/cast(list/targets) //magnets, so mostly hardcoded for(var/mob/living/target in targets) spawn(0) diff --git a/code/datums/spells/horsemask.dm b/code/datums/spells/horsemask.dm index 251fc7213b1..4d4ec72ae39 100644 --- a/code/datums/spells/horsemask.dm +++ b/code/datums/spells/horsemask.dm @@ -1,4 +1,4 @@ -/obj/effect/proc_holder/spell/targeted/wizard/horsemask +/obj/effect/proc_holder/spell/targeted/horsemask name = "Curse of the Horseman" desc = "This spell triggers a curse on a target, causing them to wield an unremovable horse head mask. They will speak like a horse! Any masks they are wearing will be disintegrated. This spell does not require robes." school = "transmutation" diff --git a/code/datums/spells/knock.dm b/code/datums/spells/knock.dm index b4d83871810..344e3d13a2d 100644 --- a/code/datums/spells/knock.dm +++ b/code/datums/spells/knock.dm @@ -1,4 +1,4 @@ -/obj/effect/proc_holder/spell/aoe_turf/wizard/knock +/obj/effect/proc_holder/spell/aoe_turf/knock name = "Knock" desc = "This spell opens nearby doors and does not require wizard garb." diff --git a/code/datums/spells/mind_transfer.dm b/code/datums/spells/mind_transfer.dm index 5390c8bc155..1a4ec7e6dea 100644 --- a/code/datums/spells/mind_transfer.dm +++ b/code/datums/spells/mind_transfer.dm @@ -1,4 +1,4 @@ -/obj/effect/proc_holder/spell/targeted/wizard/mind_transfer +/obj/effect/proc_holder/spell/targeted/mind_transfer name = "Mind Transfer" desc = "This spell allows the user to switch bodies with a target." @@ -25,7 +25,7 @@ Urist: I don't feel like figuring out how you store object spells so I'm leaving Make sure spells that are removed from spell_list are actually removed and deleted when mind transfering. Also, you never added distance checking after target is selected. I've went ahead and did that. */ -/obj/effect/proc_holder/spell/targeted/wizard/mind_transfer/cast(list/targets,mob/user = usr) +/obj/effect/proc_holder/spell/targeted/mind_transfer/cast(list/targets,mob/user = usr) if(!targets.len) user << "No mind found." return @@ -61,7 +61,7 @@ Also, you never added distance checking after target is selected. I've went ahea //SPELL LOSS BEGIN //NOTE: The caster must ALWAYS keep mind transfer, even when other spells are lost. - var/obj/effect/proc_holder/spell/targeted/wizard/mind_transfer/m_transfer = locate() in user.spell_list//Find mind transfer directly. + var/obj/effect/proc_holder/spell/targeted/mind_transfer/m_transfer = locate() in user.spell_list//Find mind transfer directly. var/list/checked_spells = user.spell_list checked_spells -= m_transfer //Remove Mind Transfer from the list. diff --git a/code/datums/spells/wizard.dm b/code/datums/spells/wizard.dm index 2d555cb1752..28035156969 100644 --- a/code/datums/spells/wizard.dm +++ b/code/datums/spells/wizard.dm @@ -1,4 +1,4 @@ -/obj/effect/proc_holder/spell/targeted/projectile/wizard/magic_missile +/obj/effect/proc_holder/spell/targeted/projectile/magic_missile name = "Magic Missile" desc = "This spell fires several, slow moving, magic projectiles at nearby targets." @@ -30,11 +30,11 @@ amt_weakened = 5 amt_dam_fire = 10 -/obj/effect/proc_holder/spell/wizard/noclothes +/obj/effect/proc_holder/spell/noclothes name = "No Clothes" desc = "This is a placeholder for knowing if you dont need clothes for any spell" -/obj/effect/proc_holder/spell/targeted/genetic/wizard/mutate +/obj/effect/proc_holder/spell/targeted/genetic/mutate name = "Mutate" desc = "This spell causes you to turn into a hulk and gain laser vision for a short while." @@ -51,7 +51,7 @@ duration = 300 cooldown_min = 300 //25 deciseconds reduction per rank -/obj/effect/proc_holder/spell/targeted/inflict_handler/wizard/disintegrate +/obj/effect/proc_holder/spell/targeted/inflict_handler/disintegrate name = "Disintegrate" desc = "This spell instantly kills somebody adjacent to you with the vilest of magick." @@ -70,7 +70,7 @@ icon_power_button = "spell_disintegrate" -/obj/effect/proc_holder/spell/targeted/wizard/smoke +/obj/effect/proc_holder/spell/targeted/smoke name = "Smoke" desc = "This spell spawns a cloud of choking smoke at your location and does not require wizard garb." @@ -88,7 +88,7 @@ icon_power_button = "spell_smoke" -/obj/effect/proc_holder/spell/targeted/emplosion/wizard/disable_tech +/obj/effect/proc_holder/spell/targeted/emplosion/disable_tech name = "Disable Tech" desc = "This spell disables all weapons, cameras and most other technology in range." charge_max = 400 @@ -104,7 +104,7 @@ icon_power_button = "spell_tech" -/obj/effect/proc_holder/spell/targeted/turf_teleport/wizard/blink +/obj/effect/proc_holder/spell/targeted/turf_teleport/blink name = "Blink" desc = "This spell randomly teleports you a short distance." @@ -128,7 +128,7 @@ icon_power_button = "spell_blink" -/obj/effect/proc_holder/spell/targeted/area_teleport/wizard/teleport +/obj/effect/proc_holder/spell/targeted/area_teleport/teleport name = "Teleport" desc = "This spell teleports you to a type of area of your selection." @@ -146,7 +146,7 @@ icon_power_button = "spell_teleport" -/obj/effect/proc_holder/spell/aoe_turf/conjure/wizard/forcewall +/obj/effect/proc_holder/spell/aoe_turf/conjure/forcewall name = "Forcewall" desc = "This spell creates an unbreakable wall that lasts for 30 seconds and does not need wizard garb." @@ -163,7 +163,7 @@ icon_power_button = "spell_forcewall" -/obj/effect/proc_holder/spell/aoe_turf/conjure/wizard/carp +/obj/effect/proc_holder/spell/aoe_turf/conjure/carp name = "Summon Carp" desc = "This spell conjures a simple carp." @@ -177,7 +177,7 @@ summon_type = list(/mob/living/simple_animal/hostile/carp) -/obj/effect/proc_holder/spell/aoe_turf/conjure/wizard/construct +/obj/effect/proc_holder/spell/aoe_turf/conjure/construct name = "Artificer" desc = "This spell conjures a construct which may be controlled by Shades" @@ -191,7 +191,7 @@ summon_type = list(/obj/structure/constructshell) -/obj/effect/proc_holder/spell/aoe_turf/conjure/wizard/creature +/obj/effect/proc_holder/spell/aoe_turf/conjure/creature name = "Summon Creature Swarm" desc = "This spell tears the fabric of reality, allowing horrific daemons to spill forth" @@ -205,7 +205,7 @@ summon_type = list(/mob/living/simple_animal/hostile/creature) -/obj/effect/proc_holder/spell/targeted/trigger/wizard/blind +/obj/effect/proc_holder/spell/targeted/trigger/blind name = "Blind" desc = "This spell temporarily blinds a single person and does not require wizard garb." @@ -229,7 +229,7 @@ disabilities = 1 duration = 300 -/obj/effect/proc_holder/spell/targeted/inflict_handler/wizard/flesh_to_stone +/obj/effect/proc_holder/spell/targeted/inflict_handler/flesh_to_stone name = "Flesh to Stone" desc = "This spell turns a single person into an inert statue for a long period of time." @@ -246,7 +246,7 @@ icon_power_button = "spell_stone" -/obj/effect/proc_holder/spell/dumbfire/wizard/fireball +/obj/effect/proc_holder/spell/dumbfire/fireball name = "Fireball" desc = "This spell fires a fireball at a target and does not require wizard garb." diff --git a/code/game/gamemodes/wizard/artefact.dm b/code/game/gamemodes/wizard/artefact.dm index b62dbed621e..36af0c78cc8 100644 --- a/code/game/gamemodes/wizard/artefact.dm +++ b/code/game/gamemodes/wizard/artefact.dm @@ -60,21 +60,21 @@ M << "You are the [H.real_name]'s apprentice! You are bound by magic contract to follow their orders and help them in accomplishing their goals." switch(href_list["school"]) if("destruction") - M.spell_list += new /obj/effect/proc_holder/spell/targeted/projectile/wizard/magic_missile(M) - M.spell_list += new /obj/effect/proc_holder/spell/dumbfire/wizard/fireball(M) + M.spell_list += new /obj/effect/proc_holder/spell/targeted/projectile/magic_missile(M) + M.spell_list += new /obj/effect/proc_holder/spell/dumbfire/fireball(M) M << "Your service has not gone unrewarded, however. Studying under [H.real_name], you have learned powerful, destructive spells. You are able to cast magic missile and fireball." if("bluespace") - M.spell_list += new /obj/effect/proc_holder/spell/targeted/area_teleport/wizard/teleport(M) - M.spell_list += new /obj/effect/proc_holder/spell/targeted/wizard/ethereal_jaunt(M) + M.spell_list += new /obj/effect/proc_holder/spell/targeted/area_teleport/teleport(M) + M.spell_list += new /obj/effect/proc_holder/spell/targeted/ethereal_jaunt(M) M << "Your service has not gone unrewarded, however. Studying under [H.real_name], you have learned reality bending mobility spells. You are able to cast teleport and ethereal jaunt." if("healing") - M.spell_list += new /obj/effect/proc_holder/spell/targeted/wizard/charge(M) - M.spell_list += new /obj/effect/proc_holder/spell/aoe_turf/conjure/wizard/forcewall(M) + M.spell_list += new /obj/effect/proc_holder/spell/targeted/charge(M) + M.spell_list += new /obj/effect/proc_holder/spell/aoe_turf/conjure/forcewall(M) M.equip_to_slot_or_del(new /obj/item/weapon/gun/magic/staff/healing(M), slot_r_hand) M << "Your service has not gone unrewarded, however. Studying under [H.real_name], you have learned livesaving survival spells. You are able to cast charge and forcewall." if("robeless") - M.spell_list += new /obj/effect/proc_holder/spell/aoe_turf/wizard/knock(M) - M.spell_list += new /obj/effect/proc_holder/spell/targeted/wizard/mind_transfer(M) + M.spell_list += new /obj/effect/proc_holder/spell/aoe_turf/knock(M) + M.spell_list += new /obj/effect/proc_holder/spell/targeted/mind_transfer(M) M << "Your service has not gone unrewarded, however. Studying under [H.real_name], you have learned stealthy, robeless spells. You are able to cast knock and mindswap." M.update_power_buttons() M.equip_to_slot_or_del(new /obj/item/device/radio/headset(M), slot_l_ear) diff --git a/code/game/gamemodes/wizard/spellbook.dm b/code/game/gamemodes/wizard/spellbook.dm index 083c98775b9..6660a5b9bd8 100644 --- a/code/game/gamemodes/wizard/spellbook.dm +++ b/code/game/gamemodes/wizard/spellbook.dm @@ -192,68 +192,68 @@ switch(href_list["spell_choice"]) if("noclothes") feedback_add_details("wizard_spell_learned","NC") - H.spell_list += new /obj/effect/proc_holder/spell/wizard/noclothes + H.spell_list += new /obj/effect/proc_holder/spell/noclothes temp = "This teaches you how to use your spells without your magical garb, truely you are the wizardest." uses-- if("magicmissile") feedback_add_details("wizard_spell_learned","MM") //please do not change the abbreviation to keep data processing consistent. Add a unique id to any new spells - H.spell_list += new /obj/effect/proc_holder/spell/targeted/projectile/wizard/magic_missile(H) + H.spell_list += new /obj/effect/proc_holder/spell/targeted/projectile/magic_missile(H) temp = "You have learned magic missile." if("fireball") feedback_add_details("wizard_spell_learned","FB") //please do not change the abbreviation to keep data processing consistent. Add a unique id to any new spells - H.spell_list += new /obj/effect/proc_holder/spell/dumbfire/wizard/fireball(H) + H.spell_list += new /obj/effect/proc_holder/spell/dumbfire/fireball(H) temp = "You have learned fireball." if("disintegrate") feedback_add_details("wizard_spell_learned","DG") //please do not change the abbreviation to keep data processing consistent. Add a unique id to any new spells - H.spell_list += new /obj/effect/proc_holder/spell/targeted/inflict_handler/wizard/disintegrate(H) + H.spell_list += new /obj/effect/proc_holder/spell/targeted/inflict_handler/disintegrate(H) temp = "You have learned disintegrate." if("disabletech") feedback_add_details("wizard_spell_learned","DT") //please do not change the abbreviation to keep data processing consistent. Add a unique id to any new spells - H.spell_list += new /obj/effect/proc_holder/spell/targeted/emplosion/wizard/disable_tech(H) + H.spell_list += new /obj/effect/proc_holder/spell/targeted/emplosion/disable_tech(H) temp = "You have learned disable technology." if("smoke") feedback_add_details("wizard_spell_learned","SM") //please do not change the abbreviation to keep data processing consistent. Add a unique id to any new spells - H.spell_list += new /obj/effect/proc_holder/spell/targeted/wizard/smoke(H) + H.spell_list += new /obj/effect/proc_holder/spell/targeted/smoke(H) temp = "You have learned smoke." if("blind") feedback_add_details("wizard_spell_learned","BD") //please do not change the abbreviation to keep data processing consistent. Add a unique id to any new spells - H.spell_list += new /obj/effect/proc_holder/spell/targeted/trigger/wizard/blind(H) + H.spell_list += new /obj/effect/proc_holder/spell/targeted/trigger/blind(H) temp = "You have learned blind." if("mindswap") feedback_add_details("wizard_spell_learned","MT") //please do not change the abbreviation to keep data processing consistent. Add a unique id to any new spells - H.spell_list += new /obj/effect/proc_holder/spell/targeted/wizard/mind_transfer(H) + H.spell_list += new /obj/effect/proc_holder/spell/targeted/mind_transfer(H) temp = "You have learned mindswap." if("forcewall") feedback_add_details("wizard_spell_learned","FW") //please do not change the abbreviation to keep data processing consistent. Add a unique id to any new spells - H.spell_list += new /obj/effect/proc_holder/spell/aoe_turf/conjure/wizard/forcewall(H) + H.spell_list += new /obj/effect/proc_holder/spell/aoe_turf/conjure/forcewall(H) temp = "You have learned forcewall." if("blink") feedback_add_details("wizard_spell_learned","BL") //please do not change the abbreviation to keep data processing consistent. Add a unique id to any new spells - H.spell_list += new /obj/effect/proc_holder/spell/targeted/turf_teleport/wizard/blink(H) + H.spell_list += new /obj/effect/proc_holder/spell/targeted/turf_teleport/blink(H) temp = "You have learned blink." if("teleport") feedback_add_details("wizard_spell_learned","TP") //please do not change the abbreviation to keep data processing consistent. Add a unique id to any new spells - H.spell_list += new /obj/effect/proc_holder/spell/targeted/area_teleport/wizard/teleport(H) + H.spell_list += new /obj/effect/proc_holder/spell/targeted/area_teleport/teleport(H) temp = "You have learned teleport." if("mutate") feedback_add_details("wizard_spell_learned","MU") //please do not change the abbreviation to keep data processing consistent. Add a unique id to any new spells - H.spell_list += new /obj/effect/proc_holder/spell/targeted/genetic/wizard/mutate(H) + H.spell_list += new /obj/effect/proc_holder/spell/targeted/genetic/mutate(H) temp = "You have learned mutate." if("etherealjaunt") feedback_add_details("wizard_spell_learned","EJ") //please do not change the abbreviation to keep data processing consistent. Add a unique id to any new spells - H.spell_list += new /obj/effect/proc_holder/spell/targeted/wizard/ethereal_jaunt(H) + H.spell_list += new /obj/effect/proc_holder/spell/targeted/ethereal_jaunt(H) temp = "You have learned ethereal jaunt." if("knock") feedback_add_details("wizard_spell_learned","KN") //please do not change the abbreviation to keep data processing consistent. Add a unique id to any new spells - H.spell_list += new /obj/effect/proc_holder/spell/aoe_turf/wizard/knock(H) + H.spell_list += new /obj/effect/proc_holder/spell/aoe_turf/knock(H) temp = "You have learned knock." if("horseman") feedback_add_details("wizard_spell_learned","HH") //please do not change the abbreviation to keep data processing consistent. Add a unique id to any new spells - H.spell_list += new /obj/effect/proc_holder/spell/targeted/wizard/horsemask(H) + H.spell_list += new /obj/effect/proc_holder/spell/targeted/horsemask(H) temp = "You have learned curse of the horseman." if("fleshtostone") feedback_add_details("wizard_spell_learned","FS") //please do not change the abbreviation to keep data processing consistent. Add a unique id to any new spells - H.spell_list += new /obj/effect/proc_holder/spell/targeted/inflict_handler/wizard/flesh_to_stone(H) + H.spell_list += new /obj/effect/proc_holder/spell/targeted/inflict_handler/flesh_to_stone(H) temp = "You have learned flesh to stone." if("summonguns") if(max_uses < 5) @@ -281,7 +281,7 @@ if("soulstone") feedback_add_details("wizard_spell_learned","SS") //please do not change the abbreviation to keep data processing consistent. Add a unique id to any new spells new /obj/item/weapon/storage/belt/soulstone/full(get_turf(H)) - H.spell_list += new /obj/effect/proc_holder/spell/aoe_turf/conjure/wizard/construct(H) + H.spell_list += new /obj/effect/proc_holder/spell/aoe_turf/conjure/construct(H) temp = "You have purchased a belt full of soulstones and have learned the artificer spell." max_uses-- if("armor") @@ -366,7 +366,7 @@ return /obj/item/weapon/spellbook/oneuse/fireball - spell = /obj/effect/proc_holder/spell/dumbfire/wizard/fireball + spell = /obj/effect/proc_holder/spell/dumbfire/fireball spellname = "fireball" icon_state ="bookfireball" desc = "This book feels warm to the touch." @@ -377,7 +377,7 @@ del(src) /obj/item/weapon/spellbook/oneuse/smoke - spell = /obj/effect/proc_holder/spell/targeted/wizard/smoke + spell = /obj/effect/proc_holder/spell/targeted/smoke spellname = "smoke" icon_state ="booksmoke" desc = "This book is overflowing with the dank arts." @@ -391,7 +391,7 @@ user.nutrition = 0 /obj/item/weapon/spellbook/oneuse/blind - spell = /obj/effect/proc_holder/spell/targeted/trigger/wizard/blind + spell = /obj/effect/proc_holder/spell/targeted/trigger/blind spellname = "blind" icon_state ="bookblind" desc = "This book looks blurry, no matter how you look at it." @@ -402,7 +402,7 @@ user.eye_blind = 10 /obj/item/weapon/spellbook/oneuse/mindswap - spell = /obj/effect/proc_holder/spell/targeted/wizard/mind_transfer + spell = /obj/effect/proc_holder/spell/targeted/mind_transfer spellname = "mindswap" icon_state ="bookmindswap" desc = "This book's cover is pristine, though its pages look ragged and torn." @@ -419,7 +419,7 @@ wabbajack(user) /obj/item/weapon/spellbook/oneuse/forcewall - spell = /obj/effect/proc_holder/spell/aoe_turf/conjure/wizard/forcewall + spell = /obj/effect/proc_holder/spell/aoe_turf/conjure/forcewall spellname = "forcewall" icon_state ="bookforcewall" desc = "This book has a dedication to mimes everywhere inside the front cover." @@ -433,7 +433,7 @@ /obj/item/weapon/spellbook/oneuse/knock - spell = /obj/effect/proc_holder/spell/aoe_turf/wizard/knock + spell = /obj/effect/proc_holder/spell/aoe_turf/knock spellname = "knock" icon_state ="bookknock" desc = "This book is hard to hold closed properly." @@ -445,7 +445,7 @@ user.Weaken(20) /obj/item/weapon/spellbook/oneuse/horsemask - spell = /obj/effect/proc_holder/spell/targeted/wizard/horsemask + spell = /obj/effect/proc_holder/spell/targeted/horsemask spellname = "horses" icon_state ="bookhorses" desc = "This book is more horse than your mind has room for." @@ -464,7 +464,7 @@ user <<"I say thee neigh" /obj/item/weapon/spellbook/oneuse/charge - spell = /obj/effect/proc_holder/spell/targeted/wizard/charge + spell = /obj/effect/proc_holder/spell/targeted/charge spellname = "charging" icon_state ="bookcharge" desc = "This book is made of 100% post-consumer wizard." diff --git a/code/modules/admin/admin_verbs.dm b/code/modules/admin/admin_verbs.dm index c9ff0c306a7..95ee8e9bc58 100644 --- a/code/modules/admin/admin_verbs.dm +++ b/code/modules/admin/admin_verbs.dm @@ -395,8 +395,7 @@ var/list/admin_verbs_mod = list( set category = "Event" set name = "Give Spell" set desc = "Gives a spell to a mob." - var/list/spellList = typesof(/obj/effect/proc_holder/spell/targeted/wizard) + typesof(/obj/effect/proc_holder/spell/aoe_turf/wizard) + typesof(/obj/effect/proc_holder/spell/targeted/projectile/wizard) + typesof(/obj/effect/proc_holder/spell/wizard) + typesof(/obj/effect/proc_holder/spell/targeted/genetic/wizard) + typesof(/obj/effect/proc_holder/spell/targeted/inflict_handler/wizard) + typesof(/obj/effect/proc_holder/spell/targeted/emplosion/wizard) + typesof(/obj/effect/proc_holder/spell/targeted/turf_teleport/wizard) + typesof(/obj/effect/proc_holder/spell/targeted/area_teleport/wizard) + typesof(/obj/effect/proc_holder/spell/aoe_turf/conjure/wizard) + typesof(/obj/effect/proc_holder/spell/targeted/trigger/wizard) + typesof(/obj/effect/proc_holder/spell/dumbfire/wizard) - var/obj/effect/proc_holder/spell/S = input("Choose the spell to give to that guy", "ABRAKADABRA") as null|anything in spellList + var/obj/effect/proc_holder/spell/S = input("Choose the spell to give to that guy", "ABRAKADABRA") as null|anything in spells if(!S) return T.spell_list += new S T.update_power_buttons() diff --git a/code/modules/mob/living/simple_animal/constructs.dm b/code/modules/mob/living/simple_animal/constructs.dm index 6af036ef89d..862076549ba 100644 --- a/code/modules/mob/living/simple_animal/constructs.dm +++ b/code/modules/mob/living/simple_animal/constructs.dm @@ -222,7 +222,7 @@ speed = -1 see_in_dark = 7 attack_sound = 'sound/weapons/bladeslice.ogg' - construct_spells = list(/obj/effect/proc_holder/spell/targeted/wizard/ethereal_jaunt/shift) + construct_spells = list(/obj/effect/proc_holder/spell/targeted/ethereal_jaunt/shift)