PsiOmega 710abd0921 Merge remote-tracking branch 'upstream/dev-freeze' into dev ...

Conflicts:
	code/modules/spells/mind_transfer.dm

2015-03-29 16:23:06 +02:00

..

area_teleport.dm

…

conjure.dm

…

dumbfire.dm

…

emplosion.dm

…

ethereal_jaunt.dm

…

explosion.dm

…

genetic.dm

…

horsemask.dm

…

inflict_handler.dm

…

knock.dm

…

mind_transfer.dm

Merge remote-tracking branch 'upstream/dev-freeze' into dev

2015-03-29 16:23:06 +02:00

projectile.dm

…

spell.dm

…

spellbook.dm

…

trigger.dm

…

turf_teleport.dm

…

wizard_artifacts.dm

…

wizard_spells.dm

…