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

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

..

devices

Merge branch 'master' into upstream-merge-29940

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

robot

Replace all secondary flags with bitflags stored in the flags_2 var

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

stacks

Merge branch 'master' into upstream-merge-29940

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

weapons

Merge branch 'master' into upstream-merge-29940

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

apc_frame.dm

Replace all secondary flags with bitflags stored in the flags_2 var

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

blueprints.dm

Renames GLOB.cardinal to GLOB.cardinals to match GLOB.diagonals and GLOB.alldirs (#1970)

2017-07-10 16:10:42 -07:00

body_egg.dm

…

bodybag.dm

…

candle.dm

…

cardboard_cutouts.dm

Replace all secondary flags with bitflags stored in the flags_2 var

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

control_wand.dm

Completes major inhand split project (#2178)

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

crayons.dm

Completes major inhand split project (#2178)

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

dehy_carp.dm

…

documents.dm

…

eightball.dm

Replace all secondary flags with bitflags stored in the flags_2 var

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

latexballoon.dm

July 5th TG sync (#1883)

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

nuke_tools.dm

…

religion.dm

Replace all secondary flags with bitflags stored in the flags_2 var

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

shooting_range.dm

[MIRROR] Ports Rapid Cable Layers from /vg/ and paradise (#2162)

2017-08-02 04:56:44 -05:00

taster.dm

…

theft_tools.dm

Completes major inhand split project (#2178)

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

toys.dm

Replace all secondary flags with bitflags stored in the flags_2 var

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

toys.dm.rej

Replace all secondary flags with bitflags stored in the flags_2 var

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

trash.dm

Completes major inhand split project (#2178)

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