phil235 0291f450d2 Merge branch 'master' of https://github.com/tgstation/-tg-station into VisionUpdatesChanges ...

Conflicts:
	code/modules/mob/living/carbon/life.dm
	code/modules/mob/living/death.dm
	code/modules/mob/living/login.dm
	code/modules/mob/mob.dm

2016-02-10 22:35:19 +01:00

..

spell_types

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

2016-02-10 22:35:19 +01:00

spell.dm

Moves the code for spells to the Modules section.

2016-02-01 19:33:44 +02:00