LetterJay 0e553b26db Merge branch 'master' into upstream-merge-31737

2017-10-28 02:20:25 -04:00

..

ammunition

[MIRROR] Grammar fixes to atom descriptions (#3165)

2017-10-21 07:17:03 -05:00

boxes_magazines

[MIRROR] Grammar fixes to atom descriptions (#3165)

2017-10-21 07:17:03 -05:00

guns

Merge branch 'master' into upstream-merge-31737

2017-10-21 07:18:14 -05:00

projectile

Merge pull request #3615 from Citadel-Station-13/upstream-merge-32075

2017-10-27 02:17:45 -04:00

ammunition.dm

…

box_magazine.dm

Remove drop_item, drop_item_v, put_in_hands_or_del

2017-10-07 12:37:06 -05:00

firing.dm

Update firing.dm

2017-10-16 06:13:51 -05:00

gun.dm

Merge pull request #31800 from DaxDupont/500hours

2017-10-17 09:19:42 -05:00

pins.dm

…

projectile.dm

Fixed projectile runtimes (#31973)

2017-10-21 07:19:28 -05:00