phil235 809a1be279 Merge branch 'master' of https://github.com/tgstation/-tg-station into NewPlants ...

Conflicts:
	icons/mob/head.dmi

2015-02-25 18:50:42 +01:00

..

ammunition

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

2015-02-25 14:10:54 +08:00

guns

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

2015-02-25 18:50:42 +01:00

projectile

Breach to Disable

2015-02-20 11:41:56 +08:00

ammunition.dm

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

2015-02-24 20:03:33 -08:00

firing.dm

* fixes #3765 (shotguns sawing off)

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

gun.dm

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

2015-02-24 20:03:33 -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