Miniature 2159409d53 Merge branch 'master' of git://github.com/Baystation12/Baystation12 ...

Conflicts:
	code/game/vote.dm

Because I did it derpily.

2011-12-03 19:30:28 +10:30

..

dead

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2 316c924e-a436-60f5-8080-3fe189b3f50e

2010-08-23 14:29:20 +00:00

living

Shhhhhhh.

2011-10-20 17:39:08 +00:00

simple_animal

◦ When equipping corgis with objects, their icons immediately update. Fixes a bit of visual lag.

2011-11-23 02:00:18 +00:00

mob.dm

Merge branch 'master' of git://github.com/Baystation12/Baystation12

2011-12-03 19:30:28 +10:30