paprka 3430cfaf44 Merge branch 'master' of https://github.com/tgstation/-tg-station into jamesbondiguess ...

Conflicts:
	code/modules/projectiles/guns/projectile/automatic.dm

2015-01-23 16:55:52 -08:00

..

automatic.dm

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

2015-01-23 16:55:52 -08:00

launchers.dm

Did what HG said to do with Protosmg firing pin

2015-01-22 08:08:14 +02:00

pistol.dm

Did what HG said to do with Protosmg firing pin

2015-01-22 08:08:14 +02:00

revolver.dm

-Adds firing pin box define

2015-01-12 21:21:34 -06:00

shotgun.dm

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

2015-01-15 22:16:11 -08:00