LetterJay 52fa1f314f Merge branch 'master' into upstream-merge-26760

2017-05-14 01:02:26 -04:00

..

ballistic

Changes the naming of an ammo to make it more distinct

2017-04-27 09:17:40 -05:00

energy

Changes a bunch of hrefs to the proper defines

2017-05-02 02:20:07 -05:00

magic

Bleeding edgy refresh (#303)

2017-03-21 11:44:10 -05:00

ballistic.dm

Bleeding edgy refresh (#303)

2017-03-21 11:44:10 -05:00

energy.dm

Replaces /image with /mutable_appearance (#556)

2017-04-26 08:18:35 -05:00

grenade_launcher.dm

Bleeding edgy refresh (#303)

2017-03-21 11:44:10 -05:00

magic.dm

Bleeding edgy refresh (#303)

2017-03-21 11:44:10 -05:00

medbeam.dm

Unorphans the blackbox

2017-04-26 17:05:23 -05:00

mounted.dm

Fixes armlasers breaking on retract (#498)

2017-04-20 22:03:30 -05:00

syringe_gun.dm

Bleeding edgy refresh (#303)

2017-03-21 11:44:10 -05:00