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

..

xenoarchaeology

Merge remote-tracking branch 'upstream/dev-freeze' into dev

2015-07-20 08:28:32 +02:00

circuitprinter.dm

Fixes #10314

2015-08-02 00:01:10 -04:00

designs.dm

Merge branch 'dev' into ofMechfabAndPanic

2015-08-21 16:59:57 +03:00

destructive_analyzer.dm

Ports /tg/'s meteor implementation.

2015-06-05 14:58:35 +02:00

mechfab_designs.dm

Merge branch 'dev' into ofMechfabAndPanic

2015-08-21 16:59:57 +03:00

message_server.dm

Request Console NanoUI and fixes

2015-06-11 21:43:27 -04:00

protolathe.dm

Updates mechfab interface

2015-08-10 17:46:03 +03:00

rd-readme.dm

…

rdconsole.dm

Merge pull request #10040 from PsiOmegaDelta/150707-MoreOverlaysFewerStates

2015-08-16 00:40:47 +01:00

rdmachines.dm

Updates mechfab interface

2015-08-10 17:46:03 +03:00

research.dm

Mech chargers are now a single machine

2015-08-16 06:07:36 -07:00

server.dm

Adds missing R&D screens. Fixes the employee computer by cheating.

2015-07-07 17:32:59 +02:00