Runtimes, 10JUL2017 (#3003)

Nukes a couple of RTs:
This commit is contained in:
skull132
2017-07-12 00:15:11 +03:00
committed by GitHub
parent f1f967eb03
commit 8495fdd084
7 changed files with 35 additions and 30 deletions
+7 -5
View File
@@ -141,11 +141,13 @@
if(path.len && frustration < 5)
if(path[1] == loc)
path -= path[1]
var/t = step_towards(src, path[1])
if(t)
path -= path[1]
else
++frustration
if (path.len)
var/t = step_towards(src, path[1])
if(t)
path -= path[1]
else
++frustration
else
path = list()
target = null
@@ -10,14 +10,14 @@
taste_description = "boiled cabbage"
/datum/reagent/kois/affect_ingest(var/mob/living/carbon/M, var/alien, var/removed)
if(isvaurca(M))
M.heal_organ_damage(0.8 * removed, 0)
M.nutrition += nutriment_factor * removed // For hunger and fatness
M.add_chemical_effect(CE_BLOODRESTORE, 6 * removed)
else
M.adjustToxLoss(1.5 * removed)
return
..()
if(isvaurca(M))
M.heal_organ_damage(0.8 * removed, 0)
M.nutrition += nutriment_factor * removed // For hunger and fatness
M.add_chemical_effect(CE_BLOODRESTORE, 6 * removed)
else
M.adjustToxLoss(1.5 * removed)
return
..()
/datum/reagent/nutriment
name = "Nutriment"
@@ -33,7 +33,6 @@
color = "#664330"
/datum/reagent/nutriment/mix_data(var/list/newdata, var/newamount)
if(!islist(newdata) || !newdata.len)
return
for(var/i in 1 to newdata.len)
@@ -44,6 +43,10 @@
var/totalFlavor = 0
for(var/i in 1 to data.len)
totalFlavor += data[data[i]]
if (!totalFlavor)
return
for(var/i in 1 to data.len) //cull the tasteless
if(data[data[i]]/totalFlavor * 100 < 10)
data[data[i]] = null