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

This commit is contained in:
PsiOmega
2015-04-14 15:54:22 +02:00
58 changed files with 2538 additions and 5003 deletions
@@ -28,6 +28,9 @@
/datum/matter_synth/medicine
name = "Medicine Synthesizer"
/datum/matter_synth/nanite
name = "Nanite Synthesizer"
/datum/matter_synth/metal
name = "Metal Synthesizer"