Commit Graph

54 Commits

Author SHA1 Message Date
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
Kelenius
012fb38de2 Finalizes mechfab 2015-08-12 21:46:11 +03:00
Kelenius
7562f6f01a Updates mechfab interface
Fixes all bugs I found.
2015-08-10 17:46:03 +03:00
Kelenius
210d8fac22 Updates mechfab to not be terrible, WIP 2015-08-07 18:01:12 +03:00