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

Conflicts:
	code/game/gamemodes/changeling/changeling.dm
	code/game/gamemodes/changeling/changeling_powers.dm
	code/game/gamemodes/changeling/modularchangling.dm
This commit is contained in:
dumpdavidson
2013-08-21 23:21:26 +02:00
380 changed files with 12772 additions and 11253 deletions
@@ -73,6 +73,8 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp
set name = "Ghost"
set desc = "Relinquish your life and enter the land of the dead."
if(stat != DEAD)
succumb()
if(stat == DEAD)
ghostize(1)
else