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

7/23/2021 Drink Revamp

Browse Source
This commit is contained in:
Chompstation Bot
2021-07-27 22:06:30 +00:00
parent 241a0d528f
commit 02af50470c
18 changed files with 8766 additions and 202 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
code/modules/reagents/machinery/dispenser/cartridge_presets.dm
View File

@@ -61,8 +61,10 @@
spawn_reagent = "kahlua"
/obj/item/weapon/reagent_containers/chem_disp_cartridge/whiskey
spawn_reagent = "whiskey"
/obj/item/weapon/reagent_containers/chem_disp_cartridge/wine
spawn_reagent = "wine"
/obj/item/weapon/reagent_containers/chem_disp_cartridge/redwine
spawn_reagent = "redwine"
/obj/item/weapon/reagent_containers/chem_disp_cartridge/whitewine
spawn_reagent = "whitewine"
/obj/item/weapon/reagent_containers/chem_disp_cartridge/vodka
spawn_reagent = "vodka"
/obj/item/weapon/reagent_containers/chem_disp_cartridge/gin

2
code/modules/reagents/machinery/dispenser/dispenser2_energy.dm
View File

@@ -52,7 +52,7 @@
/obj/machinery/chemical_dispenser/bar_alc
dispense_reagents = list(
"lemon_lime", "sugar", "orangejuice", "limejuice", "sodawater", "tonic", "beer", "kahlua",
"whiskey", "wine", "vodka", "cider", "gin", "rum", "tequilla", "vermouth", "cognac", "ale", "mead", "bitters"
"whiskey", "redwine", "whitewine", "vodka", "cider", "gin", "rum", "tequilla", "vermouth", "cognac", "ale", "mead", "bitters"
)
/obj/machinery/chemical_dispenser/bar_coffee

3
code/modules/reagents/machinery/dispenser/dispenser_presets.dm
View File

@@ -105,7 +105,8 @@
/obj/item/weapon/reagent_containers/chem_disp_cartridge/beer,
/obj/item/weapon/reagent_containers/chem_disp_cartridge/kahlua,
/obj/item/weapon/reagent_containers/chem_disp_cartridge/whiskey,
/obj/item/weapon/reagent_containers/chem_disp_cartridge/wine,
/obj/item/weapon/reagent_containers/chem_disp_cartridge/redwine,
/obj/item/weapon/reagent_containers/chem_disp_cartridge/whitewine,
/obj/item/weapon/reagent_containers/chem_disp_cartridge/vodka,
/obj/item/weapon/reagent_containers/chem_disp_cartridge/gin,
/obj/item/weapon/reagent_containers/chem_disp_cartridge/rum,

30
code/modules/reagents/machinery/dispenser/supply.dm
View File

@@ -66,7 +66,8 @@
/obj/item/weapon/reagent_containers/chem_disp_cartridge/beer,
/obj/item/weapon/reagent_containers/chem_disp_cartridge/kahlua,
/obj/item/weapon/reagent_containers/chem_disp_cartridge/whiskey,
/obj/item/weapon/reagent_containers/chem_disp_cartridge/wine,
/obj/item/weapon/reagent_containers/chem_disp_cartridge/redwine,
/obj/item/weapon/reagent_containers/chem_disp_cartridge/whitewine,
/obj/item/weapon/reagent_containers/chem_disp_cartridge/vodka,
/obj/item/weapon/reagent_containers/chem_disp_cartridge/gin,
/obj/item/weapon/reagent_containers/chem_disp_cartridge/rum,
@@ -191,19 +192,20 @@ SEC_PACK(tungsten, /obj/item/weapon/reagent_containers/chem_disp_cartridge/tung
SEC_PACK(calcium, /obj/item/weapon/reagent_containers/chem_disp_cartridge/calcium, "Reagent refill - Calcium", "calcium reagent cartridge crate", 15, access_chemistry)
// Bar-restricted (alcoholic drinks)
// Datum path Contents type Supply pack name Container name Cost Container access
SEC_PACK(beer, /obj/item/weapon/reagent_containers/chem_disp_cartridge/beer, "Reagent refill - Beer", "beer reagent cartridge crate", 15, access_bar)
SEC_PACK(kahlua, /obj/item/weapon/reagent_containers/chem_disp_cartridge/kahlua, "Reagent refill - Kahlua", "kahlua reagent cartridge crate", 15, access_bar)
SEC_PACK(whiskey, /obj/item/weapon/reagent_containers/chem_disp_cartridge/whiskey, "Reagent refill - Whiskey", "whiskey reagent cartridge crate", 15, access_bar)
SEC_PACK(wine, /obj/item/weapon/reagent_containers/chem_disp_cartridge/wine, "Reagent refill - Wine", "wine reagent cartridge crate", 15, access_bar)
SEC_PACK(vodka, /obj/item/weapon/reagent_containers/chem_disp_cartridge/vodka, "Reagent refill - Vodka", "vodka reagent cartridge crate", 15, access_bar)
SEC_PACK(gin, /obj/item/weapon/reagent_containers/chem_disp_cartridge/gin, "Reagent refill - Gin", "gin reagent cartridge crate", 15, access_bar)
SEC_PACK(rum, /obj/item/weapon/reagent_containers/chem_disp_cartridge/rum, "Reagent refill - Rum", "rum reagent cartridge crate", 15, access_bar)
SEC_PACK(tequila, /obj/item/weapon/reagent_containers/chem_disp_cartridge/tequila, "Reagent refill - Tequila", "tequila reagent cartridge crate", 15, access_bar)
SEC_PACK(vermouth, /obj/item/weapon/reagent_containers/chem_disp_cartridge/vermouth, "Reagent refill - Vermouth", "vermouth reagent cartridge crate", 15, access_bar)
SEC_PACK(cognac, /obj/item/weapon/reagent_containers/chem_disp_cartridge/cognac, "Reagent refill - Cognac", "cognac reagent cartridge crate", 15, access_bar)
SEC_PACK(ale, /obj/item/weapon/reagent_containers/chem_disp_cartridge/ale, "Reagent refill - Ale", "ale reagent cartridge crate", 15, access_bar)
SEC_PACK(mead, /obj/item/weapon/reagent_containers/chem_disp_cartridge/mead, "Reagent refill - Mead", "mead reagent cartridge crate", 15, access_bar)
// Datum path Contents type Supply pack name Container name Cost Container access
SEC_PACK(beer, /obj/item/weapon/reagent_containers/chem_disp_cartridge/beer, "Reagent refill - Beer", "beer reagent cartridge crate", 15, access_bar)
SEC_PACK(kahlua, /obj/item/weapon/reagent_containers/chem_disp_cartridge/kahlua, "Reagent refill - Kahlua", "kahlua reagent cartridge crate", 15, access_bar)
SEC_PACK(whiskey, /obj/item/weapon/reagent_containers/chem_disp_cartridge/whiskey, "Reagent refill - Whiskey", "whiskey reagent cartridge crate", 15, access_bar)
SEC_PACK(rwine, /obj/item/weapon/reagent_containers/chem_disp_cartridge/redwine, "Reagent refill - Red Wine", "red wine reagent cartridge crate", 15, access_bar)
SEC_PACK(wwine, /obj/item/weapon/reagent_containers/chem_disp_cartridge/whitewine, "Reagent refill - White Wine", "white wine reagent cartridge crate", 15, access_bar)
SEC_PACK(vodka, /obj/item/weapon/reagent_containers/chem_disp_cartridge/vodka, "Reagent refill - Vodka", "vodka reagent cartridge crate", 15, access_bar)
SEC_PACK(gin, /obj/item/weapon/reagent_containers/chem_disp_cartridge/gin, "Reagent refill - Gin", "gin reagent cartridge crate", 15, access_bar)
SEC_PACK(rum, /obj/item/weapon/reagent_containers/chem_disp_cartridge/rum, "Reagent refill - Rum", "rum reagent cartridge crate", 15, access_bar)
SEC_PACK(tequila, /obj/item/weapon/reagent_containers/chem_disp_cartridge/tequila, "Reagent refill - Tequila", "tequila reagent cartridge crate", 15, access_bar)
SEC_PACK(vermouth, /obj/item/weapon/reagent_containers/chem_disp_cartridge/vermouth, "Reagent refill - Vermouth", "vermouth reagent cartridge crate", 15, access_bar)
SEC_PACK(cognac, /obj/item/weapon/reagent_containers/chem_disp_cartridge/cognac, "Reagent refill - Cognac", "cognac reagent cartridge crate", 15, access_bar)
SEC_PACK(ale, /obj/item/weapon/reagent_containers/chem_disp_cartridge/ale, "Reagent refill - Ale", "ale reagent cartridge crate", 15, access_bar)
SEC_PACK(mead, /obj/item/weapon/reagent_containers/chem_disp_cartridge/mead, "Reagent refill - Mead", "mead reagent cartridge crate", 15, access_bar)
// Unrestricted (water, sugar, non-alcoholic drinks)
// Datum path Contents type Supply pack name Container name Cost

4
code/modules/reagents/reactions/instant/drinks.dm
View File

@@ -107,8 +107,8 @@
/decl/chemical_reaction/instant/drinks/wine
name = "Wine"
id = "wine"
result = "wine"
id = "redwine"
result = "redwine"
required_reagents = list("grapejuice" = 10)
catalysts = list("enzyme" = 5)
result_amount = 10

203
code/modules/reagents/reagents/food_drinks.dm
View File

@@ -1095,6 +1095,19 @@
glass_desc = "Juice from a potato. Bleh."
allergen_type = ALLERGEN_VEGETABLE //Potatoes are vegetables
/datum/reagent/drink/juice/turnip
name = "Turnip Juice"
id = "turnipjuice"
description = "Juice of the turnip. A step below the potato."
taste_description = "turnips"
nutrition = 2
color = "#251e2e"
sugary = FALSE
glass_name = "turnip juice"
glass_desc = "Juice of the turnip. A step below the potato."
allergen_type = ALLERGEN_VEGETABLE //Turnips are vegetables
/datum/reagent/drink/juice/tomato
name = "Tomato Juice"
id = "tomatojuice"
@@ -1783,6 +1796,110 @@
glass_desc = "A glass of refreshing Space Cola"
glass_special = list(DRINK_FIZZ)
/datum/reagent/drink/soda/lemon_soda
name = "Lemon Soda"
id = "lemonsoda"
description = "Soda made using lemon concentrate. Sour."
taste_description = "strong sourness"
reagent_state = LIQUID
color = "#ffe658"
adj_drowsy = -3
adj_temp = -5
glass_name = "lemon Soda"
glass_desc = "A glass of refreshing Lemon Soda. So sour!"
glass_special = list(DRINK_FIZZ)
allergen_type = ALLERGEN_FRUIT
/datum/reagent/drink/soda/apple_soda
name = "Apple Soda"
id = "applesoda"
description = "Soda made using fresh apples."
taste_description = "crisp juiciness"
reagent_state = LIQUID
color = "#c73737"
adj_drowsy = -3
adj_temp = -5
glass_name = "Apple Soda"
glass_desc = "A glass of refreshing Apple Soda. Crisp!"
glass_special = list(DRINK_FIZZ)
allergen_type = ALLERGEN_FRUIT
/datum/reagent/drink/soda/straw_soda
name = "Strawberry Soda"
id = "strawsoda"
description = "Soda made using sweet berries."
taste_description = "oddly bland"
reagent_state = LIQUID
color = "#ffa3a3"
adj_drowsy = -3
adj_temp = -5
glass_name = "Strawberry Soda"
glass_desc = "A glass of refreshing Strawberry Soda"
glass_special = list(DRINK_FIZZ)
allergen_type = ALLERGEN_FRUIT
/datum/reagent/drink/soda/orangesoda
name = "Orange Soda"
id = "orangesoda"
description = "Soda made using fresh picked oranges."
taste_description = "sweet and citrusy"
reagent_state = LIQUID
color = "#ff992c"
adj_drowsy = -3
adj_temp = -5
glass_name = "Orange Soda"
glass_desc = "A glass of refreshing Orange Soda. Delicious!"
glass_special = list(DRINK_FIZZ)
allergen_type = ALLERGEN_FRUIT
/datum/reagent/drink/soda/grapesoda
name = "Grape Soda"
id = "grapesoda"
description = "Soda made of carbonated grapejuice."
taste_description = "tangy goodness"
reagent_state = LIQUID
color = "#9862d2"
adj_drowsy = -3
adj_temp = -5
glass_name = "Grape Soda"
glass_desc = "A glass of refreshing Grape Soda. Tangy!"
glass_special = list(DRINK_FIZZ)
allergen_type = ALLERGEN_FRUIT
/datum/reagent/drink/soda/sarsaparilla
name = "Sarsaparilla"
id = "sarsaparilla"
description = "Soda made from genetically modified Mexican sarsaparilla plants."
taste_description = "licorice and caramel"
reagent_state = LIQUID
color = "#e1bb59"
adj_drowsy = -3
adj_temp = -5
glass_name = "Sarsaparilla"
glass_desc = "A glass of refreshing Sarsaparilla. Delicious!"
glass_special = list(DRINK_FIZZ)
/datum/reagent/drink/soda/pork_soda
name = "Bacon Soda"
id = "porksoda"
description = "Soda made using pork like flavoring."
taste_description = "sugar coated bacon"
reagent_state = LIQUID
color = "ff8080"
adj_drowsy = -3
adj_temp = -5
glass_name = "Bacon Soda"
glass_desc = "A glass of Bacon Soda, very odd..."
glass_special = list(DRINK_FIZZ)
/datum/reagent/drink/soda/spacemountainwind
name = "Mountain Wind"
id = "spacemountainwind"
@@ -2589,19 +2706,71 @@
allergen_type = ALLERGEN_GRAINS //Whiskey is also made from grain.
/datum/reagent/ethanol/wine
name = "Wine"
id = "wine"
/datum/reagent/ethanol/redwine
name = "Red Wine"
id = "redwine"
description = "An premium alchoholic beverage made from distilled grape juice."
taste_description = "bitter sweetness"
color = "#7E4043" // rgb: 126, 64, 67
strength = 15
glass_name = "wine"
glass_name = "red wine"
glass_desc = "A very classy looking drink."
allergen_type = ALLERGEN_FRUIT //Wine is made from grapes (fruit)
/datum/reagent/ethanol/whitewine
name = "White Wine"
id = "whitewine"
description = "An premium alchoholic beverage made from fermenting of the non-coloured pulp of grapes."
taste_description = "light fruity flavor"
color = "#F4EFB0" // rgb: 244, 239, 176
strength = 15
glass_name = "white wine"
glass_desc = "A very classy looking drink."
allergen_type = ALLERGEN_FRUIT //Wine is made from grapes (fruit)
/datum/reagent/ethanol/carnoth
name = "Carnoth"
id = "carnoth"
description = "An premium alchoholic beverage made with multiple hybridized species of grapes that give it a dark maroon coloration."
taste_description = "alcoholic sweet flavor"
color = "#5B0000" // rgb: 0, 100, 35
strength = 20
glass_name = "carnoth"
glass_desc = "A very classy looking drink."
allergen_type = ALLERGEN_FRUIT //Wine is made from grapes (fruit)
/datum/reagent/ethanol/pwine
name = "Poison Wine"
id = "pwine"
description = "Is this even wine? Toxic! Hallucinogenic! Probably consumed in boatloads by your superiors!"
color = "#000000"
strength = 10
druggy = 50
halluci = 10
glass_name = "???"
glass_desc = "A black ichor with an oily purple sheer on top. Are you sure you should drink this?"
allergen_type = ALLERGEN_FRUIT //Made from berries which are fruit
/datum/reagent/ethanol/pwine/affect_ingest(var/mob/living/carbon/M, var/alien, var/removed)
..()
if(dose > 30)
M.adjustToxLoss(2 * removed)
if(dose > 60 && ishuman(M) && prob(5))
var/mob/living/carbon/human/H = M
var/obj/item/organ/internal/heart/L = H.internal_organs_by_name[O_HEART]
if (L && istype(L))
if(dose < 120)
L.take_damage(10 * removed, 0)
else
L.take_damage(100, 0)
/datum/reagent/ethanol/wine/champagne
name = "Champagne"
id = "champagne"
@@ -3227,32 +3396,6 @@
glass_name = "Patron"
glass_desc = "Drinking patron in the bar, with all the subpar ladies."
/datum/reagent/ethanol/pwine
name = "Poison Wine"
id = "pwine"
description = "Is this even wine? Toxic! Hallucinogenic! Probably consumed in boatloads by your superiors!"
color = "#000000"
strength = 10
druggy = 50
halluci = 10
glass_name = "???"
glass_desc = "A black ichor with an oily purple sheer on top. Are you sure you should drink this?"
allergen_type = ALLERGEN_FRUIT //Made from berries which are fruit
/datum/reagent/ethanol/pwine/affect_ingest(var/mob/living/carbon/M, var/alien, var/removed)
..()
if(dose > 30)
M.adjustToxLoss(2 * removed)
if(dose > 60 && ishuman(M) && prob(5))
var/mob/living/carbon/human/H = M
var/obj/item/organ/internal/heart/L = H.internal_organs_by_name[O_HEART]
if (L && istype(L))
if(dose < 120)
L.take_damage(10 * removed, 0)
else
L.take_damage(100, 0)
/datum/reagent/ethanol/red_mead
name = "Red Mead"
id = "red_mead"