Steelpoint 8b53405b17 Merge branch 'master' of https://github.com/tgstation/-tg-station into HoSGun ...

Conflicts:
	icons/mob/inhands/guns_lefthand.dmi
	icons/mob/inhands/guns_righthand.dmi
	icons/obj/guns/energy.dmi

2015-02-18 12:50:05 +08:00

..

ammunition

BalanceChange-5stun10laser

2015-02-14 17:56:35 +08:00

guns

Merge branch 'master' of https://github.com/tgstation/-tg-station into HoSGun

2015-02-18 12:50:05 +08:00

projectile

Merge branch 'master' of https://github.com/tgstation/-tg-station into HoSGun

2015-02-18 12:50:05 +08:00

ammunition.dm

further changes to the ranged stun system

2015-01-01 22:22:03 -08:00

firing.dm

* fixes #3765 (shotguns sawing off)

2014-12-21 01:35:49 +01:00

gun.dm

Ports the kinetic accelerator changes from NT

2015-02-03 21:19:30 -08:00

pins.dm

honk

2015-02-07 10:12:40 -06:00

projectile.dm

Adds a slurring filter, replaces stutter filter where appropriate

2015-02-10 16:39:17 -05:00