Merge branch 'BEF-staging' of github.com:Baystation12/Baystation12 into BEF-staging

This commit is contained in:
Spamcat
2013-03-19 11:17:32 +04:00
14 changed files with 1638 additions and 1475 deletions
@@ -1676,6 +1676,13 @@ datum
///////////////////////////////////////////////////////////////////////////////////////////////////////////////
holywater
name = "Holy Water"
id = "holywater"
description = "A ubiquitous chemical substance that is composed of hydrogen and oxygen."
reagent_state = LIQUID
color = "#535E66" // rgb: 83, 94, 102
nanites
name = "Nanomachines"
id = "nanites"