LetterJay 4bfade5704 Merge branch 'master' into upstream-merge-29718

2017-08-29 01:48:22 -05:00

..

antimatter

here we go again (#2456)

2017-08-24 19:24:25 -07:00

singularity

Cleaned up environment_smash vars with bitflag defines (#2515)

2017-08-27 05:55:07 -07:00

supermatter

Syncs maps, and a bunch of other things that no one will care about/notice/give fucks about until they break. Welcome to conflict hell. (#2460)

2017-08-24 21:07:58 -07:00

tesla

here we go again (#2456)

2017-08-24 19:24:25 -07:00

apc.dm

Merge branch 'master' into upstream-merge-29718

2017-08-29 01:48:22 -05:00

apc.dm.rej

Fixes areastring grabbing area subtypes

2017-08-06 03:21:24 -05:00

cable.dm

here we go again (#2456)

2017-08-24 19:24:25 -07:00

cell.dm

here we go again (#2456)

2017-08-24 19:24:25 -07:00

floodlight.dm

here we go again (#2456)

2017-08-24 19:24:25 -07:00

generator.dm

Changes some 1s and 0s to TRUE and FALSE (#1967)

2017-07-10 16:13:16 -07:00

gravitygenerator.dm

here we go again (#2456)

2017-08-24 19:24:25 -07:00

lighting.dm

here we go again (#2456)

2017-08-24 19:24:25 -07:00

monitor.dm

here we go again (#2456)

2017-08-24 19:24:25 -07:00

port_gen.dm

here we go again (#2456)

2017-08-24 19:24:25 -07:00

power.dm

here we go again (#2456)

2017-08-24 19:24:25 -07:00

powernet.dm

April sync (#360)

2017-04-13 23:37:00 -05:00

rtg.dm

here we go again (#2456)

2017-08-24 19:24:25 -07:00

smes.dm

here we go again (#2456)

2017-08-24 19:24:25 -07:00

solar.dm

here we go again (#2456)

2017-08-24 19:24:25 -07:00

switch.dm

Changes some 1s and 0s to TRUE and FALSE (#1967)

2017-07-10 16:13:16 -07:00

terminal.dm

here we go again (#2456)

2017-08-24 19:24:25 -07:00

tracker.dm

here we go again (#2456)

2017-08-24 19:24:25 -07:00

turbine.dm

here we go again (#2456)

2017-08-24 19:24:25 -07:00