Kyep 4ddb9818f3 fixes merge conflict

2020-09-15 08:59:18 -07:00

..

ammunition

fixes merge conflict

2020-09-15 08:59:18 -07:00

guns

Merge pull request #13447 from EMPlight/BulldogXLmag

2020-09-14 16:45:04 -04:00

projectile

Merge remote-tracking branch 'upstream/master' into logging-improvements-V2

2020-08-08 17:30:09 +02:00

ammunition.dm

fixes merge conflict

2020-09-15 08:59:18 -07:00

firing.dm

Moves to BYOND 513 (#13650)

2020-06-26 01:15:59 -06:00

gun_attachments.dm

Moved silencers, gave them their own folder

2018-11-19 09:52:25 +01:00

gun.dm

oops

2020-07-01 22:34:24 -05:00

projectile.dm

Update projectile.dm

2020-07-11 16:16:13 -05:00