cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-07-21 20:14:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #9752 from VOREStation/upstream-merge-7897

Browse Source 
[MIRROR] Makes some juices not sugary
This commit is contained in:
Novacat
2021-02-19 18:08:21 -05:00
committed by GitHub
parent 17a530091b c2ca8630e4
commit 8d3fea472d
1 changed files with 16 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm
+16 -14
View File
@@ -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!"
@@ -947,21 +948,20 @@
if(issmall(M))
effective_dose *= 2
/* //VOREStation Removal - Assuming all juice has sugar is silly
if(alien == IS_UNATHI)
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)
*/
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)
/datum/reagent/drink/juice/lemon
name = "Lemon Juice"
@@ -1036,6 +1036,7 @@
taste_description = "potatoes"
nutrition = 2
color = "#302000"
sugary = FALSE
glass_name = "potato juice"
glass_desc = "Juice from a potato. Bleh."
@@ -1046,6 +1047,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?"