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

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

..

ballistic

Replace all secondary flags with bitflags stored in the flags_2 var

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

energy

Replace all secondary flags with bitflags stored in the flags_2 var

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

magic

Completes major inhand split project (#2178)

2017-08-02 06:30:33 -05:00

misc

Replaces ex_act and emp_act numbers with defines

2017-07-13 17:46:41 -05:00

ballistic.dm

July 5th TG sync (#1883)

2017-07-05 22:14:19 -05:00

beam_rifle.dm

[MIRROR] Adds defines for mouse_opacity (#2381)

2017-08-21 20:29:37 -07:00

beam_rifle.dm.rej

Replace all secondary flags with bitflags stored in the flags_2 var

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

energy.dm

July 5th TG sync (#1883)

2017-07-05 22:14:19 -05:00

grenade_launcher.dm

Bleeding edgy refresh (#303)

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

magic.dm

Replace all secondary flags with bitflags stored in the flags_2 var

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

medbeam.dm

Ports guns to Initialize

2017-05-26 19:06:39 -05:00

mounted.dm

Fixes armlasers breaking on retract (#498)

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

syringe_gun.dm

Ports guns to Initialize

2017-05-26 19:06:39 -05:00