Desolate f7627d2fcb Resolves conflicts.

2018-10-11 05:36:22 -05:00

..

ammunition

Merge pull request #9631 from Birdtalon/ERT-changes

2018-10-09 08:58:15 +08:00

guns

Resolves conflicts.

2018-10-11 05:36:22 -05:00

projectile

Resolves conflicts.

2018-10-11 05:36:22 -05:00

ammunition.dm

materials now scale to contents

2018-10-01 22:38:11 +01:00

firing.dm

Fixes the point blank shooting not working on tiles with multiple people

2018-09-28 12:51:28 +02:00

gun.dm

further conversion

2018-07-18 01:13:24 -04:00

projectile.dm

dayum dats defined

2018-10-08 22:48:00 +01:00