Merge branch 'master' of https://github.com/Baystation12/Baystation12 into dev-freeze

This commit is contained in:
Zuhayr
2013-11-20 17:50:01 +10:30
11 changed files with 59 additions and 41 deletions
@@ -65,6 +65,23 @@
real_name = name
..()
/mob/dead/attackby(obj/item/W, mob/user)
if(istype(W,/obj/item/weapon/tome))
var/mob/dead/M = src
if(src.invisibility != 0)
M.invisibility = 0
user.visible_message( \
"\red [user] drags ghost, [M], to our plan of reality!", \
"\red You drag [M] to our plan of reality!" \
)
else
user.visible_message ( \
"\red [user] just tried to smash his book into that ghost! It's not very effective", \
"\red You get the feeling that the ghost can't become any more visible." \
)
/mob/dead/CanPass(atom/movable/mover, turf/target, height=0, air_group=0)
return 1
/*