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

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

..

coil.dm

Removes a great amount of machinery copypasta with circuitboards.

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

energy_ball.dm

Replace all secondary flags with bitflags stored in the flags_2 var

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

generator.dm

TG sync Sunday (#201)

2017-02-06 00:36:56 -06:00