Merge branch 'master' into development

This commit is contained in:
skull132
2017-08-15 23:01:15 +03:00
6 changed files with 43 additions and 22 deletions
+2 -2
View File
@@ -50,10 +50,10 @@
if(reagent_data && reagent_data.len)
var/rtotal = reagent_data[1]
var/list/data = list()
if(rid == "nutriment")
data += "[seed.seed_name]"
if(reagent_data.len > 1 && potency > 0)
rtotal += round(potency/reagent_data[2])
if(rid == "nutriment")
data[seed.seed_name] = max(1,rtotal)
reagents.add_reagent(rid,max(1,rtotal),data)
update_desc()
if(reagents.total_volume > 0)