upstream-merge-27951

This commit is contained in:
LetterJay
2017-06-11 02:11:34 -05:00
parent a8b71089ae
commit c760c52817
7 changed files with 27 additions and 16 deletions
+1 -2
View File
@@ -106,10 +106,9 @@
name = "Fireball"
spell_type = /obj/effect/proc_holder/spell/aimed/fireball
/*
/datum/spellbook_entry/rod_form
name = "Rod Form"
spell_type = /obj/effect/proc_holder/spell/targeted/rod_form */
spell_type = /obj/effect/proc_holder/spell/targeted/rod_form
/datum/spellbook_entry/magicm
name = "Magic Missile"