merges #3877 proper

This commit is contained in:
deathride58
2017-11-22 17:37:22 -05:00
parent 60b2c25668
commit b6630b41d1
13 changed files with 37 additions and 9 deletions
+3
View File
@@ -897,6 +897,9 @@
to_chat(user,"<span class='warning'>[src] suddenly vanishes!</span>")
qdel(src)
/obj/item/spellbook/oneuse/random
icon_state = "random_book"
/obj/item/spellbook/oneuse/random/Initialize()
..()
var/static/banned_spells = list(/obj/item/spellbook/oneuse/mimery_blockade, /obj/item/spellbook/oneuse/mimery_guns)