LetterJay 11b558c367 Merge branch 'master' into upstream-merge-31093

2017-10-01 00:50:26 -04:00

..

ballistic

Alt-clicking descriptions when examining

2017-09-28 21:51:53 -05:00

energy

Fixes suppressing weapons in your bag / pocket (#30894)

2017-09-26 04:19:44 -05:00

magic

Stops putting RCD, bluespace bags, and staves into ORM

2017-09-29 19:33:37 -05:00

misc

here we go again (#2456)

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

ballistic.dm

Merge pull request #2918 from Citadel-Station-13/upstream-merge-30953

2017-09-27 16:31:25 -04:00

beam_rifle.dm

Update beam_rifle.dm (#2943)

2017-09-26 07:54:30 -04: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

Adds missing span-endings

2017-09-11 07:10:09 -05: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

Fixes suppressing weapons in your bag / pocket (#30894)

2017-09-26 04:19:44 -05:00