GunHog cd00e07f4f Merge remote-tracking branch 'remotes/upstream/master' into AdminLoggingForExperimentor ...

Conflicts:
	code/modules/research/experimentor.dm

2015-02-20 15:23:07 -06:00

..

designs

Merge remote-tracking branch 'remotes/origin/master' into IonCarbinesFor-k-ommandos

2015-02-12 09:08:31 -06:00

circuitprinter.dm

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

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

designs.dm

Adds NVG Mesons

2015-02-13 12:23:07 -06: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 remote-tracking branch 'remotes/upstream/master' into AdminLoggingForExperimentor

2015-02-20 15:23:07 -06:00

message_server.dm

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

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

protolathe.dm

Adds "Firing pins" category to protolathe

2015-01-17 01:23:04 +09:00

rd-readme.dm

Removed the icon color blend operations from human's update_icons().

2014-01-16 14:33:50 +00:00

rdconsole.dm

* Building an item from the protolathe/imprinter now correctly returns to the previous screen (categories or search)

2015-02-13 22:33:58 +01:00

rdmachines.dm

Adds deconstruction for DNA scanner and cloning pod.

2013-12-07 08:55:07 +02:00

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