From c48cd56583a40de497d1b9122f4812e6fa7e9316 Mon Sep 17 00:00:00 2001 From: Atermonera Date: Fri, 18 Sep 2020 20:28:12 -0700 Subject: [PATCH] Fixes runtime in Chemistry-Reagents-Food-Drinks.dm,25: bad index (#7654) --- .../Chemistry-Reagents-Food-Drinks.dm | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm b/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm index b15c84e9a98..68c0b1d1163 100644 --- a/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm +++ b/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm @@ -18,11 +18,14 @@ return //add the new taste data - for(var/taste in newdata) - if(taste in data) - data[taste] += newdata[taste] - else - data[taste] = newdata[taste] + if(islist(data)) + for(var/taste in newdata) + if(taste in data) + data[taste] += newdata[taste] + else + data[taste] = newdata[taste] + else + initialize_data(newdata) //cull all tastes below 10% of total var/totalFlavor = 0 @@ -676,7 +679,7 @@ var/mob/living/carbon/human/H = M if(!H.can_feel_pain()) return - + var/effective_dose = (dose * M.species.spice_mod) if((effective_dose < 5) && (dose == metabolism || prob(5))) to_chat(M, "Your insides feel uncomfortably hot!")