Merge remote-tracking branch 'upstream/master'

This commit is contained in:
Tastyfish
2012-01-06 16:41:52 -05:00
21 changed files with 8681 additions and 8475 deletions
@@ -263,6 +263,7 @@
mymob.blind.name = " "
mymob.blind.screen_loc = "1,1 to 15,15"
mymob.blind.layer = 0
mymob.blind.mouse_opacity = 0
mymob.flash = new /obj/screen( null )
mymob.flash.icon = 'screen1_alien.dmi'