Poojawa 45ba084c6a Merge branch 'master' into upstream-merge-27344

2017-05-20 23:26:28 -05:00

..

ballistic

Changes the naming of an ammo to make it more distinct

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

energy

Merge branch 'master' into upstream-merge-27344

2017-05-20 23:26:28 -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

Repaths /obj/effect/overlay/temp to /obj/effect/temp_visual

2017-05-18 16:38:09 -05:00

mounted.dm

Fixes armlasers breaking on retract (#498)

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

syringe_gun.dm

Adds modified syringe guns

2017-05-19 06:25:23 -05:00