DJSnapshot e1af1f4713 replaced electrodes with insta hit taser beams. ...

Conflicts:
	code/modules/projectiles/guns/energy/stun.dm
	code/modules/projectiles/projectile/beams.dm
	icons/obj/projectiles.dmi

2014-04-19 16:28:23 -04:00

..

energy

replaced electrodes with insta hit taser beams.

2014-04-19 16:28:23 -04:00

magic

Wizard stuff balancing

2013-12-28 19:39:35 -05:00

projectile

Garbage collection fixes

2014-02-19 20:24:31 -05:00

energy.dm

Projectile code overhaul

2013-10-30 10:32:21 -04:00

magic.dm

Garbage collection fixes

2014-02-19 20:24:31 -05:00

projectile.dm

Buckshot whee!

2013-12-12 22:10:33 -05:00