Thunder12345 a9a97f5a81 Fixes for Merge Tokens (#18168) ...

* fixes #15649
fixes #16575

* oops forgot those lines

2016-06-03 14:46:42 -05:00

..

ammunition

Merge pull request #18146 from pudl/angela

2016-06-03 09:10:04 +12:00

guns

Fixes for Merge Tokens (#18168)

2016-06-03 14:46:42 -05:00

projectile

Neatens code

2016-06-01 19:48:14 -04:00

ammunition.dm

initial commit

2016-05-07 14:39:17 -07:00

firing.dm

pixel projectiles dream

2016-05-16 21:26:20 -05:00

gun.dm

Merge pull request #17998 from phil235/ShotgunSawoffFix

2016-05-30 10:55:42 +12:00

pins.dm

Merge remote-tracking branch 'refs/remotes/tgstation/master' into Research

2016-05-24 22:17:44 +03:00

projectile.dm

fixes some of the crap maybe

2016-05-28 11:08:46 -05:00