cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-12 03:02:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixes runtime in Chemistry-Reagents-Food-Drinks.dm,25: bad index (#7654)

Browse Source
This commit is contained in:
Atermonera
2020-09-18 20:28:12 -07:00
committed by VirgoBot
parent 7ead858a9a
commit c48cd56583
1 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm
View File

@@ -18,11 +18,14 @@
return return
//add the new taste data //add the new taste data
for(var/taste in newdata) if(islist(data))
if(taste in data) for(var/taste in newdata)
data[taste] += newdata[taste] if(taste in data)
else data[taste] += newdata[taste]
data[taste] = newdata[taste] else
data[taste] = newdata[taste]
else
initialize_data(newdata)
//cull all tastes below 10% of total //cull all tastes below 10% of total
var/totalFlavor = 0 var/totalFlavor = 0
@@ -676,7 +679,7 @@
var/mob/living/carbon/human/H = M var/mob/living/carbon/human/H = M
if(!H.can_feel_pain()) if(!H.can_feel_pain())
return return
var/effective_dose = (dose * M.species.spice_mod) var/effective_dose = (dose * M.species.spice_mod)
if((effective_dose < 5) && (dose == metabolism || prob(5))) if((effective_dose < 5) && (dose == metabolism || prob(5)))
to_chat(M, "<span class='danger'>Your insides feel uncomfortably hot!</span>") to_chat(M, "<span class='danger'>Your insides feel uncomfortably hot!</span>")