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

Standard conformation

Browse Source 
Searching for a full word, CHOMP or CHOMPStation, is a lot easier than searching for CS and having it return every single time in the english language where CS occurs somehow.
This commit is contained in:
Razgriz
2020-01-11 04:06:38 -07:00
committed by GitHub
parent 537aeb72c2
commit f3e13456e0
1 changed files with 40 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -641,7 +641,7 @@
var/adj_drowsy = 0 var/adj_drowsy = 0
var/adj_sleepy = 0 var/adj_sleepy = 0
var/adj_temp = 0 var/adj_temp = 0
var/nutriment_factor = 0 var/nutriment_factor = 0 //CHOMPStation addition
var/water_based = TRUE var/water_based = TRUE
/datum/reagent/drink/affect_blood(var/mob/living/carbon/M, var/alien, var/removed) /datum/reagent/drink/affect_blood(var/mob/living/carbon/M, var/alien, var/removed)
@@ -660,9 +660,9 @@
M.bodytemperature = min(310, M.bodytemperature + (adj_temp * TEMPERATURE_DAMAGE_COEFFICIENT)) M.bodytemperature = min(310, M.bodytemperature + (adj_temp * TEMPERATURE_DAMAGE_COEFFICIENT))
if(adj_temp < 0 && M.bodytemperature > 310) if(adj_temp < 0 && M.bodytemperature > 310)
M.bodytemperature = min(310, M.bodytemperature - (adj_temp * TEMPERATURE_DAMAGE_COEFFICIENT)) M.bodytemperature = min(310, M.bodytemperature - (adj_temp * TEMPERATURE_DAMAGE_COEFFICIENT))
if(issmall(M)) removed *= 2 // Small bodymass, more effect from lower volume. if(issmall(M)) removed *= 2 //CHOMP Station addition Small bodymass, more effect from lower volume.
if(M.species.gets_food_nutrition) //VOREStation edit. If this is set to 0, they don't get nutrition from food. if(M.species.gets_food_nutrition) //CHOMPStation addition. If this is set to 0, they don't get nutrition from food.
M.nutrition += nutriment_factor * removed // For hunger and fatness M.nutrition += nutriment_factor * removed //CHOMPStation addition For hunger and fatness
/* VOREStation Removal /* VOREStation Removal
if(alien == IS_SLIME && water_based) if(alien == IS_SLIME && water_based)
M.adjustToxLoss(removed * 2) M.adjustToxLoss(removed * 2)
@@ -1190,7 +1190,7 @@
id = "grapesoda" id = "grapesoda"
description = "Grapes made into a fine drank." description = "Grapes made into a fine drank."
taste_description = "grape soda" taste_description = "grape soda"
nutriment_factor = 1.5 //CS Edit nutriment_factor = 1.5 //CHOMPStation addition
color = "#421C52" color = "#421C52"
adj_drowsy = -3 adj_drowsy = -3
@@ -1218,7 +1218,7 @@
id = "lemonade" id = "lemonade"
description = "Oh the nostalgia..." description = "Oh the nostalgia..."
taste_description = "lemonade" taste_description = "lemonade"
nutriment_factor = 1.5 //CS Edit nutriment_factor = 1.5 //CHOMPStation addition
color = "#FFFF00" color = "#FFFF00"
adj_temp = -5 adj_temp = -5
@@ -1244,7 +1244,7 @@
id = "appleade" id = "appleade"
description = "Applejuice, improved." description = "Applejuice, improved."
taste_description = "apples" taste_description = "apples"
nutriment_factor = 1.5 //CS Edit nutriment_factor = 1.5 //CHOMPStation addition
color = "#FFD1B3" color = "#FFD1B3"
adj_temp = -5 adj_temp = -5
@@ -1257,7 +1257,7 @@
id = "pineappleade" id = "pineappleade"
description = "Spineapple, juiced up." description = "Spineapple, juiced up."
taste_description = "sweet`n`sour pineapples" taste_description = "sweet`n`sour pineapples"
nutriment_factor = 5 //CS Edit nutriment_factor = 5 //CHOMPStation addition
color = "#FFFF00" color = "#FFFF00"
adj_temp = -5 adj_temp = -5
@@ -1270,7 +1270,7 @@
id = "kiraspecial" id = "kiraspecial"
description = "Long live the guy who everyone had mistaken for a girl. Baka!" description = "Long live the guy who everyone had mistaken for a girl. Baka!"
taste_description = "fruity sweetness" taste_description = "fruity sweetness"
nutriment_factor = 1.5 //CS Edit nutriment_factor = 1.5 //CHOMPStation addition
color = "#CCCC99" color = "#CCCC99"
adj_temp = -5 adj_temp = -5
@@ -1283,7 +1283,7 @@
id = "brownstar" id = "brownstar"
description = "It's not what it sounds like..." description = "It's not what it sounds like..."
taste_description = "orange and cola soda" taste_description = "orange and cola soda"
nutriment_factor = 1.5 //CS Edit nutriment_factor = 1.5 //CHOMPStation addition
color = "#9F3400" color = "#9F3400"
adj_temp = -2 adj_temp = -2
@@ -1377,7 +1377,7 @@
id = "rewriter" id = "rewriter"
description = "The secret of the sanctuary of the Libarian..." description = "The secret of the sanctuary of the Libarian..."
taste_description = "citrus and coffee" taste_description = "citrus and coffee"
nutriment_factor = 1.5 //CS Edit nutriment_factor = 1.5 //CHOMPStation addition
color = "#485000" color = "#485000"
adj_temp = -5 adj_temp = -5
@@ -1393,7 +1393,7 @@
id = "nuka_cola" id = "nuka_cola"
description = "Cola, cola never changes." description = "Cola, cola never changes."
taste_description = "cola" taste_description = "cola"
nutriment_factor = 1.5 //CS Edit nutriment_factor = 1.5 //CHOMPStation addition
color = "#100800" color = "#100800"
adj_temp = -5 adj_temp = -5
adj_sleepy = -2 adj_sleepy = -2
@@ -1426,7 +1426,7 @@
id = "cola" id = "cola"
description = "A refreshing beverage." description = "A refreshing beverage."
taste_description = "cola" taste_description = "cola"
nutriment_factor = 1.5 //CS Edit nutriment_factor = 1.5 //CHOMPStation addition
reagent_state = LIQUID reagent_state = LIQUID
color = "#100800" color = "#100800"
adj_drowsy = -3 adj_drowsy = -3
@@ -1441,7 +1441,7 @@
id = "spacemountainwind" id = "spacemountainwind"
description = "Blows right through you like a space wind." description = "Blows right through you like a space wind."
taste_description = "sweet citrus soda" taste_description = "sweet citrus soda"
nutriment_factor = 1.5 //CS Edit nutriment_factor = 1.5 //CHOMPStation addition
color = "#102000" color = "#102000"
adj_drowsy = -7 adj_drowsy = -7
adj_sleepy = -1 adj_sleepy = -1
@@ -1456,7 +1456,7 @@
id = "dr_gibb" id = "dr_gibb"
description = "A delicious blend of 42 different flavors" description = "A delicious blend of 42 different flavors"
taste_description = "cherry soda" taste_description = "cherry soda"
nutriment_factor = 3 //CS Edit nutriment_factor = 3 //CHOMPStation addition
color = "#102000" color = "#102000"
adj_drowsy = -6 adj_drowsy = -6
adj_temp = -5 adj_temp = -5
@@ -1469,7 +1469,7 @@
id = "space_up" id = "space_up"
description = "Tastes like a hull breach in your mouth." description = "Tastes like a hull breach in your mouth."
taste_description = "citrus soda" taste_description = "citrus soda"
nutriment_factor = 1.5 //CS Edit nutriment_factor = 1.5 //CHOMPStation addition
color = "#202800" color = "#202800"
adj_temp = -8 adj_temp = -8
@@ -1482,7 +1482,7 @@
id = "lemon_lime" id = "lemon_lime"
description = "A tangy substance made of 0.5% natural citrus!" description = "A tangy substance made of 0.5% natural citrus!"
taste_description = "tangy lime and lemon soda" taste_description = "tangy lime and lemon soda"
nutriment_factor = 1.5 //CS Edit nutriment_factor = 1.5 //CHOMPStation addition
color = "#878F00" color = "#878F00"
adj_temp = -8 adj_temp = -8
@@ -1495,7 +1495,7 @@
id = "gingerale" id = "gingerale"
description = "The original." description = "The original."
taste_description = "somewhat tangy ginger ale" taste_description = "somewhat tangy ginger ale"
nutriment_factor = 1.5 //CS Edit nutriment_factor = 1.5 //CHOMPStation addition
color = "#edcf8f" color = "#edcf8f"
adj_temp = -8 adj_temp = -8
@@ -1520,7 +1520,7 @@
id = "roy_rogers" id = "roy_rogers"
description = "I'm a cowboy, on a steel horse I ride." description = "I'm a cowboy, on a steel horse I ride."
taste_description = "cola and fruit" taste_description = "cola and fruit"
nutriment_factor = 1.5 //CS Edit nutriment_factor = 1.5 //CHOMPStation addition
color = "#4F1811" color = "#4F1811"
adj_temp = -8 adj_temp = -8
@@ -1533,7 +1533,7 @@
id = "collins_mix" id = "collins_mix"
description = "Best hope it isn't a hoax." description = "Best hope it isn't a hoax."
taste_description = "gin and lemonade" taste_description = "gin and lemonade"
nutriment_factor = 1.5 //CS Edit nutriment_factor = 1.5 //CHOMPStation addition
color = "#D7D0B3" color = "#D7D0B3"
adj_temp = -8 adj_temp = -8
@@ -1546,7 +1546,7 @@
id = "arnold_palmer" id = "arnold_palmer"
description = "Tastes just like the old man." description = "Tastes just like the old man."
taste_description = "lemon and sweet tea" taste_description = "lemon and sweet tea"
nutriment_factor = 1.5 //CS Edit nutriment_factor = 1.5 //CHOMPStation addition
color = "#AF5517" color = "#AF5517"
adj_temp = -8 adj_temp = -8
@@ -1669,7 +1669,7 @@
id = "dreamcream" id = "dreamcream"
description = "A smoothy, silky mix of honey and dairy." description = "A smoothy, silky mix of honey and dairy."
taste_description = "sweet, soothing dairy" taste_description = "sweet, soothing dairy"
nutriment_factor = 5 //CS Edit nutriment_factor = 5 //CHOMPStation addition
color = "#fcfcc9" // rgb(252, 252, 201) color = "#fcfcc9" // rgb(252, 252, 201)
glass_name = "Dream Cream" glass_name = "Dream Cream"
@@ -1680,7 +1680,7 @@
id = "vilelemon" id = "vilelemon"
description = "A fizzy, sour lemonade mix." description = "A fizzy, sour lemonade mix."
taste_description = "fizzy, sour lemon" taste_description = "fizzy, sour lemon"
nutriment_factor = 1.5 //CS Edit nutriment_factor = 1.5 //CHOMPStation addition
color = "#c6c603" // rgb(198, 198, 3) color = "#c6c603" // rgb(198, 198, 3)
glass_name = "Vile Lemon" glass_name = "Vile Lemon"
@@ -1692,7 +1692,7 @@
id = "entdraught" id = "entdraught"
description = "A natural, earthy combination of all things peaceful." description = "A natural, earthy combination of all things peaceful."
taste_description = "fresh rain and sweet memories" taste_description = "fresh rain and sweet memories"
nutriment_factor = 5 //CS Edit nutriment_factor = 5 //CHOMPStation addition
color = "#3a6617" // rgb(58, 102, 23) color = "#3a6617" // rgb(58, 102, 23)
glass_name = "Ent's Draught" glass_name = "Ent's Draught"
@@ -1713,7 +1713,7 @@
id = "oilslick" id = "oilslick"
description = "A viscous, but sweet, ooze." description = "A viscous, but sweet, ooze."
taste_description = "honey" taste_description = "honey"
nutriment_factor = 15 //CS Edit nutriment_factor = 15 //CHOMPStation addition
color = "#FDF5E6" // rgb(253,245,230) color = "#FDF5E6" // rgb(253,245,230)
water_based = FALSE water_based = FALSE
@@ -1726,7 +1726,7 @@
id = "slimeslammer" id = "slimeslammer"
description = "A viscous, but savory, ooze." description = "A viscous, but savory, ooze."
taste_description = "peanuts`n`slime" taste_description = "peanuts`n`slime"
nutriment_factor = 20 //CS Edit nutriment_factor = 20 //CHOMPStation addition
color = "#93604D" color = "#93604D"
water_based = FALSE water_based = FALSE
@@ -1749,7 +1749,7 @@
id = "nuclearwaste" id = "nuclearwaste"
description = "A viscous, glowing slurry." description = "A viscous, glowing slurry."
taste_description = "sour honey drops" taste_description = "sour honey drops"
nutriment_factor = 15 //CS Edit nutriment_factor = 15 //CHOMPStation addition
color = "#7FFF00" // rgb(127,255,0) color = "#7FFF00" // rgb(127,255,0)
water_based = FALSE water_based = FALSE
@@ -1775,7 +1775,7 @@
id = "sodaoil" id = "sodaoil"
description = "A thick, bubbling soda." description = "A thick, bubbling soda."
taste_description = "chewy water" taste_description = "chewy water"
nutriment_factor = 10 //CS Edit nutriment_factor = 10 //CHOMPStation addition
color = "#F0FFF0" // rgb(245,255,250) color = "#F0FFF0" // rgb(245,255,250)
water_based = FALSE water_based = FALSE
@@ -1862,7 +1862,7 @@
id = "fauxfizz" id = "fauxfizz"
description = "One sip and you're in the bahamas... maybe." description = "One sip and you're in the bahamas... maybe."
taste_description = "slightly tropical" taste_description = "slightly tropical"
nutriment_factor = 4 //CS Edit nutriment_factor = 4 //CHOMPStation addition
color = "#69375C" color = "#69375C"
glass_name = "tropical fizz" glass_name = "tropical fizz"
@@ -2418,7 +2418,7 @@
id = "cubalibre" id = "cubalibre"
description = "Rum, mixed with cola. Viva la revolucion." description = "Rum, mixed with cola. Viva la revolucion."
taste_description = "cola" taste_description = "cola"
nutriment_factor = 1.5 //CS Edit nutriment_factor = 1.5 //CHOMPStation addition
color = "#3E1B00" color = "#3E1B00"
strength = 30 strength = 30
@@ -2431,7 +2431,7 @@
description = "This thing makes the hair on the back of your neck stand up." description = "This thing makes the hair on the back of your neck stand up."
taste_description = "sweet tasting iron" taste_description = "sweet tasting iron"
taste_mult = 1.5 taste_mult = 1.5
nutriment_factor = 1.5 //CS Edit nutriment_factor = 1.5 //CHOMPStation addition
color = "#820000" color = "#820000"
strength = 15 strength = 15
@@ -2804,7 +2804,7 @@
id = "snowwhite" id = "snowwhite"
description = "A cold refreshment" description = "A cold refreshment"
taste_description = "refreshing cold" taste_description = "refreshing cold"
nutriment_factor = 1.5 //CS Edit nutriment_factor = 1.5 //CHOMPStation addition
color = "#FFFFFF" color = "#FFFFFF"
strength = 30 strength = 30
@@ -2816,7 +2816,7 @@
id = "suidream" id = "suidream"
description = "Comprised of: White soda, blue curacao, melon liquor." description = "Comprised of: White soda, blue curacao, melon liquor."
taste_description = "fruit" taste_description = "fruit"
nutriment_factor = 1.5 //CS Edit nutriment_factor = 1.5 //CHOMPStation addition
color = "#00A86B" color = "#00A86B"
strength = 100 strength = 100
@@ -2912,7 +2912,7 @@
id = "whiskeycola" id = "whiskeycola"
description = "Whiskey, mixed with cola. Surprisingly refreshing." description = "Whiskey, mixed with cola. Surprisingly refreshing."
taste_description = "cola with an alcoholic undertone" taste_description = "cola with an alcoholic undertone"
nutriment_factor = 1.5 //CS Edit nutriment_factor = 1.5 //CHOMPStation addition
color = "#3E1B00" color = "#3E1B00"
strength = 25 strength = 25
@@ -2925,7 +2925,7 @@
id = "whiskeysoda" id = "whiskeysoda"
description = "Ultimate refreshment." description = "Ultimate refreshment."
taste_description = "carbonated whiskey" taste_description = "carbonated whiskey"
nutriment_factor = 1.5 //CS Edit nutriment_factor = 1.5 //CHOMPStation addition
color = "#EAB300" color = "#EAB300"
strength = 15 strength = 15
@@ -3085,7 +3085,7 @@
id = "xanaducannon" id = "xanaducannon"
description = "Common in the entertainment districts of Titan." description = "Common in the entertainment districts of Titan."
taste_description = "sweet alcohol" taste_description = "sweet alcohol"
nutriment_factor = 1.5 //CS Edit nutriment_factor = 1.5 //CHOMPStation addition
color = "#614126" color = "#614126"
strength = 50 strength = 50
@@ -3097,7 +3097,7 @@
id = "debugger" id = "debugger"
description = "From Shelf. Not for human consumption." description = "From Shelf. Not for human consumption."
taste_description = "oily bitterness" taste_description = "oily bitterness"
nutriment_factor = 10 //CS Edit nutriment_factor = 10 //CHOMPStation addition
color = "#d3d3d3" color = "#d3d3d3"
strength = 32 strength = 32
@@ -3109,7 +3109,7 @@
id = "spacersbrew" id = "spacersbrew"
description = "Ethanol and orange soda. A common emergency drink on frontier colonies." description = "Ethanol and orange soda. A common emergency drink on frontier colonies."
taste_description = "bitter oranges" taste_description = "bitter oranges"
nutriment_factor = 1.5 //CS Edit nutriment_factor = 1.5 //CHOMPStation addition
color = "#ffc04c" color = "#ffc04c"
strength = 43 strength = 43
@@ -3204,7 +3204,7 @@
id = "rotgut" id = "rotgut"
description = "A heinous combination of clashing flavors." description = "A heinous combination of clashing flavors."
taste_description = "plague and coldsweats" taste_description = "plague and coldsweats"
nutriment_factor = 1.5 //CS Edit nutriment_factor = 1.5 //CHOMPStation addition
color = "#3a6617" // rgb(58, 102, 23) color = "#3a6617" // rgb(58, 102, 23)
strength = 10 strength = 10
@@ -3475,7 +3475,7 @@
description = "This thing makes the hair on the back of your neck stand up." description = "This thing makes the hair on the back of your neck stand up."
taste_description = "sweet victory and sour iron" taste_description = "sweet victory and sour iron"
taste_mult = 1.5 taste_mult = 1.5
nutriment_factor = 1.5 //CS Edit nutriment_factor = 1.5 //CHOMPStation addition
color = "#F3C906" color = "#F3C906"
strength = 30 strength = 30