Kelenius
|
6ba41bbc2a
|
Merge branch 'dev' into ofMechfabAndPanic
Conflicts:
code/__defines/research.dm
code/game/mecha/equipment/tools/tools.dm
code/game/mecha/mecha_parts.dm
code/modules/research/designs.dm
maps/exodus-1.dmm
|
2015-08-21 16:59:57 +03:00 |
|
mwerezak
|
d3a40f4269
|
Cleans up defines
Replaces bitflag values with hex literals. Some other miscellaneous
cleanup.
|
2015-08-18 17:05:26 -04:00 |
|
Kelenius
|
7c1d9b5614
|
Mech chargers are now a single machine
Can be built and upgraded
Resolves #5215
|
2015-08-16 06:07:36 -07:00 |
|
Kelenius
|
012fb38de2
|
Finalizes mechfab
|
2015-08-12 21:46:11 +03:00 |
|
Chinsky
|
bf53304fec
|
Splits setup.dm into berjillion of smaller files vaguely named thematically.
Also moved __HELPERS and _defines around so defines actually come first.
|
2015-06-04 21:51:58 +03:00 |
|