Merge branch 'master' of git://github.com/Baystation12/Baystation12

This commit is contained in:
Aryn
2012-05-27 12:50:23 -06:00
22 changed files with 88 additions and 122 deletions

View File

@@ -142,7 +142,7 @@ var/MAX_EXPLOSION_RANGE = 14
#define OPENCONTAINER 4096 // is an open container for chemistry purposes
#define ONESIZEFITSALL 8192 // can be worn by fatties (or children? ugh)
// #define ONESIZEFITSALL 8192 // can be worn by fatties (or children? ugh)
#define NOREACT 16384 //Reagents dont' react inside this container.