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 075ca58c1a3..86c2cb414e2 100644 --- a/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm +++ b/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm @@ -2728,6 +2728,17 @@ glass_name = "glass of applejack" glass_desc = "Hard apple cider that has been distilled. The result is much more flavorful and alcoholic." +/singleton/reagent/alcohol/snakebite + name = "Snakebite" + description = "An alcoholic beverage made of equal parts beer and alcoholic cider." + color = "#ceab4a" + strength = 9 + taste_description = "sweet apple-flavoured beer" + + glass_icon_state = "snakebite" + glass_name = "glass of snakebite" + glass_desc = "A glass of half-and-half beer and alcoholic cider." + /singleton/reagent/alcohol/beer name = "Beer" description = "An alcoholic beverage made from malted grains, hops, yeast, and water." diff --git a/code/modules/reagents/Chemistry-Recipes.dm b/code/modules/reagents/Chemistry-Recipes.dm index fe70060af87..63878d266dd 100644 --- a/code/modules/reagents/Chemistry-Recipes.dm +++ b/code/modules/reagents/Chemistry-Recipes.dm @@ -2156,6 +2156,13 @@ catalysts = list(/singleton/reagent/enzyme = 5) result_amount = 10 +/datum/chemical_reaction/snakebite + name = "Snakebite" + id = "snakebite" + result = /singleton/reagent/alcohol/snakebite + required_reagents = list(/singleton/reagent/alcohol/beer = 5, /singleton/reagent/alcohol/applejack = 5) + result_amount = 10 + /datum/chemical_reaction/light_beer name = "Light Beer" id = "spacebeer" diff --git a/html/changelogs/llywelwyn-booze.yml b/html/changelogs/llywelwyn-booze.yml new file mode 100644 index 00000000000..e4866cdd93b --- /dev/null +++ b/html/changelogs/llywelwyn-booze.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: Llywelwyn + +# 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 drink, snakebite (equal parts beer and alcoholic cider)." diff --git a/icons/obj/drinks.dmi b/icons/obj/drinks.dmi index df709659264..0cc4c707a1b 100644 Binary files a/icons/obj/drinks.dmi and b/icons/obj/drinks.dmi differ