Kelenius 41ff9819bd Merge branch 'dev' into ofChemistryAndStuff ...

Conflicts:
	code/modules/mob/living/carbon/carbon.dm
	code/modules/organs/organ_internal.dm
	code/modules/organs/organ_objects.dm
	code/modules/reagents/Chemistry-Reagents.dm
	code/modules/reagents/reagent_containers/syringes.dm

2015-03-31 17:44:42 +03:00

..

xenoarchaeology

Merge branch 'dev' into ofChemistryAndStuff

2015-03-31 17:44:42 +03:00

circuitprinter.dm

Chemistry commit

2015-03-25 19:09:10 +03:00

designs.dm

Changes the silicon is_malf/is_traitor procs to utilize the new antag datums.

2015-03-25 19:27:03 +01:00

destructive_analyzer.dm

Update for machine upgrades and some science

2015-02-08 15:39:11 +03:00

message_server.dm

…

protolathe.dm

Chemistry commit

2015-03-25 19:09:10 +03:00

rd-readme.dm

…

rdconsole.dm

Cleans up access handling.

2015-03-02 18:55:03 +01:00

rdmachines.dm

Update for machine upgrades and some science

2015-02-08 15:39:11 +03:00

research.dm

Fixes typo in engineering research description

2015-01-10 04:25:50 +01:00

server.dm

Corrects return values for the Topic procs of several computers and some other machines as well.

2015-02-25 21:32:35 -05:00