Incoming 26a1bb65f2 Merge branch 'master' of https://github.com/tgstation/-tg-station into wands3 ...

Conflicts:
	code/modules/mob/death.dm
	code/modules/mob/living/carbon/alien/death.dm
	code/modules/mob/living/carbon/brain/death.dm
	code/modules/mob/living/carbon/human/death.dm
	code/modules/mob/living/carbon/monkey/death.dm
	code/modules/mob/living/silicon/death.dm
	code/modules/mob/living/silicon/robot/death.dm

2013-12-27 00:55:44 -05:00

..

area_teleport.dm

Some improvement to the teleport scroll and spell code. It unbuckles the user now.

2013-01-17 06:22:29 +00:00

charge.dm

Adds new and better wand and spellbook sprtes by Neerti

2013-12-15 16:55:11 -05:00

conjure.dm

Changes mime abilities into spells. Admins can now give these from the 'give spell' menu. Unlike previous mime abilities, these are not transferred when a mime is cloned.

2013-12-21 20:54:07 +02:00

construct_spells.dm

-Changed the weighting on Juggernaut's shell to make it more likely to deflect the energy projectile than reflect it.

2013-07-24 20:30:26 +01:00

dumbfire.dm

* Dead bodies won't cause fireball to trigger anymore.

2013-10-25 17:12:03 +01:00

emplosion.dm

Fixed Issue 897

2012-09-08 07:04:22 +00:00

ethereal_jaunt.dm

feature: renames the monkeyizing var to "notransform" since that's how it was being used in the code, as a flag to tell code to ignore transformation (initially because they were already turning into a monkey).

2013-12-19 11:50:33 -05:00

explosion.dm

Fixed Issue 897

2012-09-08 07:04:22 +00:00

genetic.dm

Adding google code commits r5836 to r5849. RIP in peace google code.

2013-03-11 04:26:54 +00:00

horsemask.dm

Reworked the equation so that you gain a constant cooldown reduction per rank

2013-09-14 17:50:34 -04:00

inflict_handler.dm

Replaced organ helper procs with a single more versatile and strealined one.

2013-08-01 14:42:32 +01:00

knock.dm

Reworked the equation so that you gain a constant cooldown reduction per rank

2013-09-14 17:50:34 -04:00

mime.dm

Fixes runtimes if a non-human would somehow get the mime speech spell. Only humans have .miming

2013-12-23 18:12:04 +02:00

mind_transfer.dm

Feature: Changed how used books of mindswap punish people. Now if you use a used mindswap book it marks you to be used in a mindswap with the next unfortunate soul who reads its. Some Limitations: You can escape the impending mindswap by changing forms or being dead when the next time someone tries to read the book. You can of course also just keep the book safe or destroy it if you accidentally read one. Only works with things that have hands. Consider intentionally reading one as a monkey then giving it to the captain.

2013-12-21 12:23:50 -05:00

projectile.dm

Added a check for the target of the magic missile between the sleeps. This will stop the runtimes and the MM objects from being stuck in the spot (I think you can pull them though)

2013-11-27 05:47:36 -03:00

trigger.dm

Fixed Issue 897

2012-09-08 07:04:22 +00:00

turf_teleport.dm

Fixed Issue 897

2012-09-08 07:04:22 +00:00

wizard.dm

Removed flame_range from meteor explosions, reduced flame_range on syndie minibomb, added flame_range to all welderbomb explosions, made args prettier

2013-10-16 22:10:26 -07:00