diff --git a/code/datums/spell.dm b/code/datums/spell.dm index 5657828fd3f..8ad1b79793c 100644 --- a/code/datums/spell.dm +++ b/code/datums/spell.dm @@ -67,7 +67,6 @@ GLOBAL_LIST_INIT(spells, typesof(/datum/spell)) /datum/spell var/name = "Spell" // Only rename this if the spell you're making is not abstract var/desc = "A wizard spell." - var/school = "evocation" //not relevant at now, but may be important later if there are changes to how spells work. the ones I used for now will probably be changed... maybe spell presets? lacking flexibility but with some other benefit? ///recharge time in deciseconds var/base_cooldown = 10 SECONDS var/starts_charged = TRUE //Does this spell start ready to go? diff --git a/code/datums/spells/banana_touch.dm b/code/datums/spells/banana_touch.dm index 6f7de00bd5a..b7d823bccdb 100644 --- a/code/datums/spells/banana_touch.dm +++ b/code/datums/spells/banana_touch.dm @@ -4,7 +4,6 @@ stun them with a loud HONK, and mutate them to make them more entertaining! \ Warning : Effects are permanent on non-wizards." hand_path = /obj/item/melee/touch_attack/banana - school = "transmutation" base_cooldown = 30 SECONDS clothes_req = TRUE diff --git a/code/datums/spells/chaplain_bless.dm b/code/datums/spells/chaplain_bless.dm index de9741b5365..970cebd638c 100644 --- a/code/datums/spells/chaplain_bless.dm +++ b/code/datums/spells/chaplain_bless.dm @@ -3,7 +3,6 @@ name = "Bless" desc = "Blesses a single person." - school = "transmutation" base_cooldown = 6 SECONDS clothes_req = FALSE invocation = "none" diff --git a/code/datums/spells/charge.dm b/code/datums/spells/charge.dm index a35a923267b..50b5f3a67e8 100644 --- a/code/datums/spells/charge.dm +++ b/code/datums/spells/charge.dm @@ -1,7 +1,6 @@ /datum/spell/charge name = "Charge" desc = "This spell can be used to recharge a variety of things in your hands, from magical artifacts to electrical components. A creative wizard can even use it to grant magical power to a fellow magic user." - school = "transmutation" base_cooldown = 1 MINUTES clothes_req = FALSE invocation = "DIRI CEL" diff --git a/code/datums/spells/chef.dm b/code/datums/spells/chef.dm index b07004f5c87..a28438b397a 100644 --- a/code/datums/spells/chef.dm +++ b/code/datums/spells/chef.dm @@ -1,7 +1,6 @@ /datum/spell/expert_chef name = "Expert Chef Knowledge" desc = "Find things you can cook with the items in reach." - school = "chef" clothes_req = FALSE base_cooldown = 5 SECONDS human_req = TRUE diff --git a/code/datums/spells/cluwne.dm b/code/datums/spells/cluwne.dm index 58279b573f4..d2d81b67288 100644 --- a/code/datums/spells/cluwne.dm +++ b/code/datums/spells/cluwne.dm @@ -3,8 +3,6 @@ desc = "Turns the target into a fat and cursed monstrosity of a clown." hand_path = /obj/item/melee/touch_attack/cluwne - school = "transmutation" - base_cooldown = 1 MINUTES clothes_req = TRUE cooldown_min = 200 //100 deciseconds reduction per rank diff --git a/code/datums/spells/conjure_item.dm b/code/datums/spells/conjure_item.dm index 45c0b465f24..bc3cc721549 100644 --- a/code/datums/spells/conjure_item.dm +++ b/code/datums/spells/conjure_item.dm @@ -5,7 +5,6 @@ clothes_req = FALSE var/obj/item/item var/item_type = /obj/item/banhammer - school = "conjuration" base_cooldown = 15 SECONDS cooldown_min = 10 diff --git a/code/datums/spells/construct_spells.dm b/code/datums/spells/construct_spells.dm index 0812bae7a35..69f0a33dfcb 100644 --- a/code/datums/spells/construct_spells.dm +++ b/code/datums/spells/construct_spells.dm @@ -13,7 +13,6 @@ desc = "This spell constructs a cult floor." action_icon_state = "floorconstruct" action_background_icon_state = "bg_cult" - school = "conjuration" base_cooldown = 20 clothes_req = FALSE invocation = "none" @@ -27,7 +26,6 @@ desc = "This spell constructs a cult wall." action_icon_state = "cultforcewall" action_background_icon_state = "bg_cult" - school = "conjuration" base_cooldown = 100 clothes_req = FALSE invocation = "none" @@ -39,7 +37,6 @@ /datum/spell/aoe/conjure/build/wall/reinforced name = "Greater Construction" desc = "This spell constructs a reinforced metal wall." - school = "conjuration" base_cooldown = 300 clothes_req = FALSE invocation = "none" @@ -55,7 +52,6 @@ desc = "This spell uses vile sorcery to create a spirit-trapping soulstone." action_icon_state = "summonsoulstone" action_background_icon_state = "bg_cult" - school = "conjuration" base_cooldown = 3000 clothes_req = FALSE invocation = "none" @@ -77,7 +73,6 @@ desc = "This spell uses dark magic to craft an unholy beacon. Heals cultists, and makes a handy light source." action_icon_state = "pylon" action_background_icon_state = "bg_cult" - school = "conjuration" base_cooldown = 200 clothes_req = FALSE invocation = "none" @@ -92,7 +87,6 @@ desc = "This spell creates a temporary forcefield to shield yourself and allies from incoming fire." action_icon_state = "cultforcewall" action_background_icon_state = "bg_cult" - school = "transmutation" base_cooldown = 300 clothes_req = FALSE invocation = "none" @@ -140,7 +134,6 @@ name = "Lesser Magic Missile" desc = "This spell fires several, slow moving, magic projectiles at nearby targets." action_background_icon_state = "bg_cult" - school = "evocation" base_cooldown = 400 clothes_req = FALSE invocation = "none" @@ -167,7 +160,6 @@ desc = "This spell spawns a cloud of paralysing smoke." action_icon_state = "parasmoke" action_background_icon_state = "bg_cult" - school = "conjuration" base_cooldown = 200 clothes_req = FALSE invocation = "none" diff --git a/code/datums/spells/disguise_self.dm b/code/datums/spells/disguise_self.dm index f9c5a26a532..adffa4f4205 100644 --- a/code/datums/spells/disguise_self.dm +++ b/code/datums/spells/disguise_self.dm @@ -4,7 +4,6 @@ The illusion isn't strong enough for more thorough examinations, but will fool people at a glance. \ You will lose control over the illusion if you're attacked, shoved, or a object is thrown at you, no matter how soft." - school = "illusion" base_cooldown = 3 SECONDS clothes_req = FALSE invocation_type = "none" diff --git a/code/datums/spells/ethereal_jaunt.dm b/code/datums/spells/ethereal_jaunt.dm index b671244dfc8..a6b14329690 100644 --- a/code/datums/spells/ethereal_jaunt.dm +++ b/code/datums/spells/ethereal_jaunt.dm @@ -2,7 +2,6 @@ name = "Ethereal Jaunt" desc = "This spell creates your ethereal form, temporarily making you invisible and able to pass through walls." - school = "transmutation" base_cooldown = 300 clothes_req = TRUE invocation = "none" diff --git a/code/datums/spells/fake_gib.dm b/code/datums/spells/fake_gib.dm index 262a8c9cba9..66c2597b5f6 100644 --- a/code/datums/spells/fake_gib.dm +++ b/code/datums/spells/fake_gib.dm @@ -3,7 +3,6 @@ desc = "This spell charges your hand with vile energy that can be used to violently explode victims." hand_path = "/obj/item/melee/touch_attack/fake_disintegrate" - school = "evocation" base_cooldown = 600 clothes_req = FALSE cooldown_min = 200 //100 deciseconds reduction per rank diff --git a/code/datums/spells/horsemask.dm b/code/datums/spells/horsemask.dm index fa6cd24a8a8..f0614edddd5 100644 --- a/code/datums/spells/horsemask.dm +++ b/code/datums/spells/horsemask.dm @@ -1,7 +1,6 @@ /datum/spell/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" base_cooldown = 150 clothes_req = FALSE stat_allowed = CONSCIOUS diff --git a/code/datums/spells/infinite_guns.dm b/code/datums/spells/infinite_guns.dm index b18625a3d5f..a7666232db5 100644 --- a/code/datums/spells/infinite_guns.dm +++ b/code/datums/spells/infinite_guns.dm @@ -3,7 +3,6 @@ desc = "Why reload when you have infinite guns? Summons an unending stream of bolt action rifles. Requires both hands free to use." invocation_type = "none" - school = "conjuration" base_cooldown = 600 clothes_req = TRUE cooldown_min = 10 //Gun wizard @@ -25,7 +24,6 @@ name = "Rapid-fire Fireball" desc = "Multiple Fireballs. Need I explain more? Requires both hands free to use." - school = "evocation" base_cooldown = 30 SECONDS clothes_req = FALSE invocation = "ONI SOMA-SOMA-SOMA" diff --git a/code/datums/spells/knock.dm b/code/datums/spells/knock.dm index 9689858794a..816c529a0de 100644 --- a/code/datums/spells/knock.dm +++ b/code/datums/spells/knock.dm @@ -2,7 +2,6 @@ name = "Knock" desc = "This spell opens nearby doors and does not require wizard garb." - school = "transmutation" base_cooldown = 100 clothes_req = FALSE invocation = "AULIE OXIN FIERA" diff --git a/code/datums/spells/lichdom.dm b/code/datums/spells/lichdom.dm index b40c1a19d49..8440e17efa0 100644 --- a/code/datums/spells/lichdom.dm +++ b/code/datums/spells/lichdom.dm @@ -1,7 +1,6 @@ /datum/spell/lichdom name = "Bind Soul" desc = "A dark necromantic pact that can forever bind your soul to an item of your choosing. So long as both your body and the item remain intact and on the same plane you can revive from death, though the time between reincarnations grows steadily with use." - school = "necromancy" base_cooldown = 10 clothes_req = FALSE centcom_cancast = FALSE diff --git a/code/datums/spells/mime.dm b/code/datums/spells/mime.dm index cb8c1a4c182..2e139981d64 100644 --- a/code/datums/spells/mime.dm +++ b/code/datums/spells/mime.dm @@ -1,7 +1,6 @@ /datum/spell/aoe/conjure/build/mime_wall name = "Invisible Wall" desc = "The mime's performance transmutates into physical reality." - school = "mime" summon_type = list(/obj/structure/forcefield/mime) invocation_type = "emote" invocation_emote_self = "You form a wall in front of yourself." @@ -30,7 +29,6 @@ /datum/spell/mime/speak name = "Speech" desc = "Make or break a vow of silence." - school = "mime" clothes_req = FALSE base_cooldown = 5 MINUTES human_req = TRUE @@ -63,7 +61,6 @@ /datum/spell/forcewall/mime name = "Invisible Greater Wall" desc = "Form an invisible three tile wide blockade." - school = "mime" wall_type = /obj/effect/forcefield/mime invocation_type = "emote" invocation_emote_self = "You form a blockade in front of yourself." @@ -87,7 +84,6 @@ /datum/spell/mime/fingergun name = "Finger Gun" desc = "Shoot lethal, silencing bullets out of your fingers! 3 bullets available per cast. Use your fingers to holster them manually." - school = "mime" clothes_req = FALSE base_cooldown = 30 SECONDS human_req = TRUE diff --git a/code/datums/spells/mime_malaise.dm b/code/datums/spells/mime_malaise.dm index f012431d647..63b1c3e2f29 100644 --- a/code/datums/spells/mime_malaise.dm +++ b/code/datums/spells/mime_malaise.dm @@ -4,7 +4,6 @@ stun them so that they may contemplate Art, and silence them. \ Warning : Effects are permanent on non-wizards." hand_path = /obj/item/melee/touch_attack/mime_malaise - school = "transmutation" base_cooldown = 300 clothes_req = TRUE diff --git a/code/datums/spells/mind_transfer.dm b/code/datums/spells/mind_transfer.dm index 441ea87cbe8..4690dec4972 100644 --- a/code/datums/spells/mind_transfer.dm +++ b/code/datums/spells/mind_transfer.dm @@ -2,7 +2,6 @@ name = "Mind Transfer" desc = "This spell allows the user to switch bodies with a target." - school = "transmutation" base_cooldown = 600 clothes_req = FALSE invocation = "GIN'YU CAPAN" diff --git a/code/datums/spells/spacetime_dist.dm b/code/datums/spells/spacetime_dist.dm index 5b26c280c59..2e7a45c95ee 100644 --- a/code/datums/spells/spacetime_dist.dm +++ b/code/datums/spells/spacetime_dist.dm @@ -7,7 +7,6 @@ sound = 'sound/magic/strings.ogg' action_icon_state = "spacetime" - school = "transmutation" base_cooldown = 30 SECONDS clothes_req = TRUE invocation = "none" diff --git a/code/datums/spells/summonitem.dm b/code/datums/spells/summonitem.dm index 2c4ceebcc56..53fad3cca44 100644 --- a/code/datums/spells/summonitem.dm +++ b/code/datums/spells/summonitem.dm @@ -1,7 +1,6 @@ /datum/spell/summonitem name = "Instant Summons" desc = "This spell can be used to recall a previously marked item to your hand from anywhere in the universe." - school = "transmutation" base_cooldown = 100 clothes_req = FALSE invocation = "GAR YOK" diff --git a/code/datums/spells/touch_attacks.dm b/code/datums/spells/touch_attacks.dm index 87a9e7c91ed..f3aca8ff3fc 100644 --- a/code/datums/spells/touch_attacks.dm +++ b/code/datums/spells/touch_attacks.dm @@ -53,7 +53,6 @@ desc = "This spell charges your hand with vile energy that can be used to violently explode victims." hand_path = /obj/item/melee/touch_attack/disintegrate - school = "evocation" base_cooldown = 600 clothes_req = TRUE cooldown_min = 200 //100 deciseconds reduction per rank @@ -65,7 +64,6 @@ desc = "This spell charges your hand with the power to turn victims into inert statues for a long period of time." hand_path = /obj/item/melee/touch_attack/fleshtostone - school = "transmutation" base_cooldown = 600 clothes_req = TRUE cooldown_min = 200 //100 deciseconds reduction per rank @@ -77,7 +75,6 @@ desc = "This spell charges your hand with the power to turn your victims into marketable plushies!" hand_path = /obj/item/melee/touch_attack/plushify - school = "transmutation" base_cooldown = 600 clothes_req = TRUE cooldown_min = 200 //100 deciseconds reduction per rank diff --git a/code/datums/spells/wizard_spells.dm b/code/datums/spells/wizard_spells.dm index 3b70407a1a8..5466ee845cf 100644 --- a/code/datums/spells/wizard_spells.dm +++ b/code/datums/spells/wizard_spells.dm @@ -2,7 +2,6 @@ name = "Magic Missile" desc = "This spell fires several, slow moving, magic projectiles at nearby targets." - school = "evocation" base_cooldown = 200 clothes_req = TRUE invocation = "FORTI GY AMA" @@ -40,7 +39,6 @@ name = "Honk Missile" desc = "This spell fires several, slow moving, magic bikehorns at nearby targets." - school = "evocation" base_cooldown = 6 SECONDS clothes_req = FALSE invocation = "HONK GY AMA" @@ -87,7 +85,6 @@ name = "Mutate" desc = "This spell causes you to turn into a hulk and gain laser vision for a short while." - school = "transmutation" base_cooldown = 400 clothes_req = TRUE invocation = "BIRUZ BENNAR" @@ -113,7 +110,6 @@ name = "Smoke" desc = "This spell spawns a cloud of choking smoke at your location and does not require wizard garb." - school = "conjuration" base_cooldown = 120 clothes_req = FALSE invocation = "none" @@ -146,7 +142,6 @@ name = "Blink" desc = "This spell randomly teleports you a short distance." - school = "abjuration" base_cooldown = 20 clothes_req = TRUE invocation = "none" @@ -174,7 +169,6 @@ name = "Teleport" desc = "This spell teleports you to a type of area of your selection." - school = "abjuration" base_cooldown = 600 clothes_req = TRUE invocation = "SCYAR NILA" @@ -194,7 +188,6 @@ name = "Return to Teacher" desc = "This spell teleports you back to your teacher." - school = "abjuration" base_cooldown = 30 SECONDS clothes_req = TRUE invocation = "SCYAR TESO" @@ -217,7 +210,6 @@ name = "Force Wall" desc = "This spell creates a 3 tile wide unbreakable wall that only you can pass through, and does not need wizard garb. Lasts 30 seconds." - school = "transmutation" base_cooldown = 15 SECONDS clothes_req = FALSE invocation = "TARCOL MINTI ZHERI" @@ -259,7 +251,6 @@ name = "Summon Carp" desc = "This spell conjures a simple carp." - school = "conjuration" base_cooldown = 1200 clothes_req = TRUE invocation = "NOUK FHUNMM SACP RISSKA" @@ -274,7 +265,6 @@ name = "Artificer" desc = "This spell conjures a construct which may be controlled by Shades." - school = "conjuration" base_cooldown = 600 clothes_req = FALSE invocation = "none" @@ -290,7 +280,6 @@ name = "Summon Creature Swarm" desc = "This spell tears the fabric of reality, allowing horrific daemons to spill forth." - school = "conjuration" base_cooldown = 1200 clothes_req = FALSE invocation = "IA IA" @@ -304,7 +293,6 @@ /datum/spell/blind name = "Blind" desc = "This spell temporarily blinds a single person and does not require wizard garb." - school = "transmutation" base_cooldown = 15 SECONDS clothes_req = FALSE invocation = "STI KALY" @@ -335,7 +323,6 @@ name = "Fireball" desc = "This spell fires a fireball at a target and does not require wizard garb." - school = "evocation" base_cooldown = 60 clothes_req = FALSE invocation = "ONI SOMA" @@ -478,7 +465,6 @@ /datum/spell/corpse_explosion name = "Corpse Explosion" desc = "Fills a corpse with energy, causing it to explode violently." - school = "evocation" base_cooldown = 5 SECONDS clothes_req = TRUE invocation = "JAH ITH BER" diff --git a/code/game/gamemodes/miniantags/pulsedemon/pulsedemon_abilities.dm b/code/game/gamemodes/miniantags/pulsedemon/pulsedemon_abilities.dm index f611824bcf1..d248e460ba2 100644 --- a/code/game/gamemodes/miniantags/pulsedemon/pulsedemon_abilities.dm +++ b/code/game/gamemodes/miniantags/pulsedemon/pulsedemon_abilities.dm @@ -9,7 +9,6 @@ #define PD_UPGRADE_MAX_CHARGE "Capacity" /datum/spell/pulse_demon - school = "pulse demon" clothes_req = FALSE action_background_icon_state = "bg_pulsedemon" var/locked = TRUE diff --git a/code/modules/antagonists/vampire/vampire_powers/gargantua_powers.dm b/code/modules/antagonists/vampire/vampire_powers/gargantua_powers.dm index 11b7960235b..20071ab2ebf 100644 --- a/code/modules/antagonists/vampire/vampire_powers/gargantua_powers.dm +++ b/code/modules/antagonists/vampire/vampire_powers/gargantua_powers.dm @@ -132,7 +132,6 @@ action_icon_state = "demonic_grasp" - school = "vampire" action_background_icon_state = "bg_vampire" sound = null invocation_type = "none" diff --git a/code/modules/antagonists/vampire/vampire_powers/hemomancer_powers.dm b/code/modules/antagonists/vampire/vampire_powers/hemomancer_powers.dm index a4badcefff0..1f08f7b4289 100644 --- a/code/modules/antagonists/vampire/vampire_powers/hemomancer_powers.dm +++ b/code/modules/antagonists/vampire/vampire_powers/hemomancer_powers.dm @@ -270,7 +270,6 @@ gain_desc = "You have gained the ability to shift into a pool of blood, allowing you to evade pursuers with great mobility." jaunt_duration = 3 SECONDS clothes_req = FALSE - school = "vampire" action_background_icon_state = "bg_vampire" action_icon_state = "blood_pool" jaunt_type_path = /obj/effect/dummy/spell_jaunt/blood_pool diff --git a/code/modules/antagonists/vampire/vampire_powers/vampire_powers.dm b/code/modules/antagonists/vampire/vampire_powers/vampire_powers.dm index 7bada89589d..ff227c1774b 100644 --- a/code/modules/antagonists/vampire/vampire_powers/vampire_powers.dm +++ b/code/modules/antagonists/vampire/vampire_powers/vampire_powers.dm @@ -13,7 +13,6 @@ return TRUE /datum/spell/vampire - school = "vampire" action_background_icon_state = "bg_vampire" human_req = TRUE clothes_req = FALSE @@ -287,7 +286,6 @@ /datum/spell/vampire/raise_vampires name = "Raise Vampires" desc = "Summons deadly vampires from bluespace." - school = "transmutation" base_cooldown = 100 clothes_req = FALSE human_req = TRUE diff --git a/code/modules/mob/dead/observer/spells.dm b/code/modules/mob/dead/observer/spells.dm index 5128f8a9bb2..959a7e5f724 100644 --- a/code/modules/mob/dead/observer/spells.dm +++ b/code/modules/mob/dead/observer/spells.dm @@ -18,7 +18,6 @@ GLOBAL_LIST_INIT(boo_phrases, list( ghost = TRUE action_icon_state = "boo" - school = "transmutation" base_cooldown = 2 MINUTES starts_charged = FALSE clothes_req = FALSE