cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-08-23 04:51:32 +01:00
Code Issues Packages Projects Releases Wiki Activity

Bartender power creep (#4281)

Browse Source 
Bar functions as part time coffee shop

Overhauled the coffee system and removed the old incomplete one.
This commit is contained in:
Ivan Rubinson
2018-03-16 20:55:32 +01:00
committed by Werner
parent 3796847b39
commit a77a96cbe4
10 changed files with 222 additions and 99 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/jobs/job/civilian.dm
+1
View File
@@ -11,6 +11,7 @@
selection_color = "#dddddd"
access = list(access_hydroponics, access_bar, access_kitchen)
minimal_access = list(access_bar)
alt_titles = list("Barista")
equip(var/mob/living/carbon/human/H)
code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm
+119 -64
View File
@@ -957,14 +957,14 @@
M.make_jittery(5)
/datum/reagent/drink/coffee/icecoffee
name = "Iced Coffee"
name = "Frappe Coffee"
id = "icecoffee"
description = "Coffee and ice, refreshing and cool."
color = "#102838"
adj_temp = -5
glass_icon_state = "icedcoffeeglass"
glass_name = "glass of iced coffee"
glass_name = "glass of frappe coffee"
glass_desc = "A drink to perk you up and refresh you!"
/datum/reagent/drink/coffee/soy_latte
@@ -1001,6 +1001,123 @@
..()
M.heal_organ_damage(0.5 * removed, 0)
/datum/reagent/drink/coffee/espresso
name = "Espresso"
id = "espresso"
description = "A strong coffee made by passing nearly boiling water through coffee seeds at high pressure."
color = "#664300" // rgb: 102, 67, 0
adj_temp = 5
taste_description = "bitter coffee"
glass_icon_state = "hot_coffee"
glass_name = "shot of espresso"
glass_desc = "A strong coffee made by passing nearly boiling water through coffee seeds at high pressure."
glass_center_of_mass = list("x"=15, "y"=9)
/datum/reagent/drink/coffee/freddo_espresso
name = "Freddo espresso"
id = "freddo_espresso"
description = "Espresso with ice cubes poured over ice."
color = "#664300" // rgb: 102, 67, 0
adj_temp = 5
taste_description = "cold and bitter coffee"
glass_icon_state = "hot_coffee"
glass_name = "glass of freddo espresso"
glass_desc = "Espresso with ice cubes poured over ice."
glass_center_of_mass = list("x"=15, "y"=9)
/datum/reagent/drink/coffee/caffe_americano
name = "Caffe Americano"
id = "caffe_americano"
description = "Espresso diluted with hot water."
color = "#664300" // rgb: 102, 67, 0
adj_temp = 5
taste_description = "delicious coffee"
glass_icon_state = "hot_coffee"
glass_name = "glass of caffe Americano"
glass_desc = "delicious coffee"
glass_center_of_mass = list("x"=15, "y"=9)
/datum/reagent/drink/coffee/flat_white
name = "Flat White Espresso"
id = "flat_white"
description = "Espresso with a bit of steamy hot milk."
color = "#664300" // rgb: 102, 67, 0
adj_temp = 5
taste_description = "bitter coffee and milk"
glass_icon_state = "cafe_latte"
glass_name = "glass of flat white"
glass_desc = "Espresso with a bit of steamy hot milk."
glass_center_of_mass = list("x"=15, "y"=9)
/datum/reagent/drink/coffee/latte
name = "Latte"
id = "latte"
description = "A nice, strong and refreshing beverage while you are reading."
color = "#664300" // rgb: 102, 67, 0
adj_temp = 5
taste_description = "bitter cream"
glass_icon_state = "cafe_latte"
glass_name = "glass of cafe latte"
glass_desc = "A nice, strong and refreshing beverage while you are reading."
glass_center_of_mass = list("x"=15, "y"=9)
/datum/reagent/drink/coffee/cappuccino
name = "Cappuccino"
id = "cappuccino"
description = "Espresso with steamed milk foam."
color = "#664300" // rgb: 102, 67, 0
adj_temp = 5
taste_description = "bitter milk foam"
glass_icon_state = "hot_coffee"
glass_name = "glass of cappuccino"
glass_desc = "Espresso with steamed milk foam."
glass_center_of_mass = list("x"=15, "y"=9)
/datum/reagent/drink/coffee/freddo_cappuccino
name = "Freddo Cappuccino"
id = "freddo_cappuccino"
description = "Espresso with steamed milk foam, on ice."
color = "#664300" // rgb: 102, 67, 0
adj_temp = 5
taste_description = "cold and bitter milk foam"
glass_icon_state = "hot_coffee"
glass_name = "glass of freddo cappuccino"
glass_desc = "Espresso with steamed milk foam, on ice."
glass_center_of_mass = list("x"=15, "y"=9)
/datum/reagent/drink/coffee/macchiato
name = "Macchiato"
id = "macchiato"
description = "Espresso with milk foam."
color = "#664300" // rgb: 102, 67, 0
adj_temp = 5
taste_description = "bitter milk foam"
glass_icon_state = "hot_coffee"
glass_name = "glass of macchiato"
glass_desc = "Espresso with milk foam."
glass_center_of_mass = list("x"=15, "y"=9)
/datum/reagent/drink/coffee/mocacchino
name = "Mocacchino"
id = "mocacchino"
description = "Espresso with hot milk and chocolate."
color = "#664300" // rgb: 102, 67, 0
adj_temp = 5
taste_description = "sweet milk and bitter coffee"
glass_icon_state = "cafe_latte"
glass_name = "glass of mocacchino"
glass_desc = "Espresso with hot milk and chocolate."
glass_center_of_mass = list("x"=15, "y"=9)
/datum/reagent/drink/hot_coco
name = "Hot Chocolate"
id = "hot_coco"
@@ -2650,68 +2767,6 @@
glass_name = "glass of Dr. Daniels"
glass_desc = "A tall glass of honey, whiskey, and diet Dr. Gibb. The perfect blend of throat-soothing liquid."
/////////////////////////////////////////////////////////////////Brightdawns super cool coffee area//////////////////////////////////////////////
/datum/reagent/drink/black_coffee
name = "Black Coffee"
id = "black_coffee"
description = "A rich strong roast, you think it could be a lot better if someone added something extra."
color = "#482000"
adj_dizzy = -6
adj_drowsy = -4
adj_sleepy = -3
adj_temp = 30
overdose = 40
caffeine = 0.4
taste_description = "coffee"
glass_icon_state = "blackcoffee"
glass_name = "A mug of rich Black Coffee"
glass_desc = "A mug of a rich strong roast, you think it could be a lot better if someone added something extra to it."
/datum/reagent/drink/white_coffee
name = "Cafe Au Lait"
id = "white_coffee"
description = "A fancy name for something thats just coffee and milk."
color = "#A64D07"
adj_dizzy = -6
adj_drowsy = -4
adj_sleepy = -3
adj_temp = 30
overdose = 40
caffeine = 0.3
taste_description = "creamy coffee"
glass_icon_state = "whitecoffee"
glass_name = "A mug of Cafe Au Lait"
glass_desc = "A fancy name for something thats just coffee and milk."
/datum/reagent/drink/white_coffee/affect_ingest(var/mob/living/carbon/M, var/alien, var/removed)
..()
M.heal_organ_damage(0.5 * removed, 0)
/datum/reagent/drink/cafe_melange
name = "Cafe Melange"
id = "cafe_melange"
description = "A delicious mug of creamy coffee."
color = "#A64D07"
adj_dizzy = -6
adj_drowsy = -4
adj_sleepy = -3
adj_temp = 30
overdose = 40
caffeine = 0.3
taste_description = "creamy coffee"
glass_icon_state = "whitecoffee"
glass_name = "A mug of Cafe Melange"
glass_desc = "A delicious mug of creamy coffee, keeps you cool headed in the most heated of situations."
/datum/reagent/drink/cafe_melange/affect_ingest(var/mob/living/carbon/M, var/alien, var/removed)
..()
M.reagents.add_reagent("kelotane", removed * 0.2)
//aurora unique drinks
/datum/reagent/alcohol/ethanol/daiquiri
code/modules/reagents/Chemistry-Recipes.dm
+56 -16
View File
@@ -2028,6 +2028,62 @@
required_reagents = list("coffee" = 1, "milk" = 1)
result_amount = 2
/datum/chemical_reaction/freddo_espresso
name = "Freddo Espresso"
id = "freddo_espresso"
result = "freddo_espresso"
required_reagents = list("espresso" = 1, "ice" = 1)
result_amount = 2
/datum/chemical_reaction/caffe_americano
name = "Caffe Americano"
id = "caffe_americano"
result = "caffe_americano"
required_reagents = list("espresso" = 1, "water" = 1)
result_amount = 2
/datum/chemical_reaction/flat_white
name = "Flat White"
id = "flat_white"
result = "flat_white"
required_reagents = list("espresso" = 1, "milk" = 1)
result_amount = 2
/datum/chemical_reaction/latte
name = "Latte"
id = "latte"
result = "latte"
required_reagents = list("flat_white" = 1, "milk" = 1)
result_amount = 2
/datum/chemical_reaction/cappuccino
name = "Cappuccino"
id = "cappuccino"
result = "cappuccino"
required_reagents = list("espresso" = 1, "cream" = 1)
result_amount = 2
/datum/chemical_reaction/freddo_cappuccino
name = "Freddo cappuccino"
id = "freddo_cappuccino"
result = "freddo_cappuccino"
required_reagents = list("cappuccino" = 1, "ice" = 1)
result_amount = 2
/datum/chemical_reaction/macchiato
name = "Macchiato"
id = "macchiato"
result = "macchiato"
required_reagents = list("cappuccino" = 1, "espresso" = 1)
result_amount = 2
/datum/chemical_reaction/mocacchino
name = "Mocacchino"
id = "mocacchino"
result = "mocacchino"
required_reagents = list("flat_white" = 1, "coco" = 1)
result_amount = 2
/datum/chemical_reaction/acidspit
name = "Acid Spit"
id = "acidspit"
@@ -2259,22 +2315,6 @@
required_reagents = list("hydrazine" = 2, "carbon" = 2, "ammonia" = 2)
result_amount = 6
/////////////////////////////////////////Brightdawns super cool coffee drinks//////////////////////////////////////////////
/datum/chemical_reaction/white_coffee
name = "Cafe Au Lait"
id = "white_coffee"
result = "white_coffee"
required_reagents = list("milk" = 1, "black_coffee" = 2)
result_amount = 3
/datum/chemical_reaction/cafe_melange
name = "Cafe Melange"
id = "cafe_melange"
result = "cafe_melange"
required_reagents = list("cream" = 1, "black_coffee" = 2)
result_amount = 3
//aurora's drinks
/datum/chemical_reaction/daiquiri
code/modules/reagents/dispenser/cartridge_presets.dm
+7 -3
View File
@@ -48,8 +48,6 @@
// Bar, soft
ice spawn_reagent = "ice"
coffee spawn_reagent = "coffee"
cream spawn_reagent = "cream"
tea spawn_reagent = "tea"
icetea spawn_reagent = "icetea"
cola spawn_reagent = "cola"
@@ -64,7 +62,13 @@
orange spawn_reagent = "orangejuice"
lime spawn_reagent = "limejuice"
watermelon spawn_reagent = "watermelonjuice"
coffee_beans spawn_reagent = "black_coffee"
// Bar, coffee
coffee spawn_reagent = "coffee"
espresso spawn_reagent = "espresso"
cream spawn_reagent = "cream"
milk spawn_reagent = "milk"
soymilk spawn_reagent = "soymilk"
// ERT
inaprov spawn_reagent = "inaprovaline"
code/modules/reagents/dispenser/coffeebeans.dm
+2 -2
View File
@@ -1,4 +1,4 @@
/obj/item/weapon/reagent_containers/chem_disp_cartridge/coffee_beans
/obj/item/weapon/reagent_containers/chem_disp_cartridge/espresso
name = "A jar of Coffee Beans "
desc = "This goes into a coffee maker!"
label = "Spesscafe Dark Blend"
@@ -12,5 +12,5 @@
possible_transfer_amounts = list(20, 40)
unacidable = 1
spawn_reagent = "black_coffee"
spawn_reagent = "espresso"
code/modules/reagents/dispenser/dispenser_presets.dm
+19 -1
View File
@@ -118,6 +118,24 @@
/obj/item/weapon/reagent_containers/chem_disp_cartridge/mead
)
/obj/machinery/chemical_dispenser/coffeemaster
name = "Coffee Master 3000"
desc = "The only thing that can get some workers though the day, a coffee maker on steroids!"
icon_state = "coffee_master"
ui_title = "Coffee Master 3000"
accept_drinking = 1
density = 0
/obj/machinery/chemical_dispenser/coffeemaster/full
spawn_cartridges = list(
/obj/item/weapon/reagent_containers/chem_disp_cartridge/coffee,
/obj/item/weapon/reagent_containers/chem_disp_cartridge/espresso,
/obj/item/weapon/reagent_containers/chem_disp_cartridge/cream,
/obj/item/weapon/reagent_containers/chem_disp_cartridge/sugar,
/obj/item/weapon/reagent_containers/chem_disp_cartridge/milk,
/obj/item/weapon/reagent_containers/chem_disp_cartridge/soymilk
)
/obj/machinery/chemical_dispenser/coffee
name = "Coffee Machine"
desc = "The only thing that can get some workers though the day, the coffee maker is the stations most valuable resource."
@@ -127,5 +145,5 @@
/obj/machinery/chemical_dispenser/coffee/full
spawn_cartridges = list(
/obj/item/weapon/reagent_containers/chem_disp_cartridge/coffee_beans
/obj/item/weapon/reagent_containers/chem_disp_cartridge/espresso
)
code/modules/reagents/reagent_containers/food/lunch.dm
+1 -4
View File
@@ -71,10 +71,7 @@ var/list/lunchables_drink_reagents_ = list(
/datum/reagent/drink/dry_ramen,
/datum/reagent/drink/hell_ramen,
/datum/reagent/drink/hot_ramen,
/datum/reagent/drink/nuka_cola,
/datum/reagent/drink/black_coffee,
/datum/reagent/drink/white_coffee,
/datum/reagent/drink/cafe_melange
/datum/reagent/drink/nuka_cola
)
// This default list is a bit different, it contains items we don't want