Sawu feb141ca15 Merge branch 'master' of https://github.com/tgstation/-tg-station into freshfood ...

Conflicts:
	code/modules/research/designs/machine_designs.dm

2015-01-08 03:58:31 +11:00

..

designs

Merge branch 'master' of https://github.com/tgstation/-tg-station into freshfood

2015-01-08 03:58:31 +11:00

circuitprinter.dm

* Updated the autolathe to use the datum/designs system (new file

2014-12-13 22:56:43 +01:00

designs.dm

Done some missed designs for the R&D revamp.

2014-12-27 16:49:11 +01:00

destructive_analyzer.dm

Moves m_amt, g_amt, reliability and origin_tech to /obj/item (previously in /obj)

2014-11-02 14:10:03 -03:00

experimentor.dm

Merge branch 'freshfood' of https://github.com/sawu-tg/-tg-station into freshfood

2015-01-07 04:39:30 +11:00

message_server.dm

Merge remote-tracking branch 'upstream/master' into hiasl

2014-11-01 20:04:26 -03:00

protolathe.dm

Done some missed designs for the R&D revamp.

2014-12-27 16:49:11 +01:00

rd-readme.dm

…

rdconsole.dm

* Updated the autolathe to use the datum/designs system (new file

2014-12-13 22:56:43 +01:00

rdmachines.dm

…

research.dm

* Updated the autolathe to use the datum/designs system (new file

2014-12-13 22:56:43 +01:00

server.dm

Merge remote-tracking branch 'remotes/upstream/master' into emagrefactor

2014-12-09 16:03:45 -08:00