LetterJay 6286f4d4c2 Merge branch 'master' into upstream-merge-32161

2017-11-11 23:02:13 -06: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

512 forward compatibility merge

2017-10-29 10:28:36 -05:00

ammunition.dm

ok this is going to be a pain in the ass ain't it (#2458)

2017-08-22 05:01:38 -07:00

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

quadruple wew

2017-08-29 10:02:18 -07:00

projectile.dm

overhaul (#32316)

2017-11-03 23:40:27 -05:00