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

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

..

explorer_gear.dm

Replace all secondary flags with bitflags stored in the flags_2 var

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

goliath_hide.dm

Replace all secondary flags with bitflags stored in the flags_2 var

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

kinetic_crusher.dm

Fixes the Hierophant not spawning its crusher trophy

2017-08-08 22:24:01 -05:00

lazarus_injector.dm

Completes major inhand split project (#2178)

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

marker_beacons.dm

Replace all secondary flags with bitflags stored in the flags_2 var

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

mineral_scanner.dm

Replace all secondary flags with bitflags stored in the flags_2 var

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

mining_tools.dm

Replace all secondary flags with bitflags stored in the flags_2 var

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

mining_tools.dm.rej

Replace all secondary flags with bitflags stored in the flags_2 var

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

regenerative_core.dm

Replace all secondary flags with bitflags stored in the flags_2 var

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

resonator.dm

Completes major inhand split project (#2178)

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

survival_pod.dm

Removes a great amount of machinery copypasta with circuitboards.

2017-08-09 19:24:19 -05:00

survival_pod.dm.rej

Replace all secondary flags with bitflags stored in the flags_2 var

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

vendor_items.dm

Splits mining_mobs.dm into separate files

2017-05-29 01:17:13 -05:00

wormhole_jaunter.dm

Completes major inhand split project (#2178)

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