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

..

AI_module_designs.dm

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

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

autolathe_designs.dm

Fixed retractor spawning an /obj/item/weapon/retractor when fabricated in an autolathe.

2014-12-29 20:46:01 +01:00

comp_board_designs.dm

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

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

machine_designs.dm

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

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

mecha_designs.dm

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

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

mechfabricator_designs.dm

Done some missed designs for the R&D revamp.

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

medical_designs.dm

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

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

power_designs.dm

Done some missed designs for the R&D revamp.

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

stock_parts_designs.dm

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

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

telecomms_designs.dm

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

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

weapon_designs.dm

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

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