shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #11576 from Owai-Seek/strawberryjuice3-21-2020

Browse Source 
Porting Juices, Drinks, and Salami [READY]
This commit is contained in:
kevinz000
2020-03-23 10:36:44 -07:00
committed by GitHub
parent e6e73e0888 29576ee6a7
commit fbe77495e8
20 changed files with 380 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/reagents/chemistry/machinery/chem_dispenser.dm
+15 -6
View File
@@ -486,6 +486,7 @@
/datum/reagent/consumable/pwr_game,
/datum/reagent/consumable/shamblers,
/datum/reagent/consumable/sugar,
/datum/reagent/consumable/pineapplejuice,
/datum/reagent/consumable/orangejuice,
/datum/reagent/consumable/grenadine,
/datum/reagent/consumable/limejuice,
@@ -494,15 +495,22 @@
/datum/reagent/consumable/menthol
)
upgrade_reagents = list(
/datum/reagent/drug/mushroomhallucinogen,
/datum/reagent/consumable/nothing,
/datum/reagent/medicine/cryoxadone
/datum/reagent/consumable/banana,
/datum/reagent/consumable/berryjuice,
/datum/reagent/consumable/strawberryjuice
)
upgrade_reagents2 = list(
/datum/reagent/consumable/banana,
/datum/reagent/consumable/berryjuice
/datum/reagent/consumable/applejuice,
/datum/reagent/consumable/carrotjuice,
/datum/reagent/consumable/pumpkinjuice,
/datum/reagent/consumable/watermelonjuice
)
upgrade_reagents3 = list(
/datum/reagent/drug/mushroomhallucinogen,
/datum/reagent/consumable/nothing,
/datum/reagent/medicine/cryoxadone,
/datum/reagent/consumable/peachjuice
)
upgrade_reagents3 = null
emagged_reagents = list(
/datum/reagent/consumable/ethanol/thirteenloko,
/datum/reagent/consumable/ethanol/changelingsting,
@@ -551,6 +559,7 @@
/datum/reagent/consumable/ethanol/hcider,
/datum/reagent/consumable/ethanol/creme_de_menthe,
/datum/reagent/consumable/ethanol/creme_de_cacao,
/datum/reagent/consumable/ethanol/creme_de_coconut,
/datum/reagent/consumable/ethanol/triple_sec,
/datum/reagent/consumable/ethanol/sake,
/datum/reagent/consumable/ethanol/applejack
code/modules/reagents/chemistry/reagents/alcohol_reagents.dm
+177 -3
View File
@@ -958,14 +958,14 @@ All effects don't start immediately, but rather get worse over time; the rate is
/datum/reagent/consumable/ethanol/bahama_mama
name = "Bahama Mama"
description = "Tropical cocktail."
description = "A tropical cocktail with a complex blend of flavors."
color = "#FF7F3B" // rgb: 255, 127, 59
boozepwr = 35
quality = DRINK_GOOD
taste_description = "lime and orange"
taste_description = "pineapple, coconut, and a hint of coffee"
glass_icon_state = "bahama_mama"
glass_name = "Bahama Mama"
glass_desc = "Tropical cocktail."
glass_desc = "A tropical cocktail with a complex blend of flavors."
value = 2
/datum/reagent/consumable/ethanol/singulo
@@ -1156,6 +1156,17 @@ All effects don't start immediately, but rather get worse over time; the rate is
playsound(get_turf(M), 'sound/effects/explosionfar.ogg', 100, 1)
return ..()
/datum/reagent/consumable/ethanol/hiveminderaser
name = "Hivemind Eraser"
description = "A vessel of pure flavor."
color = "#FF80FC" // rgb: 255, 128, 252
boozepwr = 40
quality = DRINK_GOOD
taste_description = "psychic links"
glass_icon_state = "hiveminderaser"
glass_name = "Hivemind Eraser"
glass_desc = "For when even mindshields can't save you."
/datum/reagent/consumable/ethanol/erikasurprise
name = "Erika Surprise"
description = "The surprise is, it's green!"
@@ -1563,6 +1574,16 @@ All effects don't start immediately, but rather get worse over time; the rate is
glass_desc = "A million hazing lawsuits and alcohol poisonings have started with this humble ingredient."
value = 1
/datum/reagent/consumable/ethanol/creme_de_coconut
name = "Creme de Coconut"
description = "A coconut liqueur for smooth, creamy, tropical drinks."
color = "#F7F0D0"
boozepwr = 20
taste_description = "a sweet milky flavor with notes of toasted sugar"
glass_icon_state = "glass_white"
glass_name = "Creme de Coconut"
glass_desc = "An unintimidating glass of coconut liqueur."
/datum/reagent/consumable/ethanol/quadruple_sec
name = "Quadruple Sec"
description = "Kicks just as hard as licking the powercell on a baton, but tastier."
@@ -1604,6 +1625,28 @@ All effects don't start immediately, but rather get worse over time; the rate is
. = 1
return ..()
/datum/reagent/consumable/ethanol/painkiller
name = "Painkiller"
description = "Dulls your pain. Your emotional pain, that is."
boozepwr = 20
color = "#EAD677"
quality = DRINK_NICE
taste_description = "sugary tartness"
glass_icon_state = "painkiller"
glass_name = "Painkiller"
glass_desc = "A combination of tropical juices and rum. Surely this will make you feel better."
/datum/reagent/consumable/ethanol/pina_colada
name = "Pina Colada"
description = "A fresh pineapple drink with coconut rum. Yum."
boozepwr = 40
color = "#FFF1B2"
quality = DRINK_FANTASTIC
taste_description = "pineapple, coconut, and a hint of the ocean"
glass_icon_state = "pina_colada"
glass_name = "Pina Colada"
glass_desc = "If you like pina coladas, and getting caught in the rain... well, you'll like this drink."
/datum/reagent/consumable/ethanol/grasshopper
name = "Grasshopper"
description = "A fresh and sweet dessert shooter. Difficult to look manly while drinking this."
@@ -1852,6 +1895,17 @@ All effects don't start immediately, but rather get worse over time; the rate is
glass_desc = "A drink that looks as refreshing as it tastes."
value = 1
/datum/reagent/consumable/ethanol/moscow_mule
name = "Moscow Mule"
description = "A chilly drink that reminds you of the Derelict."
color = "#EEF1AA"
boozepwr = 30
quality = DRINK_GOOD
taste_description = "refreshing spiciness"
glass_icon_state = "moscow_mule"
glass_name = "Moscow Mule"
glass_desc = "A chilly drink that reminds you of the Derelict."
/datum/reagent/consumable/ethanol/fernet
name = "Fernet"
description = "An incredibly bitter herbal liqueur used as a digestif."
@@ -2159,6 +2213,25 @@ All effects don't start immediately, but rather get worse over time; the rate is
glass_desc = "Although historians believe the drink was originally created to commemorate the end of an important conflict in man's past, its origins have largely been forgotten and it is today seen more as a general symbol of human supremacy."
value = 1
/datum/reagent/consumable/ethanol/mauna_loa
name = "Mauna Loa"
description = "Extremely hot; not for the faint of heart!"
boozepwr = 40
color = "#fe8308" // 254, 131, 8
quality = DRINK_FANTASTIC
taste_description = "fiery, with an aftertaste of burnt flesh"
glass_icon_state = "mauna_loa"
glass_name = "Mauna Loa"
glass_desc = "Lavaland in a drink... mug... volcano... thing."
/datum/reagent/consumable/ethanol/mauna_loa/on_mob_life(mob/living/carbon/M)
// Heats the user up while the reagent is in the body. Occasionally makes you burst into flames.
M.adjust_bodytemperature(25 * TEMPERATURE_DAMAGE_COEFFICIENT)
if (prob(5))
M.adjust_fire_stacks(1)
M.IgniteMob()
..()
/datum/reagent/consumable/ethanol/commander_and_chief
name = "Commander and Chief"
description = "A cocktail for the captain on the go."
@@ -2182,6 +2255,107 @@ All effects don't start immediately, but rather get worse over time; the rate is
. = 1
return ..()
/datum/reagent/consumable/ethanol/gunfire
name = "Gunfire"
description = "A drink that tastes like tiny explosions."
color = "#e4830d"
boozepwr = 40
quality = DRINK_GOOD
taste_description = "tiny explosions"
glass_icon_state = "gunfire"
glass_name = "Gunfire"
glass_desc = "It pops constantly as you look at it, giving off tiny sparks."
/datum/reagent/consumable/ethanol/gunfire/on_mob_life(mob/living/carbon/M)
if (prob(3))
to_chat(M,"<span class='notice'>You feel the gunfire pop in your mouth.</span>")
return ..()
/datum/reagent/consumable/ethanol/hellfire
name = "Hellfire"
description = "A nice drink that isn't quite as hot as it looks."
color = "#fb2203"
boozepwr = 60
quality = DRINK_VERYGOOD
taste_description = "cold flames that lick at the top of your mouth"
glass_icon_state = "hellfire"
glass_name = "Hellfire"
glass_desc = "An amber colored drink that isn't quite as hot as it looks."
/datum/reagent/consumable/ethanol/hellfire/on_mob_life(mob/living/carbon/M)
M.adjust_bodytemperature(30 * TEMPERATURE_DAMAGE_COEFFICIENT, 0, BODYTEMP_NORMAL + 30)
return ..()
/datum/reagent/consumable/ethanol/sins_delight
name = "Sin's Delight"
description = "The drink smells like the seven sins."
color = "#330000"
boozepwr = 66
quality = DRINK_FANTASTIC
taste_description = "sin"
glass_icon_state = "sins_delight"
glass_name = "Sin's Delight"
glass_desc = "You can smell the seven sins rolling off the top of the glass."
/datum/reagent/consumable/ethanol/strawberry_daiquiri
name = "Strawberry Daiquiri"
description = "Pink looking alcoholic drink."
boozepwr = 20
color = "#FF4A74"
quality = DRINK_NICE
taste_description = "sweet strawberry, lime and the ocean breeze"
glass_icon_state = "strawberry_daiquiri"
glass_name = "Strawberry Daiquiri"
glass_desc = "Pink looking drink with flowers and a big straw to sip it. Looks sweet and refreshing, perfect for warm days."
/datum/reagent/consumable/ethanol/liz_fizz
name = "Liz Fizz"
description = "Triple citrus layered with some ice and cream."
boozepwr = 0
color = "#D8FF59"
taste_description = "brain freezing sourness"
glass_icon_state = "liz_fizz"
glass_name = "Liz Fizz"
glass_desc = "Looks like a citrus sherbet seperated in layers? Why would anyone want that is beyond you."
/datum/reagent/consumable/ethanol/miami_vice
name = "Miami Vice"
description = "A drink layering Pina Colada and Strawberry Daiquiri"
boozepwr = 30
color = "#D8FF59"
quality = DRINK_FANTASTIC
taste_description = "sweet and refreshing flavor, complemented with strawberries and coconut, and hints of citrus"
glass_icon_state = "miami_vice"
glass_name = "Miami Vice"
glass_desc = "Strawberries and coconut, like yin and yang."
/datum/reagent/consumable/ethanol/malibu_sunset
name = "Malibu Sunset"
description = "A drink consisting of creme de coconut and tropical juices"
boozepwr = 20
color = "#FF9473"
quality = DRINK_NICE
taste_description = "coconut, with orange and grenadine accents"
glass_icon_state = "malibu_sunset"
glass_name = "Malibu Sunset"
glass_desc = "Tropical looking drinks, with ice cubes hovering on the surface and grenadine coloring the bottom."
/datum/reagent/consumable/ethanol/hotlime_miami
name = "Hotlime Miami"
description = "The essence of the 90's, if they were a bloody mess that is."
boozepwr = 40
color = "#A7FAE8"
quality = DRINK_FANTASTIC
taste_description = "coconut and aesthetic violence"
glass_icon_state = "hotlime_miami"
glass_name = "Hotlime Miami"
glass_desc = "This looks very aesthetically pleasing."
/datum/reagent/consumable/ethanol/hotlime_miami/on_mob_life(mob/living/carbon/M)
M.set_drugginess(50)
M.adjustStaminaLoss(-2)
return ..()
/datum/reagent/consumable/ethanol/fruit_wine
name = "Fruit Wine"
description = "A wine made from grown plants."
code/modules/reagents/chemistry/reagents/drink_reagents.dm
+29
View File
@@ -136,6 +136,14 @@
. = 1
..()
/datum/reagent/consumable/strawberryjuice
name = "Strawberry Juice"
description = "Refreshing seasonal summer drink."
color = "#E50D31"
taste_description = "strawberry"
glass_name = "glass of strawberry juice"
glass_desc = "Refreshing seasonal summer drink."
/datum/reagent/consumable/nothing
name = "Nothing"
description = "Absolutely nothing."
@@ -812,6 +820,14 @@
taste_description = "peaches"
glass_name = "glass of peach juice"
/datum/reagent/consumable/pineapplejuice
name = "Pineapple Juice"
description = "Tart, tropical, and hotly debated."
color = "#F7D435"
taste_description = "pineapple"
glass_name = "glass of pineapple juice"
glass_desc = "Tart, tropical, and hotly debated."
/datum/reagent/consumable/cream_soda
name = "Cream Soda"
description = "A classic space-American vanilla flavored soft drink."
@@ -826,6 +842,19 @@
M.adjust_bodytemperature(-5 * TEMPERATURE_DAMAGE_COEFFICIENT, BODYTEMP_NORMAL)
..()
/datum/reagent/consumable/sol_dry
name = "Sol Dry"
description = "A soothing, mellow drink made from ginger."
color = "#f7d26a"
quality = DRINK_NICE
taste_description = "sweet ginger spice"
glass_name = "Sol Dry"
glass_desc = "A soothing, mellow drink made from ginger."
/datum/reagent/consumable/sol_dry/on_mob_life(mob/living/carbon/M)
M.adjust_disgust(-5)
..()
/datum/reagent/consumable/red_queen
name = "Red Queen"
description = "DRINK ME."