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 5b33274553f..958bd56751e 100644 --- a/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm +++ b/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm @@ -1762,6 +1762,17 @@ 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) +/singleton/reagent/drink/coffee/ration + name = "Ration Coffee" + description = "Watered-down coffee. One cup now becomes four!" + color = "#664300" // rgb: 102, 67, 0 + taste_description = "weak, watered-down coffee" + + glass_icon_state = "hot_coffee" + glass_name = "glass of ration coffee" + glass_desc = "Coffee, watered-down." + glass_center_of_mass = list("x"=15, "y"=9) + /singleton/reagent/drink/coffee/freddo_espresso name = "Freddo Espresso" description = "Espresso with ice cubes poured over ice." diff --git a/code/modules/reagents/Chemistry-Recipes.dm b/code/modules/reagents/Chemistry-Recipes.dm index e798567d4bf..f95f9bb1192 100644 --- a/code/modules/reagents/Chemistry-Recipes.dm +++ b/code/modules/reagents/Chemistry-Recipes.dm @@ -2371,6 +2371,13 @@ required_reagents = list(/singleton/reagent/alcohol/rum = 1, /singleton/reagent/water = 1) result_amount = 2 +/datum/chemical_reaction/drink/ration_coffee + name = "Ration Coffee" + id = "ration_coffee" + result = /singleton/reagent/drink/coffee/ration + required_reagents = list(/singleton/reagent/drink/coffee = 2, /singleton/reagent/water = 1) + result_amount = 3 + /datum/chemical_reaction/drink/soy_latte name = "Soy Latte" id = "soy_latte" diff --git a/html/changelogs/Caelphon-RationCoffee.yml b/html/changelogs/Caelphon-RationCoffee.yml new file mode 100644 index 00000000000..1faba07f441 --- /dev/null +++ b/html/changelogs/Caelphon-RationCoffee.yml @@ -0,0 +1,41 @@ +################################ +# 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 +# balance +# admin +# backend +# security +# refactor +################################# + +# Your name. +author: Caelphon + +# 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: "Added a new recipe called Ration Coffee. 2u Coffee and 1u Water make it."