Markolie 354e569f9d Merge branch 'master' of https://github.com/ParadiseSS13/Paradise ...

Conflicts:
	code/game/machinery/rechargestation.dm

2015-02-09 16:15:00 +01:00

..

area_teleport.dm

Made all current wizard + genetic spells a subtype of spell/wizard (Since they use the same action button row)

2014-07-23 11:04:07 -04:00

charge.dm

Defib update, cell path update

2015-02-09 16:12:01 +01:00

conjure.dm

Made all current wizard + genetic spells a subtype of spell/wizard (Since they use the same action button row)

2014-07-23 11:04:07 -04:00

construct_spells.dm

Made all current wizard + genetic spells a subtype of spell/wizard (Since they use the same action button row)

2014-07-23 11:04:07 -04:00

dumbfire.dm

Made all current wizard + genetic spells a subtype of spell/wizard (Since they use the same action button row)

2014-07-23 11:04:07 -04:00

emplosion.dm

Made all current wizard + genetic spells a subtype of spell/wizard (Since they use the same action button row)

2014-07-23 11:04:07 -04:00

ethereal_jaunt.dm

Made all current wizard + genetic spells a subtype of spell/wizard (Since they use the same action button row)

2014-07-23 11:04:07 -04:00

explosion.dm

Made all current wizard + genetic spells a subtype of spell/wizard (Since they use the same action button row)

2014-07-23 11:04:07 -04:00

fake_gib.dm

MetaToys

2015-02-06 23:25:13 -05:00

genetic.dm

Made all current wizard + genetic spells a subtype of spell/wizard (Since they use the same action button row)

2014-07-23 11:04:07 -04:00

horsemask.dm

Wizard Update Part 8

2015-01-16 16:39:12 -05:00

inflict_handler.dm

Made all current wizard + genetic spells a subtype of spell/wizard (Since they use the same action button row)

2014-07-23 11:04:07 -04:00

knock.dm

Made all current wizard + genetic spells a subtype of spell/wizard (Since they use the same action button row)

2014-07-23 11:04:07 -04:00

mind_transfer.dm

Wizard Update Part 1

2015-01-14 21:56:39 -05:00

projectile.dm

Made all current wizard + genetic spells a subtype of spell/wizard (Since they use the same action button row)

2014-07-23 11:04:07 -04:00

summonitem.dm

Syndicate Strike Team Weaponry Changes

2015-01-23 20:07:55 -05:00

trigger.dm

Made all current wizard + genetic spells a subtype of spell/wizard (Since they use the same action button row)

2014-07-23 11:04:07 -04:00

turf_teleport.dm

Made all current wizard + genetic spells a subtype of spell/wizard (Since they use the same action button row)

2014-07-23 11:04:07 -04:00

wizard.dm

Wizard Bugfixes

2015-01-17 12:12:28 -05:00