Tastyfish 6a8ea815b2 Merge branch 'master' into buttbots2 ...

Conflicts:
	code/defines/procs/AStar.dm
	code/modules/mob/living/simple_animal/bot/cleanbot.dm
	code/modules/mob/living/simple_animal/bot/medbot.dm
	paradise.dme

2016-03-31 13:33:46 -04:00

..

area_teleport.dm

Various Ragin' Mages fixes

2016-01-13 21:56:56 -08:00

bloodcrawl.dm

fixes demons

2016-03-29 20:51:16 -04:00

charge.dm

tweaks

2016-01-29 19:40:46 -05:00

conjure.dm

Ports tg simple_animal bots

2016-03-28 00:22:04 -04:00

construct_spells.dm

Nukes useless /wizard/ spell pathing

2015-08-08 14:06:50 -04:00

dumbfire.dm

Nukes useless /wizard/ spell pathing

2015-08-08 14:06:50 -04:00

emplosion.dm

Nukes useless /wizard/ spell pathing

2015-08-08 14:06:50 -04:00

ethereal_jaunt.dm

Brainmobs can no longer ethereal jaunt

2016-01-25 19:21:40 -08:00

explosion.dm

Nukes useless /wizard/ spell pathing

2015-08-08 14:06:50 -04:00

fake_gib.dm

Updates Fake Disintegrate and Spell Icons

2016-02-10 00:01:37 -05:00

genetic.dm

fixes blind spell

2016-01-29 21:31:16 -05:00

horsemask.dm

Updates Fake Disintegrate and Spell Icons

2016-02-10 00:01:37 -05:00

infinite_guns.dm

lesser summon guns, wizman update

2016-01-29 09:12:37 -05:00

inflict_handler.dm

issue with identity transfer

2016-02-13 15:20:21 -05:00

knock.dm

tweaks

2016-01-29 19:40:46 -05:00

lichdom.dm

Fixes lich spell preventing round end when viewed in the spellbook

2016-03-06 21:59:48 -05:00

lightning.dm

Electrocution Refactor+Electric Reagents

2015-12-31 17:28:27 -05:00

magnet.dm

Nukes useless /wizard/ spell pathing

2015-08-08 14:06:50 -04:00

mime.dm

Miming Refactor

2016-02-28 22:40:00 -05:00

mind_transfer.dm

Removes Mindswap Suiciding

2016-02-05 22:30:43 -05:00

projectile.dm

Nukes useless /wizard/ spell pathing

2015-08-08 14:06:50 -04:00

summonitem.dm

Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into OrganRefactor

2016-02-02 15:35:54 -05:00

touch_attacks.dm

Wizard touch attacks and fixes

2015-08-20 10:21:45 -04:00

trigger.dm

Nukes useless /wizard/ spell pathing

2015-08-08 14:06:50 -04:00

turf_teleport.dm

Nukes useless /wizard/ spell pathing

2015-08-08 14:06:50 -04:00

wizard.dm

Updates Fake Disintegrate and Spell Icons

2016-02-10 00:01:37 -05:00