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

Conflicts:
	html/changelog.html
This commit is contained in:
cib
2013-05-26 20:43:22 +02:00
11 changed files with 604 additions and 586 deletions
+1
View File
@@ -304,6 +304,7 @@ var/MAX_EXPLOSION_RANGE = 14
// mob/var/list/mutations
#define STRUCDNASIZE 27
#define UNIDNASIZE 13
// Generic mutations:
#define TK 1