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 e8c39d05b0f..59220465736 100644 --- a/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm +++ b/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm @@ -936,6 +936,7 @@ description = "It's grrrrrape!" taste_description = "grapes" color = "#863333" + var/sugary = TRUE ///So non-sugary juices don't make Unathi snooze. glass_name = "grape juice" glass_desc = "It's grrrrrape!" @@ -949,6 +950,7 @@ /* //VOREStation Removal - Assuming all juice has sugar is silly if(alien == IS_UNATHI) +<<<<<<< HEAD if(effective_dose < 2) if(effective_dose == metabolism * 2 || prob(5)) M.emote("yawn") @@ -962,6 +964,21 @@ M.Sleeping(20) M.drowsyness = max(M.drowsyness, 60) */ +======= + if(sugary == TRUE) + if(effective_dose < 2) + if(effective_dose == metabolism * 2 || prob(5)) + M.emote("yawn") + else if(effective_dose < 5) + M.eye_blurry = max(M.eye_blurry, 10) + else if(effective_dose < 20) + if(prob(50)) + M.Weaken(2) + M.drowsyness = max(M.drowsyness, 20) + else + M.Sleeping(20) + M.drowsyness = max(M.drowsyness, 60) +>>>>>>> 83e0c14... adds sugary var (#7897) /datum/reagent/drink/juice/lemon name = "Lemon Juice" @@ -1036,6 +1053,7 @@ taste_description = "potatoes" nutrition = 2 color = "#302000" + sugary = FALSE glass_name = "potato juice" glass_desc = "Juice from a potato. Bleh." @@ -1046,6 +1064,7 @@ description = "Tomatoes made into juice. What a waste of big, juicy tomatoes, huh?" taste_description = "tomatoes" color = "#731008" + sugary = FALSE glass_name = "tomato juice" glass_desc = "Are you sure this is tomato juice?"