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 4f3f3ccbcc6..c00c05037d7 100644 --- a/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm +++ b/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm @@ -1277,6 +1277,17 @@ glass_name = "glass of lemonade" glass_desc = "Oh the nostalgia..." +/datum/reagent/drink/lemonade/pink + name = "Pink Lemonade" + description = "A fruity pink citrus drink." + id = "pinklemonade" + color = "#FFC0CB" + taste_description = "girly tartness" + + glass_icon_state = "pinklemonade" + glass_name = "glass of pink lemonade" + glass_desc = "You feel girlier just looking at this." + /datum/reagent/drink/kiraspecial name = "Kira Special" description = "Long live the guy who everyone had mistaken for a girl. Baka!" diff --git a/code/modules/reagents/Chemistry-Recipes.dm b/code/modules/reagents/Chemistry-Recipes.dm index e91972ad138..65bdb046182 100644 --- a/code/modules/reagents/Chemistry-Recipes.dm +++ b/code/modules/reagents/Chemistry-Recipes.dm @@ -2343,6 +2343,14 @@ required_reagents = list("lemonjuice" = 1, "sugar" = 1, "water" = 1) result_amount = 3 +/datum/chemical_reaction/lemonade/pink + name = "Pink Lemonade" + id = "pinklemonade" + result = "pinklemonade" + required_reagents = list("lemonade" = 8, "grenadine" = 2) + result_amount = 10 + + /datum/chemical_reaction/kiraspecial name = "Kira Special" id = "kiraspecial" diff --git a/html/changelogs/Kaedwuff - Pink Lemonade.yml b/html/changelogs/Kaedwuff - Pink Lemonade.yml new file mode 100644 index 00000000000..399f9d5403e --- /dev/null +++ b/html/changelogs/Kaedwuff - Pink Lemonade.yml @@ -0,0 +1,37 @@ +################################ +# 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 +################################# + +# Your name. +author: Kaedwuff + +# 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: "Pink lemonade can now be made by mixing in grenadine to lemonade, if you want to make a girly fruit drink." diff --git a/icons/obj/drinks.dmi b/icons/obj/drinks.dmi index 9adbb500f8d..213e1e69f1e 100644 Binary files a/icons/obj/drinks.dmi and b/icons/obj/drinks.dmi differ