Merge branch 'dev' into ofDryingAndRacks

This commit is contained in:
Kelenius
2015-02-03 20:51:27 +03:00
119 changed files with 991 additions and 674 deletions
+2 -2
View File
@@ -217,8 +217,8 @@ proc/populate_seed_list()
"water",
"potassium",
"plasticide",
"slimetoxin",
"aslimetoxin",
"mutationtoxin",
"amutationtoxin",
"inaprovaline",
"space_drugs",
"paroxetine",
+2
View File
@@ -362,6 +362,8 @@
SV.life()
if(!SV) continue
if(SV.energy < 2) //If tile isn't fully grown
var/chance
if(seed)