Merge tgstation r4572 into bs12_with_tgport, fixed missing title screen (tgside problem?), some conflicts

Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
This commit is contained in:
Cael_Aislinn
2012-08-28 20:22:22 +10:00
parent eacd84b212
commit e6078b100f
15 changed files with 127 additions and 41 deletions
@@ -76,7 +76,7 @@
if(buckled_mob != user)
buckled_mob.visible_message(\
"\blue [buckled_mob.name] was unbuckled by [user.name]!",\
"You unbuckled from [src] by [user.name].",\
"You were unbuckled from [src] by [user.name].",\
"You hear metal clanking")
else
buckled_mob.visible_message(\