mwerezak 9ad533a094 Merge remote-tracking branch 'upstream/dev-freeze' into dev ...

Conflicts:
	code/modules/mob/living/carbon/monkey/update_icons.dm
	code/modules/mob/mob_helpers.dm
	code/modules/spells/spellbook.dm
	icons/mob/items_lefthand.dmi
	icons/mob/items_righthand.dmi

2015-03-31 00:16:56 -04: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

…

projectile.dm

…

spell.dm

…

spellbook.dm

…

trigger.dm

…

turf_teleport.dm

…

wizard_artifacts.dm

…

wizard_spells.dm

…