CPTANT 086dd558f3 Merge branch 'master' of https://github.com/tgstation/-tg-station into laserfire ...

# Conflicts:
#	code/game/gamemodes/malfunction/Malf_Modules.dm

2016-02-16 03:23:55 +01:00

..

spell_types

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

2016-02-16 03:23:55 +01:00

spell.dm

Moves the code for spells to the Modules section.

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