Miauw62 a0d3a09ef8 Merge branch 'master' of https://github.com/tgstation/-tg-station into thespookisreal ...

Conflicts:
	code/modules/events/carp_migration.dm

2014-10-25 11:29:07 +00:00

..

observer

Merge branch 'master' of https://github.com/tgstation/-tg-station into thespookisreal

2014-10-25 11:29:07 +00:00

death.dm

* Refactored gib() and dust()

2013-12-23 17:56:58 +00:00