From a3b1363b2cc4684308a3f4b460f71170de8a5569 Mon Sep 17 00:00:00 2001 From: Yoshax Date: Thu, 7 Jul 2016 21:51:30 +0100 Subject: [PATCH 1/2] Adds new non-alcoholic drinks --- code/modules/economy/price_list.dm | 13 ++++++ .../Chemistry-Reagents-Food-Drinks.dm | 44 +++++++++++++++++++ code/modules/reagents/Chemistry-Recipes.dm | 27 ++++++++++++ 3 files changed, 84 insertions(+) diff --git a/code/modules/economy/price_list.dm b/code/modules/economy/price_list.dm index 8301043c092..3d4589469bc 100644 --- a/code/modules/economy/price_list.dm +++ b/code/modules/economy/price_list.dm @@ -42,6 +42,18 @@ /datum/reagent/drink/milkshake price_tag = 2 +/datum/reagent/drink/roy_rogers + price_tag = 2 + +/datum/reagent/drink/shirley_temple + price_tag = 2 + +/datum/reagent/drink/arnold_palmer + price_tag = 2 + +/datum/reagent/drink/collins_mix + price_tag = 2 + // Beer // @@ -322,6 +334,7 @@ price_tag = 3 + // From the machine // /obj/item/weapon/reagent_containers/food/drinks/cans/cola diff --git a/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm b/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm index 55a50bc925e..715adbf7d69 100644 --- a/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm +++ b/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm @@ -924,6 +924,50 @@ glass_desc = "A tangy substance made of 0.5% natural citrus!" glass_special = list(DRINK_FIZZ) +/datum/reagent/drink/shirley_temple + name = "Shirley Temple" + description = "A sweet concotion hated even by its namesake." + id = "shirley_temple" + color = "#EF304F" + adj_temp = -8 + + glass_name = "shirley temple" + glass_desc = "A sweet concotion hated even by its namesake." + glass_special = list(DRINK_FIZZ) + +/datum/reagent/drink/roy_rogers + name = "Roy Rogers" + description = "I'm a cowboy, on a steel horse I ride." + id = "roy_rogers" + color = "#4F1811" + adj_temp = -8 + + glass_name = "roy rogers" + glass_desc = "I'm a cowboy, on a steel horse I ride" + glass_special = list(DRINK_FIZZ) + +/datum/reagent/drink/collins_mix + name = "Collins Mix" + description = "Best hope it isn't a hoax." + id = "collins_mix" + color = "#D7D0B3" + adj_temp = -8 + + glass_name = "collins mix" + glass_desc = "Best hope it isn't a hoax." + glass_special = list(DRINK_FIZZ) + +/datum/reagent/drink/arnold_palmer + name = "Arnold Palmer" + description = "Tastes just like the old man." + id = "arnold_palmer" + color = "#AF5517" + adj_temp = -8 + + glass_name = "arnold palmer" + glass_desc = "Tastes just like the old man." + glass_special = list(DRINK_FIZZ) + /datum/reagent/drink/doctor_delight name = "The Doctor's Delight" id = "doctorsdelight" diff --git a/code/modules/reagents/Chemistry-Recipes.dm b/code/modules/reagents/Chemistry-Recipes.dm index a2938bb56dc..081be5d54ac 100644 --- a/code/modules/reagents/Chemistry-Recipes.dm +++ b/code/modules/reagents/Chemistry-Recipes.dm @@ -1748,3 +1748,30 @@ required_reagents = list("hydrogen" = 2, "carbon" = 2, "ammonia" = 2) result_amount = 6 +/datum/chemical_reaction/shirleytemple + name = "Shirley Temple" + id = "shirley_temple" + result = "shirley_temple" + required_reagents = list("lemon_lime" = 4, "grenadine" = 1) + result_amount = 5 + +/datum/chemical_reaction/royrogers + name = "Roy Rogers" + id = "roy_rogers" + result = "roy_rogers" + required_reagents = list("cola" = 4, "grenadine" = 1) + result_amount = 5 + +/datum/chemical_reaction/collinsmix + name = "Collins Mix" + id = "collins_mix" + result = "collins_mix" + required_reagents = list("lemon_lime" = 3, "sodawater" = 1) + result_amount = 4 + +/datum/chemical_reaction/arnoldpalmer + name = "Arnold Palmer" + id = "arnold_palmer" + result = "arnold_palmer" + required_reagents = list("icetea" = 1, "lemonade" = 1) + result_amount = 2 \ No newline at end of file From cdd143a3dddf78b06137df922e33a6a0f367614a Mon Sep 17 00:00:00 2001 From: Yoshax Date: Thu, 7 Jul 2016 21:51:36 +0100 Subject: [PATCH 2/2] Adds changelog --- html/changelogs/Yoshax - drinks.yml | 36 +++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) create mode 100644 html/changelogs/Yoshax - drinks.yml diff --git a/html/changelogs/Yoshax - drinks.yml b/html/changelogs/Yoshax - drinks.yml new file mode 100644 index 00000000000..d24482d9f2d --- /dev/null +++ b/html/changelogs/Yoshax - drinks.yml @@ -0,0 +1,36 @@ +################################ +# Example Changelog File +# +# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb. +# +# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.) +# When it is, any changes listed below will disappear. +# +# Valid Prefixes: +# bugfix +# wip (For works in progress) +# tweak +# soundadd +# sounddel +# rscadd (general adding of nice things) +# rscdel (general deleting of nice things) +# imageadd +# imagedel +# maptweak +# spellcheck (typo fixes) +# experiment +################################# + +# Your name. +author: Yoshax + +# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again. +delete-after: True + +# Any changes you've made. See valid prefix list above. +# INDENT WITH TWO SPACES. NOT TABS. SPACES. +# SCREW THIS UP AND IT WON'T WORK. +# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries. +# Please surround your changes in double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog. +changes: + - rscadd: "Adds recipes for four new non-alcoholic cocktails. Shirley Temples, Roy Rogers, Arnold Palmers and Collins Mixes." \ No newline at end of file