PsiOmega 71a8ddf50e Merge remote-tracking branch 'upstream/dev-freeze' into dev ...

Conflicts:
	code/game/gamemodes/cult/runes.dm
	code/modules/paperwork/paper.dm
	code/modules/projectiles/projectile.dm

2015-04-08 10:55:26 +02:00

..

area_teleport.dm

…

conjure.dm

…

dumbfire.dm

…

emplosion.dm

…

ethereal_jaunt.dm

…

explosion.dm

…

genetic.dm

…

horsemask.dm

…

inflict_handler.dm

Updated ismonkey(), refactored kitchen spike, refactored plastic flaps.

2015-03-26 12:45:12 +10:30

knock.dm

…

mind_transfer.dm

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

2015-04-08 10:55:26 +02:00

projectile.dm

…

spell.dm

Updated ismonkey(), refactored kitchen spike, refactored plastic flaps.

2015-03-26 12:45:12 +10:30

spellbook.dm

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

2015-03-31 00:16:56 -04:00

trigger.dm

…

turf_teleport.dm

…

wizard_artifacts.dm

…

wizard_spells.dm

…