diff --git a/code/game/objects/items/storage/belt.dm b/code/game/objects/items/storage/belt.dm index 1e55164fd3d..ba0d338d333 100644 --- a/code/game/objects/items/storage/belt.dm +++ b/code/game/objects/items/storage/belt.dm @@ -545,7 +545,7 @@ /obj/item/storage/belt/wands/full/PopulateContents() new /obj/item/gun/magic/wand/death(src) new /obj/item/gun/magic/wand/resurrection(src) - new /obj/item/gun/magic/wand/polymorph(src) + new /obj/item/gun/magic/wand/fireball(src) //SKYRAT EDIT - Trades polymorph for second fireball new /obj/item/gun/magic/wand/teleport(src) new /obj/item/gun/magic/wand/door(src) new /obj/item/gun/magic/wand/fireball(src) diff --git a/code/modules/antagonists/wizard/equipment/spellbook.dm b/code/modules/antagonists/wizard/equipment/spellbook.dm index 6cb147d071e..dca770bbda3 100644 --- a/code/modules/antagonists/wizard/equipment/spellbook.dm +++ b/code/modules/antagonists/wizard/equipment/spellbook.dm @@ -348,11 +348,14 @@ log_spellbook("[key_name(user)] bought [src] for [cost] points") SSblackbox.record_feedback("tally", "wizard_spell_learned", 1, name) return TRUE - +//SKYRAT EDIT REMOVAL BEGIN +/* /datum/spellbook_entry/item/staffchange name = "Staff of Change" desc = "An artefact that spits bolts of coruscating energy which cause the target's very form to reshape itself." item_path = /obj/item/gun/magic/staff/change +*/ +//SKYRAT EDIT REMOVAL END /datum/spellbook_entry/item/staffanimation name = "Staff of Animation" diff --git a/code/modules/projectiles/guns/magic/staff.dm b/code/modules/projectiles/guns/magic/staff.dm index 35593a520e5..343d7c78f02 100644 --- a/code/modules/projectiles/guns/magic/staff.dm +++ b/code/modules/projectiles/guns/magic/staff.dm @@ -48,11 +48,11 @@ recharge_rate = 2 no_den_usage = 1 school = SCHOOL_FORBIDDEN //this staff is evil. okay? it just is. look at this projectile type list. this is wrong. - var/allowed_projectile_types = list(/obj/projectile/magic/change, /obj/projectile/magic/animate, /obj/projectile/magic/resurrection, + var/allowed_projectile_types = list(/obj/projectile/magic/animate, /obj/projectile/magic/resurrection, /obj/projectile/magic/death, /obj/projectile/magic/teleport, /obj/projectile/magic/door, /obj/projectile/magic/aoe/fireball, /obj/projectile/magic/spellblade, /obj/projectile/magic/arcane_barrage, /obj/projectile/magic/locker, /obj/projectile/magic/flying, /obj/projectile/magic/bounty, /obj/projectile/magic/antimagic, /obj/projectile/magic/fetch, /obj/projectile/magic/sapping, - /obj/projectile/magic/necropotence, /obj/projectile/magic, /obj/projectile/temp/chill, /obj/projectile/magic/wipe) + /obj/projectile/magic/necropotence, /obj/projectile/magic, /obj/projectile/temp/chill, /obj/projectile/magic/wipe) //SKYRAT EDIT - Removes /obj/projectile/magic/change /obj/item/gun/magic/staff/chaos/process_fire(atom/target, mob/living/user, message = TRUE, params = null, zone_override = "", bonus_spread = 0) chambered.projectile_type = pick(allowed_projectile_types) diff --git a/code/modules/spells/spell_types/rightandwrong.dm b/code/modules/spells/spell_types/rightandwrong.dm index f6d2dc854c2..36f0c38de5a 100644 --- a/code/modules/spells/spell_types/rightandwrong.dm +++ b/code/modules/spells/spell_types/rightandwrong.dm @@ -63,10 +63,9 @@ GLOBAL_LIST_INIT(summoned_magic, list( /obj/item/book/granter/spell/barnyard, /obj/item/book/granter/spell/charge, /obj/item/book/granter/spell/summonitem, - /obj/item/gun/magic/wand/nothing, + /obj/item/gun/magic/wand/nothing, //SKYEDIT EDIT - Removes wand of polymorph /obj/item/gun/magic/wand/death, /obj/item/gun/magic/wand/resurrection, - /obj/item/gun/magic/wand/polymorph, /obj/item/gun/magic/wand/teleport, /obj/item/gun/magic/wand/door, /obj/item/gun/magic/wand/fireball, @@ -78,8 +77,7 @@ GLOBAL_LIST_INIT(summoned_magic, list( /obj/item/immortality_talisman, /obj/item/melee/ghost_sword)) -GLOBAL_LIST_INIT(summoned_special_magic, list( - /obj/item/gun/magic/staff/change, +GLOBAL_LIST_INIT(summoned_special_magic, list( //SKYEDIT EDIT - Removes wand of polymorph /obj/item/gun/magic/staff/animate, /obj/item/storage/belt/wands/full, /obj/item/antag_spawner/contract,