LetterJay a0cf777040 Merge branch 'master' into upstream-merge-29940

2017-08-21 23:29:24 -05:00

..

ammunition

Replace all secondary flags with bitflags stored in the flags_2 var

2017-08-17 09:19:14 -05:00

boxes_magazines

Removes bows (#2163)

2017-07-28 02:53:47 -07:00

guns

Merge branch 'master' into upstream-merge-29940

2017-08-21 23:29:24 -05:00

projectile

Replace all secondary flags with bitflags stored in the flags_2 var

2017-08-17 09:19:14 -05:00

ammunition.dm

Replace all secondary flags with bitflags stored in the flags_2 var

2017-08-17 09:19:14 -05:00

box_magazine.dm

Replace all secondary flags with bitflags stored in the flags_2 var

2017-08-17 09:19:14 -05:00

firing.dm

Tg patch branch to master (#192)

2017-02-03 05:56:14 -06:00

gun.dm

Replace all secondary flags with bitflags stored in the flags_2 var

2017-08-17 09:19:14 -05:00

pins.dm

Replace all secondary flags with bitflags stored in the flags_2 var

2017-08-17 09:19:14 -05:00

projectile.dm

Merge branch 'master' into upstream-merge-29940

2017-08-21 23:29:24 -05:00

projectile.dm.rej

Replace all secondary flags with bitflags stored in the flags_2 var

2017-08-17 09:19:14 -05:00