LetterJay 24a7aa5a9f Merge branch 'master' into upstream-merge-30079

2017-09-06 09:24:23 -05:00

..

ballistic

double wew

2017-08-29 09:53:11 -07:00

energy

Merge pull request #2195

2017-08-29 22:26:58 -07:00

magic

here we go again (#2456)

2017-08-24 19:24:25 -07:00

misc

here we go again (#2456)

2017-08-24 19:24:25 -07:00

ballistic.dm

here we go again (#2456)

2017-08-24 19:24:25 -07:00

beam_rifle.dm

here we go again (#2456)

2017-08-24 19:24:25 -07:00

energy.dm

here we go again (#2456)

2017-08-24 19:24:25 -07:00

grenade_launcher.dm

here we go again (#2456)

2017-08-24 19:24:25 -07:00

magic.dm

double wew

2017-08-29 09:53:11 -07:00

medbeam.dm

Prevents medbeams from crossing themselves

2017-08-29 09:50:47 -05:00

mounted.dm

here we go again (#2456)

2017-08-24 19:24:25 -07:00

syringe_gun.dm

here we go again (#2456)

2017-08-24 19:24:25 -07:00