fixes for conflict and a map runtime

This commit is contained in:
Aurorablade
2017-01-12 00:06:58 -05:00
parent 5a07759c97
commit 1ed0d48da1
2 changed files with 4 additions and 1 deletions
+4 -1
View File
@@ -36,7 +36,10 @@
canbypass = 1
/obj/item/weapon/tome/New()
icon_state = ticker.mode.cultdat.tome_icon
if(!ticker)
icon_state = "tome"
else
icon_state = ticker.mode.cultdat.tome_icon
..()
/obj/item/weapon/tome/examine(mob/user)
Binary file not shown.

Before

Width:  |  Height:  |  Size: 158 KiB

After

Width:  |  Height:  |  Size: 158 KiB