Merge master into dev.

This commit is contained in:
Zuhayr
2015-02-12 23:01:08 +10:30
25 changed files with 1252 additions and 1209 deletions

View File

@@ -462,10 +462,10 @@
if(prob(75))
I.loc = src
for(var/mob/M in viewers(src))
M.show_message("\the [I] lands in \the [src].", 3)
M.show_message("\The [I] lands in \the [src].", 3)
else
for(var/mob/M in viewers(src))
M.show_message("\the [I] bounces off of \the [src]'s rim!", 3)
M.show_message("\The [I] bounces off of \the [src]'s rim!", 3)
return 0
else
return ..(mover, target, height, air_group)