DZD 3939abaf5d Fix Conflicts and Sync with Upstream ...

Fixes conflict in icons/obj/gun.dmi by importing sprites added by #172

2015-01-16 17:07:22 -05:00

..

animate.dm

…

beams.dm

Rebalance Stamina

2015-01-05 06:53:48 -05:00

bullets.dm

Rebalance Stamina

2015-01-05 06:53:48 -05:00

change.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

energy.dm

Odds and Ends

2015-01-01 21:05:50 -05:00

force.dm

Projectile update

2013-11-01 14:00:50 -04:00

magic.dm

Wizard Update Part 6

2015-01-15 15:50:10 -05:00

special.dm

Kinetic Accelerator

2015-01-15 21:58:51 -05:00